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

11117 Commits

Author SHA1 Message Date
Calen Pennington
4007d5ebcb Wrap ModuleSystem and DescriptorSystem into a single object, to continue holding up the XModule house of cards 
[PLAT-191]
 2014-10-30 14:23:16 -04:00
Renzo Lucioni
471f513566 Merge pull request #5770 from edx/renzo/logistration-i18n 
i18n logistration
 2014-10-30 14:20:08 -04:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
Adam
75fab0ccfd Merge pull request #5538 from edx/adam/generalized-draft-import-export-2 
Adam/generalized draft import export 2
 2014-10-30 13:53:57 -04:00
David Baumgold
1b49dd0e6d Deleted some unused images under common 2014-10-30 13:49:45 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Adam Palay
a6c31fc46b generalize draft import/export TNL-574 
add test for videomodule

Import drafts handles modules w/o xml_attributes
and ones using the old parent_sequential_url pointer

Handle drafts for modules which don't define nor extract xml_attributes

Support  and  in get_items qualifiers

Unit test for   value query
 2014-10-30 12:22:05 -04:00
Brian Talbot
ee368e8740 Studio: cleaning up/removing unused sass 
* removing unused font-family-centric Sass variables
* removing unused graphic images and Sass references
* clean up of style removal fallout
 2014-10-30 12:07:52 -04:00
Sarina Canelake
1b6d1b3730 Fix i18n and quality errors in course_groups/views.py 2014-10-30 11:10:57 -04:00
AlasdairSwan
ff753f2bcb Merge pull request #5784 from edx/alasdair/rwd-header-and-footer 
Alasdair/rwd header and footer
 2014-10-30 09:21:21 -04:00
Nimisha Asthagiri
994ac6da6d Fixes for MOB-836 and MOB-766 and MA-96. 2014-10-29 22:06:42 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -04:00
John Eskew
c9071353fd Merge pull request #5742 from edx/jeskew/asset_manager_read_wrapper 
Wrap all asset read operations.
 2014-10-28 15:57:28 -04:00
John Eskew
1cdf84974c Merge pull request #5556 from edx/jeskew/fix_split_old_analytics_call 
Fix old analytics api call for Split modulestore.
 2014-10-28 15:49:59 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -04:00
John Eskew
786a32e7cf Wrap all asset read operations. 
First step in moving assets out of the contentstore (optionally).
https://openedx.atlassian.net/browse/PLAT-77
 2014-10-28 14:20:36 -04:00
Don Mitchell
ef0111d060 Merge pull request #5759 from edx/dhm/plat-142 
Add tests for clone_course
 2014-10-28 13:31:06 -04:00
John Eskew
5e103a918b Fix pylint errors to get below limit. 2014-10-28 13:15:10 -04:00
Don Mitchell
6989999d8a Add tests for clone_course 
PLAT-142
 2014-10-28 11:09:24 -04:00
Adam
37949e07f7 Merge pull request #5345 from edx/adam/adjust-logging-level 
change ItemNotFoundErrors to log.warning on bringup
 2014-10-28 10:57:35 -04:00
Will Daly
f9b5a9173f Redirect users to the track selection page or ?next page when using third party auth 
Set marketing site logged in cookie from third party auth.
 2014-10-28 10:28:30 -04:00
AlasdairSwan
08e03ef380 ECOM-369 updated in light of review with Andy and code review 2014-10-27 15:17:07 -04:00
AlasdairSwan
2ea9685552 ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur. 2014-10-27 15:16:33 -04:00
AlasdairSwan
a86e9e68db ECOM-466 Added support for custom error messages. Styled select widths 2014-10-27 15:15:10 -04:00
Will Daly
0735141afc Merge pull request #5730 from edx/will/update-donation-tests 
Add a test for donations with a white-label course mode
 2014-10-27 14:13:44 -04:00
Will Daly
5a1df635d0 Merge pull request #5735 from edx/will/update-release-10-27 
Merge release into master (with changes from Friday 10/24/14)
 2014-10-27 12:01:09 -04:00
Will Daly
0cac6ea21b Fix pylint violations 2014-10-27 11:04:22 -04:00
Will Daly
7f54af3be0 Merge remote-tracking branch 'origin/release' 2014-10-27 10:59:31 -04:00
Don Mitchell
f48289cc4f Moved assetstore tests to own file and ddt'd across stores 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
 2014-10-27 10:04:10 -04:00
Don Mitchell
b6fac23960 Implement asset metadata storage in Split - per-asset functionality 
PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-10-27 10:04:09 -04:00
Will Daly
2c062ca08b Add a test for donations with a white-label course mode 2014-10-26 15:58:26 -04:00
Will Daly
60f02feb71 Merge pull request #5716 from edx/will/logistration-custom-error-msgs 
Add field from server to set custom error messages for logistration fields
 2014-10-25 14:29:21 -04:00
Will Daly
3996b0a7e6 Merge pull request #5708 from edx/will/fix-401-basic-auth-issue 
Logistration: Use a 403 status to indicate that the user does not have a linked account
 2014-10-25 14:29:05 -04:00
Sarina Canelake
5b79de580a Update wording per Doc 2014-10-24 16:21:13 -04:00
Jesse Zoldak
26c01dffe3 Merge pull request #5721 from edx/zoldak/fix-easy-access-test 
Fix test page definition for course group configurations page
 2014-10-24 16:16:43 -04:00
Jesse Zoldak
74b65ddb1e Improve rerun test 
for troubleshooting TNL-692
 2014-10-24 16:12:11 -04:00
Renzo Lucioni
05cb2a071b Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth 2014-10-24 15:59:42 -04:00
Jesse Zoldak
af3d911a7f Fix test page definition for course group configurations page 
TNL-685
 2014-10-24 14:30:31 -04:00
John Eskew
5ffc6ac256 Merge pull request #4854 from edx/jeskew/assetstore_modulestore_work 
Phase 1 of adding asset metadata saving to old Mongo
 2014-10-24 12:47:53 -04:00
Sarina Canelake
3d1c54fefa Merge pull request #5595 from Stanford-Online/caijim/resetbutton 
Support and tests for adding a reset button to units
 2014-10-24 11:49:24 -04:00
John Eskew
b857a0ed7b Phase 1 of adding asset metadata saving to old Mongo 2014-10-24 11:07:32 -04:00
Will Daly
ac2201a648 Add field from server to set custom error messages for logistration fields 2014-10-24 11:02:38 -04:00
AlasdairSwan
2284d5ee14 Merge pull request #5713 from edx/alasdair/logistration-validation 
ECOM-466 cleaned up form submission validation
 2014-10-24 09:52:08 -04:00
Will Daly
611e819d17 Change field type for email from 'text' to 'email' 2014-10-24 09:25:56 -04:00
Will Daly
cc07afb967 Use a 403 status to indicate that the user does not have a linked 
account for third party auth.
 2014-10-24 08:57:54 -04:00
AlasdairSwan
c3083069d1 ECOM-466 cleaned up form submission validation 2014-10-24 08:55:28 -04:00
zubair-arbi
4ea6323d96 reload video in setPlaybackRate only if speed of video is '1.0' 
TNL-537
 2014-10-24 12:29:06 +05:00