Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

4251 Commits

Author SHA1 Message Date
stephensanchez
afaaca969a Adding new styles for dashboard notifications. 
Change the reverification failure message styling.

Changing templates so new styles do not appear in courseware.

Removing unused aria tag.

PR comments on cleaning up SASS

Fix signup LMS test.

Copy changes per review on PR

Updating based on PR comments

Style and HTML changes for notifications
 2014-10-07 15:44:47 +00:00
John Eskew
18822bdb4e Wrap course info and dashboard in bulk ops wrapper to reduce Mongo calls. 2014-10-06 16:53:11 -04:00
John Eskew
c8898b0afc Use: 
CourseLocator.from_string()
instead of:
	SlashSeparatedCourseKey.from_deprecated_string()
to construct the course_key for which the auto-created user is registered.
 2014-10-06 16:53:10 -04:00
brianhw
0e46eebf73 Merge pull request #5478 from edx/brian/fix-user-track 
Add _get_request_value to safely access request.REQUEST for browser events.
 2014-10-03 14:28:12 -04:00
David Baumgold
376c111169 Merge pull request #5111 from edx/shib-tests-ddt 
Use ddt for shib tests
 2014-10-03 14:18:46 -04:00
Brian Wilson
0eb190fc61 Add _get_request_value to safely access request.REQUEST for browser events. 2014-10-03 11:45:08 -04:00
Greg Price
183d688129 Add events for cohort modifications 
This includes cohort creation/deletion and membership changes.
 2014-10-03 11:32:43 -04:00
Greg Price
606ad7ab26 Remove dead code 2014-10-03 11:32:42 -04:00
Don Mitchell
4f795f8270 Fix hardcoded course urls 2014-10-03 10:56:00 -04:00
Christina Roberts
5d7b5228f7 Merge pull request #5464 from edx/christina/js-coverage 
Don't put all of xmodule_js as src (changes coverage metrics).
 2014-10-02 17:14:18 -04:00
cahrens
2286366c90 Remove unused files, add missing spec file. 2014-10-02 15:05:17 -04:00
David Baumgold
9c81004fc7 Remove test cleanups 
Since `ddt` should make them unnecessary
 2014-10-02 12:18:16 -04:00
David Baumgold
62fcc6f23a Use ddt for shib tests 2014-10-02 12:18:15 -04:00
Usman Khalid
4e796c575a Merge pull request #5366 from edx/usman/tnl367-transaction-level-decorator 
MySQL transaction isolation level decorator.
 2014-10-02 19:16:46 +05:00
Stephen Sanchez
aba57382ab Merge pull request #5420 from edx/sanchez/enrollment-success-message 
Add new enrollment message to the dashboard
 2014-10-02 09:59:39 -04:00
Stephen Sanchez
bf112f7ef0 Add new enrollment message to the dashboard 
The body of the enrollment message template

Tokenize platform name in message.

Changing to a datetime enrollment approach

Adding sorting. A little refactoring.

Adding confguration model for time delta

Adding admin registration and basic form for new config model.

Fixing docstring typo

Updating default time delta to 0, adding test to show it disabled functionality.

Removing the form from configuration and tweaking the enrollment message html
 2014-10-02 12:32:35 +00:00
David Baumgold
31931827bf Kill DISABLE_RESET_EMAIL_TEST flag 
We're better served by just directly testing if we're in the LMS or not.
 2014-10-01 11:42:41 -04:00
Christina Roberts
7f4cc1c75c Merge pull request #5407 from edx/cohort-management 
Cohorts UI
 2014-10-01 11:01:03 -04:00
Usman Khalid
32063fe003 Added commit_on_success_with_read_committed decorator to views 
which raise IntegrityErrors.

TNL-367
 2014-10-01 19:48:37 +05:00
Usman Khalid
ae09573228 commit_on_success_with_read_committed should only work with atmost 
1 level of transactions.

TNL-367
 2014-10-01 19:45:38 +05:00
Usman Khalid
25a90301b3 Tests for the commit_on_success_with_read_committed decorator. 
TNL-367
 2014-10-01 19:45:38 +05:00
Usman Khalid
5ba236f405 Created commit_on_success_with_read_committed decorator. 
This decorator executes the decorated function inside a
transaction with isolation level set to READ COMMITTED.

TNL-367
 2014-10-01 19:42:47 +05:00
Adam
6a5fc054ba Merge pull request #5445 from edx/release 
Release
 2014-10-01 09:32:23 -04:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard 
TNL-162
 2014-10-01 09:22:32 -04:00
Nimisha Asthagiri
f72974d4df TNL-328 Server-side work for displaying type of cohort. 2014-10-01 09:22:30 -04:00
Nimisha Asthagiri
3bb1ab080d TNL-160 Default cohorts, automatically created. 2014-10-01 09:22:30 -04:00
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Adam Palay
0c4f98a89b update password reset template (TNL-503) 2014-09-29 16:15:31 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split 
11300
 2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Tim Babych
3f2346260c Merge pull request #5393 from edx/anton/js-double-loading-studio 
Fix double loading of cms-modules.js.
 2014-09-29 16:39:40 +03:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms 
PLAT-88
 2014-09-29 13:26:43 +05:00
polesye
e588fb8f05 TNL-272: Fix double loading of cms-modules.js. 2014-09-26 21:28:54 +03:00
Sarina Canelake
fbd9cc1310 Merge pull request #5386 from open-craft/fix-anonymous-ids-unicode 
Fix UnicodeError with anonymous student IDs
 2014-09-25 16:43:18 -04:00
Andy Armstrong
0ed3a95d3a Merge branch 'release' 
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
 2014-09-25 16:25:45 -04:00
Julia Hansbrough
c5ae921dea Merge pull request #5328 from edx/flowerhack/auto-login 
Automatically log in users who access third party login after trying to register for a course
 2014-09-25 10:40:33 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile. 
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
 2014-09-25 08:36:22 -04:00
Braden MacDonald
8e32672228 Fix UnicodeError with anonymous student IDs 2014-09-24 20:17:47 -07:00
Julia Hansbrough
6b061ad23b Response to CR 2014-09-24 21:20:49 +00:00
Julia Hansbrough
5d5ff8d9c1 Docs 2014-09-24 17:24:42 +00:00
Julia Hansbrough
3fbbe57cef Add auto-registration to third party login flow 2014-09-24 17:24:42 +00:00
Julia Hansbrough
5b3c69bc87 Tests fixed 2014-09-24 17:24:42 +00:00
Julia Hansbrough
4d77b0552f Move server-side validation to enroll method 2014-09-24 17:23:25 +00:00
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
chrisndodge
21933bfbd7 Revert "add an additional tag so we can route zendesk tickets better for white l..." 2014-09-24 12:46:05 -04:00
chrisndodge
7b88863b4d Merge pull request #5359 from edx/cdodge/add-microsite-tag-to-zendesk 
add an additional tag so we can route zendesk tickets better for white l...
 2014-09-24 08:52:43 -04:00
David Baumgold
9542b0a885 Revert "Puts course listings in a sane order" 
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
 2014-09-23 18:45:59 -04:00
Andy Armstrong
fe6668a550 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
 2014-09-23 15:53:10 -04:00
Chris Dodge
e08040aa75 add an additional tag so we can route zendesk tickets better for white label sites 
add tests

fix

use org
 2014-09-23 15:39:21 -04:00
Usman Khalid
ed84c1b27a Merge pull request #5246 from edx/usman/plat104-static-content-server 
Improvements to byte range handling in StaticContentServer.
 2014-09-24 00:15:46 +05:00