Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,583 Commits 1 Branch 0 Tags
08e90d2e993a96fd191af940bb9b4531a76cbf59
Commit Graph

905 Commits

Author SHA1 Message Date
Renzo Lucioni
c42c2573b0 Merge pull request #6259 from edx/renzo/split-verification-payment-hookup 
Hook up new payment and verification flow
 2014-12-19 13:29:13 -05:00
Afzal Wali
872dbb874b WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased 2014-12-17 16:19:06 -05:00
Renzo Lucioni
a268c91236 Hook up new payment/verification flow to dashboard, track selection page, and upgrade 2014-12-16 23:32:17 -05:00
David Baumgold
3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8 
Update pep8 to 1.5.7
 2014-12-12 15:00:13 -05:00
David Baumgold
08a8afa619 For methods on PasswordHistory, only calculate if necessary 
Check settings.FEATURES["ADVANCED_SECURITY"] first
 2014-12-12 11:53:02 -05:00
Afzal Wali
51e53587dc WL-105 Show course cards sorted by start dates, oldest first. 2014-12-11 20:05:04 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Christina Roberts
77f5d90d6a Merge pull request #5961 from edx/dan-f/cohort-csv-upload 
Upload CSV file for cohorting students
 2014-12-10 11:04:14 -05:00
Daniel Friedman
3d91f43030 Support cohorting students via a CSV File. 
TNL-735
 2014-12-10 09:23:04 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
chrisndodge
099d02d13d Merge pull request #6124 from edx/muhhshoaib/WL-164 
Unpurchased items in the shoppingcart should be removed if the enrollment period has closed
 2014-12-09 09:25:46 -05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed 
changed the url name to verify_cart and change the color of the message in the shopping cart
 2014-12-09 12:20:37 +05:00
stephensanchez
7ab0cb0730 3rd-party pipeline supports updating email optin 
Fix all the 3rd party auth scenarios.

Update pipeline to preserve parameters.

Updating tests
 2014-12-08 19:52:06 +00:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00
Will Daly
23a51a6515 Add email opt in to old login and register pages 2014-12-08 09:29:16 -05:00
Will Daly
1c6d197bd0 Merge pull request #6156 from edx/will/revert-logistration-enablement 
Revert enable login/registration
 2014-12-05 13:06:44 -05:00
Don Mitchell
3e1e4a4b25 Merge pull request #6123 from mitocw/bdero/move-course-role-check-to-student 
Moved has_course_access from CMS to student.auth (common)
 2014-12-05 11:35:16 -05:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page." 
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
 2014-12-05 10:41:42 -05:00
Andy Armstrong
eced849db0 Add group_access field to all xblocks 
TNL-670
 2014-12-05 09:55:00 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations 
TNL-649
 2014-12-05 09:52:26 -05:00
Renzo Lucioni
5e41a34dd1 Refrain from setting email opt-in preference when checkbox is missing 2014-12-04 17:35:19 -05:00
Will Daly
988753395f Add support for external auth on the combined login/registration page 
Add support for redirect URLs in third party auth for combined login/registration page

Remove old login/registration acceptance tests

Add deprecation warnings to old login and register views

Move third party auth util to student_account

Add exception for microsites
 2014-12-04 09:34:51 -05:00
Brandon DeRosier
046e295322 Change has_course_access definition and doc string 
- has_course_access renamed to has_course_author_access for clarity
- Changed doc string to clearly state that it determines whether or not
  a user has write access to a course
 2014-12-02 22:08:58 -05:00
Brandon DeRosier
bdc64a7c70 Moved has_course_access from CMS to student.auth (common) 2014-12-02 19:36:38 -05:00
Will Daly
84301e7698 Merge pull request #6070 from edx/will/verified-messaging-per-course 
Student verification status
 2014-12-02 16:08:25 -05:00
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases 
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
 2014-12-02 07:09:36 -05:00
Renzo Lucioni
28186e233c Merge pull request #6062 from edx/renzo/email-opt-in 
Updating the marketing iframe, courseware views, and student views for email opt-in
 2014-12-01 17:22:49 -05:00
Renzo Lucioni
8961ec4f35 Update the student views to accept the email_opt_in parameter 
Includes tests checking that the student views integrate with the profile API as expected.
 2014-12-01 15:57:40 -05:00
Sarina Canelake
13946fb844 s/pylint: disable=W0511/pylint: disable=fixme/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
0c7b60b82b Remove 'pylint: disable=W0232' because we ignore this warning in pylintrc 2014-12-01 11:22:12 -05:00
Sarina Canelake
ff18b7d01a s/pylint: disable=W0611/pylint: disable=unused-import/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
c0556a7ef8 s/pylint: disable=W0613/pylint: disable=unused-argument/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
e15d4aea71 s/pylint: disable=F0401/pylint: disable=import-error/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
19f1dacab2 s/pylint: disable=E1101/pylint: disable=no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b127d2844b s/pylint: disable=C0103/pylint: disable=invalid-name/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3 s/pylint: disable=C0111/pylint: disable=missing-docstring/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
0dad9da5e4 s/pylint: disable=W0621/pylint: disable=redefined-outer-name/ 2014-12-01 11:22:08 -05:00
Sarina Canelake
a883a9cdda Merge pull request #5925 from stvstnfrd/pep8/continuation 
Fix continuation-related PEP8 issues
 2014-11-25 09:03:40 -05:00
stv
11020cf115 Fix Pylint: C0103: (invalid-name) 
Command.handle: Invalid name "d" for type variable
(should match [a-z_][a-z0-9_]{2,30}$)
 2014-11-24 20:48:05 -05:00
stv
b215d771b7 Fix PEP8: E128 continuation line under-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
stv
4d30aedf4e Fix PEP8: E127 continuation line over-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
stv
6763c5dd74 Fix PEP8: E126 continuation line over-indented 
for hanging indent
 2014-11-24 20:46:44 -05:00
stv
5a69feadeb Fix PEP8: E123 closing bracket does not match 
indentation of opening bracket's line
 2014-11-24 20:46:44 -05:00
stv
55de42d19c Fix PEP8: E122 continuation line missing 
indentation or outdented
 2014-11-24 20:46:35 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
 2014-11-13 11:16:16 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
Stephen Sanchez
fc8b2a5f37 Merge pull request #5720 from edx/sanchez/avoid_event_suppression 
Changing event suppression to signal suppression.
 2014-11-12 12:46:26 -05:00
stephensanchez
6e85ec0739 Changing event suppression to signal suppression. 
Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error
 2014-11-12 16:26:29 +00:00