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

15796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
1bcafd32a9 Make the service-variant flag on manage.py longform only 2013-07-25 09:34:51 -04:00
Sarina Canelake
6923687c8e Merge pull request #460 from edx/sarina/update-diffcover 
Update diff-cover to latest version
 2013-07-24 20:18:15 -07:00
Calen Pennington
a569a5f6a7 Merge pull request #490 from edx/cale/make-cms.dev-environment-work-with-manage.py 
Make cms.dev environment work with manage.py
 2013-07-24 13:26:50 -07: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
Calen Pennington
3e9bbe2550 Make cms.dev environment work with manage.py 2013-07-24 14:49:07 -04: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
Calen Pennington
8e12590668 Merge pull request #451 from edx/cale/add-a-manage.py-command-that-understands-the-extra-edx-options 
Add a manage.py command that understands the extra edX options
 2013-07-24 07:34:13 -07:00
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -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
Diana Huang
86ee2bca7a Merge branch 'release' 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:57:07 -04:00
Diana Huang
09dc468342 Merge pull request #482 from edx/hotfix-2013-07-23 
Hotfix 2013 07 23
 2013-07-23 14:49:36 -07:00
chrisndodge
077f0a2a10 Merge pull request #481 from edx/fix/cdodge/regression-on-tabs-initialization 
It seems like self.tabs is getting set to an empty set [] now rather tha...
 2013-07-23 14:32:47 -07:00
Brian Talbot
31e1b0e5e9 Studio: revises spacing fix for welcome to edX studio title 
Conflicts:
	cms/templates/howitworks.html
 2013-07-23 17:26:52 -04:00
Diana Huang
2926c94330 Prevent XSS attack via submission_history page. 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:23:59 -04: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
b76e7387aa Merge pull request #452 from edx/feature/cdodge/add-jump-to-substituions 
add a /jump_to_id/ shortcut for producing more durable links between cou...
 2013-07-23 12:15:31 -07:00
jkarni
3a5e1c7021 Merge pull request #463 from edx/fix/jkarni/linkoutline 
Link section to course outline
 2013-07-23 10:59:11 -07:00
Chris Dodge
6f3b49a6f9 add some chinese characters to the test content 2013-07-23 12:15:56 -04:00
Chris Dodge
c5ef8dc526 add line break between arguments 2013-07-23 12:15:56 -04:00
Chris Dodge
f78e3a221b fix fat finger string formatting 2013-07-23 12:15:56 -04:00
Chris Dodge
345d2af540 address review feedback 2013-07-23 12:15:56 -04:00
Chris Dodge
565564a46e add input/output information in doc strings 2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb added explicit unit test to verify the link rewriting 2013-07-23 12:15:55 -04:00
Chris Dodge
80e0b99342 add a reference in the toy course to the test jump_to_id HTML module 2013-07-23 12:11:41 -04:00
Brian Talbot
059450c0de Studio: revises HTML and styling around new unit ID on unit view 2013-07-23 12:10:49 -04:00
Chris Dodge
63c5cfda94 add comment and fix mistake in test 2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
Peter Fogg
6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories 
Peter fogg/notification stories
 2013-07-23 09:05:10 -07:00
Peter Fogg
69e8d4d32f Merge pull request #469 from edx/peter-fogg/fix-stud-486 
Trim whitespace when adding course authors.
 2013-07-23 09:01:25 -07: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
David Baumgold
89705f275d Merge pull request #461 from edx/db/change-asset-to-pdf 
Change "asset" to "PDF" in textbooks interface
 2013-07-23 06:49:39 -07:00
Sarina Canelake
4ee16f1664 Add diff-quality rake task (rake quality) 2013-07-23 09:16:35 -04:00
Calen Pennington
4c3a017486 Merge pull request #462 from edx/cale/use-xblock-children-api 
Make XModuleDescriptor use the XBlock children API
 2013-07-23 04:56:44 -07:00
Alexander Kryklia
1eaba8b0b4 Merge pull request #41 from edx/alex/word_cloud_course_factory 
Word cloud tests
 2013-07-23 04:47:38 -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
Brian Talbot
4a3b680ee6 Merge pull request #447 from edx/talbs/studio-fix-title 
Studio: adds a space back to the phrase 'Welcome to edX Studio'
 2013-07-22 13:27:46 -07: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
Peter Fogg
305bc23d68 Merge pull request #465 from edx/peter-fogg/fix-stud-485 
Correctly persist checklist settings.
 2013-07-22 13:09:37 -07:00
Peter Fogg
060b2e17e5 Trim whitespace when adding course authors. 2013-07-22 15:58:22 -04:00
Peter Fogg
d87dba9e04 Correctly persist checklist settings. 
Incidentally, fixes an acceptance test (which would have caught this
bug) not running. Its step regex was "They are correctly selected
after I reload the page$", which happens to be matched by "I reload
the page$", another step definition. Lettuce seems to arbitrarily pick
between definitions if they both match a step, so it's good to ensure
that each step isn't a sub-regexes of another.
 2013-07-22 15:10:59 -04:00
Greg Price
e6fd3b38d6 Merge pull request #459 from edx/gprice/notification-setting-endpoints 
Add endpoints to set user notification preference
 2013-07-22 11:55:06 -07:00
Julian Arni
4f9a290a32 Link section to course outline 2013-07-22 14:26:47 -04:00
David Baumgold
ca2bb0e850 PDF Upload button now refers to "PDF" rather than "asset" 2013-07-22 12:54:31 -04:00