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

14265 Commits

Author SHA1 Message Date
Renzo Lucioni
003cbd5a1d Fix discussion category map for self-paced courses 
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
 2016-04-05 09:09:09 -04:00
Renzo Lucioni
77a90a08ca Add option to bypass course home 
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
 2016-04-05 09:08:51 -04:00
Simon Chen
649e8b1158 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-04-05 09:07:56 -04:00
Renzo Lucioni
0e7247f2a7 Fix discussion category map for self-paced courses 
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
 2016-04-04 21:15:26 -04:00
John Eskew
35a235b348 Merge pull request #11899 from edx/jeskew/ccx_safe_templating 
Safe templating changes for CCX.
 2016-04-04 12:45:24 -04:00
John Eskew
13ef2b7d1a Safe templating changes for CCX. 2016-04-04 09:59:45 -04:00
Nimisha Asthagiri
f5ad6aaddb Merge pull request #11506 from openfun/openfun/translate_user_languages_in_account_settings 
Translate preferred languages in user account settings
 2016-04-04 09:31:35 -04:00
Régis Behmo
d2317be682 Translate available preferred languages in user account settings 
The listed languages in the "preferred languages" input dropdown should
be translated in the user language.
 2016-04-04 10:33:00 +02:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
ca959ab1d1 Patch for badge migrations to fix date specificity change. 2016-04-01 10:13:10 -05:00
Jonathan Piacenti
1a6394b781 Add share modal to badge listing. 2016-04-01 10:13:10 -05:00
Jonathan Piacenti
ccb5b6c74c Adjust get_completion_badge usages to handle exceptions. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
4fde73fae3 Address notes. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
cb4ed42075 Disable badge issuance for courses where badges are disabled. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
cff9343889 Change issuing_component for included badge events. 2016-04-01 10:13:09 -05:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
a2104634a1 Implement Badging API views. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
61c76771f8 Add completion and enrollment badges. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
25958febbf Add XBlock Badging Service. 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
112a143589 Refactor badging, move into its own app. 2016-04-01 10:13:08 -05:00
Muzaffar yousaf
cc4349e9ae Merge pull request #11990 from edx/mzfr/prvw-masqrd-tnl4291 
Staff should be able to masquerade when previewing content.
 2016-04-01 19:42:58 +05:00
Clinton Blackburn
c921f2ac90 Merge pull request #12011 from edx/clintonb/course-api-image 
Exposing absolute/CDN image URLs via Course API
 2016-04-01 10:31:59 -04:00
Clinton Blackburn
00b48e54a1 Exposing absolute/CDN image URLs via Course API 
ECOM-4013
 2016-04-01 09:42:57 -04:00
J. Cliff Dyer
845b0261c0 Fix broken import due to merging oauth changes to master 2016-04-01 12:14:27 +00:00
Cliff Dyer
6917eb03cf Merge pull request #12009 from edx/merge-release-into-master 
Merge oauth release into master via intermediary branch
 2016-04-01 06:12:16 -04:00
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-01 08:57:43 +07:00
Sanford Student
53e6611fc8 removing feature flag for next button across sections 2016-03-31 16:50:48 -04:00
Renzo Lucioni
dc25ece02a Merge pull request #11879 from edx/schen/ECOM-3194 
ECOM-3194 Create the listing page of Programs (x-series) which learners have enrolled in
 2016-03-31 16:35:54 -04:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00:00
Simon Chen
21be72048a Create the listing page of Programs (x-series) which learners have enrolled in 2016-03-31 15:35:50 -04:00
Adam Palay
6e43d97fe7 make sure email from addresses don't exceed 320 characters (TNL-4264) 
clean up and fix quality violations

since get_course can never return None, we can remove these lines
 2016-03-31 14:23:08 -04:00
Simon Chen
cd737b6fcc Merge pull request #11992 from edx/schen/ECOM-3673 
ECOM-3673 Update the course end date description text to remove the reference to certificates
 2016-03-31 11:50:52 -04:00
Simon Chen
33fc268d21 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-03-31 10:47:31 -04:00
muzaffaryousaf
e572eafaa4 Staff should be able to masquerade when previewing content. 
TNL-4291
 2016-03-31 19:12:16 +05:00
Diana Huang
ced32800a6 Add new djangoapp that allows for configuration of 
Verified Track Cohorts through the admin interface.
 2016-03-31 09:45:22 -04:00
attiyaIshaque
b912aa453f Merge pull request #11948 from edx/atiya/ECOM-3963-specific-student 
Fixed error on Course Home, when viewed as specific student.
 2016-03-31 10:48:43 +05:00
Clinton Blackburn
bc5e6c8da2 Merge pull request #11985 from edx/clintonb/course-api-pacing 
Added pacing field Course API
 2016-03-30 17:27:07 -04:00
Clinton Blackburn
1185fff1ec Added pacing field Course API 
ECOM-3994
 2016-03-30 14:36:43 -04:00
Diana Huang
70145de7bb Merge pull request #11061 from CredoReference/impossible-to-click-check-without-answer 
PR-154 - Make it impossible to click "final check" without selecting a choice
 2016-03-30 11:33:11 -04:00
J. Cliff Dyer
1df040228a Configure LMS to select oauth2 providing library. 
Available backends:

* django-oauth-toolkit (DOT)
* django-oauth2-provider (DOP)

* Use provided client ID to select backend for
  * AccessToken requests
  * third party auth-token exchange
* Create adapters to isolate library-dependent functionality
* Handle django-oauth-toolkit tokens in edX DRF authenticator class

MA-1998
MA-2000
 2016-03-30 14:21:27 +00:00
J. Cliff Dyer
88fef8b2a4 Use renamed edx_oauth2_provider throughout. 
MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
 2016-03-30 14:21:17 +00:00
Dmitry Viskov
4c83a2f0de Make it impossible to click "final check" without selecting a choice 2016-03-30 16:50:00 +03:00
Matt Drayer
db3b2f0c97 Merge pull request #11954 from edx/mattdrayer/theme-ecommerce-url 
mattdrayer/theme-ecommerce-url: Theme support for ECOMMERCE_PUBLIC_URL_ROOT
 2016-03-30 09:41:30 -04:00
attiyaishaque
acc6d4f282 Fixed error on Course Home, when viewed as specific student. 2016-03-30 17:09:25 +05:00
mrey
b5bf8fe143 ShoppingCart: Added 'Order' word to PDF name file 2016-03-30 13:22:01 +02:00
mrey
125eb81775 ShoppingCart: Added number receipt to PDF name file 2016-03-30 13:11:07 +02:00
Dmitry Viskov
57a9839e4c LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack 2016-03-30 03:38:21 +03:00
Nimisha Asthagiri
74a9989f04 Merge pull request #11705 from edx/tnl/next_button 
Activate LMS Navigation Button across sections
 2016-03-29 15:05:59 -04:00
Nimisha Asthagiri
2c90cac962 Accessible Sequence navigation 
MA-2190
 2016-03-29 12:59:05 -04:00
Nimisha Asthagiri
8cbf99aca4 Activate Next and Previous Buttons across sections 
MA-2152
MA-2153
 2016-03-29 12:58:08 -04:00