Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,619 Commits 1 Branch 0 Tags
7b5f9b80098b9a8100dc0acc9bb19f7ef6804713
Commit Graph

6145 Commits

Author SHA1 Message Date
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS 
TNL-2487
 2015-07-20 13:59:54 -04:00
Max Rothman
80cf4d6ecb Merge pull request #8969 from edx/release-merge-test 
Release merge test
 2015-07-20 10:38:37 -04:00
tlindaliu
0c837adfce Refactor auth.has_access to auth.user_has_role 
Change name of method to clear up confusion with the access.has_access method.
 2015-07-19 20:42:29 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test 
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
 2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Jesse Zoldak
e89d8e14d4 Merge pull request #8955 from edx/zoldak/cleanup-js-includes 
Remove unused includes
 2015-07-16 19:56:04 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Jesse Zoldak
7aebf0684a Remove unused includes 2015-07-15 17:17:55 -04:00
Sarina Canelake
9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag 2015-07-15 11:11:09 -04:00
Matt Drayer
66e1b11a58 Merge pull request #8931 from edx/ziafazal/fix-SOL-1008 
SOL-1008: only edx PM can activate/deactivate or delete certificate configuration
 2015-07-15 10:03:17 -04:00
Vedran Karačić
4eb4a82ea5 Merge pull request #8851 from edx/vkaracic/PLAT-619-2 
PLAT-619: Custom error messages for delete course command
 2015-07-15 14:59:25 +02:00
Zia Fazal
0793cc8b5c only ddx PM can activate/deactivate or delete certificate configuration 
fix for flaky test

fix for broken test

fixed quality violation
 2015-07-15 17:09:01 +05:00
Vedran Karačić
43547bd5c8 Merge pull request #8875 from edx/vkaracic/TNL-136 
TNL-136: Added New page creation animation
 2015-07-14 20:18:49 +02:00
Dino Cikatic
862262bd2d SOL-974 make index and remove calls use ES bulk API 2015-07-14 11:47:08 -04:00
vkaracic
ff6afaf483 Custom error messages for delete course command 
This is a fix for
https://openedx.atlassian.net/browse/PLAT-619
added custom CommandError messages for invalid syntax and
invalid course keys.
 2015-07-14 15:28:01 +00:00
vkaracic
8f0bb98990 Added New page creation animation 
This is a fix for
https://openedx.atlassian.net/browse/TNL-136
added scroll to new page and remove class 'new' on hover to better
indicate that a new page is created.
 2015-07-14 13:05:47 +00:00
Matt Drayer
d57fd0e47c Merge pull request #8847 from edx/ziafazal/SOL-1021 
ziafazal/SOL-1021: Create Analytics events for certificate actions
 2015-07-14 07:58:55 -04:00
Vedran Karačić
f9cb092488 Merge pull request #8852 from edx/vkaracic/PLAT-324 
PLAT-324: Custom error message for export course command
 2015-07-14 09:15:53 +02:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events 
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
 2015-07-14 11:12:09 +05:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations 
Skipped 'print' statement violations, as print() is Py3k syntax.
 2015-07-13 17:33:28 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Adam Palay
24cd124195 add data_dir to bok_choy test settings 2015-07-13 17:10:32 -04:00
Adam Palay
213dc70d1e update to course import (TNL-2270) 2015-07-13 14:17:26 -04:00
muhammad-ammar
5a8b158900 Visual change to new Hints and Feedback problem types 
TNL-2619
 2015-07-13 12:18:25 +05:00
Andy Armstrong
85857e6729 Merge pull request #8831 from edx/andya/reenable-video-jasmine-tests 
Re-enable the video translation Jasmine tests
 2015-07-09 11:47:00 -04:00
Andy Armstrong
14a9796cd4 Re-enable the video translation Jasmine tests 
TNL-2689
 2015-07-09 09:34:38 -04:00
vkaracic
87fb431be4 Custom error message for export course command 
This is a fix for
https://openedx.atlassian.net/browse/PLAT-324
added custom CommandError messages for invalid course key.
 2015-07-09 11:57:53 +00:00
zubair-arbi
db82cbdeb7 Merge pull request #8817 from edx/zub/story/ecom-1648-update-credit-eligibility-ui-text 
update credit eligibility ui text
 2015-07-09 12:03:06 +05:00
Alison Hodges
747c6b7413 Merge pull request #8716 from edx/ahodges/staff_labeling 
Ahodges/staff labeling
 2015-07-08 17:34:29 -04:00
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API" 
This reverts commit c94abd2705.
 2015-07-08 16:55:38 -04:00
Jesse Zoldak
a11275ee0d Disable flaky GroupConfigurationsPage JS test TNL-1475 2015-07-08 11:48:31 -04:00
zubair-arbi
ab74f64e85 update credit eligibility ui text 
ECOM-1648
 2015-07-08 20:13:42 +05:00
Jesse Zoldak
de25880c10 Disable test specs that use old flaky sinon pattern 2015-07-08 09:22:32 -04:00
Jesse Zoldak
1e5fe3a3a7 Use the correct sinon request pattern to avoid flaky tests 2015-07-07 16:12:42 -04:00
Jesse Zoldak
c219be5e75 Remove unused references to AjaxHelpers 2015-07-07 16:06:41 -04:00
Marko Jevtić
1c161ffc5f Merge pull request #8793 from edx/mjevtic/env-devstack-fix 
Fixed misordered settings for devstack environment
 2015-07-07 15:14:24 +02:00
Marko Jevtic
d09bfa5e99 Fixed misordered settings for devstack environment 2015-07-07 12:01:12 +02:00
Matt Drayer
a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006 
ziafazal/SOL-1006: Disable course 'start date' for inactive web-enabled certificates
 2015-07-06 16:45:24 -04:00
Matt Drayer
685a2d31b3 Merge pull request #8774 from edx/ziafazal/SOL-1008 
ziafazal/SOL-1008: Ensure that only authorized actors can perform assigned roles
 2015-07-06 15:57:28 -04:00
asadiqbal
2e4f1225ea Improved text in Studio Certificate Configuration 2015-07-06 15:35:32 -04:00
Awais Jibran
770b3e807e Merge pull request #8499 from edx/aj/tnl2435-broken-page-for-schedule-details-cms 
Fixed Broken page in "Schedule & Details" due to course image
 2015-07-06 19:50:21 +05:00
Shrhawk
a67d80c232 Merge pull request #8702 from edx/shr/bug/TNL-2592-problem-release-date-error 
Handle dates have year smaller than 1900
 2015-07-06 06:39:11 -07:00
Awais Jibran
ded7682090 Studio "Schedule & Details" page is broken in IDBx+IDB9x+2015_T2 
TNL-2435
 2015-07-06 18:26:00 +05:00
Frances Botsford
b45b122c18 fixed pagination styles in teams and studio 2015-07-06 08:45:03 -04:00
Ben McMorran
351e491c82 Add generic paging framework 
Authors:
  - Daniel Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Zia Fazal
9711cd5fc3 certificate add/update/delete operations permission check 
address quality violation
 2015-07-06 09:45:33 +05:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view 
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
 2015-07-02 18:52:15 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API 
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
 2015-07-02 15:32:00 -04:00
Calen Pennington
012a3c7540 Merge pull request #8725 from openfun/regisb/fix_xblock_class_loading 
Fix XBlock class loading in local resource view
 2015-07-02 13:37:03 -04:00