Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,450 Commits 1 Branch 0 Tags
356fac144b1763e08c6fa673d11eedaa9482cfb1
Commit Graph

1163 Commits

Author SHA1 Message Date
Victor Shnayder
cc1dd65eb0 Merge branch 'master' of github.com:MITx/mitx 2012-08-20 16:04:41 -04:00
Victor Shnayder
5f612c7819 Oops. Make modx_dispatch and xqueue callback work again. 
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
 2012-08-20 16:04:16 -04:00
Kyle Fiedler
20d9e6e86d Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red 2012-08-20 15:45:05 -04:00
Calen Pennington
de4abe300b Merge pull request #464 from MITx/kimth/textbook 
Kimth/textbook
 2012-08-20 12:38:14 -07:00
Calen Pennington
259e21364f Merge pull request #461 from MITx/feature/victor/multi-run-policy 
Keep each course's descriptors separate
 2012-08-20 12:35:55 -07:00
Bridger Maxwell
9bc5aec01a Fixed up courseware-error view. Moved it to templates/courseware too. 2012-08-20 15:03:55 -04:00
Bridger Maxwell
0ac5ded095 Moved the course template pages to be templates/courseware/ 2012-08-20 14:54:23 -04:00
Bridger Maxwell
ee3f46fd30 Changed titles on course pages. 2012-08-20 14:19:47 -04:00
Bridger Maxwell
5b38f9d4ac Removed empty sidebar from Progress page. 2012-08-20 14:15:41 -04:00
Bridger Maxwell
1159b14b0d Merge branch 'master' of github.com:MITx/mitx 2012-08-20 14:08:48 -04:00
Bridger Maxwell
70c7ee42ed Fixed tests from profile->progress rename. 2012-08-20 14:08:42 -04:00
thomasxiii
38f96b72a1 Merge pull request #463 from MITx/feature/kfiedler/courseware-style 
Feature/kfiedler/courseware style
 2012-08-20 10:58:46 -07:00
Bridger Maxwell
92a293f07e Removed profile info from Profile page and renamed it to Progress. 2012-08-20 13:50:28 -04:00
kimth
c084745290 Textbook TOC from S3 2012-08-20 13:32:13 -04:00
Kyle Fiedler
ab28e08591 Added new button classes 2012-08-20 13:22:21 -04:00
kimth
987d7bcc29 book_url doesn't come from settings 2012-08-20 12:40:34 -04:00
Victor Shnayder
f2197227c1 add out-of-date message to check_course 2012-08-20 09:26:16 -04:00
Victor Shnayder
c6c95c63ac Keep each course's descriptors separate 
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
  change the same module in different ways, it works.  Such edits will need to
  merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
  Update all the call sites
* tests, including a 2nd toy course with same course and org.
 2012-08-20 09:26:16 -04:00
David Ormsbee
6a05a812c3 Merge pull request #460 from MITx/kimth/multiple-fileupload 
Kimth/multiple fileupload
 2012-08-19 18:08:40 -07:00
kimth
2f63a9b403 Limit number of files that can be uploaded at once 2012-08-19 20:12:01 -04:00
David Ormsbee
a729e16e88 Merge pull request #459 from MITx/feature/bridger/new_wiki 
Fix broken dependency updates for wiki
 2012-08-19 13:05:59 -07:00
Bridger Maxwell
24c0b5145d Updated django-wiki and plugin imports. 2012-08-19 14:41:49 -04:00
David Ormsbee
6c3b28b526 Merge pull request #452 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-19 09:46:15 -07:00
kimth
d2cb645834 Multiple file submissions 2012-08-19 09:26:03 -04:00
Bridger Maxwell
1e08164db5 Added MathJax to wiki pages. 2012-08-18 13:12:04 -04:00
Bridger Maxwell
0598a471c1 Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. 2012-08-18 12:22:50 -04:00
Bridger Maxwell
3fc59b3da5 Added javascript groups to wiki preview modal so circuits show up. 2012-08-18 00:17:20 -04:00
Bridger Maxwell
361e409d4e Got the tests passing! 2012-08-18 00:02:09 -04:00
Bridger Maxwell
1470045b74 Fixed wiki circuit editor modal to be a little better styled. 2012-08-17 21:44:56 -04:00
Bridger Maxwell
a4b97c5f10 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 21:44:05 -04:00
kimth
40b49224a2 Merge pull request #451 from MITx/feature/kfiedler/courseware-style 
Added new styles for sequence nav and reset some of the styles for inputs
 2012-08-17 17:54:03 -07:00
Bridger Maxwell
0fbfaf612f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 17:52:22 -04:00
Kyle Fiedler
8473188fea Added new styles for sequence nav and reset some of the styles for inputs 2012-08-17 17:41:45 -04:00
Bridger Maxwell
58620ebc2f Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-17 17:33:28 -04:00
Bridger Maxwell
93d15d15d0 Added markdown extensions from 6.002x 2012-08-17 17:32:44 -04:00
Tom Giannattasio
a2d0ada82c styled settings page 2012-08-17 17:01:45 -04:00
Tom Giannattasio
1bd790fabb finished attachment styles 2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297 added modal functionality for attachments page 2012-08-17 15:59:31 -04:00
Tom Giannattasio
e47f3ccf35 added CodeMirror styles for the circuit editor 2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb added Code Mirror styles 2012-08-17 15:10:24 -04:00
Tom Giannattasio
411fcfd0cd Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-17 14:50:44 -04:00
Tom Giannattasio
1411c0e066 started tweaking upload interface 2012-08-17 14:50:40 -04:00
Bridger Maxwell
b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:48:06 -04:00
Tom Giannattasio
e96a5fcbee started attachments rework 2012-08-17 14:44:27 -04:00
Bridger Maxwell
8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:44:25 -04:00
David Ormsbee
83ea5efac6 add course-specific askbot URLs for AWS course servers 2012-08-17 14:34:58 -04:00
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
Tom Giannattasio
f67a356466 added additional bootstrap js files 2012-08-17 14:14:07 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00