David Ormsbee
0d07ebc921
Merge branch 'master' into move_settings
...
Conflicts:
static/simplewiki
2012-04-09 16:47:45 -04:00
pmitros
90cd57f6ad
Merge pull request #12 from MITx/check_button
...
Number of attempts remaining shown below -- not on button.
2012-04-09 08:14:44 -07:00
Bridger Maxwell
202659cb1b
Merged in master branch
2012-04-05 14:50:36 -04:00
Lyla Fischer
abee617622
check button and "we already started" announcement
...
Changed the format of the check/submit button so that the exam
submission makes more sense; added a disclaimer to the enrollment
number so that new students know that they will be disadvantaged.
2012-04-05 14:18:22 -04:00
Piotr Mitros
df637d32a2
Typo in gradebook
2012-04-03 15:56:14 -04:00
Bridger Maxwell
5aa68c9bb9
Removed code accidentally left in.
2012-04-02 14:47:02 -04:00
David Ormsbee
98ff3d5bfb
Merge branch 'master' into move_settings
...
Conflicts:
djangoapps/student/views.py
urls.py
2012-04-02 14:26:05 -04:00
David Ormsbee
d1cd7e50c0
change logging from mitx.user to mitx.student to reflect package structure
2012-04-02 14:09:53 -04:00
Bridger Maxwell
3dee54429d
More comments on mdx_circuit.py. Incorporated some pull request feedback.
2012-04-01 15:15:39 -04:00
Bridger Maxwell
6f2f218bea
The wiki creation page now uses the edit template, so it has the unsaved changes confirmation and Codemirror editor.
2012-03-30 06:03:10 -07:00
Bridger Maxwell
4938fb63da
Set size of wiki circuits
2012-03-29 16:39:06 -07:00
Piotr Mitros
cd1226814a
Typo
2012-03-29 15:01:45 -04:00
Piotr Mitros
1ddf41ab1c
Missed one conversion to complex
2012-03-29 15:00:39 -04:00
Piotr Mitros
1c5945db9c
Fixed bug with showing answers related to complex numbers
2012-03-29 14:46:53 -04:00
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
Bridger Maxwell
b2fbf537e4
Properly escaping the schematic html attributes.
2012-03-29 00:16:03 -07: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
Bridger Maxwell
f95aa496fa
Better compatibility with the Codemirror editor and the markdown circuit extension.
2012-03-28 14:09:21 -07: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
8fce7066da
You can now edit a circuit directly on the edit page of the wiki. These edits show up in the history. This hasn't been tested much.
2012-03-25 20:39:21 -07:00
Bridger Maxwell
3ed5b161ec
Moved simplewiki autosuggest js (it didn't get migrated). Fixed a minor typo in settings.py (it suggested the wrong override location for the static js files)
2012-03-25 20:08:03 -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
