Commit Graph

6131 Commits

Author SHA1 Message Date
Ibrahim Awwal
ef8ca23dee Fix pagination and sorting for followed threads. Also fixed sorting so that it always retrieves a new set of threads from the server for the initial set. 2012-09-18 04:35:32 -07:00
Ibrahim Awwal
a444166d98 Add a followed threads entry to the topic dropdown in the discussion sidebar.
Also fixed up some random bugs with content_info, and changed pagination code a little. Needs comments service update for the subscribed threads API call.
2012-09-18 04:09:38 -07:00
Ibrahim Awwal
151dbda242 Fix followed state not showing up on initial forum load in sidebar. 2012-09-18 04:09:38 -07:00
arjun810
0df2000680 Merge pull request #715 from MITx/feature/ibrahim/discussion-cleanup
Feature/ibrahim/discussion cleanup
2012-09-18 03:18:50 -07:00
Ibrahim Awwal
7fb757c86c Rename Tooltips => TooltipManager. 2012-09-17 23:03:36 -07:00
Ibrahim Awwal
aa301a805e Converted tooltips to coffee too, and removed both converted files from the included js header. 2012-09-17 19:19:09 -07:00
Ibrahim Awwal
daa38af58c Convert DiscussionFilter to coffeescript. 2012-09-17 18:55:52 -07:00
Ibrahim Awwal
bb6f4cdb2e Move dropdown filter into a more clearly named file, discussion-filter.js, and move the
event bindings into the proper views.
2012-09-17 18:08:44 -07:00
Ibrahim Awwal
680e681fee Removed a lot of dead code and moved tooltips into their own file. 2012-09-17 18:08:43 -07:00
Ibrahim Awwal
5d4c60a880 Move new post button handler to DiscussionRouter. 2012-09-17 18:08:43 -07:00
David Ormsbee
db18ed811e Merge pull request #714 from MITx/hotfix/arjun/fix-ff-imageupload
Fixes image uploades in firefox
2012-09-17 15:56:09 -07:00
Arjun Singh
aaa4db8d29 Fixes image uploades in firefox 2012-09-17 15:54:24 -07:00
David Ormsbee
989d1c05c9 Merge pull request #710 from MITx/jarv/new-brew-install-url
homebrew changed the installation url
2012-09-17 15:03:22 -07:00
David Ormsbee
f2ae0c1e84 Merge pull request #713 from MITx/feature/arjun/discussion-fixes
Don't use the search API to retrieve all threads.
2012-09-17 15:02:46 -07:00
Arjun Singh
90f37b3344 Don't use the search API to retrieve all threads. 2012-09-17 14:10:58 -07:00
John Jarvis
abf2e50893 homebrew changed the installation url 2012-09-17 15:15:15 -04:00
kimth
7801fe0c9b Merge pull request #709 from MITx/bug/tomg/capa-solutions
fixed multi-box glitch
2012-09-17 11:54:42 -07:00
Tom Giannattasio
0acc75e3a4 fixed detailed-solution bug 2012-09-17 14:51:20 -04:00
Tom Giannattasio
3bf8ae8f09 double border fix 2012-09-17 14:44:32 -04:00
kimth
9628f90642 Merge pull request #707 from MITx/bug/tomg/capa-solutions
fixed solution set glitch
2012-09-17 11:40:28 -07:00
Tom Giannattasio
53ec558f11 fixed solution set glitch 2012-09-17 14:38:19 -04:00
Tom Giannattasio
97cff9c06f Merge pull request #690 from MITx/feature/kfiedler/multiple-choice
styles for a slightly better multiple choice and solution span
2012-09-17 10:23:24 -07:00
Tom Giannattasio
092403c1bc Merge pull request #688 from MITx/feature/kfiedler/submission-feedback
Style for submission feedback on problems
2012-09-17 10:21:04 -07:00
David Ormsbee
4a9b88fcd4 Merge pull request #705 from MITx/feature/tomg/discussion-bugs
fixed search and url style issues
2012-09-17 10:09:19 -07:00
Tom Giannattasio
d016c0b20a fixed discussion search cursor bug 2012-09-17 12:00:08 -04:00
Tom Giannattasio
2133ec9686 fixed word wrap issue on discussions 2012-09-17 11:55:37 -04:00
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