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

14469 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Chris Rodriguez
079b2df404 AC-455 adding main to PDF books 2016-06-15 14:05:31 -04:00
Calen Pennington
5e11f86ed7 Remove flaky-test marker from badges tests 2016-06-15 13:49:52 -04:00
Brian Jacobel
38bd9ad047 Merge pull request #12740 from edx/bjacobel/discussions-self-post-interaction 
Can't report or vote for your own posts
 2016-06-15 13:04:33 -04:00
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Brian Jacobel
b6cf9d231f Disallow reporting and upvoting of your own posts in discussion forums 2016-06-15 12:01:23 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00
Ahsan Ulhaq
09cdc6f47f Merge pull request #12760 from edx/ahsan/ECOM-4217-certs-invalidate-by-instructor 
Revert "Revert Adding logic to check if cert is invalidate then user cannot see the cert"
 2016-06-15 19:48:18 +05:00
Awais
0bd1f4ccdd Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-15 19:02:06 +05:00
Calen Pennington
4840f8c568 Don't try and cleanup a directory that doesn't exist (in badging tests) 2016-06-15 09:51:43 -04:00
Ben Patterson
6eb9b65497 Merge pull request #12761 from edx/tasawer/bugfix/ecom-4713-mark-test-as-flaky 
Test marked as flaky
 2016-06-15 09:17:14 -04:00
Awais Jibran
acc3a9bf76 Merge pull request #12713 from edx/aj/ecom4650-fix-remove-exception 
Fix remove user from cert-exception list
 2016-06-15 17:00:55 +05:00
Tasawer
9281c601c0 test marked as flaky 2016-06-15 16:34:48 +05:00
Ahsan Ulhaq
39f8757f42 Fix order history page if order don't have any product 2016-06-14 22:34:36 +05:00
Ben Patterson
707b682fe0 Revert "Adding logic to check if cert is invalidate then user cannot see the …" 2016-06-14 12:03:17 -04:00
Chris
ff242a3eac Merge pull request #12694 from edx/clrux/ac-454-repeat 
AC-454 visual indicator in video menus + safe transcripts
 2016-06-14 08:46:47 -04:00
Chris Rodriguez
55d84d34b8 AC-454 adding visual clarify for selected menu options 2016-06-14 07:53:15 -04:00
Awais Qureshi
a361d44bfd Merge pull request #12666 from edx/awais786/ECOM-4217-certs-invalidate-by-instructor 
Adding logic to check if cert is invalidate then user cannot see the …
 2016-06-14 13:50:17 +05:00
Clinton Blackburn
77f605b30a Corrected usage of the title block for the main_django template 
ECOM-4610
 2016-06-13 19:11:36 -04:00
Simon Chen
8d672bc832 ECOM-3206 allow run selection and enrollment (#12685) 2016-06-13 15:08:00 -04:00
Brian Jacobel
781a20497b Merge pull request #12735 from edx/bjacobel/dsc-image-overflow 
Fix overflowing images in forum posts/responses
 2016-06-13 14:25:42 -04:00
Cliff Dyer
2337b80af5 Merge pull request #12722 from edx/tnl/splittest-zerogroup-test 
modified tests to directly address split test group 0 issues.
 2016-06-13 13:26:29 -04:00
Brian Jacobel
5e0e337654 Fix overflowing images in forum posts/responses 2016-06-13 12:30:13 -04:00
Awais Jibran
8d40dcd0f4 Fix remove user from cert-exception list 
ECOM-4650
 2016-06-13 18:50:16 +05:00
Sofiya Semenova
0431bacbe1 Merge pull request #12656 from edx/ssemenova/tabindex 
Removing instances of positive integer tab index values
 2016-06-13 09:23:48 -04:00
Awais
112aa71fe0 Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-11 15:26:30 +05:00
Robert Raposa
84726d6e1b Merge pull request #12723 from edx/release 
Merge hotfix-2016-06-10 release into master
 2016-06-10 16:01:23 -04:00
ssemenova
e7e1f647aa replace positive tab index values in the platform 
TNL-4705
 2016-06-10 15:35:51 -04:00
clrux
0aa87b8a22 Merge pull request #12452 from edx/clrux/ac-414 
AC-414 adding headings as first child to sections
 2016-06-10 15:23:10 -04:00
J. Cliff Dyer
2696650437 modified tests to directly address split test group 0 issues. 2016-06-10 17:59:02 +00:00
Robert Raposa
d54f79f5bf Switch dashboard from GET to POST. 2016-06-10 13:14:19 -04:00