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

37946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
raeeschachar
e8d32c839d Skipped test failing on chrome due to old version 2016-07-26 11:49:18 +00: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
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
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
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
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
Ned Batchelder
3799890b98 Merge pull request #13072 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-07-22 10:14:30 -04:00
Kevin Kim
2fddd2bd71 Initial check of removing feature flag (#13058) 2016-07-22 09:28:19 -04:00
Ned Batchelder
eaece533a9 Update translations (autogenerated message) 2016-07-22 09:28:15 -04:00
Jesse Zoldak
4906bde056 Comment out flaky lettuce test TNL-5051 2016-07-22 09:11:55 -04:00
Nimisha Asthagiri
b04a6a6a4b Merge pull request #13053 from edx/tnl/grades-app 
Create Grades djangoapp
 2016-07-22 09:07:40 -04:00
Muddasser
64838f5665 Conversion of cms/signup.feature to bok-choy 2016-07-22 12:22:59 +00:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp 
https://openedx.atlassian.net/browse/TNL-5008
 2016-07-22 00:09:43 -04:00
Christina Roberts
467bc55d27 Merge pull request #12950 from edx/christina/studio-support-levels 
Studio support level of components/xblocks
 2016-07-21 17:13:58 -04:00
sanfordstudent
f2a1984f1a Revert "genericizing transformer" (#13063) 
This reverts commit 4e65b1f14b.
 2016-07-21 17:04:07 -04:00
Simon Chen
d27bec6111 ECOM-4906 Add the program editor fix to allow creation of Micromasters programs (#13064) 2016-07-21 16:51: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
cahrens
d4cc7b8ffd Support level support for Studio xblock creation. 
TNL-4670
 2016-07-21 15:44:59 -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
Adam
05700243fe Merge pull request #13037 from OmarIthawi/edraak/calculator-2-fixups 
Calculator wording and translation improvements
 2016-07-21 14:42:53 -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
Eric Fischer
9ab92d58c3 Revert "moving milestones check to access.py" (#13060) 
This reverts commit 5db58c0038.
 2016-07-21 13:12:44 -04:00
Eric Fischer
b040801476 edx-ora2 1.1.6 (#13051) 2016-07-21 12:24:02 -04:00
Kevin Kim
1ab52f8b0a Merge pull request #12945 from edx/kkim/ora_tz_date 
Convert ORA Due Dates
 2016-07-21 10:52:07 -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
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Mushtaq Ali
d4f359d42a Merge pull request #13013 from edx/mushtaq/ecom4926-unactivated-user-msg 
Show user activation message if he has activation incomplete.
 2016-07-21 11:33:32 +05:00