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

26394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlasdairSwan
ab035a0ebb ECOM-531 updating grid column counts in media queries and added some more classes to style against instead of elements 2014-10-22 09:06:28 -04:00
AlasdairSwan
24a01ae37e ECOM-531 Styling the buttons 2014-10-21 16:40:58 -04:00
AlasdairSwan
00ff10820a ECOM-531 Styling the forms 2014-10-21 16:03:58 -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
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
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
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
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
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
AlasdairSwan
52ffe93866 ECOM-369 added forgot password flow plugged in to Renzo's API 2014-10-20 14:33:40 -04:00
AlasdairSwan
61db0182e5 Added password reset view and started basic styling 2014-10-20 12:12:17 -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
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
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
Waqas Khalid
be19c1a9a5 Merge pull request #5610 from mlkwaqas/waqas/tnl607-forum-post-are-uneditable 
Post with the discussion id containing dots uneditable
 2014-10-20 19:39:29 +05:00
Renzo Lucioni
6013c529f4 Merge pull request #5615 from edx/renzo/account-password-reset 
Add password reset request handling to the account page
 2014-10-20 10:21:18 -04:00
Will Daly
9da81adaa4 Merge pull request #5626 from edx/will/more-unit-tests-failures 
Fix unit test failures due to duplicate url names
 2014-10-20 10:03:52 -04:00
Alison Hodges
3cfe586b41 Merge pull request #5614 from edx/ahodges/doc/DOC1116 
Open source rename child-id
 2014-10-20 09:48:19 -04:00
Mark Hoeber
5ee7f4eba5 Merge pull request #5491 from edx/markhoeber-doc989 
WIP: edX Mobile API Doc
 2014-10-20 09:26:27 -04:00
Will Daly
d558a36127 Fix unit test failures due to duplicate url names 
Reset the correct URLs module to fix test failures.

Fix third party auth to reconfigure the registry on test cleanup.
 2014-10-20 09:10:11 -04:00
zubair-arbi
6bb878afb2 Merge pull request #5468 from edx/zub/bugfix/tnl-256-protex-scroll-with-increased-font-size 
set overflow to scroll so that user can see full content with increased ...
 2014-10-20 12:23:24 +05:00
Renzo Lucioni
ff587c5cbb Add password reset request handling to the account page 
The next step in the password reset process (confirmation) continues to be handled by student.views.password_reset_confirm_wrapper, a custom wrapper around Django's password reset confirmation view.
 2014-10-18 00:54:38 -04:00
Brian Talbot
5a31005e96 Merge pull request #5563 from lpil/master 
Stop page extending out of viewport width by 40px
 2014-10-17 17:14:01 -04:00
Mark Hoeber
8b98c08d13 Merge pull request #5525 from edx/pmitros/olx-doc-fixups 
First pass at improving OLX docs
 2014-10-17 16:41:13 -04:00
Mark Hoeber
fba0b7b8a4 Merge pull request #5620 from edx/markhoeber-devdoc-fix 
Devdoc fix
 2014-10-17 16:38:45 -04:00
Mark Hoeber
3170e36c66 Removed highlight underscore, which was breaking on RTD 2014-10-17 16:24:38 -04:00
Waqas Khalid
9ba03c8aac Post with the discussion id containing dots uneditable 
When user try to edit the post under dicussion whose
id contains dots it doesn't allow user to edit taht
post.

TNL-607
 2014-10-18 01:07:27 +05:00
Will Daly
6250c95d2e Fix immutable querydict error 2014-10-17 16:07:06 -04:00
frances botsford
b9c37120b3 Merge pull request #2682 from edx/frances/experiments/rtl 
RTL platform support
 2014-10-17 15:22:36 -04:00
Will Daly
efec188b69 Fix unit tests 2014-10-17 15:01:21 -04:00
Will Daly
3c1aab8043 Merge pull request #5622 from edx/will/set-password-field-type 
Use password field type for the login form password
 2014-10-17 14:46:34 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Will Daly
be0033eefe Use password field type for the login form password 2014-10-17 13:41:10 -04:00
Will Daly
c1e2674997 Merge pull request #5621 from edx/will/remember-me 
Add remember me checkbox to the login page
 2014-10-17 13:37:41 -04:00
Jesse Zoldak
03a42898c9 Merge pull request #5608 from edx/zoldak/lti-test-fixes 
Fix sychronization issues in LTI lettuce test
 2014-10-17 13:18:11 -04:00
Will Daly
e65fe4ed03 Add remember me checkbox to the login page 2014-10-17 13:17:13 -04:00
Mark Hoeber
cc702589f6 Merge pull request #5607 from edx/carol/docs/DOC-1054 
Clarify Max Attempts
 2014-10-17 12:50:54 -04:00
Carol Tong
11792fb955 Clarify Max Attempts 
Add text to clarify relationship between Max Attempts setting
course-wide vs individual problems
 2014-10-17 12:49:15 -04:00
Mark Hoeber
0ea2254062 Platform API doc 2014-10-17 12:27:45 -04:00