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

4327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
56fc4e2fe8 Merge pull request #433 from MITx/feature/kfiedler/courseware-style 
Made video go to the center of the screen in full screen
 2012-08-16 10:52:27 -07:00
Calen Pennington
4e9e65e0e1 Merge pull request #432 from MITx/feature/cale/fix-tests 
Move mitxmako out of common lib, and pass template rendering function in...
 2012-08-16 10:52:12 -07:00
Kyle Fiedler
c2ee844704 Made video go to the center of the screen in full screen 2012-08-16 13:47:15 -04:00
Calen Pennington
4798a46948 Add docstring for load_function 2012-08-16 13:08:10 -04:00
Calen Pennington
3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore 2012-08-16 12:49:42 -04:00
Calen Pennington
9118e585cc Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks 
Feature/halogenandtoast/multiple textbooks
 2012-08-16 09:47:53 -07:00
Calen Pennington
73623ed92b Merge pull request #431 from MITx/feature/kfiedler/askbot 
MAnage askbot images
 2012-08-16 09:10:02 -07:00
Matthew Mongeau
ae3cb4ec7b Nest textbooks under data 2012-08-16 12:06:37 -04:00
Kyle Fiedler
24ed4a4dae MAnage images 2012-08-16 12:06:20 -04:00
Calen Pennington
6bca6cdc28 Merge pull request #430 from MITx/feature/ichuang/fix-modulestore-etree-parser 
Fix bug preventing comments from being in course.xml
 2012-08-16 09:06:14 -07:00
Calen Pennington
919b3e2137 Merge pull request #429 from MITx/feature/victor/strip-metadata 
Feature/victor/strip metadata
 2012-08-16 08:52:23 -07:00
Matthew Mongeau
4ff80287f7 Remove TextbookDescriptor from setup. 2012-08-16 11:52:10 -04:00
ichuang
7553dac2f3 etree parser needs to be set on each call in modulestore load_course 2012-08-16 11:50:04 -04:00
Matthew Mongeau
945632362b Get rid of TextbookModule and TextbookDescriptor. 2012-08-16 11:49:03 -04:00
Victor Shnayder
61478f4ba0 fix string format bug 2012-08-16 11:46:56 -04:00
Victor Shnayder
c02313a099 hackish cleanup script 2012-08-16 11:43:40 -04:00
Victor Shnayder
00d9ecd600 New policy organization: 
* course roots live in roots/{url_name}.xml
   - one is linked from course.xml

* policies live in policies/url_name.json
  - loaded based on course url_name

* Updated to pass policy through into xml parsing, so it takes effect
  before descriptor constructors are called.

* Update toy test course to new structure, fix up tests
 2012-08-16 11:41:19 -04:00
Victor Shnayder
691744e359 Use .display_name instead of metadata['display_name'] 
* the former does a fallback if metadata['display_name'] isn't set.
 2012-08-16 11:37:54 -04:00
Victor Shnayder
5e2f676153 backcompat warnings 2012-08-16 11:36:05 -04:00
Calen Pennington
053d52e893 Merge pull request #420 from MITx/feature/kfiedler/courseware-style 
Added styles to grade out the top and bottom of the sidebar border and f...
 2012-08-16 08:33:29 -07:00
Kyle Fiedler
7f72004b50 Fix conflicts 2012-08-16 11:33:05 -04:00
Kyle Fiedler
ad7061e41f Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav 2012-08-16 11:33:05 -04:00
Calen Pennington
4653eebdc3 Merge pull request #428 from MITx/kimth/xqueue_callback_blocking 
Kimth/xqueue callback blocking
 2012-08-16 08:31:22 -07:00
kimth
909a368f4a Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 11:27:56 -04:00
kimth
1bb8d9366d Xqueue URL is https not http 2012-08-16 11:27:29 -04:00
Calen Pennington
a3b144045c Merge pull request #427 from MITx/feature/bridger/new_wiki 
New wiki installed from pip
 2012-08-16 08:01:39 -07:00
Bridger Maxwell
c4b362ca71 Removed old path include for django-wiki. 2012-08-16 10:56:33 -04:00
Bridger Maxwell
337f109af7 Moved django-wiki submodule to be a pip install from git. 2012-08-16 10:54:34 -04:00
Calen Pennington
3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-16 07:31:56 -07:00
Matthew Mongeau
4a7b163ce3 Keep textbooks out of displayable items. 2012-08-16 10:31:18 -04:00
Matthew Mongeau
34010a38a8 Fix textbook module. 2012-08-16 10:31:17 -04:00
Matthew Mongeau
ae09598d9a Display textbooks in course navigation, handle in urls and views. 2012-08-16 10:31:17 -04:00
Calen Pennington
884f33c932 Merge pull request #423 from MITx/feature/ichuang/fix-capa-answers-static-urls 
capa problem answers may have static urls - needs replace_urls
 2012-08-16 07:15:14 -07:00
Calen Pennington
e60f2e3d3d Merge pull request #422 from MITx/kimth/sjsu 
Don't display 'None points' on problem rendering
 2012-08-16 07:14:28 -07:00
thomasxiii
1a8e5485eb Merge pull request #416 from MITx/feature/kfiedler/askbot 
Fix all of askbots style
 2012-08-16 07:02:39 -07:00
kimth
da9a4710ce Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 09:38:25 -04:00
Bridger Maxwell
326a0f61c1 Updated django-wiki submodule. 2012-08-15 23:43:05 -04:00
Bridger Maxwell
d064d29cd8 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-15 23:01:27 -04:00
Bridger Maxwell
8fb83ee33c Added django-wiki as a submodule. 2012-08-15 23:01:06 -04:00
ichuang
033211a5d1 doc update - LMS migrate reload 2012-08-15 22:03:00 -04:00
ichuang
f39e589625 do replace_urls within capa_module get_answer (eg for img in <solution>s) 2012-08-15 21:57:33 -04:00
Bridger Maxwell
2b29c95266 Added template for inline preview. 2012-08-15 21:47:26 -04:00
Bridger Maxwell
262a49a6da Permissions on root article no longer allow students to edit it. 2012-08-15 21:47:08 -04:00
Victor Shnayder
f717b0421f fix bug in backcompat section replacement 
(s/sequence/sequential/)
 2012-08-15 21:39:10 -04:00
Bridger Maxwell
48e9dc8031 Added bootstrap-modal for the wiki preview modals. 2012-08-15 20:07:05 -04:00
Bridger Maxwell
a163b486ac Fixed up course_nav to swizzle url reversing too. 2012-08-15 19:34:42 -04:00
Bridger Maxwell
e76be095e9 Middleware for changing redirects to stay in course wiki. 2012-08-15 18:54:22 -04:00
Bridger Maxwell
0d28d286e2 Added creation of Site() object on wiki load. 2012-08-15 18:54:01 -04:00
kimth
3519ea6b2f Don't display 'None points' on problem rendering 2012-08-15 17:14:27 -04:00
Victor Shnayder
ce29b5aec2 Special case handling of course url_names in policy.json 2012-08-15 16:06:42 -04:00