Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

10188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valera Rozuvan
8d69049746 Client-side Drag and Drop: work in progress. Part 1. 2013-01-21 15:53:44 +02:00
Alexander Kryklia
95060f3930 updated python part to sync with new interface 2013-01-21 15:53:44 +02:00
Valera Rozuvan
61c68b740c Set up of basic RequireJS skeleton structure. 2013-01-21 15:53:44 +02: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
313055fe96 transfer images list to html 2013-01-21 15:53:43 +02:00
Alexander Kryklia
ccb8e96acb fix 2013-01-21 15:53:43 +02:00
Alexander Kryklia
a394419641 updates 2013-01-21 15:53:43 +02:00
Alexander Kryklia
c7add85c9a added new tag 2013-01-21 15:53:43 +02:00
Alexander Kryklia
0001a67ce1 update tag name 2013-01-21 15:53:43 +02:00
Alexander Kryklia
cc78ebe329 rename tag 2013-01-21 15:53:43 +02:00
Alexander Kryklia
ea3b1f93b0 updated drag and drop files 2013-01-21 15:53:43 +02:00
Alexander Kryklia
5200534a4a template for drag_and_drop capaproblem 2013-01-21 15:52:49 +02:00
Kevin Chugh
b26c59bda0 fix syntax error 2013-01-20 01:53:25 -05:00
Brian Wilson
6da9c7bd9a get (openId) provider_login to work with POST requests 2013-01-18 18:37:24 -05:00
Carlos Andrés Rocha
9790881af3 Merge pull request #1319 from MITx/bug/remove_extra_require_js 
Remove extra RequireJS.js entry.
 2013-01-18 14:07:07 -08:00
David Ormsbee
0f035b7692 Remove extra RequireJS.js entry. 2013-01-18 17:03:55 -05:00
David Ormsbee
84fa4a0192 Merge pull request #1318 from MITx/hotfix/rocha/javascript-error-in-sequence-display 
Add missing semicolon at the end of sequence display module javascript
 2013-01-18 14:02:27 -08: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
Diana Huang
c7421f040b Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 16:45:36 -05:00
Diana Huang
ef53bab5dd One more fix 2013-01-18 16:41:00 -05:00
Diana Huang
6ab7afac4a One more merge fix 2013-01-18 16:37:47 -05:00
Diana Huang
dd20226ec3 Merge branch 'master' into feature/diana/rubric-input 
Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 16:36:22 -05:00
chrisndodge
2767610ef6 Merge pull request #1317 from MITx/feature/cdodge/cms-master-merge4 
Feature/cdodge/cms master merge4
 2013-01-18 13:28:02 -08:00
Diana Huang
8cdc118a1d Typo fix 2013-01-18 16:26:47 -05:00
Diana Huang
e04f2f984a Update tests for new behavior 2013-01-18 16:18:33 -05:00
Diana Huang
2291483c43 Merge branch 'master' into diana/open-ended-ui-updates 2013-01-18 16:16:21 -05:00
Chris Dodge
0efd6e6a15 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-18 16:14:27 -05:00
David Ormsbee
44e7d6b267 Merge pull request #1315 from MITx/diana/fix-sa-tests 
Quick fixes to self assessment tests
 2013-01-18 13:07:33 -08:00
Diana Huang
999a648c3f Merge branch 'master' into diana/fix-sa-tests 2013-01-18 15:49:03 -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
David Ormsbee
878640b651 Merge pull request #1316 from MITx/bugfix/victor/beta_testers 
fix tests--nosetests is overly excited about my code
 2013-01-18 12:43:11 -08:00
Victor Shnayder
1411bd1a88 fix tests--nosetests is overly excited about my code 2013-01-18 15:39:28 -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
Don Mitchell
f10a5c4f83 Oops, forgot new class 2013-01-18 15:21:21 -05:00
Diana Huang
bd6d153126 Fix failing self-assessment unit tests 2013-01-18 15:18:13 -05:00
David Ormsbee
bdc55d3686 Merge pull request #1308 from MITx/feature/rocha/sort-by-announcement-date 
Sort courses by announcement date
 2013-01-18 11:20:18 -08:00
David Ormsbee
33093e2d7a Merge pull request #1313 from MITx/feature/ichuang/fix-bug-in-idashboard 
fix bug in instructor dashboard groups code
 2013-01-18 11:17:30 -08:00
ichuang
6d73a399b1 fix bug in instructor dashboard groups code 2013-01-18 14:04:01 -05:00
Diana Huang
f500958439 More fixes for the merge and some display updates. 2013-01-18 13:52:50 -05:00
Your Name
b8e3cfcf96 added get_cohort_ids 2013-01-18 13:50:05 -05:00
Your Name
dba39e2431 add group support to lms 2013-01-18 12:50:25 -05:00
chrisndodge
381ede20e1 Merge pull request #1312 from MITx/feature/christina/misc 
Need path to tiny mce JS file now.
 2013-01-18 07:54:11 -08: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
Christina Roberts
b4de7fac26 Merge pull request #1311 from MITx/style/btalbot/cms-tinymce 
studio - adding in LMS synced styles for TinyMCE WYSIWYG preview
 2013-01-18 07:25:51 -08:00
Brian Talbot
72fc192f6e studio - adding in LMS synced styles for TinyMCE WYSIWYG preview 2013-01-18 10:24:29 -05:00
Ashley Penney
aeee13ab91 Fix the virtualenv creation for Jenkins. 2013-01-18 10:01:21 -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