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

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Shnayder
7e69c35735 fix another backcompat html bug 2012-08-16 17:58:10 -04:00
kimth
9686868a32 Merge pull request #442 from MITx/feature/kfiedler/courseware-style 
Added fix for answer status and show answer to stay in the same place
 2012-08-16 14:51:43 -07:00
Kyle Fiedler
f343bc28f3 Added fix for answer status and show answer to stay in the same place 2012-08-16 17:49:50 -04:00
Tom Giannattasio
b0b10aa598 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:35:56 -04:00
Bridger Maxwell
2de55d074b Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:34:38 -04:00
Bridger Maxwell
385772373a Updated django-wiki requirement with fixed version. 2012-08-16 17:32:11 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00
kimth
c56fb6f326 Merge pull request #440 from MITx/feature/kfiedler/courseware-style 
BUG SMASH
 2012-08-16 14:12:45 -07:00
David Ormsbee
b5c6053000 Merge pull request #438 from MITx/feature/ichuang/minor-py26-compat-fix-part2 
{} -> {0} etc in .format statements
 2012-08-16 14:11:25 -07:00
Kyle Fiedler
09973bd815 Added fix for circut simulator 2012-08-16 17:08:12 -04:00
Matthew Mongeau
409477522b Add jQuery scrollTo to courseware. 2012-08-16 17:07:43 -04:00
kimth
fa3e46880d Merge pull request #439 from MITx/feature/victor/fix-html-rendering 
fix html rendering bug
 2012-08-16 14:02:10 -07:00
Victor Shnayder
1ae71313bc fix html rendering bug 2012-08-16 16:53:29 -04:00
Rocky Duan
c89e290cdd use only one conf param 2012-08-16 13:43:48 -07:00
Tom Giannattasio
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04:00
Rocky Duan
730d4d9485 add askbot flag back 2012-08-16 13:40:12 -07:00
ichuang
6e3eff304e {} -> {0} etc in .format statements 2012-08-16 16:22:26 -04:00
Calen Pennington
97538e7077 Merge pull request #437 from MITx/feature/ichuang/minor-py26-compat-fix 
Fix backcompat_module : html escape & py26
 2012-08-16 12:36:51 -07:00
Calen Pennington
f09fa831d8 Merge pull request #436 from MITx/kimth/sjsu 
Hide chapters in addition to sections
 2012-08-16 12:32:21 -07:00
Kyle Fiedler
b17cbcdccd Added fixes for speed dropdown 2012-08-16 15:27:23 -04:00
ichuang
73d9d10aa8 html needs < in backcompat_module 2012-08-16 15:17:55 -04:00
ichuang
0cac6c9512 minor change to backcompat_module for py26 compat 2012-08-16 15:16:42 -04:00
kimth
9acb1ddaca Hide chapters in addition to sections 2012-08-16 15:06:49 -04:00
ichuang
ea03838a0f Merge pull request #434 from MITx/sarina/max-attempts-fix 
Add facility for fixed number of problem attempts
 2012-08-16 11:57:30 -07:00
Sarina Canelake
725e9a2a7b Add facility for fixed number of problem attempts 2012-08-16 14:27:28 -04:00
Victor Shnayder
147bd5eb3d add initial docs on xml format and policy files 2012-08-16 14:04:41 -04:00
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
Bridger Maxwell
9411bdaaa2 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-16 13:02:00 -04:00
Bridger Maxwell
034bd7308e The django/mako template loader now caches mako templates by loading them from file. 2012-08-16 13:01:04 -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