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

37926 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
74ab4ad9c8 fix quality failure 2016-07-29 15:28:02 -04:00
Adam Palay
ec1cbdf513 test that passing unicode to a youtube id does not throw an error (TNL-5127) 2016-07-29 14:07:08 -04:00
Renzo Lucioni
66d4dc9397 Merge pull request #13109 from edx/patch/2016-07-27 
Updates to facilitate program category casing changes
 2016-07-27 11:05:54 -04:00
Renzo Lucioni
b540968457 Updates to facilitate program category casing changes 
The LMS continues to expect lowercased category slugs, while the Studio program creator now uses correctly cased slugs. Programs should be updated before this is released. Part of ECOM-5018.
 2016-07-26 16:28:41 -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
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
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
Simon Chen
bc6a0603d4 Try to fix program editor in studio for stage (#13084) 2016-07-25 15:39:53 -04:00
Simon Chen
9424930fbd Try to fix program editor in studio for stage 2016-07-25 14:49:46 -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
Diana Huang
b51c4456b8 Fix flaky asset test. 2016-07-20 14:18:27 -04:00
sanfordstudent
ed6995b0ba Merge pull request #12984 from edx/sstudent/TNL-4925 
generalizing proctored exam transformer
 2016-07-20 13:56:36 -04:00
Brian Jacobel
8ed78a387e Fix TNL-5011 (#13031) 
Vote button is now disabled for yourself, but count is still visible
 2016-07-20 13:29:33 -04:00
Robert Raposa
6e04ddcc4d Merge pull request #13041 from edx/robrap/activate-fix 
activate fix
 2016-07-20 13:22:49 -04:00
Chris
92010f003a Merge pull request #13015 from edx/clrux/ac-522 
AC-522 fixing checkboxgroup ignores in platform
 2016-07-20 11:37:23 -04: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
Edward Zarecor
95800be01f Merge pull request #12999 from edx/e0d/random-passwords 
use random rather than unusable so they can be reset
 2016-07-20 09:28:26 -04:00