Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,295 Commits 1 Branch 0 Tags
2a4e141e0e6552cfb20fb50bc9d545395871e5ce
Commit Graph

35295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
f95ecea9a9 Temporary fix for runtime.resources_fs error 2014-10-21 13:55:29 -04:00
Chris Dodge
19ab2b93b4 Fix unicode problem and also make display links a bit shorter 
wip

remove unused kwarg
 2014-10-21 13:35:25 -04:00
Don Mitchell
f89a6944de Re-enable the unit tests and fix 2014-10-21 13:14:21 -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
srpearce
8e0d5bd96b Merge pull request #5354 from edx/sylvia/docs/mobile 
Sylvia/docs/mobile
 2014-10-21 10:46:32 -04:00
AlasdairSwan
b69035f3af Merge pull request #5659 from edx/alasdair/combine-reg-login-form 
ECOM-408 Added grid-settings to override the default global box-sizing s...
 2014-10-21 10:19:41 -04:00
AlasdairSwan
a5da61b4ab ECOM-408 Added breakpoint variables to _grid-settings.scss 2014-10-21 09:39:32 -04:00
Don Mitchell
98f962274c Update opaque_keys to new release 2014-10-21 09:30:33 -04:00
AlasdairSwan
93246db656 ECOM-408 Added grid-settings to override the default global box-sizing style 2014-10-21 09:11:59 -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
9a1bae0453 Merge pull request #5612 from edx/waheed/tnl89-add-missing-required-states-for-video--progress-slider 
Added three missing required states for video progress slider.
 2014-10-21 13:23:42 +05:00
Waheed Ahmed
865850c2ad Fixed screen reader issues. 
TNL-568
TNL-588
TNL-595
 2014-10-21 12:33:51 +05:00
Waheed Ahmed
204b52e92d Added three missing required states for video progress slider. 
TNL-89
 2014-10-21 12:21:16 +05:00
Stephen Sanchez
655381b4d1 Merge pull request #5652 from edx/talbs/fix-edx-footer-width 
LMS: FIX - edX Footer Width
 2014-10-20 17:56:46 -04:00
Sarina Canelake
16771e6944 Merge pull request #5634 from Edraak/fix-unicode-error-in-migration 
Fixed UnicodeEncodeError in student`s migrations
 2014-10-20 17:51:23 -04:00
Stephen Sanchez
2f0e4fa764 Merge pull request #5651 from edx/talbs/fix-studio-usernav 
Studio: FIX - Username Display in Nav
 2014-10-20 17:48:03 -04:00
Stephen Sanchez
f9d04e424f Merge pull request #5606 from edx/sanchez/create-enrollment-api 
WIP Enrollment API -- Merge to Reg-Login Form branch only
 2014-10-20 17:11:13 -04:00
Brian Talbot
c62bb614f3 LMS: resolving display issue with edx-footer's width 2014-10-20 16:57:01 -04:00
Brian Talbot
d238fa1477 Studio: resolving a display issue for longer usernames in Studio's navigation 2014-10-20 16:55:14 -04:00
David Baumgold
9c8c33c532 Merge pull request #5603 from lduarte1991/lduarte-harvardx-pr32 
Image Annotation Tool: Border and tag-based coloring
 2014-10-20 16:40:11 -04:00
stephensanchez
f01e5268b4 Initial setup for new enrollment API 
Quick tweaks to the API

Aggregating course modes data.

Fixing the POST request endpoints.
 2014-10-20 20:26:31 +00:00
Alison Hodges
6baae890c0 Merge pull request #5635 from edx/ahodges/doc/DOC1120 
Remove weekly tracking log instructions
 2014-10-20 15:31:05 -04:00
Alison Hodges
8a80934fcb Remove weekly tracking log instructions 
@stroilova, @victor, @mhoeber, @clintonb, @WatsonEmily, please review.
 2014-10-20 15:30:42 -04:00
Jesse Zoldak
1d7c8d39b2 Update js-test config with new sources 2014-10-20 15:23:34 -04:00
lduarte1991
464de86c2d Annotation Tool: Search happens when user hits enter 2014-10-20 15:14:36 -04:00
AlasdairSwan
ed0c383ac0 Merge pull request #5647 from edx/alasdair/combine-reg-login-form 
Alasdair/combine reg login form
 2014-10-20 14:54:34 -04:00
AlasdairSwan
e5386907cc ECOM-369 uncommented model sync trigger 2014-10-20 14:36:14 -04:00
Don Mitchell
4fc8ed8e7a Fix command line migrator 2014-10-20 14:34:33 -04:00
AlasdairSwan
52ffe93866 ECOM-369 added forgot password flow plugged in to Renzo's API 2014-10-20 14:33:40 -04:00
Will Daly
7496041f62 Merge pull request #5567 from edx/will/register-says-enroll 
Change text of registration to enrollment
 2014-10-20 14:20:45 -04:00
Carol Tong
2639b2f191 Update screenshots for discussion blackout setting 2014-10-20 13:55:59 -04:00
Will Daly
5a9da83abf Update translation strings to ensure tests pass 2014-10-20 12:39:20 -04:00
Will Daly
e7609597bc Change text of registration to enrollment 2014-10-20 12:32:57 -04:00
stephensanchez
c876c4ae93 Merge remote-tracking branch 'origin/release' into rc/2014-10-20 2014-10-20 16:19:08 +00:00
AlasdairSwan
61db0182e5 Added password reset view and started basic styling 2014-10-20 12:12:17 -04:00
Sarina Canelake
3f33fa4eec Merge pull request #5638 from edx/sarina/10202014-translation-update 
Update translations (autogenerated message)
 2014-10-20 12:11:14 -04:00
AlasdairSwan
b70dfb0780 ECOM-369 added registration view and front end validation 2014-10-20 12:07:51 -04:00
AlasdairSwan
bd0c5f227c ECOM-369 Added initial Backbone code which allows a user to login to lms 2014-10-20 12:07:51 -04:00
Will Daly
6ab8a8560d Merge pull request #5640 from edx/will/open-source-tos 
Support separate terms of service and honor code checkboxes.
 2014-10-20 11:57:52 -04:00
Mark Hoeber
67c718674f Updated max attempts advanced settings help string 2014-10-20 11:44:05 -04:00
Will Daly
d774bcf36e Support separate terms of service and honor code checkboxes. 2014-10-20 11:26:17 -04:00
Will Daly
a35ce365d7 Merge pull request #5637 from edx/will/honor-code-and-tos 
Add honor code to registration dialog.
 2014-10-20 11:17:11 -04:00
Will Daly
97f3f09009 Add honor code to registration dialog. 2014-10-20 11:14:39 -04:00
chrisndodge
1abf064dfd Merge pull request #5235 from edx/cdodge/shopping-cart-rewrite 
Cdodge/shopping cart rewrite
 2014-10-20 11:13:51 -04:00
Sarina Canelake
93cfdc86d4 Update translations (autogenerated message) 2014-10-20 10:59:51 -04:00
Will Daly
458186f7d1 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py
 2014-10-20 10:57:05 -04:00