Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
32,165 Commits 1 Branch 0 Tags
9cbc8564a12eaae381ebefeb7c98b420f7265b68
Commit Graph

11688 Commits

Author SHA1 Message Date
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
AlasdairSwan
b14a129132 Merge pull request #5705 from edx/alasdair/logistration-error-styles 
Alasdair/logistration error styles
 2014-10-23 16:28:05 -04:00
AlasdairSwan
e332e79328 ECOM-369 Moved to Base FormView extended by other views. 2014-10-23 16:23:59 -04:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Jim
6d19a0c87c Support and tests for adding a reset button to units 
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
 2014-10-23 12:14:27 -07:00
Adam Palay
0be9a26521 change ItemNotFoundErrors to log.warning in x_module.py 2014-10-23 13:38:12 -04:00
stephensanchez
e7570c52e6 adding all the tests for data and api. 
Updating tests for views

Last chunk of tests and pep8 cleanup

Code Review cleanup.

Additional CR comments

Changing serialization of suggested prices.
 2014-10-23 16:57:29 +00:00
David Baumgold
14209c672a Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33 
Annotation Tools: Upgrading Share plugin from v1.0 to v1.1
 2014-10-23 11:22:22 -04:00
Will Daly
fb5a8098de Disable auth for login and registration end-points 2014-10-23 10:20:37 -04:00
Will Daly
0245c7e16e Use 'defaultValue' instead of 'default' in the form description. Fix an error that would cause the login and password reset pages to not load correctly. 2014-10-23 08:56:40 -04:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer 
Add RequireJS Optimizer.
 2014-10-23 15:29:42 +03:00
Oleg Marshev
f550359d67 Merge pull request #5545 from edx/oleg/lms-dashboard-course-start-time 
Add course start/end time to student dashboard.
 2014-10-23 11:56:37 +03:00
Will Daly
33f0e92d62 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 2014-10-22 17:13:30 -04:00
Will Daly
9e9dec1de1 Integrate third party auth into the combined login/registration page. 
Change third party auth login failure code to a 401, to detect authentication
success with no linked account.

If already authenticated, redirect immediately to the dashboard.

Use "Location" header correctly for 302 redirects from student views.

Add utility functions for simulating a running third-party auth pipeline.

Add a utility function for checking whether third party auth is enabled.

Respect default values sent by the server
 2014-10-22 17:10:49 -04:00
stephensanchez
128d4836c0 Change design to check for min price or suggested prices. 2014-10-22 20:26:03 +00:00
stephensanchez
de4a2191c8 pep8 error. 2014-10-22 19:53:59 +00:00
stephensanchez
d5966b1e21 Adding an additional check to avoid donations showing up for microsites. 2014-10-22 18:20:32 +00:00
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
lduarte1991
976c3cb11f Annotation Tool: Fix Share Plugin style and spacing 
- fixed parseInt issue

 - PR fixes
 2014-10-22 09:22:10 -04:00
lduarte1991
deefe9b13e Annotation Tools: Updated Share plugin from version 1.0 to v1.1 2014-10-22 09:21:39 -04:00
Adam
2bb44a001a Merge pull request #5641 from edx/adam/update-latex-data 
update latex problem data (TNL-264)
 2014-10-22 08:52:52 -04:00
Adam Palay
becd4c1b9a update latex problem data (TNL-264) 2014-10-21 16:58:30 -04:00
Don Mitchell
0d36dd7264 Merge pull request #5646 from edx/dhm/migrate_bug 
Fix command line migrator
 2014-10-21 16:55:59 -04:00
Mark Hoeber
c213f64d4f Merge pull request #5642 from edx/markhoeber-doc1123 
Updated max attempts advanced settings help string
 2014-10-21 11:09:34 -04:00
Will Daly
d610237388 Merge pull request #5656 from edx/will/logistration-js-work 
Combined login/registration JS work
 2014-10-21 08:35:55 -04:00
Oleg Marshev
3d149bf5ea Merge pull request #5585 from edx/oleg/giturl-not-deprecate 
GIT URL should not be a deprecated setting (TNL-396).
 2014-10-21 14:52:57 +03:00
Will Daly
fabd8a97ad Fix validation for checkboxes in forms. 
Remove hard-coded TOS checkbox in registration template.
Disable new dashboard in settings; expose password reset end-point in student account app.
Added empty JS tests for new JavaScript
 2014-10-21 07:29:46 -04:00
Oleg Marshev
f5294358a6 Do not deprecate giturl. 2014-10-21 13:21:38 +03:00
Waheed Ahmed
3ad2959f65 Merge pull request #5639 from edx/waheed/fix-screen-reader-user-issues 
Fixed screen reader issues.
 2014-10-21 14:13:51 +05:00
Waheed Ahmed
865850c2ad Fixed screen reader issues. 
TNL-568
TNL-588
TNL-595
 2014-10-21 12:33:51 +05:00