Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bridger Maxwell
b65577f2b7 Fixed tests for fast grading. 2012-09-18 13:18:19 -04:00
Calen Pennington
0492c8e3bd Enable wip flag 2012-09-18 13:17:52 -04:00
Calen Pennington
0758d21d6a Re-enable wip markers in cms css 2012-09-18 10:44:12 -04:00
David Ormsbee
62bb10156d Merge pull request #704 from MITx/feature/victor/custom-tabs 
Custom tabs
 2012-09-18 07:10:42 -07:00
Victor Shnayder
a242ac54b0 remove dead code 2012-09-18 10:10:07 -04:00
Calen Pennington
c914a46a3f Merge pull request #691 from MITx/feature/victor/anon-deep-links 
Feature/victor/anon deep links
 2012-09-18 07:08:45 -07:00
Victor Shnayder
ba92bdc2dc Merge pull request #708 from MITx/feature/cale/cms-bug-fixes 
Feature/cale/cms bug fixes
 2012-09-18 06:20:15 -07:00
Victor Shnayder
d9219c6086 Custom tabs 
* specify in tabs list in course policy
  - active page tracking now done in tabs.py
  - properly handle the fact that there may be multiple textbooks

* Still need:
  - wiki pages
  - (if that's delayed, special-case syllabus support)
 2012-09-18 08:45:09 -04:00
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
kimth
0fdd0a005f Add docs to xml_format 2012-09-17 20:40:06 -04: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
kimth
f45fa578a2 onreset rerandomize option 2012-09-17 15:56:09 -04: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
Calen Pennington
c0ed793976 Add an empty get_errored_courses function for the mongo modulestore 2012-09-17 14:19:23 -04:00
Calen Pennington
d17e2aada9 Remove trailing '/' from ajax_urls 2012-09-17 14:19:07 -04:00
Calen Pennington
0a55e1eae1 Add sub-environments for the lms that is running alongside the lms for debugging 2012-09-17 13:51:33 -04:00
Calen Pennington
34541b5e7c Make a list of textbooks, don't just store a single one 2012-09-17 13:49:42 -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
Calen Pennington
261948f38a Make textbooks in the course definition be stored as data, rather than objects, and turn them into objects during module instatiation 2012-09-17 13:19:24 -04: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