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 |
|
Piotr Mitros
|
37452f3a58
|
Moved from type to isinstance
* Parallel and exponentials in calc were broken because of this. Confirmed working
* Added test cases for the above
* Fixed a broken test case
|
2012-03-29 09:43:45 -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
|
9a7c0451ab
|
Better logging. Tested and fixed bugs in previous commits
|
2012-03-28 17:45:43 -04:00 |
|
Piotr Mitros
|
25ca62d952
|
Proper e-mail address validation
|
2012-03-28 17:20:35 -04:00 |
|
Piotr Mitros
|
adf483a96b
|
type converted to isinstance
|
2012-03-28 17:11:14 -04:00 |
|
Piotr Mitros
|
59dfb2cfd4
|
Complex numbers now work in problems
|
2012-03-28 14:42:02 -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
|
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
|
2f15424acc
|
Merged in master branch
|
2012-03-25 15:05:37 -04:00 |
|
Piotr Mitros
|
edfff32338
|
Incorporated Dave's feedback
|
2012-03-21 14:19:36 -04:00 |
|
Piotr Mitros
|
f2878b549c
|
Merge. Note duplicate e-mail subject files
|
2012-03-21 11:03:01 -04:00 |
|
Piotr Mitros
|
8a13b8c45b
|
Minor cleanup of auxilliary changes to models
|
2012-03-21 10:39:56 -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 |
|
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
|
1bc3835fe6
|
Splitting files into subdirectories in preparation for merge
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
a20b01c081
|
Splitting files into subdirectories in preparation for merge
|
2012-03-19 11:10:44 -04:00 |
|
Calen Pennington
|
6dc7fd6ea5
|
Splitting files into subdirectories in preparation for merge
|
2012-03-19 11:10:44 -04:00 |
|