Kyle Fiedler
|
162fa59441
|
Merge branch 'master' into pmitros/name-change
Conflicts:
static/css/application.css
static/css/marketing.css
|
2012-03-29 11:08:41 -04:00 |
|
David Ormsbee
|
dbb4ff18b0
|
minor user message changes
|
2012-03-29 10:44:06 -04:00 |
|
Piotr Mitros
|
9a7c0451ab
|
Better logging. Tested and fixed bugs in previous commits
|
2012-03-28 17:45:43 -04:00 |
|
Piotr Mitros
|
f6787bd8be
|
Minor word smithing
|
2012-03-28 14:53:35 -04:00 |
|
Kyle Fiedler
|
d3771b16a8
|
Removed deactive and unenroll
|
2012-03-27 13:59:24 -04:00 |
|
Bridger Maxwell
|
e0e8e1e5e6
|
Fixes from pull request comments. Added Score namedtuple.
|
2012-03-26 09:38:58 -07:00 |
|
Bridger Maxwell
|
2f15424acc
|
Merged in master branch
|
2012-03-25 15:05:37 -04:00 |
|
Kyle Fiedler
|
1be8d198ab
|
Added a fake deactivate and unenroll links and some style for profile
|
2012-03-22 15:32:31 -04:00 |
|
Kyle Fiedler
|
84ac8a1d2a
|
Added some styles for name and email change
|
2012-03-21 17:06:37 -04:00 |
|
Piotr Mitros
|
f2878b549c
|
Merge. Note duplicate e-mail subject files
|
2012-03-21 11:03:01 -04:00 |
|
Piotr Mitros
|
bb288663db
|
Last commit missing -a
|
2012-03-21 10:10:49 -04:00 |
|
Piotr Mitros
|
75c5c1ce74
|
Name changes work, but meta storage not tested
|
2012-03-20 22:27:30 -04:00 |
|
Piotr Mitros
|
2b173379e5
|
E-mail changes appear to work
|
2012-03-20 09:37:15 -04:00 |
|
Piotr Mitros
|
2e905dc70c
|
More of e-mail change process works
|
2012-03-19 21:24:21 -04:00 |
|
Calen Pennington
|
fdc5cd94a9
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
98dd48f9da
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
2f0b39189a
|
Move to subdirectory in prepartion for merge
|
2012-03-19 11:10:44 -04:00 |
|