Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,158 Commits 1 Branch 0 Tags
78ca8fb7bef9153a56aa1ec9edfcdfd2ddb40b2d
Commit Graph

4242 Commits

Author SHA1 Message Date
Don Mitchell
b80aad2308 Merge pull request #528 from edx/dhm/rename_revision 
Rename CourseLocator.revision to branch
 2013-07-31 13:18:17 -07:00
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04:00
Calen Pennington
e43dbd29c4 Merge pull request #487 from edx/cale/lms-xblock-student-view 
Cale/lms xblock student view
 2013-07-31 09:04:38 -07:00
Don Mitchell
68e1bcf42e Remove edu from doc string examples & typos 2013-07-31 11:24:51 -04:00
Peter Fogg
25955a79c4 Merge pull request #492 from edx/peter-fogg/fix-stud-146 
Fix word cloud modules not exporting correctly.
 2013-07-31 08:19:32 -07:00
Ned Batchelder
15859dd880 Merge pull request #522 from edx/ned/quiet-mongoimport-noise-during-tests 
Quiet mongoimport noise during tests
 2013-07-31 07:25:57 -07:00
Ned Batchelder
4cb8f58b27 Quiet mongoimport noise during tests 2013-07-31 10:25:09 -04:00
Vasyl Nakvasiuk
1233d73e01 Merge pull request #497 from edx/alex/graphical_slider_tool_for_studio 
"Graphical Slider Tool" integration into studio
 2013-07-31 06:36:49 -07:00
Don Mitchell
f2977704fe Remove unused tests 
which a previous refactoring had replaced. Coverage of locator.py is
100%
 2013-07-31 09:35:21 -04:00
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands 
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
 2013-07-31 09:22:10 -04:00
Vasyl Nakvasiuk
61327bc599 fix python code styles 2013-07-31 10:43:06 +03:00
Don Mitchell
119652a62a Rename CourseLocator.revision to branch 
and all related vars and methods.
 2013-07-30 14:37:33 -04:00
Peter Fogg
512269f842 Add descriptor for modules with empty XML data. 
This allows a more general approach to modules such as word_cloud and
video which have no XML data (it's all store in metadata), but use
XmlDescriptor for backwards compatibility. They now generate an empty
tag on export, and clear out empty tags on import.

Also a small change to the video module as a result -- if it's asked
to parse empty XML data, it won't try to parse anything.
 2013-07-30 13:53:38 -04:00
Peter Fogg
f355e4a8f4 More general solution to word cloud export problems. 2013-07-30 10:29:12 -04:00
Peter Fogg
0967cb0d9d Fix word cloud modules not exporting correctly. 2013-07-30 10:29:12 -04:00
Vasyl Nakvasiuk
d6f794c4d7 gst module: add configuration and render properties 2013-07-30 11:59:41 +03:00
Calen Pennington
8ed33b3dd5 Merge pull request #478 from edx/cale/xmodule-descriptor-studio-view 
Cale/xmodule descriptor studio view
 2013-07-29 11:43:29 -07:00
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
Vasyl Nakvasiuk
57bc010a0a gst integration into studio 2013-07-26 17:22:27 +03:00
Adam Palay
62a54555b6 fixes back nav button 2013-07-25 15:32:43 -04:00
Calen Pennington
802d36c192 Add an XBlock studio_view to XModuleDescriptors 
This just wraps get_html, and ignores javascript and css for now.

[LMS-187]
 2013-07-25 13:59:52 -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