Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,438 Commits 1 Branch 0 Tags
615e6da2f4b5fd0eecd13bb7fe1590fbe25804f2
Commit Graph

1584 Commits

Author SHA1 Message Date
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
ichuang
c56982e6f0 fix bug in video player:if from=xx:xx:xx is used then bkgrnd flashes 2013-01-25 16:45:16 -05:00
Victor Shnayder
87e92644b6 Make all tests pass 
caveat: with a bit of hackery.  Need to do better testing once things are live.
 2013-01-25 16:13:55 -05:00
Victor Shnayder
22ccf9c500 Some test cleanups 2013-01-24 17:33:25 -05:00
Jay Zoldak
896933a3c4 Fix broken IE 2013-01-24 17:02:18 -05:00
Victor Shnayder
69711a91ff Fix inline discussion cohorting, debug logging 2013-01-24 16:58:19 -05:00
Victor Shnayder
3bfe9decf4 Change config keys to use underscores for consistency with other policy keys 2013-01-24 15:14:34 -05:00
Victor Shnayder
9e84ae14d4 Started integration work with Kevin's cohort changes 
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.

Next: testing :)
 2013-01-24 15:14:33 -05:00
Victor Shnayder
0d41a04490 fix line length 2013-01-24 15:12:52 -05:00
Victor Shnayder
90a5703419 Test for cohort config 2013-01-24 15:12:52 -05:00
Victor Shnayder
f005b70f3b Minor test cleanups 2013-01-24 15:12:52 -05:00
Victor Shnayder
fa17913a91 is_cohorted course descriptor property, docs 2013-01-24 15:12:52 -05:00
David Ormsbee
e074c629fc Merge pull request #1344 from MITx/bugfix/brian/pearson-reg-end-date 
add UTC time to registration end date
 2013-01-24 09:27:11 -08:00
Don Mitchell
f2b43ec459 Merge pull request #1343 from MITx/feature/christina/tiny-mce 
Make code inline instead of block.
 2013-01-24 05:34:36 -08:00
Brian Wilson
0cb5f101ae add UTC time to registration end date 2013-01-24 01:18:10 -05:00
cahrens
711cc9a041 Tell tinyMCE to not change image paths. 
#143
 2013-01-23 20:18:28 -05:00
cahrens
4a79643fde Make code inline instead of block. 2013-01-23 16:43:49 -05:00
Victor Shnayder
abcc5c0204 Merge pull request #1342 from MITx/feature/cdodge/add-standard-problem-metadata 
update templates to include attemps and weight values. Also update capa_...
 2013-01-23 13:40:46 -08:00
Chris Dodge
2856971b45 update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value' 2013-01-23 16:36:16 -05:00
chrisndodge
fe8e25e72d Merge pull request #1341 from MITx/feature/christina/tiny-mce 
Toggling of code should mark editor as dirty.
 2013-01-23 13:25:01 -08:00
cahrens
2969a9e48d Toggling of code should mark editor as dirty. 2013-01-23 16:19:17 -05:00
Chris Dodge
9d5ac308b1 remove flag to hide progress tab 2013-01-23 15:11:41 -05:00
Brian Talbot
5fee7eeaec studio - further resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:58:20 -05:00
Brian Talbot
2ca267dc52 studio - resolved bug with .header CSS inheritance and problem editor menu UI 2013-01-23 12:50:10 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-23 09:14:42 -08:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Don Mitchell
966db4fbaf Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items 
add optional course_id parameter to DraftMongoStore.get_items()
 2013-01-23 07:39:36 -08:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
Brian Talbot
fd3ae2c478 studio html editor - matched up styles for <pre> elements 2013-01-22 16:16:30 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 
Conflicts:
	cms/static/css/tiny-mce.css
 2013-01-22 16:15:27 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
cahrens
13945994f0 change class on right element! 2013-01-22 15:47:09 -05:00
cahrens
b554eb5afe Cleanup of format dropdown, toolbar buttons. 2013-01-22 15:28:47 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Chris Dodge
9520290018 add optional course_id parameter to DraftMongoStore.get_items() 2013-01-22 11:55:36 -05:00
Valera Rozuvan
757f955c5e Moved JS for drag-and-drop from global capa. Now it will load only when required, and can be specified from any course. 2013-01-21 15:53:44 +02:00
Alexander Kryklia
5200534a4a template for drag_and_drop capaproblem 2013-01-21 15:52:49 +02:00
Carlos Andrés Rocha
84efafc896 Add missing semicolon at the end of sequence display module javascript 2013-01-18 17:00:51 -05:00
Chris Dodge
0efd6e6a15 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-18 16:14:27 -05:00
Chris Dodge
550e805b74 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
 2013-01-18 15:44:41 -05:00
Chris Dodge
39101c76a5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 2013-01-18 15:43:45 -05:00
Diana Huang
89055da8ba Take out useless logging. 2013-01-18 15:38:59 -05:00
Diana Huang
0e3aeb4041 Merge branch 'master' into diana/fix-sa-tests 2013-01-18 15:21:50 -05:00
Diana Huang
bd6d153126 Fix failing self-assessment unit tests 2013-01-18 15:18:13 -05:00
cahrens
700b0f14fd Need path to tiny mce JS file now. 2013-01-18 10:48:42 -05:00
Chris Dodge
575ff02f8a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 
Conflicts:
	jenkins/test.sh
 2013-01-18 10:26:44 -05:00
Brian Talbot
d2f79f10f0 studio - synced LMS common content styles with HTML component display/edit rendering styles 2013-01-18 09:59:08 -05:00
chrisndodge
031e79ec24 Merge pull request #1310 from MITx/fix/cdodge/discussion-fixes 
only cache discussion forum info for 5 minutes before flushing. This is ...
 2013-01-17 20:59:27 -08:00
Chris Dodge
c6276c8394 only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata 2013-01-17 23:58:07 -05:00