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

36107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Régis Behmo
e850ef2db2 Fix broken French i18n in CMS tests 
French ugettext method was being monkey-patched with a "XYZ " prefix in
all tests. This introduces a context manager to guarantee that the
function reverts to its original state after the unit test has ended
(successfuly or not).
 2016-04-04 18:28:26 +02:00
Omar Khan
66ac9b0185 Merge pull request #11849 from open-craft/omar/watch-assets 
Fix paver watch_assets
 2016-04-04 22:37:50 +07:00
Brian Jacobel
9baae2ff3f Merge pull request #11963 from edx/andya/upgrade-underscore-string 
Upgrade Underscore.string
 2016-04-04 11:35:40 -04:00
Vedran Karačić
5fafdbf5ec Merge pull request #12027 from edx/vkaracic/update-browser-link 
Update browser support link
 2016-04-04 17:33:29 +02:00
Cliff Dyer
11e8306a2e Merge pull request #12022 from edx/cdyer/make-task-of-uninstall 
paver uninstall_python_packages
 2016-04-04 11:13:22 -04:00
Vedran Karacic
66ff1667be Update browser support link. 2016-04-04 14:36:17 +00:00
John Eskew
3e40c9f843 Merge pull request #12019 from edx/jeskew/upgrade_to_django_1_8_12 
Upgrade to Django 1.8.12
 2016-04-04 10:32:26 -04:00
Brian Jacobel
6df9f3d5fb Add Brian Jacobel to AUTHORS 2016-04-04 10:18:45 -04:00
Brian Jacobel
24990272b1 Do not set up underscore.string globally. 2016-04-04 10:18:44 -04:00
Brian Jacobel
1ed5b4bda9 Remove usage of Underscore.string in edit-chapter.underscore 2016-04-04 10:18:44 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string 
FEDX-117
 2016-04-04 10:18:43 -04:00
John Eskew
13ef2b7d1a Safe templating changes for CCX. 2016-04-04 09:59:45 -04:00
Nimisha Asthagiri
f5ad6aaddb Merge pull request #11506 from openfun/openfun/translate_user_languages_in_account_settings 
Translate preferred languages in user account settings
 2016-04-04 09:31:35 -04:00
Ned Batchelder
f10a3c968e Merge pull request #12020 from edx/ned/fix-doc-links 
Fix links to moved sections of the developer guide
 2016-04-04 06:43:30 -04:00
M. Rehan
ceecae7bec Merge pull request #12001 from edx/mrehan/tnl-4236-nonetype-no-attr-keys 
TNL-4236 – Check for video transcripts before using it
 2016-04-04 14:48:27 +05:00
Régis Behmo
d2317be682 Translate available preferred languages in user account settings 
The listed languages in the "preferred languages" input dropdown should
be translated in the user language.
 2016-04-04 10:33:00 +02:00
Omar Khan
53642579ad Fix paver watch_assets 
- Update to latest version of watchdog.
- inotify doesn't work on nfs share in devstack. Use polling instead.
- Some editors (vim) do not trigger modify events in their default
  configuration. Rebuild assets on all filesystem changes, and debounce
  when changes happen too quickly.
 2016-04-04 12:36:07 +07:00
Clinton Blackburn
ed66a1d214 Merge pull request #12018 from edx/clintonb/ccx-keys-update 
Using edx-ccx-keys from PyPI
 2016-04-03 21:53:51 -04:00
Bill DeRusha
fb6f3a411b Merge pull request #11920 from edx/bderusha/st-wiki 
Safe Templatize: wiki templates
 2016-04-03 19:11:39 -04:00
Kelketek
ab0cbfffeb Merge pull request #10556 from edx/feature/badges-v2 
Badges V2 Feature Branch
 2016-04-01 17:06:26 -05:00
Jonathan Piacenti
f84f95c7ee Refresh DB caches. 2016-04-01 21:06:08 +00:00
Jacek Bzdak
09f5277f3b Some tests for badges js 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Clinton Blackburn
320abd7d24 Using edx-ccx-keys from PyPI 
ECOM-4016
 2016-04-01 16:59:02 -04:00
J. Cliff Dyer
f2ea041948 Allow paver users to uninstall obsolete python packages via a paver command. 
MA-2250
 2016-04-01 16:37:15 -04:00
Ned Batchelder
e2109b97db Run compilejsi18n when we make dummy strings 2016-04-01 15:52:27 -04:00
Ned Batchelder
a368982c14 Stop using roundabout ways of passing strings to cmd() 2016-04-01 15:52:27 -04:00
Ned Batchelder
d47f872ab7 Fix links to moved sections of the developer guide 2016-04-01 15:33:24 -04:00