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

37935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sanford Student
7d690dde8a adding request cache for milestones 2016-07-25 16:55:06 -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
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
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
Jesse Zoldak
893d1f5dfe Merge pull request #13049 from edx/zoldak/TNL-5051 
Skip flaky CMS.Course updates lettuce tests  TNL-5051
 2016-07-20 21:04:15 -04:00
Eric Fischer
35ae67b530 New CMS visibility settings (#12940) 
TNL-4906 Subsections now use radio buttons, to allow for "hide after due" as a
visibility option. Also, all tabs have been consolidated to "Basic" and
"Advanced", and visibility options have moved there.

Documentation links are updated to assist course authors with the new
visibility options. Tests have also been updated, and the changes suggested
in TNL-4951 are included.
 2016-07-20 19:58:51 -04:00
Diana Huang
f3a46bfb07 Merge pull request #13045 from edx/diana/flaky-course-page-test 
Fix flaky asset page test
 2016-07-20 16:19:02 -04:00
Jesse Zoldak
8cdac6c99a Skip flaky CMS.Course updates lettuce tests TNL-5051 2016-07-20 16:15:26 -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
Renzo Lucioni
f0644abe3b Merge pull request #13033 from edx/renzo/handle-missing-catalog-config 
Allow program detail pages to function when catalog config is missing
 2016-07-20 15:46:59 -04:00
Andy Armstrong
51bb4d4e00 Merge pull request #12795 from eduNEXT/fmo/coffee_to_js_cms_main 
Convert cms/coffee/src/main to js
 2016-07-20 15:16:48 -04:00
Robert Raposa
80c361f10b Merge pull request #13006 from edx/rc/2016-07-19 
Release Candidate rc/2016-07-19
 2016-07-20 15:03:29 -04:00
Renzo Lucioni
935be27118 Allow program detail pages to function when catalog config is missing 2016-07-20 14:19:08 -04:00