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

37966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Daniel Naranjo
f84d05b9af add formatting and indentation best practices (#12850) 
add_missing_semicolon

simple SpaceBeforeBrace
 2016-07-22 15:42:42 -04: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
Jesse Zoldak
056d27f8ca Merge pull request #13073 from edx/zoldak/TNL-5051 
Comment out flaky lettuce test  TNL-5051
 2016-07-22 12:32:04 -04:00
Eric Fischer
2cd40c318c Merge pull request #13074 from edx/merge-release-to-master 
Merge release to master
 2016-07-22 11:10:03 -04:00
Eric Fischer
9125ae2f6d Merge remote-tracking branch 'origin/release' into merge-release-to-master 2016-07-22 11:07:48 -04:00
Calen Pennington
5f05c66d31 Get rid of the extra parse_bokchoy_opts step for passing arguments to a BokChoySuite 2016-07-22 10:57:09 -04:00
Calen Pennington
8c3d4ce85c Split actions needed for bok_choy tests into smaller tasks to get more granular timing information 2016-07-22 10:57:08 -04:00
Calen Pennington
fa52573277 Move the definition of shared bok_choy task options into a separate file 2016-07-22 10:54:48 -04:00
Calen Pennington
f94530ba12 [EV-62] Add the ability to log timing information during paver tasks 2016-07-22 10:54:48 -04:00
Ned Batchelder
3799890b98 Merge pull request #13072 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-07-22 10:14:30 -04:00