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

9783 Commits

Author SHA1 Message Date
Will Daly
c8751b5b4a Add CSRF cookie to combined login/registration form 
Add CSRF check for login/registration views.
 2014-11-12 16:15:20 -05:00
Renzo Lucioni
2fc2207bd2 Merge pull request #5905 from edx/renzo/pep8-pylint-cleanup 
Clean up pep8 and pylint violations
 2014-11-12 14:34:03 -05:00
AlasdairSwan
3eb287151c ECOM-369 accessibility updates 2014-11-12 14:17:41 -05:00
Renzo Lucioni
8d02efb021 Clean up pep8 and pylint violations 
Also fixes failing Python unit tests
 2014-11-12 12:55:56 -05:00
Will Daly
1537086a9b Merge pull request #5930 from edx/will/logistration-handle-redirects 
Logistration: Clean up redirect logic
 2014-11-12 11:23:48 -05:00
Will Daly
ce158cf54e Merge pull request #5929 from edx/will/logistration-fix-cancel-third-party-auth 
Logistration: Redirect to a valid URL when cancelling third party auth
 2014-11-12 10:49:20 -05:00
Will Daly
02485be3e3 Clean up redirect logic 2014-11-12 10:27:25 -05:00
Renzo Lucioni
34dd4e59a1 Merge pull request #5914 from edx/renzo/final-text-review 
Final text review
 2014-11-12 09:55:48 -05:00
Will Daly
d50137bb64 Redirect to a valid URL when cancelling third party auth 2014-11-12 09:33:06 -05:00
Renzo Lucioni
6defcaa0af Final text review 2014-11-10 16:33:37 -05:00
Will Daly
5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py
 2014-11-10 15:05:37 -05:00
Will Daly
c150ea76aa Merge pull request #5890 from edx/will/logistration-auto-enroll-register 
Logistration: Auto-enroll fails after registering a new account
 2014-11-10 12:23:28 -05:00
AlasdairSwan
b9998b6d5b Merge pull request #5899 from edx/alasdair/logistration-select-validation 
ECOM-626 Added required check for select dropdowns and validation
 2014-11-10 11:54:20 -05:00
Renzo Lucioni
031195d0d8 Fix Jasmine test 2014-11-10 11:25:39 -05:00
AlasdairSwan
cb5c03f0d1 ECOM-626 Added required check for select dropdowns and validation 2014-11-10 11:06:52 -05:00
Will Daly
95a435abc5 Include course ID in analytics events for logistration 2014-11-10 10:23:34 -05:00
Usman Khalid
96b1a17b66 Merge pull request #5816 from edx/usman/plat71-mongo-autoreconnect-errors-2 
Proxy to retry on mongo Autoreconnect errors.
 2014-11-10 19:56:11 +05:00
Waheed Ahmed
c397495eb9 Fixed null answer in checkbox problem as incorrect. 
TNL-765
 2014-11-10 18:41:26 +05:00
Will Daly
b8f5be2cdd Allow inactive users to modify their own enrollments 2014-11-10 08:10:47 -05:00
Waheed Ahmed
3a71901f93 Fixed youtube stub server and removed unused variable. 
TNL-778
 2014-11-10 11:43:58 +05:00
chrisndodge
c4a957c159 Merge pull request #5876 from edx/cdodge/catalog-visibility 
Add new course_module field which describes what the catalog visibility ...
 2014-11-09 21:02:49 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Will Daly
578c04f62f Put logistration page behind a feature flag 2014-11-07 13:05:17 -05:00
Will Daly
e629ce2ba6 Move redirection/enrollment to AccessView and trigger it using an event. 
Ensure window.isExternal is loaded

Don't set a default for terms of service

For paid courses, add the course to the cart and redirect to the shopping cart view.

Don't send form method and url as form data.

Stub window.analytics in the access view test.
 2014-11-07 12:59:08 -05:00
Sarina Canelake
2cdbabc0b8 Merge pull request #5880 from edx/sarina/name-branded-assets-in-common 
Sarina/name branded assets in common
 2014-11-07 11:13:51 -05:00
Renzo Lucioni
bedd6cc2f5 Jasmine tests of validation utility 
Includes a modification of validation logic which performs min and max length checks on optional fields in addition to required fields.
 2014-11-07 10:44:25 -05:00
Sarina Canelake
4e9bf5e104 Last reference removed in 3b2c970248 [OPEN-299] 2014-11-07 09:50:45 -05:00
Sarina Canelake
5cedbc7ee6 Rename branded asset; moved to LMS as that's where it is referenced [OPEN-302] 2014-11-07 09:50:45 -05:00
Waheed Ahmed
b6d4a533a9 Fixed jump_to_id in problem solution. 
TNL-729
 2014-11-07 19:16:49 +05:00
chrisndodge
01c029aa9f Merge pull request #5805 from edx/cdodge/make-customizeable-region-in-receipt-page 
allow for a customized region on the receipt page that is microsite bran...
 2014-11-06 21:13:43 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page. 
TNL-683
 2014-11-06 15:48:55 -05:00
Renzo Lucioni
f9ecd8849a Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
 2014-11-06 12:07:49 -05:00
Usman Khalid
5fa1104787 Wrapped Split MongoConnection in MongoProxy. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Usman Khalid
4a969f9f1b Added autoretry_read decorator to methods which use mongo cursor. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Usman Khalid
328a79cc60 Wrap pymongo connections in MongoProxy. 
PLAT-71
 2014-11-06 20:13:45 +05:00
Renzo Lucioni
edba397a20 Return more helpful error messages when a resource conflict occurs 2014-11-05 22:36:27 -05:00
Don Mitchell
5491418cd5 Merge pull request #5847 from edx/dhm/generalize_assets 
Generalize assets to any block_type but using
 2014-11-05 17:32:56 -05:00
Don Mitchell
fc83c299ca Generalize assets to any block_type but using 
AssetKey and the metadata store
PLAT-204
 2014-11-05 16:01:50 -05:00
AlasdairSwan
d0b1a8ec06 Fixed bug with validation templates expecting number but being passed string. 2014-11-05 15:40:38 -05:00
Greg Price
d2183c58c8 Add endpoint to log in with OAuth access token 2014-11-05 14:09:41 -05:00
Sarina Canelake
303b4e66e1 Merge pull request #5822 from edx/sarina/OPEN-303 
Move all lms image files into lms/static/images [OPEN-303]
 2014-11-05 10:58:02 -05:00
John Eskew
db682dae05 Merge pull request #5819 from edx/jeskew/asset_mongo_coursewide 
Implement course-wide asset paging methods.
 2014-11-05 10:05:32 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements 
Unit Test Improvements
 2014-11-05 19:55:39 +05:00
Sarina Canelake
ad8bc69f93 Move all lms image files into lms/static/images [OPEN-303] 2014-11-05 09:10:15 -05:00
John Eskew
3534ba70ca Changes for PR review: More compact tests, enumeration for metadata 
sort order, etc.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 18:49:38 -05:00
John Eskew
098bba16e1 Implement copy_all_asset_metadata for Old Mongo->Old Mongo. 
Add tests for copying all asset metadata.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 11:38:56 -05:00
John Eskew
062e0b2174 Implement course-wide asset paging methods. 
Add SortedCollection class to help sort lists efficiently.
https://openedx.atlassian.net/browse/PLAT-74
 2014-11-04 11:35:02 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Don Mitchell
436b32a66d Merge pull request #5800 from edx/dhm/xml_assetstore 
Abstract asset methods into own interface class
 2014-11-04 10:43:41 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00