David Ormsbee
|
5fbbd0ddbd
|
Merge pull request #646 from MITx/feature/dave/disable_query_count
Move QueryCountDebugMiddleware inclusion to dev.py instead of common.py ...
|
2012-09-17 06:42:32 -07:00 |
|
kimth
|
f43c485d2a
|
Merge pull request #703 from MITx/kimth/tiny-detailed-soln-style-fix
Tiny fix to style
|
2012-09-16 13:47:57 -07:00 |
|
kimth
|
9e01b51f96
|
Tiny fix to style
|
2012-09-16 16:46:19 -04:00 |
|
arjun810
|
0e1a56d9fe
|
Merge pull request #699 from MITx/kimth/remember-caption
Kimth/remember caption
|
2012-09-16 12:50:23 -07:00 |
|
arjun810
|
b681e2bd94
|
Merge pull request #702 from MITx/kimth/fix-dynamath
Escape quotations, lt/gt, ampersand
|
2012-09-16 12:30:22 -07:00 |
|
kimth
|
1dfd222b98
|
Escape quotations, lt/gt, ampersand
|
2012-09-16 14:50:40 -04:00 |
|
kimth
|
9b6007fc13
|
Merge pull request #701 from MITx/kimth/solution-style
Trivial fix to detailed-solution style
|
2012-09-16 07:28:24 -07:00 |
|
kimth
|
44d5bfa9d0
|
Trivial fix to detailed-solution style
|
2012-09-16 10:27:37 -04:00 |
|
David Ormsbee
|
86217379e0
|
Merge pull request #700 from MITx/kimth/H1P1-debug
Reset CapaProblem when state HTML is corrupt
|
2012-09-15 22:08:40 -07:00 |
|
Arjun Singh
|
7682663e1b
|
Make broken problem error a bit scarier and fix typo in message
|
2012-09-15 22:07:10 -07:00 |
|
kimth
|
2c239f87e8
|
Change wording of warning slightly
|
2012-09-16 00:48:53 -04:00 |
|
kimth
|
f5d6f080c7
|
Add basic styles
|
2012-09-16 00:47:40 -04:00 |
|
kimth
|
eac8037808
|
Add TODO comment
|
2012-09-16 00:29:48 -04:00 |
|
kimth
|
827e211ac7
|
Reveal student input at state of problem reset back to student
|
2012-09-16 00:27:41 -04:00 |
|
kimth
|
1a02cfec83
|
Reset CapaProblem when state HTML is corrupt
|
2012-09-15 23:25:26 -04:00 |
|
kimth
|
68e0701113
|
Remove extra line
|
2012-09-15 17:23:41 -04:00 |
|
kimth
|
439ca1dd59
|
Write setter, toggle uses setter
|
2012-09-15 17:18:21 -04:00 |
|
kimth
|
1625125e6f
|
Respect object boundaries
|
2012-09-15 16:55:43 -04:00 |
|
kimth
|
c031020099
|
Merge branch 'master' into kimth/remember-caption
|
2012-09-15 15:47:22 -04:00 |
|
David Ormsbee
|
f1349eea33
|
Merge pull request #656 from MITx/kimth/fix-dynamath-6002x
Kimth/fix dynamath 6002x
|
2012-09-15 11:28:16 -07:00 |
|
David Ormsbee
|
b06aafd5ad
|
Merge pull request #697 from MITx/feature/arjun/run_specific_syllabi
Try and find a run-specific syllabus before loading a course-specific syllabus
|
2012-09-15 10:50:57 -07:00 |
|
David Ormsbee
|
53191d32ce
|
Merge pull request #698 from MITx/feature/arjun/new-discussions
New Discussions
|
2012-09-15 06:24:42 -07:00 |
|
Arjun Singh
|
08464725c3
|
Try and find a run-specific syllabus before loading a course-specific syllabus
|
2012-09-15 05:02:28 -07:00 |
|
Arjun Singh
|
2ee41ebf0c
|
blockquotes may be fixed
|
2012-09-15 03:10:51 -07:00 |
|
Arjun Singh
|
3b13013ecc
|
Merge whitespace fix
|
2012-09-15 02:14:01 -07:00 |
|
Arjun Singh
|
4efe1135cb
|
fix up whitespace causing weirdness in inline response comment rendering
|
2012-09-15 02:12:52 -07:00 |
|
Ibrahim Awwal
|
c47f0ffb47
|
Hopefully fix code formatting showing up on comments? But it doesn't seem to happen everywhere...
|
2012-09-15 00:42:47 -07:00 |
|
Arjun Singh
|
7c86f324ea
|
Fixes the one broken thread in prod; it had no lettters in its ID, so the id was being cast to a number.
|
2012-09-14 22:55:45 -07:00 |
|
Arjun Singh
|
b5351cc584
|
Support legacy anonymity
|
2012-09-14 21:59:09 -07:00 |
|
Arjun Singh
|
033ce7ef42
|
Discussioninfo needs to be multicourse-friendly..
|
2012-09-14 18:34:37 -07:00 |
|
Arjun Singh
|
6d753ae323
|
Ensure that ability is present when showing endorse button
|
2012-09-14 17:41:02 -07:00 |
|
Rocky Duan
|
3e241182c7
|
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
|
2012-09-14 17:22:26 -07:00 |
|
Rocky Duan
|
9c19f64c01
|
for students, only display endorse icon if endorsed
|
2012-09-14 17:22:11 -07:00 |
|
Arjun Singh
|
aa61569110
|
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
|
2012-09-14 16:59:25 -07:00 |
|
Arjun Singh
|
84d2ebf631
|
fix font colors
|
2012-09-14 16:59:20 -07:00 |
|
David Ormsbee
|
3ee0f39b18
|
Merge pull request #696 from MITx/feature/dave/new-discussions
Add AWS storage bucket name for S3 to make file uploads work
|
2012-09-14 16:56:31 -07:00 |
|
Ibrahim Awwal
|
17c3dd913e
|
Tooltips on follow and vote.
|
2012-09-14 16:55:16 -07:00 |
|
David Ormsbee
|
239e6e8cc5
|
Add AWS storage bucket name for S3 to make file uploads work
|
2012-09-14 19:55:13 -04:00 |
|
Arjun Singh
|
b2c88575ee
|
fix deep comment links
|
2012-09-14 15:38:48 -07:00 |
|
Arjun Singh
|
46d830df13
|
Merge branch 'master' into feature/arjun/new-discussions
|
2012-09-14 15:15:21 -07:00 |
|
Arjun Singh
|
febba9b93a
|
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
|
2012-09-14 15:10:06 -07:00 |
|
Arjun Singh
|
913403d1e0
|
increase font size for votes / comments
|
2012-09-14 15:09:55 -07:00 |
|
arjun810
|
8561469f8f
|
Merge pull request #694 from MITx/feature/dave/new-discussions
Don't explode if a forum content piece is by a user that doesn't exist
|
2012-09-14 14:28:03 -07:00 |
|
David Ormsbee
|
ce9fc9ceab
|
Don't explode if a forum content piece is by a user that doesn't exist
|
2012-09-14 17:25:12 -04:00 |
|
kimth
|
d893a14a53
|
Load player before turning off caption
|
2012-09-14 17:24:15 -04:00 |
|
kimth
|
8673460b85
|
Merge branch 'master' into kimth/remember-caption
|
2012-09-14 16:53:41 -04:00 |
|
kimth
|
210da2c4f0
|
Start to remember caption state
|
2012-09-14 16:53:23 -04:00 |
|
Arjun Singh
|
8631cb2644
|
Add a tiny bit of padding back to unexpanded form
|
2012-09-14 13:39:07 -07:00 |
|
Arjun Singh
|
190f25c0dd
|
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
|
2012-09-14 13:35:43 -07:00 |
|
Tom Giannattasio
|
2f5ad06eec
|
smoother comment form expansion
|
2012-09-14 16:34:55 -04:00 |
|