Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,929 Commits 1 Branch 0 Tags
13ca61ba7feb2dd76c889b3affddd9e793d80b01
Commit Graph

4223 Commits

Author SHA1 Message Date
Adam
50ef0d1c09 Merge pull request #503 from edx/fix/back-button 
fixes back nav button
 2013-07-29 10:29:40 -07:00
Don Mitchell
393aa1da26 Ensure parent update of children decaches correctly 2013-07-29 12:23:19 -04:00
Don Mitchell
d1ed6fbc34 More xblock.save() calls to handle fields set during inits 2013-07-29 09:08:37 -04:00
Adam Palay
62a54555b6 fixes back nav button 2013-07-25 15:32:43 -04:00
Sarina Canelake
c80a05f4d8 Merge pull request #471 from edx/giulio/fix-tooltips 
override .sr class from keeping tooltips hidden in sequence nav
 2013-07-25 08:03:23 -07:00
Adam Palay
2efcb0cdca Change default names for various LMS components 
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
 2013-07-25 10:38:47 -04:00
Giulio Gratta
214a814b94 Adjustment to show sequence tool tips in LMS 2013-07-25 00:48:36 -04:00
Renzo Lucioni
1a0055ae77 Blank common and advanced problems now display an inline score of '0 points' upon creation. 2013-07-24 16:44:22 -04:00
Don Mitchell
e223d753e3 Merge pull request #489 from edx/dhm/export_policy 
change of defaults for rerandomize/showanswer
 2013-07-24 12:54:32 -07:00
Calen Pennington
dd338c17a5 Merge pull request #477 from edx/cale/xmodule-student-vieww 
Add an XBlock student_view to XModule
 2013-07-24 12:08:25 -07:00
Don Mitchell
400ff494cb Remove presumption of user's intent for imported xml attrs 
Moved to xlint rather than setting to old default.
 2013-07-24 14:08:34 -04:00
Don Mitchell
2d085c426d Add xlint check for any policy fields whose default changed. 
Warn user that the course behavior may change.
 2013-07-24 14:07:39 -04:00
Calen Pennington
3774ea1565 Add an XBlock student_view to XModule 
This just wraps XModule.get_html, and ignores javascript and css for
now.

[LMS-189]
 2013-07-24 12:23:26 -04:00
Adam
420b092033 Merge pull request #467 from edx/fix/adam/file-upload 
Fix/adam/file upload
 2013-07-23 15:05:18 -07:00
Chris Dodge
0b6932f4b8 add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition. 2013-07-23 16:15:39 -04:00
Chris Dodge
8584aae866 It seems like self.tabs is getting set to an empty set [] now rather than None. This causes the tab defaulting to not populate, leading to crashes in the LMS if someone makes a new course with additional tabs (e.g. static tabs or pdf-textbooks) 2013-07-23 15:34:02 -04:00
chrisndodge
8c94be8083 Merge pull request #436 from edx/fix/cdodge/stop-using-unmunged-urlnames-as-display-names 
change from_xml class method on video class to make sure we honor the fa...
 2013-07-23 08:33:27 -07:00
Adam Palay
2b40462263 convert all datetime.now() to datetime.now(UTC) 2013-07-22 17:39:11 -04:00
Adam Palay
b2b3a50400 convert datetime.now() to datetime.now(UTC) for xqueue 2013-07-22 17:39:11 -04:00
Adam Palay
b744aaa360 make sure parsed times are set to UTC 2013-07-22 17:39:11 -04:00
Adam Palay
af522af2ca formatting 2013-07-22 17:39:11 -04:00
Calen Pennington
a9fb82cae6 Make XModuleDescriptor use the XBlock children API 
N.B. When we are in a world of mixed XModules and XBlocks, the
system/runtime will have to be cognizant of that when asked to return a
XModule from an XModuleDescriptor child

[#LMS-190]
 2013-07-22 16:15:57 -04:00
Don Mitchell
0ed06504bb Merge pull request #448 from edx/dhm/xml_default 
Set to old xml defaults IFF no specified policy for problem nor course.
 2013-07-22 08:13:03 -07:00
Calen Pennington
679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore 
Next gen modulestore
 2013-07-20 04:51:11 -07:00
Calen Pennington
6dab09f5f2 PEP8 and Pylint fixes 2013-07-20 06:26:38 -04:00
Don Mitchell
654686293b Set to old xml defaults IFF no specified policy for problem nor course. 2013-07-19 16:51:48 -04:00
Renzo Lucioni
9af87e41ba Resolve issues with persistence and sequential bar 2013-07-19 16:14:24 -04:00
Renzo Lucioni
1fc4ac864e Add feature showing current score next to problem title 2013-07-19 16:14:24 -04:00
Adam
73e6e6f443 Merge pull request #394 from edx/fix/foldit-leaderboard 
Fix/foldit leaderboard
 2013-07-19 12:09:37 -07:00
Don Mitchell
913c601ac1 Move default set_many impl to xblock 2013-07-19 15:08:24 -04:00
Don Mitchell
549ef5d494 Ensure kvs up-to-date if code accessing it. 2013-07-19 14:55:49 -04:00
Chris Dodge
22802a4d29 change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes 2013-07-19 13:54:22 -04:00
Joe Blaylock
044a69d63d Merge pull request #52 from edx/nate/simple-chat 
Simple port of Class2Go's chat feature
 2013-07-19 10:10:32 -07:00
Don Mitchell
62afa23a0d Make tests not msec time sensitive 2013-07-19 13:10:14 -04:00
Don Mitchell
df7b917b40 Implement next generation modulestore 
A new modulestore backed by mongo that changes the data format to
facilitate easy versioning, sharing content between courses, and fast
lookup of course structure and Scope.settings data.

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
 2013-07-19 13:10:14 -04:00
Vik Paruchuri
a2522c492c Merge pull request #160 from edx/fix/vik/studio-oe 
Fix/vik/studio oe
 2013-07-19 08:44:16 -07:00
Adam Palay
a04539af5d change models to filter by course 2013-07-19 11:03:25 -04:00
Don Mitchell
e3602941ee Merge pull request #440 from edx/dhm/adaptive_template 
Bug report: remove <?xml version..> tag
 2013-07-19 07:57:29 -07:00
Don Mitchell
eee1d6f593 Bug report: remove <?xml version..> tag 
https://edx-wiki.atlassian.net/browse/STUD-428
 2013-07-19 09:15:29 -04:00
Alexander Kryklia
67f6d6c4d1 Fixes code_jail imports and draganddrop yaml 2013-07-19 12:05:17 +03:00
Nate Hardison
bf8e5e6ba1 Simple port of Class2Go's chat feature 
Embed a chat widget (much like the calculator widget) into the
courseware. To use, you must point it at an ejabberd box,
configured as `JABBER_DOMAIN` in the settings.
 2013-07-18 15:00:53 -07:00
Vik Paruchuri
a478fa9ff7 Change error class 2013-07-18 16:56:38 -04:00
Don Mitchell
025a95885a Generate TypeError if from or to_json fail. 2013-07-18 16:47:15 -04:00
Sarina Canelake
7615a0638b Merge pull request #310 from robertjmarks/master 
Adds in changes for stat2.3x question type
 2013-07-18 13:44:00 -07:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Vik Paruchuri
2a4976cf8a Cleanup how peer grading handles due date 2013-07-18 15:36:42 -04:00
Sarina Canelake
f0c9aa3916 Provide set_many methods for Lms and Mongo KeyValueStores 
Refactor new set_many and update XBlock version number.
 2013-07-18 15:30:13 -04:00
Vik Paruchuri
0b991f9bbd Fix reset and score tests 2013-07-18 15:19:13 -04:00
Vik Paruchuri
84c4b7f139 Test fixes 2013-07-18 15:08:52 -04:00
Vik Paruchuri
480e97a3fd Cleanup and change attribute names 2013-07-18 14:55:59 -04:00