Kyle Fiedler
|
ca69dc632f
|
Added styles for the captions and video bar
|
2012-04-04 10:26:13 -04:00 |
|
Kyle Fiedler
|
77bd47f749
|
Added some styles to make videos more cohesive
|
2012-04-04 10:26:12 -04:00 |
|
Kyle Fiedler
|
ceb8d4bf5b
|
fix some small css bugs in askbot
|
2012-04-03 16:48:00 -04:00 |
|
Piotr Mitros
|
cec1ecf952
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-04-03 16:21:29 -04:00 |
|
Kyle Fiedler
|
3111bdd3a0
|
Added specificity to the input styles for password reset
|
2012-04-03 16:18:15 -04:00 |
|
Piotr Mitros
|
e2e9f8904e
|
Gradebook bug. Maybe fixed? Maybe not? Deploy debugging.
|
2012-04-03 15:59:58 -04:00 |
|
Piotr Mitros
|
df637d32a2
|
Typo in gradebook
|
2012-04-03 15:56:14 -04:00 |
|
David Ormsbee
|
ab6ec55a83
|
Convert AWS settings to pull values from JSON files
|
2012-04-03 12:54:02 -04:00 |
|
David Ormsbee
|
d7131c8b13
|
Update requirements: add path.py (used in settings), remove flup (only necessary for FCGI)
|
2012-04-02 16:38:33 -04:00 |
|
David Ormsbee
|
55312bf7db
|
show instructions for gunicorn
|
2012-04-02 14:58:04 -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
|
f0d80a0738
|
Flesh out the README.txt for the new settings arrangement
|
2012-04-02 14:20:00 -04:00 |
|
David Ormsbee
|
3a95e3f79f
|
Moving settings2/ folder to envs/
|
2012-04-02 14:15:44 -04:00 |
|
David Ormsbee
|
a90e6e3243
|
Disable profiler in django-debug-toolbar to avoid duplicate request bug
|
2012-04-02 14:11:23 -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
|
d390e9983b
|
Changed CodeMirror back to use a monospaced font, which is important.
|
2012-03-31 16:59:39 -04:00 |
|
Bridger Maxwell
|
26c0a24a0f
|
Added generated css files.
|
2012-03-31 15:43:49 -04:00 |
|
Bridger Maxwell
|
bf7bf61cd5
|
Moved styling to sass. Editor now looks like textarea used to.
|
2012-03-31 15:43:09 -04:00 |
|
Monitor Machine
|
0c69e00932
|
Settings has a default sqlite database
|
2012-03-30 18:22:44 -04:00 |
|
Monitor Machine
|
c121f2b024
|
Django version restriction
|
2012-03-30 09:16:11 -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
|
acbe1e8860
|
Re-enabled unsaved changes confirmation on wiki edit.
|
2012-03-30 05:49:32 -07:00 |
|
Bridger Maxwell
|
183774f637
|
Fixed codemirror arrowkey navigation bug.
|
2012-03-29 22:27:55 -07:00 |
|
Bridger Maxwell
|
d7383bf3c4
|
Small cleanups in codemirror.
|
2012-03-29 18:21:25 -07:00 |
|
Bridger Maxwell
|
d283bb5794
|
Moved bug fix to minified leanModal
|
2012-03-29 18:00:42 -07:00 |
|
Bridger Maxwell
|
283ad48c25
|
Changed instructions for circuit-schematic:
|
2012-03-29 16:41:44 -07:00 |
|
Bridger Maxwell
|
4938fb63da
|
Set size of wiki circuits
|
2012-03-29 16:39:06 -07:00 |
|
Bridger Maxwell
|
d51341301d
|
Changed some css properties for proper sizing of elements.
|
2012-03-29 15:56:21 -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 |
|
David Ormsbee
|
3d7acff666
|
removed junk file
|
2012-03-29 12:24:06 -04:00 |
|
Calen Pennington
|
93c689e2a8
|
Don't fail post-install script if link target doesn't exist
|
2012-03-29 11:40:03 -04:00 |
|
David Ormsbee
|
a54fcd9777
|
Merge pull request #5 from MITx/pmitros/name-change
Name and e-mail change functionality
|
2012-03-29 08:12:12 -07: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 |
|
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 |
|
David Ormsbee
|
17e84aaed1
|
Merge pull request #9 from MITx/pmitros/complex-numbers-fix
Complex numbers now work in problems
|
2012-03-29 07:08:59 -07: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 |
|
David Ormsbee
|
bc604fca34
|
disabled mail_admins handler for error messages
|
2012-03-29 09:29:47 -04:00 |
|
Bridger Maxwell
|
b2fbf537e4
|
Properly escaping the schematic html attributes.
|
2012-03-29 00:16:03 -07:00 |
|
Bridger Maxwell
|
f62a43965b
|
Fixed bug for selecting lines with non-integer heights. It put up a fight...
|
2012-03-28 22:50:23 -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
|
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 |
|
Piotr Mitros
|
25ca62d952
|
Proper e-mail address validation
|
2012-03-28 17:20:35 -04:00 |
|
Bridger Maxwell
|
bb15d92381
|
Fixed leanModal bug that caused lots of overlays to be added.
|
2012-03-28 14:20:08 -07:00 |
|
Piotr Mitros
|
adf483a96b
|
type converted to isinstance
|
2012-03-28 17:11:14 -04:00 |
|