Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,978 Commits 1 Branch 0 Tags
5346ee25b8eed7d13eec9dc451f22e442909c9b3
Commit Graph

37978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Kim
5346ee25b8 Merge pull request #12974 from edx/kkim/gate_banner 
Gated Subsection Staff Banner
 2016-07-27 11:27:52 -04:00
Christina Roberts
99eb795a89 Merge pull request #13107 from edx/christina/delete-xblock-disable-config 
Delete XBlockDisableConfig model.
 2016-07-27 10:08:25 -04:00
Kevin Kim
a39d6c2e94 Add gated content banner for staff in lms 2016-07-27 14:03:08 +00:00
David Ormsbee
1809f88dd8 Merge pull request #12931 from edx/ormsbee/ok_perf_0.3.2 
Bump opaque-keys version to 0.3.2
 2016-07-27 09:48:04 -04:00
Saleem Latif
a538fa00e8 Merge pull request #12995 from edx/saleem-latif/WL-300 
WL-300: Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files
 2016-07-27 15:48:50 +05:00
Saleem Latif
6277bd27e6 Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files 2016-07-27 14:53:02 +05:00
Saleem Latif
80644e0d18 Merge pull request #13039 from edx/saleem-latif/WL-343 
WL-343: Merge microsites into Comprehensive Theming
 2016-07-27 14:50:13 +05:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
David Ormsbee
5d150a39eb Bump opaque-keys version to 0.3.2 2016-07-26 17:31:15 -04:00
cahrens
b8cd96e371 Delete XBlockDisableConfig model. 
TNL-4672
 2016-07-26 15:49:34 -04:00
Ahsan Ulhaq
e8c60bc6c1 Merge pull request #13096 from edx/ahsan/ECOM-5029-Photo-Verification-Admin-Broken 
Photo Verification Admin Broken
 2016-07-27 00:32:45 +05:00
Diana Huang
92587fbf2b Merge pull request #13105 from edx/release 
Release back into master
 2016-07-26 15:09:11 -04:00
Nimisha Asthagiri
558043a8e6 Merge pull request #13082 from edx/tnl/split-edit-version 
Expose course_version and subtree_edited_on in BlockStructures
 2016-07-26 15:04:47 -04:00
sanfordstudent
8acd1bb19f Merge pull request #13090 from edx/sstudent/TNL-5071 
adding request cache for milestones
 2016-07-26 15:03:01 -04:00
Sanford Student
f02889e8d2 removing redundant inherit 2016-07-26 14:11:50 -04:00
Calen Pennington
a1e93f613a Merge pull request #13104 from cpennington/revert-paver-timing 
Revert "Merge pull request #13021 from cpennington/paver-timing"
 2016-07-26 13:41:39 -04:00
Nimisha Asthagiri
9616ac99f8 Expose course_version from Split Modulestore; 
Support subtree_edited_on and course_version fields in BlockStructures
TNL-5010
 2016-07-26 13:40:53 -04:00
Diana Huang
20cbc62c37 Merge pull request #13077 from edx/rc/2016-07-26 
Release Candidate rc/2016-07-26
 2016-07-26 13:33:12 -04:00
Calen Pennington
acf50c4469 Revert "Merge pull request #13021 from cpennington/paver-timing" 
This reverts commit ed80381b41, reversing
changes made to 205cb8b3eb.
 2016-07-26 13:32:59 -04:00
Sanford Student
d996c2a3cd per cliff's review 2016-07-26 11:39:19 -04:00
Sanford Student
c3d829f2c5 adding query counts 2016-07-26 11:11:59 -04:00
Sanford Student
d9e0ba45cc first round of self review and code review 2016-07-26 10:50:02 -04:00
Calen Pennington
ed80381b41 Merge pull request #13021 from cpennington/paver-timing 
[EV-62] Paver timing
 2016-07-26 09:50:40 -04:00
alisan617
b5dc83f101 Merge pull request #13095 from open-craft/discussion-export-hotfix 
Discussion import/export fix (TNL-5001)
 2016-07-26 09:07:28 -04:00
Eugeny Kolpakov
205cb8b3eb Merge pull request #13056 from open-craft/ekolpakov/fix_legacy_discussion_import 
[TNL-5001] Import-export issues when importing legacy discussion OLX format
 2016-07-26 13:05:23 +03:00
Ahsan Ulhaq
45db2feb01 Photo Verification Admin Broken 
ECOM-5029
 2016-07-26 09:37:17 +05:00
E. Kolpakov
1f9dfe6573 [TNL-5001] Import-export issues when importing legacy discussion OLX format 
Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID
 2016-07-25 14:38:03 -07:00
E. Kolpakov
fe6a942baa [TNL-5001] Import-export issues when importing legacy discussion OLX format 
Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID
 2016-07-25 14:35:19 -07:00
Christina Roberts
0438878ab9 Merge pull request #13069 from edx/christina/cache-disable-state 
Use request cache for disabled_xblock_types
 2016-07-25 17:20:49 -04:00
Sanford Student
7d690dde8a adding request cache for milestones 2016-07-25 16:55:06 -04:00
Renzo Lucioni
27d585e0fc Merge pull request #13085 from edx/renzo/devstack-jwt 
Configure JWT auth when running Studio in devstack
 2016-07-25 16:29:55 -04:00
cahrens
682ee5eac1 Rename helper method that was being run as a testpoint. 2016-07-25 16:17:40 -04:00
cahrens
d061b8ddbe Use request_cache for storing disabled xblock names. 
TNL-5002
 2016-07-25 16:17:30 -04:00
Brian Jacobel
450a0bc980 Document how to run tests on Paver scripts (#13088) 
Meta.
 2016-07-25 16:13:17 -04:00
Simon Chen
bc6a0603d4 Try to fix program editor in studio for stage (#13084) 2016-07-25 15:39:53 -04:00
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
Brian Jacobel
940f6e992d Document how to run tests on Paver scripts 
Meta.
 2016-07-25 15:20:58 -04:00
Simon Chen
9424930fbd Try to fix program editor in studio for stage 2016-07-25 14:49:46 -04:00
Renzo Lucioni
29672370b9 Configure JWT auth when running Studio in devstack 
An important step towards being able to use Studio's program editor out of the box. Part of ECOM-4638.
 2016-07-25 13:37:20 -04:00
Muddasser
00448dffe5 Merge pull request #12882 from edx/muddasser/lettuce-to-bok-choy/signup.feature 
Conversion of cms/signup.feature to bok-choy
 2016-07-25 20:52:55 +05: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
42337f803f Merge pull request #12895 from edx/jia/MA-2552 
MA-2552: create revoke_token endpoint for oauth
 2016-07-25 18:20:42 +05:00
Syed Hasan raza
d1ce8d39aa Merge pull request #13055 from edx/shr/bug/plat-1048-mongo-courses-restriction-split-key 
Mongo courses wrong course_key restriction
 2016-07-25 16:06:17 +05:00
Syed Hassan Raza
79df545606 Mongo courses wrong course_key restriction 2016-07-25 14:41:31 +05:00
wajeeha-khalid
f90bf5964a MA-2552: create revoke_token endpoint for oauth 2016-07-25 13:34:34 +05:00
wajeeha-khalid
cd0df9e55f Merge pull request #13012 from edx/jia/MA-2076 
MA-2076: add due date to course block API
 2016-07-25 12:29:35 +05:00
wajeeha-khalid
733abe3787 Merge pull request #12988 from edx/jia/MA-2591 
MA-2591 update oauthlib version to 1.0.3
 2016-07-25 12:12:19 +05:00
wajeeha-khalid
98ba4b779c MA-2076: add due date to course block API 2016-07-25 11:06:47 +05:00
wajeeha-khalid
03cee389e0 update oauthlib version to 1.0.3 2016-07-25 10:59:42 +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