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

37516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
alisan617
812caa2b62 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-06-20 19:51:20 -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
alisan617
1b2a2c41a0 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update packages.xml 2016-06-20 10:01:07 -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
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
alisan617
e103633960 PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Merge branch 'master' 2016-06-19 12:43:38 -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
David Ormsbee
255267d42c Create forums config model for adjusting connection timeouts. 2016-06-16 13:50:13 -04:00
Ben Patterson
d544340fde Merge pull request #12776 from edx/benp/remove-invalid-scss-calc 
Remove invalid css syntax.
 2016-06-16 13:35:38 -04:00
Ned Batchelder
b1c15af3ff Merge pull request #12779 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-16 13:14:07 -04:00
Ben Patterson
28a01a4d7c Merge pull request #12774 from edx/benp/fix-scss-typo-shoppingcart 
Remove improper scss syntax.
 2016-06-16 13:13:35 -04:00
Douglas Hall
7e55cc26d8 Merge pull request #12769 from edx/release 
Merging Patch Release 2016-06-15 back to master
 2016-06-16 11:35:47 -04:00
Ned Batchelder
25c195d48a Update translations (autogenerated message) 2016-06-16 14:48:20 +00:00
Ben Patterson
1044dd5965 Remove invalid css syntax. 
This line can safely be removed since it does not impact
styling (nothing is being supplied to calculate).

Reference [here](http://www.w3schools.com/cssref/func_calc.asp)
 2016-06-16 09:58:41 -04:00
Ben Patterson
602380e52d Remove improper scss syntax. 
This was a typo that was missed, and is not resulting in any styling.

Removing it is a no-op.

The original committer does not work in this code anymore, and
it is old enough such that changing it would be more disruptive.
 2016-06-16 08:38:14 -04:00
Muzaffar yousaf
08a4d11db1 Merge pull request #12378 from edx/usman/atomic-refinement 
A more considerate outer_atomic.
 2016-06-16 17:25:54 +05:00
Usman Khalid
781623205e Added a named outer_atomic option. 
A named outer is suitable when dealing with IntegrityErrors. It only
checks that it is not nested under an atomic only if it is nested
under enable_outer_atomic(name=<name>). This way only the view which
is causing IntegrityErrors needs to have its automatic transaction
management disabled and other callers are not effected.
 2016-06-16 14:18:21 +05:00
Waheed Ahmed
70a0b063ed Merge pull request #12759 from edx/waheed/ecom-2378-change-refund-log-level 
Changed refund log level to warning.
 2016-06-16 03:45:07 +05:00
Waheed Ahmed
07ab6cc744 Changed refund log level to warning. 
ECOM-2378
 2016-06-16 02:59:37 +05:00
Chris
b725dc0d75 Merge pull request #12744 from edx/clrux/ac-455 
AC-455 adding main to PDF books; styling chapters
 2016-06-15 17:36:45 -04:00
Douglas Hall
32b8391c11 Merge pull request #12766 from edx/patch/2016-06-15 
Patch Release 2016-06-15
 2016-06-15 16:51:45 -04:00
estute
d5c0e25a19 Merge pull request #12765 from edx/release 
Merge Release to Master
 2016-06-15 15:58:30 -04:00
Calen Pennington
a2bf90f64f Merge pull request #12763 from cpennington/badge-testing-allow-missing-dir 
Don't try and cleanup a directory that doesn't exist (in badging tests)
 2016-06-15 15:57:44 -04:00