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

9651 Commits

Author SHA1 Message Date
Waheed Ahmed
222b05a158 Added IMG tag instead of css background property for important visual indicator. 
TNL-892
 2014-12-09 12:38:54 +05:00
Andy Armstrong
2b0f959bd7 Merge pull request #5942 from edx/cohorted-courseware 
Cohorted courseware
 2014-12-08 14:38:30 -05:00
Ben Patterson
89397d00f9 Revert "Jarv/config refactor wip" 2014-12-08 13:40:49 -05:00
John Jarvis
cc6111181d Merge pull request #6096 from edx/jarv/config-refactor-wip 
Jarv/config refactor wip
 2014-12-08 13:19:29 -05:00
Will Daly
1511851abf Merge pull request #6170 from edx/will/old-login-register-email-opt-in 
Add email opt in to old login and register pages
 2014-12-08 11:15:01 -05:00
Sarina Canelake
dca161ccea Merge pull request #6168 from fmyzjs/patch-6 
Support unicode ANALYTICS_DASHBOARD_NAME
 2014-12-08 11:12:04 -05:00
Waqas Khalid
c88a017dea Merge pull request #5244 from mlkwaqas/waqas/tnl152-stop-voting-on-closed-thread 
Don't allow voting while the thread is closed
 2014-12-08 20:15:33 +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
23a51a6515 Add email opt in to old login and register pages 2014-12-08 09:29:16 -05:00
Chris
50152abb09 Merge pull request #5966 from Stanford-Online/kluo/help-modal-id 
Fix help modal css selector
 2014-12-05 14:45:07 -05:00
John Jarvis
c711ed5091 moving the convert_tokens function to a common file 2014-12-05 14:00:25 -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
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
Chris
c45e34bf2e Merge pull request #5842 from Stanford-Online/giulio/prerequisites-style-fixes 
Remove extra prerequisites style and class
 2014-12-05 09:03:14 -05:00
Waqas Khalid
1efa1b3169 Don't allow voting while the thread is closed 
When someone closes thread there is still option
to add vote which cause error when click on add
vote button. User shouldn't be able to add vote
while the thread is closed.

TNL-152
 2014-12-05 15:59:07 +05:00
Renzo Lucioni
b97400eb07 Merge pull request #6137 from edx/renzo/missing-checkbox-absent-preference 
Refrain from setting email opt-in preference when checkbox is missing
 2014-12-05 01:11:02 -05:00
Brian Talbot
d4154a4bc8 Merge pull request #6149 from edx/talbs/fix-lms-calculator-toggle 
FIX - LMS: Calculator Toggle Label Display
 2014-12-04 19:47:44 -05:00
John Jarvis
de98bf8fac renaming to use underscores 2014-12-04 18:01:34 -05:00
Renzo Lucioni
5e41a34dd1 Refrain from setting email opt-in preference when checkbox is missing 2014-12-04 17:35:19 -05:00
Giulio Gratta
54b7a578a2 Remove extra prerequisites style and add classes 2014-12-04 14:25:26 -08:00
John Jarvis
a32f337326 renmaing prod.py and setting more defaults 2014-12-04 16:43:17 -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
Brian Talbot
93c33cdfd8 LMS: fix - visually hiding calculator toggle label 2014-12-04 16:15:46 -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
srpearce
f2e20f333e Merge pull request #5998 from edx/sylvia/docs/1162 
Sylvia/docs/1162
 2014-12-04 12:19:39 -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
Sylvia Pearce
3e779a52f3 Fix minor typo in Trigonometric Functions row 2014-12-04 11:00:37 -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
Will Daly
2ef7829fb7 Fix issue with iframe redirect 2014-12-04 08:46:32 -05:00
Waheed Ahmed
c2c40eba1b Fixed instructor dashboard tooltip far away issue. 
TNL-558
 2014-12-04 12:08:13 +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
Brian Talbot
8d947f0215 LMS: revising styling of calculator tooltip content 2014-12-03 16:09:07 -05:00
Brian Talbot
a9daaff17b LMS: revising semantic markup of calculator tooltip content 2014-12-03 16:08:33 -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
f40447b3c8 If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page. 2014-12-03 08:00:33 -05:00
Sarina Canelake
dc972eb2d6 Add additional context for translators 2014-12-02 20:56:08 -05:00
Sarina Canelake
6539a6e0fc Keep closing lines of email together for translation purposes 2014-12-02 20:56:07 -05:00
Sarina Canelake
98b9fb09cd Fix dashboard i18n 2014-12-02 20:56:07 -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
AlasdairSwan
96afb82dbd Added styles for email opt in/out checkbox label 2014-12-02 11:50:31 -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