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

37527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muddasser
d336e246b6 Merge pull request #12801 from edx/muddasser/bok-choy-to-lettuce/component 
Conversion of cms/component.feature into bokchoy tests
 2016-06-22 17:07:16 +05:00
Muddasser
ce665e3b4c Conversion of cms/component.feature into bokchoy tests 2016-06-22 11:20:48 +00:00
Syed Hasan raza
01c8b3499c Merge pull request #12790 from edx/shr/bug/ECOM-4645-Certificate-exception-whitelisted-users 
exception_handling_for_unverified_cert_status
 2016-06-22 15:46:49 +05:00
Syed Hassan Raza
5f7cdcd30a exception_handling_for_unverified_cert_status 2016-06-22 13:33:40 +05:00
Renzo Lucioni
a240780b85 Merge pull request #12768 from edx/alasdair/ECOM-4224-certificate-messaging-for-program-course-cards 
Front End for certificates
 2016-06-21 16:58:15 -04:00
Douglas Hall
f8ac8c1aaa Merge pull request #12815 from edx/douglashall/SOL-1844 
SOL-1844 Upgrade edx-proctoring to 0.12.20
 2016-06-21 15:24:26 -04:00
Eric Fischer
49add6c963 edx-submissions version bump (#12812) 2016-06-21 14:44:34 -04:00
AlasdairSwan
619829d5b5 Program details front end for certificates 
Part of ECOM-4224.
 2016-06-21 13:20:40 -04:00
Diana Huang
7c647e5e55 Merge pull request #12767 from edx/diana/topic-truncation 
Change topic name truncation.
 2016-06-21 11:21:01 -04:00
Andy Armstrong
037e27b268 Merge pull request #12208 from edx/andya/use-ui-toolkit-helpers 
Use the UI Toolkit's spec helpers
 2016-06-21 10:55:26 -04:00
Douglas Hall
697821e570 Upgrade edx-proctoring to 0.12.20 2016-06-21 10:47:46 -04:00
Andy Armstrong
d462c73fd8 Use the UI Toolkit's spec helpers. 2016-06-21 10:16:00 -04:00
Diana Huang
d75e633508 Change topic name truncation. 2016-06-21 09:59:25 -04:00
Renzo Lucioni
10ad29f33c Merge pull request #12757 from edx/renzo/link-to-detail 
Link program listing cards to detail pages
 2016-06-21 09:37:02 -04:00
Awais Qureshi
38a25446e9 Merge pull request #12773 from edx/tasawer/story/ecom-4199/inconsistancy-of-invalidate-certs 
Mark the invalidation entry as inactive If support user re-generates the cert.
 2016-06-21 15:06:57 +05:00
Douglas Hall
132d576e97 Merge pull request #12799 from edx/ibrahimahmed443/override-language-selector 
allow SHOW_LANGUAGE_SELECTOR to be overridden by MICROSITE_CONFIGURATION
 2016-06-21 05:36:33 -04:00
Awais
7ae64b4fb6 If support user re-generates the cert. Removes the invalidation entry if exists. 
ECOM-4199
 2016-06-21 14:08:56 +05:00
Renzo Lucioni
9cd7c93223 Link program listing cards to detail pages 
When program detail pages are enabled, cards on the listing page will link to their respective detail pages. Includes extensive cleanup of program listing tests. ECOM-4227.
 2016-06-20 16:34:57 -04:00
Andy Armstrong
cae69f9600 Merge pull request #12810 from edx/andya/no-karma-firefox-modals 
Don't auto-update during Karma test runs
 2016-06-20 16:21:28 -04:00
Andy Armstrong
f713308984 Don't auto-update during Karma test runs 2016-06-20 14:42:21 -04:00
kylecrawshaw
5e4ce786fd Merge pull request #12804 from edx/kylecrawshaw/unusable-password-option 
Added 'unusable_password' argument to 'manage_user' management command
 2016-06-20 14:07:53 -04:00
Kyle Crawshaw
47401742a9 Added 'unusable_password' argument to 'manage_user' management command 2016-06-20 11:30:56 -04:00
Andy Armstrong
519ebed615 Merge pull request #12780 from edx/andya/remove-coffeescript 
Convert XBlock runtime code from CoffeeScript
 2016-06-20 10:39:45 -04:00
Chris
93850baf3a Merge pull request #12754 from edx/clrux/package-version-bump-for-a11y 
Bumping version of a11y custom ruleset
 2016-06-20 10:39:07 -04:00
Matt Drayer
a9cfa74650 Merge pull request #12775 from edx/asadiqbal08/WL-515 
WL-515 Update Activate Account message page
 2016-06-20 10:20:19 -04:00
Calen Pennington
6222b1cda8 Merge pull request #12749 from cpennington/jenkins-concurrent-unit-tests 
Jenkins concurrent unit tests
 2016-06-20 09:58:36 -04:00
Calen Pennington
b839b048ee Clean up documentation about test concurrency 2016-06-20 08:30:23 -04:00
Calen Pennington
c2fc945892 Convert verbosity number into an integer 2016-06-20 08:30:23 -04:00
Calen Pennington
08fd3ac57c Enable multiprocess tests on LMS tests in jenkins 2016-06-20 08:30:22 -04:00
Calen Pennington
dcf5fd3e8f Enable coverage.py measurement of multiprocess tests 2016-06-20 08:30:22 -04:00
Ibrahim
ee70ea99fc allow SHOW_LANGUAGE_SELECTOR to be overridden by MICROSITE_CONFIGURATION 2016-06-20 17:15:08 +05:00
asadiqbal
4e38b2e4e8 WL-515 Update Activate Account message page 2016-06-20 14:34:17 +05:00
Andy Armstrong
fff88151d2 Convert XBlock runtime code to JavaScript 2016-06-19 12:55:20 -04:00
Andy Armstrong
df399de186 Merge pull request #12781 from eduNEXT/fmo/coffee_to_js_tabs 
Converting views/tabs.coffee in the cms to js
 2016-06-17 12:56:49 -07:00
Gregory Martin
f701058296 Merge pull request #12764 from edx/yro-add_val_duplicate_video 
Add VAL "Duplicate" status
 2016-06-17 14:49:14 -04:00
Chris Rodriguez
fe5e5507c9 Bumping version of a11y custom ruleset 2016-06-17 14:44:26 -04:00
Chris
a7bd52952e Merge pull request #12729 from edx/clrux/bumping-bokchoy 
Bumping bok-choy to pick up a11y changes
 2016-06-17 14:43:21 -04:00
Douglas Hall
75945b8c9e Merge pull request #12791 from edx/ibrahimahmed443/WL-529-platform-name-theme-override 
replace references to settings.PLATFORM_NAME in edx-platform with the…
 2016-06-17 10:44:41 -04:00
Clinton Blackburn
b89fc91786 Merge pull request #12786 from edx/clintonb/catalog-admin-csv 
Added CSV catalog downloads
 2016-06-17 09:34:25 -04:00
Ibrahim
603546a04a replace references to settings.PLATFORM_NAME in edx-platform with theme overrides 2016-06-17 18:33:19 +05:00
Douglas Hall
6705677ba3 Merge pull request #12785 from edx/douglashall/WL-531 
WL-531 Pass purchase_workflow parameter through to post-FinishAuth views
 2016-06-17 08:29:55 -04:00
Clinton Blackburn
eab057c812 Corrected JWT data type 
ECOM-4653
 2016-06-16 23:23:36 -04:00
Clinton Blackburn
372c59e4a4 Added links to download catalog CSVs in API admin tool 
ECOM-4729
 2016-06-16 23:00:48 -04:00
Clinton Blackburn
ecf44bbeaa Removed unused template file 
ECOM-4729
 2016-06-16 23:00:46 -04:00
Clinton Blackburn
880493099f Corrected Course Catalog API URL 
Retrieving the URL from settings rather than an OAuth client that might not exist.

ECOM-4729
 2016-06-16 23:00:45 -04:00
Felipe Montoya
43ea4e21bb Converting views/tabs.coffee in the cms to js 
Linting the compiled file
 2016-06-16 18:35:34 -07:00
Douglas Hall
2717167f24 Pass purchase_workflow parameter through to post-FinishAuth views 2016-06-16 21:17:05 -04:00
David Ormsbee
5f1595910d Merge pull request #12784 from edx/release 
Release to Master (2016-06-16 hotfix)
 2016-06-16 18:50:18 -04:00
Eric Fischer
fdc6d91588 update_in_cache on lms worker (#12689) 
This commit "undoes"a previous hotfix, and allows a cms course_publish
signal to trigger a block_structure update_course_in_cache task, which
is run on an lms worker queue.

Changes:
    -exposes ALTERNATE_QUEUE_ENVS
    -adds routing layer in celery.py
    -moves prior dev_with_worker settings file to devstack_with_worker
    -moves course_block api functionality into openedx/core/djangoapps/content/block_structure
 2016-06-16 18:01:06 -04:00
David Ormsbee
53712a60e5 Merge pull request #12778 from edx/hotfix/2016-06-16 
Create forums config model for adjusting connection timeouts.
 2016-06-16 15:46:32 -04:00