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

9246 Commits

Author SHA1 Message Date
AlasdairSwan
3a0304724d ECOM-531 tweaking margins 2014-10-22 09:52:40 -04:00
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
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
d774bcf36e Support separate terms of service and honor code checkboxes. 2014-10-20 11:26:17 -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
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
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
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
frances botsford
b9c37120b3 Merge pull request #2682 from edx/frances/experiments/rtl 
RTL platform support
 2014-10-17 15:22:36 -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
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
Mark Hoeber
0ea2254062 Platform API doc 2014-10-17 12:27:45 -04:00
Jesse Zoldak
dd35005132 Fix sychronization issues in LTI test 
Better verification for troubleshooting LTI test failures
Dismiss any lingering alerts after lettuce scenarios
 2014-10-17 12:22:34 -04:00
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references 
Remove references to /tmp in tests
 2014-10-17 12:12:53 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests 
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
 2014-10-17 10:00:12 -04:00
Louis Pilfold
16ed497497 Use box-sizing SCSS mixin rather than property 2014-10-17 09:09:19 +01:00
Waheed Ahmed
16566684c9 Fixed CC button in internet explorer. 
TNL-617
 2014-10-17 12:23:27 +05:00
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00
Christina Roberts
f7ef9eb511 Merge pull request #5510 from edx/christina/bug-tnl-543 
Pass group_id when getting user thread and comment counts.
 2014-10-16 16:03:22 -04:00
cahrens
7133cfc150 Pass group_id when getting user thread and comment counts. 
Depends on cs_comments_serivce commit ea218a2b038b59e63fd6593b5598db90223636e1.

TNL-543
 2014-10-16 14:32:10 -04:00
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -04:00
Daniel Friedman
64d2514f2c Merge pull request #5528 from edx/dan-f/data-download-tech-debt 
Student profile CSV background task tech debt
 2014-10-15 16:54:41 -04:00
Daniel Friedman
33cfb9c78a Merge pull request #5582 from edx/dan-f/cohorts-internationalization 
Ensure all user-facing cohort-related strings are internationalized
 2014-10-15 16:26:06 -04:00
Daniel Friedman
62c46c80e7 Bump the report downloads poll interval to 20 seconds 
TNL-565
 2014-10-15 15:58:08 -04:00
Daniel Friedman
37158bab1f Create standard way of updating a task's progress 
TNL-566
 2014-10-15 15:58:08 -04:00
Daniel Friedman
a9fc3b035b Verify cohort strings are scraped for translation 2014-10-15 14:51:02 -04:00
Jim Abramson
b6013a2399 Merge pull request #5577 from edx/jsa/tnl549 
Fix topic-related errors when editing discussion threads in inline mode.
 2014-10-15 11:34:40 -04:00
Nimisha Asthagiri
e0f9def061 Merge pull request #5584 from edx/nimisha/val/MA-81 
MA-81 Honor video download setting with VAL-enabled videos.
 2014-10-15 10:10:13 -04:00
Nimisha Asthagiri
5355b4b96e MA-81 Honor video download setting with VAL-enabled videos. 2014-10-14 22:32:16 -04:00
Will Daly
26a94afb26 Merge pull request #5573 from edx/will/django-countries-fix 
Update django-countries to 2.1.2, override country name for Taiwan
 2014-10-14 17:14:32 -04:00
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors 
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
 2014-10-14 15:45:19 -04:00