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

2016 Commits

Author SHA1 Message Date
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
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
cahrens
a4196ffa00 Relative path seems to work. 2013-01-17 21:15:38 -05:00
cahrens
8cca193903 Add a comment. 2013-01-17 21:06:05 -05:00
cahrens
a1bb533b60 Workaround for sandbox. 2013-01-17 21:04:17 -05:00
Chris Dodge
44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-17 20:30:22 -05:00
Chris Dodge
0e2d8be442 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 2013-01-17 20:29:41 -05:00
Vik Paruchuri
18dc59c93a Error message fix 2013-01-17 17:18:10 -05:00
Vik Paruchuri
eaa6701c6f Remove mitxmako dependencies, make rubric and oechild inherit fro object 2013-01-17 17:13:31 -05:00
cahrens
77865f7ab2 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 2013-01-17 14:22:18 -05:00
cahrens
5f05ec83f1 Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly. 2013-01-17 13:11:47 -05:00
Chris Dodge
fe964ec8ba disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate 2013-01-17 13:11:16 -05:00
Chris Dodge
45bb511e15 remove obsolete test (per Vik) 2013-01-17 12:06:21 -05:00
cahrens
b6fcf3a51e Some refactoring from Brian's submission. 2013-01-17 10:36:04 -05:00
Chris Dodge
48cbf38a41 resolve merge conflicts 2013-01-17 09:36:09 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08:00
Alexander Kryklia
176be15998 removed unnecssary debug information 2013-01-17 14:25:28 +02:00
Alexander Kryklia
f22af62f2c removed jstat, added javascript_loader 2013-01-17 14:22:13 +02:00
Alexander Kryklia
1d36e7baf9 now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first 2013-01-17 14:21:52 +02:00
Brian Talbot
f34fd5c426 studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js 2013-01-16 16:55:11 -05:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
 2013-01-16 15:40:14 -05:00
Brian Talbot
e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip 2013-01-16 14:54:28 -05:00
cahrens
cc5a5e2996 Fix multiple choice checkbox. 
#117
 2013-01-16 12:52:05 -05:00
Brian Wilson
bfb5f5e5bd Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-16 11:24:46 -05:00
Brian Wilson
cc1b50ee4a use new-style class for TestCenterExam 2013-01-16 11:24:20 -05:00
Brian Wilson
3b28e328c4 disable export of testcenter_exam from course module (and add test). 2013-01-15 17:54:10 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
Brian Talbot
ed6134ea11 abstracted out common editor styles shared by problem and html editors 2013-01-15 14:14:31 -05:00
Victor Shnayder
2f7210ed0c address Ike's comments 2013-01-15 11:44:27 -05:00
Victor Shnayder
3e5a2f9bde Add beta test group support 
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
 2013-01-15 11:36:25 -05:00
Brian Talbot
623769e9d8 separated common editor UI from problem and HTML editor SCSS - wip 2013-01-15 09:57:48 -05:00
Alexander Kryklia
b53786b688 removed on event from slider and readonly from textbox 2013-01-15 13:34:16 +02:00
Valera Rozuvan
c9c328cf39 Bugfix. 2013-01-15 12:55:25 +02:00
Alexander Kryklia
d3045b36ab initial function call added, fix 2013-01-15 12:55:25 +02:00
Alexander Kryklia
fc09bbd0b4 added funciton call 2013-01-15 12:55:25 +02:00
Alexander Kryklia
a49f94fe49 added none to allowed parameters in functions 2013-01-15 12:55:25 +02:00
Valera Rozuvan
ec0bdfb445 New feature: can specify output of "none" for a dynamic element. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
1770de73f1 Bugfixing. Refactoring. Removed readonly check for text edits. Styling of text edits with jQuery UI. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
77962e3cdb Removed unnecessary comments. Added feature to update element either on "change" or on "slide" event. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
052dc3fa22 New feature: For bar graphs, can specify bar width and bar alignment. 2013-01-15 12:55:24 +02:00
Valera Rozuvan
271c182f4e Fixed bug: jQuery slider default change event name is "slidechange", and it behaves a bit differently than "slide" event. 2013-01-15 12:55:24 +02:00
Alexander Kryklia
a75003ef2f added no_slide parameters 2013-01-15 12:55:23 +02:00
Valera Rozuvan
782fb3b465 New feature: Can specify "change" or "slide" event type of sliders. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
f17e2466b1 New feature: Now can specify x-axis and y-axisnames for ticks. Updated "Fick s Second Law" demo to demonstrate this. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
efa375114e Enabled automatic addition of "return" statement for asymptotes, xrange.min, and xrange.max. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
ad4f4144e8 New feature: Added ability to set "color" and "weight" property of moving label text. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
bd605150ad New feature: Dynamically moving labels added. "Sample size and power" demo updated. 2013-01-15 12:55:23 +02:00
Valera Rozuvan
1753f983ae Added ability to insert automatic "return" for dynamic element functions, and graph label dynamic element functions. 2013-01-15 12:55:23 +02:00