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
Brian Beggs
93969f1b1e Merge pull request #12996 from mitocw/fix/aq/staff_access_coach_dashboard 
Fixed staff access to CCX coach dashboard issues
 2016-07-25 15:37:58 -04:00
sanfordstudent
ba54ad197e Merge pull request #13075 from edx/sstudent/TNL-4925 
generalizing proctored exam transformer to handle all milestones
 2016-07-25 10:10:42 -04:00
wajeeha-khalid
f90bf5964a MA-2552: create revoke_token endpoint for oauth 2016-07-25 13:34:34 +05:00
wajeeha-khalid
98ba4b779c MA-2076: add due date to course block API 2016-07-25 11:06:47 +05:00
Mushtaq Ali
d4ff39a391 Merge pull request #12237 from edx/mushtaq/maintenance 
Maintenance app and force publish course view
 2016-07-23 01:23:58 +05:00
Mushtaq Ali
27646b7e6f Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-07-22 18:29:12 +00:00
Eric Fischer
1af5e2abda Retry-while-retrying is not an error in bulk email (#13068) 
This code will be hit if, during a retry of the send_email task, an error
is encountered that means we need to retry the task again. Since the task will
be retried with timed backoff up to predefinied limits, this is an expected
situation and does not need to be logged as an exception.
 2016-07-22 14:19:03 -04:00
Sanford Student
87a9ebce9a generalizing proctored exam transformer to handle all milestones 2016-07-22 12:57:23 -04:00
Kevin Kim
2fddd2bd71 Initial check of removing feature flag (#13058) 2016-07-22 09:28:19 -04:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp 
https://openedx.atlassian.net/browse/TNL-5008
 2016-07-22 00:09:43 -04:00
sanfordstudent
f2a1984f1a Revert "genericizing transformer" (#13063) 
This reverts commit 4e65b1f14b.
 2016-07-21 17:04:07 -04:00
Renzo Lucioni
719edc7632 Merge pull request #13032 from edx/renzo/program-utility-cleanup 
Handle unavailable course runs on the program detail page
 2016-07-21 16:30:44 -04:00
Renzo Lucioni
4c997601e9 Handle unavailable course runs on the program detail page 
Includes a refactor of the program data extension utility. ECOM-4807.
 2016-07-21 15:05:23 -04:00
Eric Fischer
cae03d0349 Revert "moving milestones check to access.py" (#13060) (#13061) 
This reverts commit 5db58c0038.
 2016-07-21 13:58:35 -04:00
Robert Raposa
67e15e22e6 Merge pull request #13046 from edx/release 
Release 2016-07-20 back to Master
 2016-07-21 10:43:58 -04:00
Umar Nawaz
733cf06cd9 Merge pull request #13005 from edx/unawaz/ECOM-4787-account-settings-page-header 
unawaz/ECOM-4787-account-settings-page-header
 2016-07-21 01:13:32 +05:00
Sanford Student
4e65b1f14b genericizing transformer 2016-07-20 11:28:04 -04:00
unawaz
5f8bb35f9d Account settings page 
unawaz/ECOM-4787-account-settings-page-header
 2016-07-20 20:18:53 +05:00
Adam Palay
95c0b50ebe authenticate user after their reset confirmation goes through 
make password validation code more DRY

grammar nit: "less" -> "fewer"
 2016-07-20 11:06:58 -04:00
Nimisha Asthagiri
37b8e6360c HiddenContentTransformer to check for hide_after_due 2016-07-19 21:13:14 -04:00
Nimisha Asthagiri
eb02f2adc1 LMS Update to hide subsection content based on due-date 
TNL-4905
 2016-07-19 21:13:14 -04:00
Amir Qayyum Khan
5839e1ca12 rearrage test code to avoid confusion 2016-07-18 14:40:32 +05:00
Amir Qayyum Khan
c0fc8669ba Only coach can access ccx dashboard 2016-07-18 14:40:32 +05:00
Jesse Zoldak
5600a9bd0c Fix instructor_task model tests to use unique temp dirs 2016-07-16 09:37:30 -04:00
Jesse Zoldak
3647c17911 Make the temp dir for instructor dashboard local files uniquely named. EV-56 2016-07-16 09:37:30 -04:00
Renzo Lucioni
863782d021 Merge pull request #12991 from edx/renzo/run-marketing-urls 
Use course run marketing URLs from the catalog service on program detail page
 2016-07-15 17:55:01 -04:00
PaulWattenberger
ff247a6802 Merge pull request #13004 from edx/pwattenberger/sailthru-fix 
Fix 500 error unenrolling when running Sailthru integration on Stage ECOM-4960
 2016-07-15 17:40:36 -04:00
PaulWattenberger
ab242145cb Fix 500 error unenrolling when running Sailthru integration on Stage ECOM-4960 2016-07-15 16:36:20 -04:00
Renzo Lucioni
a43c507a00 Use course run marketing URLs from the catalog service on program detail page 
Part of ECOM-4566.
 2016-07-15 16:12:10 -04:00
Ahsan Ulhaq
18a2b535ba Merge pull request #12922 from edx/ahsan/ECOM-4681-Tech-Debt-on-Certificate-generate-panel 
Tech Debt on Certificate generate panel
 2016-07-15 15:56:14 +05:00
Saleem Latif
bfae8206ff Merge pull request #12987 from edx/saleem-latif/branding-logo-url-fix 
Fix branding api get_logo_url return value
 2016-07-14 17:52:28 +05:00
Cliff Dyer
b9056f96a5 Merge pull request #12951 from edx/release 
Release
 2016-07-13 14:10:02 -04:00
Chris Rodriguez
638263027d Hotfix for tabs 2016-07-13 11:13:39 -04:00
Ahsan Ulhaq
518218ba7d Tech Debt on Certificate generate panel 
ECOM-4681
 2016-07-13 12:44:23 +05:00
Saleem Latif
5503285f5c Fix branding api get_logo_url return value 2016-07-13 09:25:22 +05:00
caseylitton
a6e028c6b4 Add flag allow toggle logistration footer 2016-07-12 12:13:12 -07:00
Chris
53c98f10cc Merge pull request #12750 from edx/clrux/ac-486 
AC-486 updating tabbed_view to use proper accessibility rules
 2016-07-12 12:50:20 -04:00
Chris Rodriguez
298f168e23 AC-486 updating tabbed_view to be accessible 2016-07-12 11:01:11 -04:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924 
moving milestones/gating check to access.py
 2016-07-11 16:21:53 -04:00
Renzo Lucioni
e7cdcb9b71 Merge pull request #12954 from edx/renzo/extract-token-generation 
Unify JWT generation code
 2016-07-11 15:37:14 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
Chris
db04911268 Merge pull request #12924 from edx/clrux/ac-521 
AC-521 fixes 'data-table' ignores
 2016-07-08 17:10:22 -07:00
Chris Rodriguez
ddc93abf81 AC-521 fixes data-table ignores in the platform 2016-07-08 15:28:31 -04:00
Christina Roberts
b6b792826c Merge pull request #12864 from edx/christina/disable-xblocks 
Move disabling of XBlocks to new XBlockConfiguration model
 2016-07-08 15:05:17 -04:00
Cliff Dyer
cb4c712558 Merge pull request #12964 from edx/adam/merge-release-to-rc 
Adam/merge release to rc
 2016-07-08 13:53:57 -04:00
Amir Qayyum Khan
0d3f96d4b5 Fixed CCX coach dashboard access issues. 2016-07-08 04:24:19 +05:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00
Braden MacDonald
7c3d902ff6 Merge pull request #11286 from open-craft/omar/remove-s3 
Add OpenStack Swift support
 2016-07-07 11:05:28 -07:00
Joyce Zhu
afa9a2cd3a Revert "Remove receipt page links' bottom borders" 
This reverts commit 01e2104979.
 2016-07-07 11:17:01 -04:00
Joyce Zhu
01e2104979 Remove receipt page links' bottom borders 2016-07-07 09:42:10 -04:00