Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,300 Commits 1 Branch 0 Tags
b0eba8a62ec8dd1c19a05bb91a582c27250b40b7
Commit Graph

4437 Commits

Author SHA1 Message Date
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00
Jason Zhu
7391f359dd Support unicode ANALYTICS_DASHBOARD_NAME 
I open this pull to support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 23:10:27 +08: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
jsa
f24f01d217 Add support for user partitioning based on cohort. 
JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.
 2014-12-05 09:53:44 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations 
TNL-649
 2014-12-05 09:52:26 -05:00
christopher lee
212598e649 Merge branch 'release' 
Conflicts:
	lms/djangoapps/mobile_api/course_info/tests.py
 2014-12-04 16:39:37 -05:00
chrisndodge
f7f9bec6ea Merge pull request #5774 from edx/cdodge/shopping-cart-touchups 
Cdodge/shopping cart touchups
 2014-12-04 14:02:19 -05:00
Will Daly
3c5da9d3ea Merge pull request #6077 from edx/will/enable-logistration 
Login/Registration A/B test cleanup
 2014-12-04 11:47:20 -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
Muhammad Shoaib
cd30164b5f Improvements and bug fixes for shopping cart: WL-117, WL-114, WL-116, WL-115, WK-122 2014-12-04 01:11:49 -05:00
Akiva Leffert
66f41e1d9f Make static URLs absolute in handouts, updates, and about for mobile API 
JIRA: MA-147
 2014-12-03 16:25:48 -05:00
christopher lee
b89113e114 Revert "Make static URLs absolute in handouts, updates, and about for mobile API" 
This reverts commit fb6579abfdb6fc9fb8bc9233554ff5c6e9215659.
 2014-12-03 16:24:27 -05:00
Akiva Leffert
1088855d0b Make static URLs absolute in handouts, updates, and about for mobile API 
JIRA: MA-147
 2014-12-03 16:18:39 -05:00
Calen Pennington
e01ffcc27e Merge pull request #6129 from cpennington/fewer-queries-in-field-data-cache 
Don't query for the user every time in FieldDataCache, just use the user_id instead
 2014-12-03 16:08:24 -05:00
christopher lee
3c99912213 Merge branch 'release' 2014-12-03 14:46:40 -05:00
Calen Pennington
14e6f3cc2b Don't query for the user every time in FieldDataCache, just use the user_id instead 2014-12-03 11:00:03 -05:00
Adam Palay
c0b87d87ab fix typo on course payment page (ECOM-714) 2014-12-03 10:52:34 -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
Clinton Blackburn
46d5593201 Merge pull request #6105 from edx/clintonb/oidc-administrator-claim 
Added OAuth2 Permissions Scope Handler
 2014-12-02 11:11:15 -05:00
Clinton Blackburn
5a561f81d4 Added OAuth2 Permissions Scope Handler 
This scope offers a simple claim, administrator, that is true iff the user is a superuser.
 2014-12-02 11:08:44 -05:00
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
Jesse Zoldak
e26a0c4308 Fix pep8 violations in some tests 2014-12-02 09:39:23 -05:00
Jesse Zoldak
17379f4079 Merge pull request #6078 from edx/zoldak/modulestore-test-refactor 
Clean up all modulestore testcases
 2014-12-02 08:53:41 -05:00
Shrhawk
0f3bce02a0 Merge pull request #5888 from Shrhawk/shr/bug/TNL-590-encode-error 
Handle Unicode for Incoming Keys
 2014-12-02 17:53:47 +05:00
Jesse Zoldak
121b31309d Small fixes to modulestore test refactoring 2014-12-02 07:09:37 -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
Sarina Canelake
252d6704d0 s/pylint: disable=W0221/pylint: disable=arguments-differ/ 2014-12-01 11:22:13 -05:00
Sarina Canelake
547660fd87 Resolve "pointless-string-statement" pylint violation 2014-12-01 11:22:13 -05:00
Sarina Canelake
640353d94a s/pylint: disable=W0231/pylint: disable=super-init-not-called/ 2014-12-01 11:22:13 -05:00
Sarina Canelake
520935209d s/pylint: disable=W0402/pylint: disable=deprecated-module/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
f663a7fe8d s/pylint: disable=W0612/pylint: disable=unused-variable/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
7aab4151bb s/pylint: disable=W0201/pylint: disable=attribute-defined-outside-init/ 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
7229ef92ee s/pylint: disable=W0212/pylint: disable=protected-access/ 2014-12-01 11:22:12 -05:00
Sarina Canelake
5f723e8d3c s/pylint: disable=W0703/pylint: disable=broad-except/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
c0556a7ef8 s/pylint: disable=W0613/pylint: disable=unused-argument/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
e45994b2ef s/pylint: disable=R0924/pylint: disable=incomplete-protocol/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
90624ac4ba s/pylint: disable=R0915/pylint: disable=too-many-statements/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
d14c39a13e Fix exposed pylint violations 2014-12-01 11:22:10 -05:00
Sarina Canelake
f2626e6896 s/disable=E0213,W0613/disable=no-self-argument,unused-argument/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
89b6adadf2 s/pylint: disable=E1102/pylint: disable=not-callable/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
aa7cc2b79e s/pylint: disable=E0702/pylint: disable=raising-bad-type/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
1e0f3ddb7d s/pylint: disable=E1111,E1124/pylint: disable=assignment-from-no-return,redundant-keyword-arg/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b8c16d5ed7 s/pylint: disable=E1120/pylint: disable=no-value-for-parameter/ 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
20e2ee9a57 s/pylint: disable=E0611/pylint: disable=no-name-in-module/ 2014-12-01 11:22:09 -05:00