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 |
|
Kyle Fiedler
|
393044fba9
|
cleaned up some css
|
2012-03-29 10:45:52 -04:00 |
|
David Ormsbee
|
dbb4ff18b0
|
minor user message changes
|
2012-03-29 10:44:06 -04:00 |
|
Piotr Mitros
|
686b1bf6bd
|
Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates
|
2012-03-28 19:44:22 -04:00 |
|
Piotr Mitros
|
eeffa7a6d2
|
http to https in confirmation e-mails
|
2012-03-28 17:50:51 -04:00 |
|
Piotr Mitros
|
9a7c0451ab
|
Better logging. Tested and fixed bugs in previous commits
|
2012-03-28 17:45:43 -04:00 |
|
Kyle Fiedler
|
7d3caf58e2
|
Fixed buttons for most sequnces
|
2012-03-28 15:48:30 -04:00 |
|
Kyle Fiedler
|
b288ec50f3
|
Fixed bug with the calculator
|
2012-03-28 15:09:05 -04:00 |
|
Kyle Fiedler
|
230ea1e650
|
Added fix for sequence nav bug
|
2012-03-28 14:56:32 -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 |
|
Kyle Fiedler
|
e99e5b3679
|
Added the highlight back to the updates
|
2012-03-27 13:54:49 -04:00 |
|
David Ormsbee
|
469a429c2a
|
Merge pull request #7 from MITx/bridger-grades
Bridger grades
|
2012-03-27 09:59:19 -07:00 |
|
Lyla Fischer
|
75f5a1cfee
|
failed to actually test and find the missing colon
|
2012-03-27 09:51:27 -04:00 |
|
Lyla Fischer
|
64e187fdd4
|
fixed default handling
|
2012-03-27 09:44:27 -04:00 |
|
Lyla Fischer
|
ce5540b234
|
textine size addition
|
2012-03-27 09:35:22 -04:00 |
|
Bridger Maxwell
|
e0e8e1e5e6
|
Fixes from pull request comments. Added Score namedtuple.
|
2012-03-26 09:38:58 -07:00 |
|
Bridger Maxwell
|
d809b68b2c
|
Fixed slight difference between master branch
|
2012-03-25 15:11:46 -04:00 |
|
Bridger Maxwell
|
2f15424acc
|
Merged in master branch
|
2012-03-25 15:05:37 -04:00 |
|
Bridger Maxwell
|
2aca626440
|
Changed gradebook to be a table.
|
2012-03-24 15:32:11 -04:00 |
|
Kyle Fiedler
|
e81bc425cb
|
Added return false on clicks for calculator
|
2012-03-22 16:37:36 -04:00 |
|
Kyle Fiedler
|
813fc488c6
|
Spead up animation and added diferent wording
|
2012-03-22 16:37:36 -04:00 |
|
Kyle Fiedler
|
6627153e1c
|
Added styles for the calc hint
|
2012-03-22 16:37:36 -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
|
399ea8e41e
|
Removed duplicates
|
2012-03-21 11:03:45 -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
|
7986c7547b
|
Name and e-mail change functionality appears to work -- needs graphic design
|
2012-03-21 09:39:32 -04:00 |
|
Piotr Mitros
|
75c5c1ce74
|
Name changes work, but meta storage not tested
|
2012-03-20 22:27:30 -04:00 |
|
Kyle Fiedler
|
3fadf0e16c
|
Added styles for new calc and updated bourbon
|
2012-03-20 14:11:25 -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 |
|
Kyle Fiedler
|
a3eb345bb1
|
added fixes for info updates
|
2012-03-19 16:19:15 -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 |
|