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

4365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ichuang
e3ecd22fa0 github IPs in lms.envs.common; made create_user, create_groups, 
manage_course_groups management commands (in lms_migration)
 2012-08-20 18:38:05 -04:00
ichuang
660c35f63e additional changes to make inline textinput work properly 2012-08-20 00:19:28 -04:00
ichuang
b23bfc75bc additional minor change: allow "inline" attrib on textline 2012-08-19 23:18:06 -04:00
ichuang
ed1a08d397 Merge branch 'feature/ichuang/add-gitreload-to-migrate' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate 2012-08-17 15:46:52 -04:00
ichuang
b6e41dc05c fix view_tracking_log to show proper timezone 2012-08-17 15:46:09 -04:00
ichuang
f7d4831939 update utility scripts for djang-1.4; will make them management cmds later 2012-08-17 15:20:19 -04:00
ichuang
a6c6d0f4d1 MITX_FEATURES['USE_DJANGO_PIPELINE']=False in dev_ike by default 2012-08-17 14:49:59 -04:00
ichuang
39e2d64207 Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate 2012-08-17 16:22:40 +00:00
ichuang
4365b4a092 more flexible event logs retrieval 2012-08-17 16:17:00 +00:00
ichuang
7dd7de9566 add gitreload to lms migration, so it doesn't have to run separately 2012-08-17 15:57:12 +00:00
ichuang
5300670076 Merge pull request #446 from MITx/hotfix/ichuang/pyxserver-default-url-change 
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver

merging now so it stops holding up content teams.
 2012-08-17 06:39:57 -07:00
ichuang
4dbcfe927e hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver 
This needs a more permanent solution.
 2012-08-17 09:36:43 -04:00
Calen Pennington
b0627efc74 Fix the tests of the book url 2012-08-17 09:23:37 -04:00
Calen Pennington
427c400f9e Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus 
Fix user replication to Courses you're already enrolled in
 2012-08-17 05:55:31 -07:00
Calen Pennington
502691fa6e Merge pull request #441 from MITx/feature/halogenandtoast/fix_scroll 
Add jQuery scrollTo to courseware.
 2012-08-17 05:54:51 -07:00
ichuang
879fb0db0c Merge pull request #445 from MITx/kimth/sjsu 
Fix CustomResponse for 6.002x
changes affect 6.002 model of customresponse, making it slightly more robust when improperly used.
 2012-08-16 19:13:52 -07:00
kimth
0a9065f2be Fix CustomResponse for 6.002x 2012-08-16 22:00:10 -04:00
David Ormsbee
61108c27cb When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models 2012-08-16 19:12:57 -04:00
kimth
bea9aec6ea Merge pull request #443 from MITx/feature/victor/fix-html-rendering 
fix another backcompat html bug
 2012-08-16 15:00:37 -07:00
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
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
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
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