repo
string
commit
string
message
string
diff
string
aemadrid/rubyhaze-persisted
b95dc369bf8f2ca10c59b642fe3a2dea4f668cb9
Version bump to 0.0.1
diff --git a/VERSION b/VERSION index 77d6f4c..8acdd82 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.0 +0.0.1
aemadrid/rubyhaze-persisted
4c02e2bc87392c956ec60ede70304d42800e0df3
Version bump to 0.0.0
diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..77d6f4c --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.0
aemadrid/rubyhaze-persisted
d7f7d4e3981e610ecc1258ecd2af536f30fb9509
First running version
diff --git a/.gitignore b/.gitignore index c1e0daf..a2972e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,23 @@ ## MAC OS .DS_Store ## TEXTMATE *.tmproj tmtags ## EMACS *~ \#* .\#* ## VIM *.swp ## PROJECT::GENERAL coverage rdoc pkg +.rvmrc +.idea/* ## PROJECT::SPECIFIC diff --git a/READ...
radekp/qgcide
93cd2d3897a47b38c26398481b5917767defa56e
qbuild.pro - remove unneeded link flags
diff --git a/qbuild.pro b/qbuild.pro index f2c76f1..214ddd6 100644 --- a/qbuild.pro +++ b/qbuild.pro @@ -1,55 +1,50 @@ TEMPLATE=app TARGET=qgcide CONFIG+=qtopia DEFINES+=QTOPIA # I18n info STRING_LANGUAGE=en_US LANGUAGES=en_US -INCLUDEPATH+=/usr/include/glib-2.0 \ - /usr/lib/glib-2.0/include - ...
radekp/qgcide
c22792d027365ed4ad4b4e7dc9d892a0da92dd63
Debian package
diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..4773f72 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,6 @@ +qtmoko for Debian +----------------- + +<possible notes regarding this package - if none, delete this file> + + -- Radek Polak <psonek2@seznam.cz> Sat, 05 Feb 2...
radekp/qgcide
56ea27013659e9f0d9e9ad6264e581f0f3e2a909
Better description
diff --git a/qbuild.pro b/qbuild.pro index fa84dc1..f2c76f1 100644 --- a/qbuild.pro +++ b/qbuild.pro @@ -1,55 +1,55 @@ TEMPLATE=app TARGET=qgcide CONFIG+=qtopia DEFINES+=QTOPIA # I18n info STRING_LANGUAGE=en_US LANGUAGES=en_US INCLUDEPATH+=/usr/include/glib-2.0 \ /usr/lib/glib-2.0/include ...
radekp/qgcide
3522268c22f66ebb71d3ab343103d04213c27ff1
Compare only letters and numbers, skip marks and other stuff
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index 5541be1..d3506be 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,524 +1,524 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); #ifdef QTOPI...
radekp/qgcide
eec620029157f75b6b4968f92c50f5a001ba9080
Fix searching and unicode chars in key
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index 72ea2d4..5541be1 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,518 +1,524 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); #ifdef QTOPI...
radekp/qgcide
1f1e4d9d0bd40c16680892a529fc4b047a2a7718
Fix unpacking progress
diff --git a/qbuild.pro b/qbuild.pro index 7085067..fa84dc1 100644 --- a/qbuild.pro +++ b/qbuild.pro @@ -1,55 +1,55 @@ TEMPLATE=app TARGET=qgcide CONFIG+=qtopia DEFINES+=QTOPIA # I18n info STRING_LANGUAGE=en_US LANGUAGES=en_US INCLUDEPATH+=/usr/include/glib-2.0 \ /usr/lib/glib-2.0/include ...
radekp/qgcide
7e3d68282ed140a6b9400d5b936e8c7687223da1
Better icon
diff --git a/pics/qgcide.png b/pics/qgcide.png deleted file mode 100644 index 1256873..0000000 Binary files a/pics/qgcide.png and /dev/null differ diff --git a/pics/qgcide.svg b/pics/qgcide.svg new file mode 100644 index 0000000..b9ed77d --- /dev/null +++ b/pics/qgcide.svg @@ -0,0 +1,356 @@ +<?xml version="1.0" encodin...
radekp/qgcide
9820d0ca7bdba64ccaca1b32d15fc08eade35b27
Fix searching, after found move to left
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index 62650f6..35d6a56 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,504 +1,508 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); //QMenu *m...
radekp/qgcide
964d205d445b42c4546194f13eff174101fc24e7
Fix qtopia build
diff --git a/src/qgcide.h b/src/qgcide.h index 44d6efc..4c70cf1 100644 --- a/src/qgcide.h +++ b/src/qgcide.h @@ -1,67 +1,71 @@ #ifndef QGCIDE_H #define QGCIDE_H #include <QWidget> #include <QLineEdit> #include <QTextBrowser> #include <QGridLayout> #include <QMainWindow> #include <QMenuBar> #include <QDir> #...
radekp/qgcide
9474461c26a94bf4158f23d299f10753d97ccf3a
Implement dictionary downloading
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index e090820..62650f6 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,318 +1,504 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); - QMenu *men...
radekp/qgcide
caf06813fff58cdb100946361b42fdb739e26bce
fix slowness when expression does not exist
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index d62449b..e090820 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,314 +1,318 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); QMenu *men...
radekp/qgcide
d938d8327443629498171c8f5a558b89aee40855
Get rid of backward searching
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index 14da85d..d62449b 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,337 +1,314 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); QMenu *men...
radekp/qgcide
2a4d221a8da1abad6584aae8402ee9bce3975c25
Speedup using binary search, backward search is still slow
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index 717abd8..14da85d 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,248 +1,337 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); QMenu *men...
radekp/qgcide
36bcbbd0f23a343da64e2b0421c75fb195631de5
Stop searching after expression no more matches
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index 54efccd..717abd8 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,240 +1,248 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); QMenu *men...
radekp/qgcide
60483b6494e66c9ab74fba9960ef984a18a95ccd
Add definitions to output
diff --git a/src/qgcide.cpp b/src/qgcide.cpp index 558f63c..54efccd 100644 --- a/src/qgcide.cpp +++ b/src/qgcide.cpp @@ -1,232 +1,240 @@ #include "qgcide.h" QDictMainWindow::QDictMainWindow(QWidget* parent, Qt::WindowFlags f) : QMainWindow(parent, f) { setWindowTitle(tr("English dictionary")); QMenu *men...
radekp/qgcide
28162eb338ac234c773fe048bf970347b5912867
First working version
diff --git a/qgcide.pro b/qgcide.pro index 70d8717..4cb0e8d 100644 --- a/qgcide.pro +++ b/qgcide.pro @@ -1,15 +1,15 @@ #------------------------------------------------- # # Project created by QtCreator 2009-04-14T22:32:40 # #------------------------------------------------- TARGET = qgcide TEMPLATE = app -Q...
radekp/qgcide
11aeb5f90085078253664bad87dbfbd828f82370
QGcide - English dictionary app working with GCIDE database
diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..bff37be --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Radek Polak <psonek2@seznam.cz> \ No newline at end of file diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PU...
benmyles/chimera
3044c1cbca42cfa4627eb523b374bab14f008a61
simpler postinstall
diff --git a/PostInstall.txt b/PostInstall.txt index e5e8b83..f1f9af8 100644 --- a/PostInstall.txt +++ b/PostInstall.txt @@ -1,18 +1,8 @@ -== CHIMERA ISSUES/NOTES: +Documentation on Chimera is available at: + http://wiki.github.com/benmyles/chimera/ -* Experimental. Not yet tested in production environment, use at y...
benmyles/chimera
ff854e0a2cd651b28a7530b9b151232ecdd84fdf
bump version
diff --git a/lib/chimera.rb b/lib/chimera.rb index 9e00d0e..c2e8481 100644 --- a/lib/chimera.rb +++ b/lib/chimera.rb @@ -1,35 +1,35 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) gem 'uuidtools','= 2.1.1' gem 'activemodel...
benmyles/chimera
06e81010345f1599009c2f75764fff3eff5a76a0
fix github url in readme
diff --git a/README.rdoc b/README.rdoc index 27f4604..aacfb44 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,131 +1,131 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
1c5426329f5e78ce9d4b08c7172a673564f898ff
added pagination example to README
diff --git a/README.rdoc b/README.rdoc index 2fa9a8f..27f4604 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,127 +1,131 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
9235f7e2d691669b2dbe3d7d1cd59babfcf7884b
implemented MAX_FINDER_THREADS
diff --git a/lib/chimera.rb b/lib/chimera.rb index 197bec2..9e00d0e 100644 --- a/lib/chimera.rb +++ b/lib/chimera.rb @@ -1,34 +1,35 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) gem 'uuidtools','= 2.1.1' gem 'activemodel...
benmyles/chimera
d4195786d406706ba5136d585ede39b95a239712
all indexes and associations now support paging
diff --git a/lib/chimera/indexes.rb b/lib/chimera/indexes.rb index 4a55605..db454b0 100644 --- a/lib/chimera/indexes.rb +++ b/lib/chimera/indexes.rb @@ -1,183 +1,196 @@ module Chimera module Indexes SEARCH_EXCLUDE_LIST = %w(a an and as at but by for in into of on onto to the) def self.included(base)...
benmyles/chimera
d797b81dc7aaf83d3a4b79260c33c6ab712022ea
paging for :all indexes
diff --git a/lib/chimera/indexes.rb b/lib/chimera/indexes.rb index c739911..4a55605 100644 --- a/lib/chimera/indexes.rb +++ b/lib/chimera/indexes.rb @@ -1,177 +1,183 @@ module Chimera module Indexes SEARCH_EXCLUDE_LIST = %w(a an and as at but by for in into of on onto to the) def self.included(base)...
benmyles/chimera
a153f4a8aa3cc6a182e18be41fb4b86b7d9193ae
implemented paging for associations
diff --git a/lib/chimera/associations.rb b/lib/chimera/associations.rb index 34c11ab..301f579 100644 --- a/lib/chimera/associations.rb +++ b/lib/chimera/associations.rb @@ -1,148 +1,148 @@ module Chimera module Associations def self.included(base) base.send :extend, ClassMethods base.send :includ...
benmyles/chimera
18d8f861d8398625056330e17fcd6e51e3f631a3
dont bundle typhoeus
diff --git a/Manifest.txt b/Manifest.txt index 4212f2b..7eb5079 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -1,57 +1,45 @@ doc/examples/config.yml doc/NOTES doc/redis6379.conf History.txt lib/chimera/associations.rb lib/chimera/attributes.rb lib/chimera/base.rb lib/chimera/config.rb lib/chimera/error.rb l...
benmyles/chimera
dbf360fc7fa1e54dba6b3921c3425c5c8ee18e81
added destroy_all method
diff --git a/lib/chimera/base.rb b/lib/chimera/base.rb index c45d6da..a4fe8be 100644 --- a/lib/chimera/base.rb +++ b/lib/chimera/base.rb @@ -1,99 +1,103 @@ module Chimera def self.config_path=(path) @config_path = path @config = YAML.load_file(@config_path) end def self.config @config || ra...
benmyles/chimera
dea3853358e6487095889bc44a36ba9d005198e1
support for riak siblings so that we can manage conflicts
diff --git a/lib/chimera/base.rb b/lib/chimera/base.rb index f9b663a..c45d6da 100644 --- a/lib/chimera/base.rb +++ b/lib/chimera/base.rb @@ -1,95 +1,99 @@ module Chimera def self.config_path=(path) @config_path = path @config = YAML.load_file(@config_path) end def self.config @config || rai...
benmyles/chimera
3a35b3aa37156fc7c5309726affeb147b5030221
formatting
diff --git a/README.rdoc b/README.rdoc index 72ee8bd..c5672d2 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,127 +1,126 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
1d89f8f21938486514e3809f37ff261636021630
add my name in the license, email and twitter
diff --git a/README.rdoc b/README.rdoc index fa49601..72ee8bd 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,124 +1,127 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
8cb75e63cc619301999e91d57030ac0ac3971679
add ruby 1.9 as a requirement
diff --git a/README.rdoc b/README.rdoc index f1a2fa2..fa49601 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,122 +1,124 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
3adc091ff756534dc0d87a3260c5993f08238d7b
add a note about being alpha
diff --git a/README.rdoc b/README.rdoc index 96e9793..bc6826e 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,117 +1,119 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
9f4fb189ab2ad7783ee98b99c63240f50c153611
bump version again for readme
diff --git a/README.rdoc b/README.rdoc index edd5584..96e9793 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,118 +1,117 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
4b825e9b9d9372c2e5295366b64f07d637dd24ae
added link to google group
diff --git a/README.rdoc b/README.rdoc index 55412d4..edd5584 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,118 @@ = chimera * http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability, massive data stor...
benmyles/chimera
42275196cecf1a5e106f42c61d657a5274aaa48a
fix homepage
diff --git a/README.rdoc b/README.rdoc index 336f422..55412d4 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,114 @@ = chimera -* http://github.com/#{github_username}/#{project_name} +* http://github.com/benmyles/chimera == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix...
benmyles/chimera
188292d3bfa6290a6c7f9f8ae116bfc5ca3c255c
new version
diff --git a/README.rdoc b/README.rdoc index 9202abf..336f422 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,114 @@ = chimera * http://github.com/#{github_username}/#{project_name} == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability,...
benmyles/chimera
84eb06c10b4791cfe2a974b2983556b26cfbe658
repackaged gem
diff --git a/pkg/chimera-0.0.1.gem b/pkg/chimera-0.0.1.gem index 6652c64..4c44505 100644 Binary files a/pkg/chimera-0.0.1.gem and b/pkg/chimera-0.0.1.gem differ
benmyles/chimera
276517a11a3ec83dc3ab47d52d8d4c1c47ed83f4
use yajl ruby
diff --git a/README.rdoc b/README.rdoc index a1e99e4..9202abf 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,114 @@ = chimera * http://github.com/#{github_username}/#{project_name} == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability,...
benmyles/chimera
a3a7482aa21d4b003ff2911d5898438ae3f5a4dc
more indentaiton
diff --git a/README.rdoc b/README.rdoc index b7237b6..a1e99e4 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,114 @@ = chimera * http://github.com/#{github_username}/#{project_name} == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability,...
benmyles/chimera
51883fe014fef7eefbae3a1bba9bf3e720c2737d
more indentaiton
diff --git a/README.rdoc b/README.rdoc index e9693b9..b7237b6 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,114 @@ = chimera * http://github.com/#{github_username}/#{project_name} == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability,...
benmyles/chimera
c9b298382b39ac1c55a225a8e34e034b77cbb0de
more indentaiton
diff --git a/README.rdoc b/README.rdoc index f430265..e9693b9 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,114 @@ = chimera * http://github.com/#{github_username}/#{project_name} == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability,...
benmyles/chimera
18dd979eb3e71c0fb730c91731e28939f7aaf9d6
indentation
diff --git a/README.rdoc b/README.rdoc index 3a50233..f430265 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,114 +1,114 @@ = chimera * http://github.com/#{github_username}/#{project_name} == DESCRIPTION: Chimera is an object mapper for Riak and Redis. The idea is to mix the advantages of Riak (scalability,...
benmyles/chimera
3b8e98d01bc107ebbef12243c3e9767a631f34ef
added pkg files
diff --git a/pkg/chimera-0.0.1.gem b/pkg/chimera-0.0.1.gem new file mode 100644 index 0000000..0873775 Binary files /dev/null and b/pkg/chimera-0.0.1.gem differ
benmyles/chimera
fbc29af55350c76e38af2215e4c08547b796bf1f
now everything is encoded with yaml
diff --git a/Manifest.txt b/Manifest.txt index 81e06cf..4212f2b 100644 --- a/Manifest.txt +++ b/Manifest.txt @@ -1,11 +1,57 @@ +doc/examples/config.yml +doc/NOTES +doc/redis6379.conf History.txt +lib/chimera/associations.rb +lib/chimera/attributes.rb +lib/chimera/base.rb +lib/chimera/config.rb +lib/chimera/error.rb +l...
benmyles/chimera
a2930c67959d60727f1c906da8aa25b5d406f038
added redis objects
diff --git a/lib/chimera.rb b/lib/chimera.rb index f12978c..2e645d6 100644 --- a/lib/chimera.rb +++ b/lib/chimera.rb @@ -1,30 +1,32 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) gem 'uuidtools','= 2.1.1' gem 'activemodel...
benmyles/chimera
519a0a5d1acd7a204d09493c06f7c6fd8c2b5f90
just missing associations now
diff --git a/History.txt b/History.txt new file mode 100644 index 0000000..5846f89 --- /dev/null +++ b/History.txt @@ -0,0 +1,4 @@ +=== 0.0.1 2010-03-01 + +* 1 major enhancement: + * Initial release diff --git a/Manifest.txt b/Manifest.txt new file mode 100644 index 0000000..81e06cf --- /dev/null +++ b/Manifest.txt @@...
cooperq/Resume
35e80c4a6ce180ec86249138d67ffed8cdc07d05
updating resume
diff --git a/CooperResume.doc b/CooperResume.doc index a2b6368..121a579 100755 Binary files a/CooperResume.doc and b/CooperResume.doc differ diff --git a/CooperResume.html b/CooperResume.html new file mode 100644 index 0000000..f2f8895 --- /dev/null +++ b/CooperResume.html @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding...
dreamsocket/actionscript-analytics-framework
2278e4517dabfd25cd9208d282257f6a62df8dc8
[FIX] allowed external modules to be loaded from other domains by loading them into the same security sandbox
diff --git a/bin/daf_google.swf b/bin/daf_google.swf index 51e7572..c0777b7 100644 Binary files a/bin/daf_google.swf and b/bin/daf_google.swf differ diff --git a/bin/daf_javascript.swf b/bin/daf_javascript.swf index 2bf3147..626c10e 100644 Binary files a/bin/daf_javascript.swf and b/bin/daf_javascript.swf differ diff -...
dreamsocket/actionscript-analytics-framework
694faa500e482fff801facd2a1f5de38f0b275ff
[CHG] updated HTTPUtil pings to use sendToURL for GET requests (doesn't need crossdomain.xml)
diff --git a/bin/daf_google.swf b/bin/daf_google.swf index 7c03c9e..51e7572 100644 Binary files a/bin/daf_google.swf and b/bin/daf_google.swf differ diff --git a/bin/daf_javascript.swf b/bin/daf_javascript.swf index ad88088..2bf3147 100644 Binary files a/bin/daf_javascript.swf and b/bin/daf_javascript.swf differ diff -...
dreamsocket/actionscript-analytics-framework
94193d7816ce78aa1706f61bae6973d0dc5ed80f
[NEW] added ability to queue tracks in TrackerManager. by default if enabled, tracks will be queued until a tracker has been added [NEW] added ability to specify properties using bracket syntax (ex: data['myProperty']) [NEW] added ability to specify ActionSource reference to be used by OmnitureTracker [FIX] corrected i...
diff --git a/bin/daf_google.swf b/bin/daf_google.swf index 3a65f1e..7c03c9e 100644 Binary files a/bin/daf_google.swf and b/bin/daf_google.swf differ diff --git a/bin/daf_javascript.swf b/bin/daf_javascript.swf index 970da61..ad88088 100644 Binary files a/bin/daf_javascript.swf and b/bin/daf_javascript.swf differ diff -...
dreamsocket/actionscript-analytics-framework
b265711fc8d1d4c312e17bb3c76ddba38b139ed7
[NEW] added ant task to build ASDocs
diff --git a/build.xml b/build.xml index 511a223..38c8f2b 100644 --- a/build.xml +++ b/build.xml @@ -1,117 +1,139 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="dreamsocket_actionscript_analytics" default="buildAll" basedir="."> <!-- FLEX TASKS --> <property name="FLEX_HOME" value="/tools/flash/f...
dreamsocket/actionscript-analytics-framework
0dd3490974ac4088f6eca90daebdeeadbf52b9f9
[CHG] updated version minor to 4 [CHG] recompiled all binaries with changes from last checkin
diff --git a/bin/daf_google.swf b/bin/daf_google.swf index c0b5ff5..3a65f1e 100644 Binary files a/bin/daf_google.swf and b/bin/daf_google.swf differ diff --git a/bin/daf_javascript.swf b/bin/daf_javascript.swf index f297d4d..970da61 100644 Binary files a/bin/daf_javascript.swf and b/bin/daf_javascript.swf differ diff -...
dreamsocket/actionscript-analytics-framework
79165e673fc9c3ed2b6d5d2f523825bbd61043d3
[CHG] renamed resource property to params property on TrackerModuleLoaderEvent [CHG] general trace, import cleanups [NEW] added evar and prop properties to OmnitureParams [DEL] removed unused file GoogleTrackerParams
diff --git a/src/com/dreamsocket/analytics/TrackerModuleLoader.as b/src/com/dreamsocket/analytics/TrackerModuleLoader.as index 8545d2e..70fd342 100644 --- a/src/com/dreamsocket/analytics/TrackerModuleLoader.as +++ b/src/com/dreamsocket/analytics/TrackerModuleLoader.as @@ -1 +1 @@ -/** * Dreamsocket, Inc. * http://dr...
dreamsocket/actionscript-analytics-framework
69eff098547aa1a2044e8804ec607175250e4585
[CHG] corrected some of the license header files (made MIT license) [CHG] removed some random traces
diff --git a/bin/daf_google.swf b/bin/daf_google.swf index ac5d6e0..c0b5ff5 100644 Binary files a/bin/daf_google.swf and b/bin/daf_google.swf differ diff --git a/bin/daf_javascript.swf b/bin/daf_javascript.swf index 51899c8..f297d4d 100644 Binary files a/bin/daf_javascript.swf and b/bin/daf_javascript.swf differ diff -...
dreamsocket/actionscript-analytics-framework
9913dd83dd5c02aa724e61cbba5d01938edbef76
[CHG] made default size of swfs 1x1
diff --git a/build.xml b/build.xml index 34b0687..ed74cb5 100644 --- a/build.xml +++ b/build.xml @@ -1,117 +1,117 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="dreamsocket_actionscript_analytics" default="buildAll" basedir="."> <!-- FLEX TASKS --> <property name="FLEX_HOME" value="/tools/flash/f...
dreamsocket/actionscript-analytics-framework
b3931514e8a65b81b2483cc1b28c059dc09ecb89
[FIX] adding TestOmnitureMediaTracking with a change, GitHub wasn't recognizing an ammendment
diff --git a/test/TestOmnitureMediaTracking.as b/test/TestOmnitureMediaTracking.as index 135f1db..4cff893 100644 --- a/test/TestOmnitureMediaTracking.as +++ b/test/TestOmnitureMediaTracking.as @@ -1,122 +1,122 @@ /** * Dreamsocket, Inc. * http://dreamsocket.com * Copyright 2010 Dreamsocket, Inc. * * Permission ...
dreamsocket/actionscript-analytics-framework
a900fe8488889678b51f37c2be756d9ffe8cda2f
[FIX] added TestOmnitureMediaTracking.as that was missing before [NEW] added batch type for Google and Omniture allowing multiple calls for an ID [NEW] added ability to do POST data requests (raw string or name/value pairs) [CHG] removed mediaOffset from OmnitureMediaCloseParams since this wasn't inline with native cal...
diff --git a/bin/daf_google.swf b/bin/daf_google.swf index d87ff7b..ac5d6e0 100644 Binary files a/bin/daf_google.swf and b/bin/daf_google.swf differ diff --git a/bin/daf_javascript.swf b/bin/daf_javascript.swf index 4ec3466..51899c8 100644 Binary files a/bin/daf_javascript.swf and b/bin/daf_javascript.swf differ diff -...
dreamsocket/actionscript-analytics-framework
3981af16be5a7bc6e141ecc78c33d5fd3549131e
[ADMIN] reattempting last commit since elements weren't added/deleted.
diff --git a/src/com/dreamsocket/analytics/TrackerModuleLoaderEvent.as b/src/com/dreamsocket/analytics/TrackerModuleLoaderEvent.as new file mode 100644 index 0000000..a6a25db --- /dev/null +++ b/src/com/dreamsocket/analytics/TrackerModuleLoaderEvent.as @@ -0,0 +1,77 @@ +/** +* Dreamsocket, Inc. +* http://dreamsocket.co...
dreamsocket/actionscript-analytics-framework
54976adb3264a21011016502bc6a8db66453d347
[CHG] renamed tracking package to analytics [CHG] reworked XML schema for trackers [CHG] reworked OmnitureTracker significantly. all track mappings are now done with a lookup for speed [CHG] renamed Request based classes to Params [NEW] added native bindings for Omniture media calls (open, play, stop, close, track) [NE...
diff --git a/bin/daf_google.swf b/bin/daf_google.swf new file mode 100644 index 0000000..d87ff7b Binary files /dev/null and b/bin/daf_google.swf differ diff --git a/bin/daf_javascript.swf b/bin/daf_javascript.swf new file mode 100644 index 0000000..4ec3466 Binary files /dev/null and b/bin/daf_javascript.swf differ diff...
dreamsocket/actionscript-analytics-framework
caec51b9274d396353c88adf23df654f961b94b7
[FIX] corrected issue with OmnitureTracker and GoogleTracker not having a default config
diff --git a/src/com/dreamsocket/tracking/google/GoogleTracker.as b/src/com/dreamsocket/tracking/google/GoogleTracker.as index 41aeeec..2efea8a 100644 --- a/src/com/dreamsocket/tracking/google/GoogleTracker.as +++ b/src/com/dreamsocket/tracking/google/GoogleTracker.as @@ -1,171 +1,172 @@ /** * Dreamsocket, Inc. * ht...
dreamsocket/actionscript-analytics-framework
b592fc86efdce7e0322ac8c49730c18fc73aba92
[NEW] added test for TrackingManager tracking across multiple systems
diff --git a/test/TestTrackingManager.as b/test/TestTrackingManager.as new file mode 100644 index 0000000..2c70f25 --- /dev/null +++ b/test/TestTrackingManager.as @@ -0,0 +1,90 @@ +/** +* Dreamsocket, Inc. +* http://dreamsocket.com +* Copyright 2010 Dreamsocket, Inc. +* +* Permission is hereby granted, free of charge...
dreamsocket/actionscript-analytics-framework
8e2db6d22c52bb6cbd62845c1e7943647d9d7b0a
[FIX] corrected JS config parser and used XML in TestJSTracker
diff --git a/src/com/dreamsocket/tracking/js/JSTrackerConfigXMLDecoder.as b/src/com/dreamsocket/tracking/js/JSTrackerConfigXMLDecoder.as index f2c026f..ad0d68f 100644 --- a/src/com/dreamsocket/tracking/js/JSTrackerConfigXMLDecoder.as +++ b/src/com/dreamsocket/tracking/js/JSTrackerConfigXMLDecoder.as @@ -1,89 +1,97 @@ ...
dreamsocket/actionscript-analytics-framework
f70a1b7b31cfe829f31e0fc2c2bf1c3fdbeec40d
[CHG] updated legal header to open source
diff --git a/test/TestGoogleTracker.as b/test/TestGoogleTracker.as index 16a0a96..66e4282 100644 --- a/test/TestGoogleTracker.as +++ b/test/TestGoogleTracker.as @@ -1,68 +1,76 @@ -/** - * Dreamsocket - * - * Copyright 2009 Dreamsocket. - * All Rights Reserved. - * - * This software (the "Software") is the pro...
dreamsocket/actionscript-analytics-framework
c29dbd9b0edc4dfcd56ccea3edb7f336138b80de
[CHG] updated legal header to open source
diff --git a/src/com/dreamsocket/tracking/ITrack.as b/src/com/dreamsocket/tracking/ITrack.as index d35bd13..17b0b47 100644 --- a/src/com/dreamsocket/tracking/ITrack.as +++ b/src/com/dreamsocket/tracking/ITrack.as @@ -1,28 +1,37 @@ -/** - * Dreamsocket, Inc. - * - * Copyright 2009 Dreamsocket, Inc.. - * All Rights ...
dreamsocket/actionscript-analytics-framework
855be3f30ba5ea6e6c946e1535e2cb07e5b9b45b
[ADMIN] init
diff --git a/libs/GoogleAnalytics_1.0.1.319.swc b/libs/GoogleAnalytics_1.0.1.319.swc new file mode 100644 index 0000000..4633eeb Binary files /dev/null and b/libs/GoogleAnalytics_1.0.1.319.swc differ diff --git a/libs/OmnitureActionSource_2.8.swc b/libs/OmnitureActionSource_2.8.swc new file mode 100644 index 0000000..6...
sunlightlabs/tcorps
f9fcf8f319c121b3d134e0cd3ee3738c8bf7a306
Finished updating deploy script for unicorn and new box
diff --git a/config/deploy.rb b/config/deploy.rb index b9aebed..e898650 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,61 +1,64 @@ -set :environment, (ENV['target'] || 'staging') +set :environment, (ENV['target'] || 'production') # Change repo and domain for your setup #if environment == 'production' ...
sunlightlabs/tcorps
e02c114a4c2d27db87722e0d2b0d97ae31a6dd83
Tentative new deploy details
diff --git a/config/deploy.rb b/config/deploy.rb index f6722a7..b9aebed 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,51 +1,61 @@ set :environment, (ENV['target'] || 'staging') # Change repo and domain for your setup -if environment == 'production' - set :domain, 'belushi.sunlightlabs.org' -else - se...
sunlightlabs/tcorps
2f10a32bfcec418760e381f2645aecc3ed83c0f0
Simplified contact form and made the from address the sender of the email
diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb index bf9ceec..791db4e 100644 --- a/app/models/contact_mailer.rb +++ b/app/models/contact_mailer.rb @@ -1,10 +1,10 @@ class ContactMailer < ActionMailer::Base def contact_form(name, email, message) recipients 'tcorps@sunlightfoundatio...
sunlightlabs/tcorps
82a67ae98e272250983320bbca56a5394e5fb94e
adding new avatar images and placing borders around avatar photos
diff --git a/public/images/avatar_female_normal.jpg b/public/images/avatar_female_normal.jpg index 8f818f2..24455ec 100644 Binary files a/public/images/avatar_female_normal.jpg and b/public/images/avatar_female_normal.jpg differ diff --git a/public/images/avatar_male_normal.jpg b/public/images/avatar_male_normal.jpg in...
sunlightlabs/tcorps
024ff67d62292b713a16d4eb6b3a8c5440e7d3aa
No deploy environment is using SQLite3, so don't need to manage the DB file in the deploy script anymore
diff --git a/config/deploy.rb b/config/deploy.rb index c7155e8..f6722a7 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,52 +1,51 @@ set :environment, (ENV['target'] || 'staging') # Change repo and domain for your setup if environment == 'production' set :domain, 'belushi.sunlightlabs.org' else se...
sunlightlabs/tcorps
996af32f9c453b9ebe47134633782092e6452667
Ignoring config/initializers/mailer.rb
diff --git a/.gitignore b/.gitignore index da61acc..91507c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ tmp/* log/* config/database.yml +config/initializers/mailer.rb db/*.sqlite3 db/*.sql public/system/* .DS_Store
sunlightlabs/tcorps
779ba2ec93564ffd74f9a0bf2a4d7aa703a9d19e
Splitting out mailer.rb into an example file
diff --git a/README.md b/README.md index 68ec0b1..976cf34 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,57 @@ # TransparencyCorps TransparencyCorps is a volunteer-driven, decentralized microtask campaign platform. ## What does that mean? In fact, it's really more of an enhanced microtask directory, as no...
sunlightlabs/tcorps
fec53dce91809e5ff500d69dcb0b6daaa991c34e
Added a 'Give Feedback' link to the task frame that links to the Contact page.
diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb index 5416c7f..61007a2 100644 --- a/app/views/tasks/show.html.erb +++ b/app/views/tasks/show.html.erb @@ -1,24 +1,27 @@ <div class="header"> <div class="campaign"> <span class="title"> <%= h @task.campaign.name %> </span> ...
sunlightlabs/tcorps
30d229fec1d1b99b47bd8150ffc6bba611c20aed
Margin fix to user avatars on sidebar
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 29540f5..cf6648d 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -1,324 +1,324 @@ /* * YUI Resect CSS version: 2.2.2 * Copyright (c) 2007, Yahoo! Inc. All rights reserved. * Licensed under the BSD Lice...
sunlightlabs/tcorps
1d6f2bcdd22ccfb969bcc08719b47cc8af17bab0
cleaning up some styling things and adding rss link
diff --git a/app/views/campaigns/index.html.erb b/app/views/campaigns/index.html.erb index d86fca0..fa14c2e 100644 --- a/app/views/campaigns/index.html.erb +++ b/app/views/campaigns/index.html.erb @@ -1,10 +1,11 @@ <% content_for :class, :tasks %> <% content_for :header, :scoreboard %> <% content_for :hide_sidebar, ...
sunlightlabs/tcorps
051a1f56ff26bc79d204452900b5f66d8d213739
Adding in a db dumping and loading helper
diff --git a/lib/tasks/yaml_db_tasks.rake b/lib/tasks/yaml_db_tasks.rake new file mode 100644 index 0000000..6851d44 --- /dev/null +++ b/lib/tasks/yaml_db_tasks.rake @@ -0,0 +1,23 @@ +namespace :db do + desc "Dump schema and data to db/schema.rb and db/data.yml" + task(:dump => [ "db:schema:dump", "db:data:dump" ]) + +...
sunlightlabs/tcorps
6e92eafcd879b9e0b0feb4dd8c8faac186467923
Whitespace
diff --git a/app/controllers/admin/campaigns_controller.rb b/app/controllers/admin/campaigns_controller.rb index 36425b0..78d7c08 100644 --- a/app/controllers/admin/campaigns_controller.rb +++ b/app/controllers/admin/campaigns_controller.rb @@ -1,64 +1,64 @@ class Admin::CampaignsController < ApplicationController ...
sunlightlabs/tcorps
3567a276b24ebd6ea4a6864136035ca574bdc5ad
Lightly narrowed the iframe, to avoid a horizontal scrollbar
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index c2ae5c5..7788bc1 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -1,322 +1,322 @@ /* * YUI Resect CSS version: 2.2.2 * Copyright (c) 2007, Yahoo! Inc. All rights reserved. * Licensed under the BSD Lice...
sunlightlabs/tcorps
6e21238a9b2da76dea191ec8af6ab2990a330d91
Scoped elvolunteer man-hours count to campaigns belonging to logged in user
diff --git a/app/models/user.rb b/app/models/user.rb index c3847a4..02a93bd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,67 +1,71 @@ class User < ActiveRecord::Base attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns, :subscribe_all ...
sunlightlabs/tcorps
e27f5479d28352e96db67bd4625bf9027a67104d
Scoped the completed task count for a campaign to the logged in user's campaigns
diff --git a/app/models/user.rb b/app/models/user.rb index d74558f..c3847a4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,63 +1,67 @@ class User < ActiveRecord::Base attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns, :subscribe_all ...
sunlightlabs/tcorps
1d7af7e25024eec10090967e9165339b22825f37
Scoped participant count to logged in user's campaigns
diff --git a/app/models/user.rb b/app/models/user.rb index b6d0091..d74558f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,58 +1,63 @@ class User < ActiveRecord::Base attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns, :subscribe_all ...
sunlightlabs/tcorps
15071364d823f8560946edaaee81c5953a1ff682
Fixed an out of date attribute name
diff --git a/test/factories.rb b/test/factories.rb index 1cca56b..a48d165 100644 --- a/test/factories.rb +++ b/test/factories.rb @@ -1,44 +1,44 @@ require 'factory_girl' Factory.define :task do |t| t.association :user t.association :campaign end Factory.define :completed_task, :parent => :task do |t| t...
sunlightlabs/tcorps
19904e1d6c02a377aec4d6b8d2f459bf14a8d1e4
Fixed a failing functional test
diff --git a/test/functional/pages_controller_test.rb b/test/functional/pages_controller_test.rb index fefee5a..c9d5a8e 100644 --- a/test/functional/pages_controller_test.rb +++ b/test/functional/pages_controller_test.rb @@ -1,97 +1,98 @@ require 'test_helper' class PagesControllerTest < ActionController::TestCase ...
sunlightlabs/tcorps
df5dd10d518672b70303a7db370f8645ffdc8024
Added a named_scope for users who participated in a specific campaign
diff --git a/app/models/user.rb b/app/models/user.rb index 4beedb3..2f98ce6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,49 +1,53 @@ class User < ActiveRecord::Base attr_accessible :login, :email, :openid_identifier, :password, :password_confirmation, :avatar, :subscribe_campaigns, :subscribe_all ...
sunlightlabs/tcorps
b849017702662eb879b3d2490a9b8ad8ffca1b95
CSS class wasn't being applied to dropdown
diff --git a/app/views/admin/campaigns/_form.html.erb b/app/views/admin/campaigns/_form.html.erb index 54120dd..eaac828 100644 --- a/app/views/admin/campaigns/_form.html.erb +++ b/app/views/admin/campaigns/_form.html.erb @@ -1,50 +1,50 @@ <ul> <li> <%= f.label :name %> <%= f.text_field :name, :class => 't...
sunlightlabs/tcorps
88c570c1106745d8fa5c6bc4f6f58ad30ffc4f41
Let strong tags be strong, and em tags have emphasis
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 7ff0a9c..c2ae5c5 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -1,322 +1,322 @@ /* * YUI Resect CSS version: 2.2.2 * Copyright (c) 2007, Yahoo! Inc. All rights reserved. * Licensed under the BSD Lice...
sunlightlabs/tcorps
c21ab19785a1a7025b1d868baf7380d994467a31
Added a README that documents the TransparencyCorps API.
diff --git a/README b/README index e69de29..68ec0b1 100644 --- a/README +++ b/README @@ -0,0 +1,47 @@ +# TransparencyCorps + +TransparencyCorps is a volunteer-driven, decentralized microtask campaign platform. + +## What does that mean? + +In fact, it's really more of an enhanced microtask directory, as no tasks are ac...
sunlightlabs/tcorps
52dc01fe73f39f6d418b64a6256406422a2416db
Zero prefixing elapsed time summary
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2f1ec3a..b7ca642 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,40 +1,44 @@ module ApplicationHelper def is_home?(body_class) [nil, :home].include? body_class end def...
sunlightlabs/tcorps
cfc9a197864e4f91db6e9d324a3e95556160e166
gave task h3 titles a width
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 6af2b9f..7ff0a9c 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -1,322 +1,322 @@ /* * YUI Resect CSS version: 2.2.2 * Copyright (c) 2007, Yahoo! Inc. All rights reserved. * Licensed under the BSD Lice...
sunlightlabs/tcorps
85cee47c21e7b06baa2703a56858a7fcda9cadcf
Made checkboxes work
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index bea9f59..53e46bc 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,48 +1,50 @@ <div class="mainTaskHeader"> <h2>Edit Profile</h2> <div class="clear"></div> </div> <% form_for @user, :html => {:mu...
sunlightlabs/tcorps
51f5ac9b73bfe9c4df98f8fd2e74b592bd8b1459
Finally fixed last problem around adding these checkboxes
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 60c0262..bea9f59 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,48 +1,48 @@ <div class="mainTaskHeader"> <h2>Edit Profile</h2> <div class="clear"></div> </div> <% form_for @user, :html => {:mu...
sunlightlabs/tcorps
db1bf471e34677654f60ab2584bcc81eb5964da3
putting label tags around check box text
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 9d60c22..60c0262 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,48 +1,48 @@ <div class="mainTaskHeader"> <h2>Edit Profile</h2> <div class="clear"></div> </div> <% form_for @user, :html => {:mu...
sunlightlabs/tcorps
fb8d7f7faf87b3153280f4d500302a30807ea51b
Renamed internal descriiption to short description, and placed on the sidebar display of campaigns
diff --git a/app/views/admin/campaigns/_form.html.erb b/app/views/admin/campaigns/_form.html.erb index 1175aa0..54120dd 100644 --- a/app/views/admin/campaigns/_form.html.erb +++ b/app/views/admin/campaigns/_form.html.erb @@ -1,50 +1,50 @@ <ul> <li> <%= f.label :name %> <%= f.text_field :name, :class => 't...
sunlightlabs/tcorps
b6f7ff36ed06a9d80ed70084a48db4e21a750a1e
changing css so hidden input fields won't show
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 86108eb..d8d8b2a 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -1,134 +1,134 @@ <% content_for :class, :signup %> <div class="mainTaskHeader"> <h2>Join Us</h2> <div class="clear"></div> </div> ...
sunlightlabs/tcorps
d31f1472d67bec80bfc8f098ec8b13711f07212c
Added a class of 'text' to text input fields
diff --git a/app/views/user_sessions/new.html.erb b/app/views/user_sessions/new.html.erb index 96cf4e1..3062b54 100644 --- a/app/views/user_sessions/new.html.erb +++ b/app/views/user_sessions/new.html.erb @@ -1,98 +1,98 @@ <% content_for :class, :signin %> <div class="mainTaskHeader"> <h2>Sign In</h2> <div cl...
sunlightlabs/tcorps
3917b268503a6bc43701864a17f5b69ce2a82900
Put plain HTML instead of checkbox generator tags, for now
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index eb23f70..9d60c22 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,45 +1,48 @@ <div class="mainTaskHeader"> <h2>Edit Profile</h2> <div class="clear"></div> </div> <% form_for @user, :html => {:mu...
sunlightlabs/tcorps
8d6562984b62d598a8ec970a1b7f15b8af417f5d
Converted display of elapsed time to hours and minutes
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b853558..2f1ec3a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,36 +1,40 @@ module ApplicationHelper def is_home?(body_class) [nil, :home].include? body_class end def...