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

36137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
abba913bee Merge pull request #12053 from mitocw/fix/aq/ccx_creating_issue 
Fixed unable to created ccx issue
 2016-04-07 12:09:40 -04:00
Matt Drayer
c7552db4d5 Merge pull request #11987 from edx/asadiqbal08/xblock_translations 
asadiqbal08/WL-388: Add ModuleI18nService for Descriptor System
 2016-04-07 10:54:33 -04:00
Amir Qayyum Khan
60b368e22b Fixed unable to created ccx even if ccx_conn url is not set 2016-04-07 19:30:17 +05:00
Muzaffar yousaf
b9b87f9b46 Merge pull request #11949 from edx/fix-migrations 
Making migrations in-sync with models.
 2016-04-07 14:59:17 +05:00
muzaffaryousaf
2e0a9b2658 Bump version for edx/django-oauth2-provider that includes in-sync migrations. 
TNL-4296
 2016-04-07 12:26:18 +05:00
muzaffaryousaf
c3cd2db384 Moving choices to admin form instead of models. 
TNL-4296
 2016-04-07 12:26:18 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
muzaffaryousaf
90c670c0ac Unit test to check the migrations are in sync. 2016-04-07 12:26:17 +05:00
Robert Raposa
68ae132542 Merge pull request #12048 from edx/robrap/linter-revert-include 
TNL-4345: Remove include linting
 2016-04-06 20:35:01 -04:00
Jim Abramson
e0ca1ecaef remove unused CERTIFICATES_ENABLED feature flag 
ECOM-4040
 2016-04-06 17:53:40 -04:00
Diana Huang
ec08b91e67 Merge pull request #12062 from edx/diana/ora-version-bump 
Bump ORA version.
 2016-04-06 16:50:45 -04:00
Ned Batchelder
530d61e678 Merge pull request #12063 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-06 16:41:15 -04:00
Ned Batchelder
88e3634d82 Update translations (autogenerated message) 2016-04-06 19:32:20 +00:00
Diana Huang
efc1f9683e Bump ORA version. 2016-04-06 15:28:32 -04:00
Robert Raposa
a6ac06f210 Remove outdated safe template recommendations 
- Remove <%include> linting
- Remove dump_html_escaped_json
 2016-04-06 14:57:48 -04:00
Jesse Zoldak
6bfb94cd60 Merge pull request #12061 from edx/revert-11374-omar/verified-coursemode-price 
Revert "Disallow free verified course modes"
 2016-04-06 14:14:54 -04:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Simon Chen
e0995b8072 Merge pull request #11374 from open-craft/omar/verified-coursemode-price 
Disallow free verified course modes
 2016-04-06 12:32:00 -04:00
asadiqbal
7ae40dced8 asadiqbal08/WL-388: ModuleI18nService for Descriptor System 
mattdrayer: Default to XBlock class if no unmixed class
 2016-04-06 11:53:14 -04:00
Toby Lawrence
fc149abf06 Merge pull request #12007 from edx/PERF-274 
[PERF-274] Add NewRelic instrumentation to contentserver.
 2016-04-06 11:43:08 -04:00
Toby Lawrence
09586d8a37 [PERF-274] Add NewRelic instrumentation to contentserver. 
This includes the course key/path for a given contentserver request,
whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests are
coming into the contentserver to figure out whether or use of a CDN in
front of these assets is as efficient as effective as it could be.
 2016-04-06 10:31:02 -04:00
Douglas Hall
a9a330a0e4 Merge pull request #11021 from StraNNiKK/LTI-9 
LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack
 2016-04-06 10:10:15 -04:00
Waheed Ahmed
058a7e8478 Merge pull request #12036 from edx/waheed/ecom-3127-fix-grade-requirements 
Fixed progress page grade requirements text.
 2016-04-06 16:48:28 +05:00
Waheed Ahmed
6a9157e409 Fixed progress page grade requirements text. 
ECOM-3127
 2016-04-06 15:37:28 +05:00
Andy Armstrong
34cecaee77 Merge pull request #11957 from edx/andya/pattern-library-test-page 
Introduce Pattern Library test pages
 2016-04-05 15:36:11 -04:00
John Eskew
33568cb409 Merge pull request #11988 from mitocw/fix/aq/cas_profile_not_found_mitocw#102 
Fixed 500 error in case of user's profile not found when login/logout with CAS.
 2016-04-05 15:31:48 -04:00
Renzo Lucioni
05b8a77afe Merge pull request #12046 from edx/release 
Merge release into master
 2016-04-05 15:13:32 -04:00
Renzo Lucioni
0fd06e808a Merge pull request #12040 from edx/patch/2016-04-05 
Patch/2016 04 05
 2016-04-05 14:15:48 -04:00
John Eskew
fc1669734a Merge pull request #11947 from mitocw/fix/aq/max_enrollments_and_staff 
Excluded admins, staff and coach of master course from max enrollment
 2016-04-05 14:01:59 -04:00
Amir Qayyum Khan
9220c4d8dd Fixed 500 error in case of user's profile not found when login/logout with CAS 2016-04-05 22:49:05 +05:00
Peter Fogg
847618c761 Merge pull request #12031 from edx/rc-merge-test 
Merge RC back into master.
 2016-04-05 12:48:46 -04:00
Amir Qayyum Khan
58bde7f301 Excluded admins, staff and coach of master course from max enrollment 2016-04-05 21:31:54 +05:00
Kevin Falcone
905d18638b Allow migrations to run if CCX is enabled 
Without this, when CCX runs 0003 it'll invoke course_overviews while
loading a course, but that table has a model change, and the migration
has not run yet.  This ensures the course_overviews migration happens
first.
 2016-04-05 11:47:55 -04:00
Christina Roberts
d9ad47c901 Merge pull request #12026 from edx/christina/verified-track-cohort 
Automatic cohorting of verified track learners
 2016-04-05 11:12:15 -04:00
muzaffaryousaf
cc7aa349a1 Removing check for edx notes for OAUTH token timeout. 
TNL-4336
 2016-04-05 10:21:25 -04:00
cahrens
18d0161556 Automaticaly move learners to verified cohort. 
TNL-4281.
 2016-04-05 10:12:03 -04:00
Nimisha Asthagiri
7639d6c3e5 Merge pull request #12032 from edx/nasthagiri/fixup-safe-template 
Fix safe template change on dashboard
 2016-04-05 09:44:26 -04:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages 
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
 2016-04-05 09:22:14 -04:00
Renzo Lucioni
003cbd5a1d Fix discussion category map for self-paced courses 
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
 2016-04-05 09:09:09 -04:00
Renzo Lucioni
77a90a08ca Add option to bypass course home 
Exposes an advanced setting in Studio allowing course teams to bypass the home tab when students arrive from the dashboard, sending them directly to course content. ECOM-3961.
 2016-04-05 09:08:51 -04:00
Renzo Lucioni
7222f9b0f5 Hide chrome and default_tab from advanced settings 
It doesn't make sense to list these LMS block attributes in course-level advanced settings. Doing so is confusing to course teams.
 2016-04-05 09:08:39 -04:00
Simon Chen
649e8b1158 ECOM-3673 Update the course end date description text to remove the reference to certificate when course enrollment is in audit mode 2016-04-05 09:07:56 -04:00
Renzo Lucioni
3cce6c1e46 Merge pull request #12034 from edx/renzo/discussion-topics 
Fix discussion category map for self-paced courses
 2016-04-05 08:29:49 -04:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request 
Request API access.
 2016-04-04 22:56:49 -04:00
Renzo Lucioni
0e7247f2a7 Fix discussion category map for self-paced courses 
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
 2016-04-04 21:15:26 -04:00
Peter Fogg
b340c2fd9c Allow users to request access to the Course Discovery API. 
ECOM-3940
 2016-04-04 20:29:19 -04:00
Nimisha Asthagiri
c1c41a36b5 Fix safe template change on dashboard. 
MA-2257
 2016-04-04 15:58:21 -04:00
Ned Batchelder
82e77049fa Merge pull request #11996 from edx/ned/i18n-dummy-compilejs 
Compile js strings when we make dummy strings.
 2016-04-04 14:57:20 -04:00
Nimisha Asthagiri
1c9a75b42e Merge pull request #12029 from openfun/regisb/fix_broken_french_ugettext_in_tests 
Fix broken French i18n in CMS tests
 2016-04-04 14:28:04 -04:00
John Eskew
35a235b348 Merge pull request #11899 from edx/jeskew/ccx_safe_templating 
Safe templating changes for CCX.
 2016-04-04 12:45:24 -04:00