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

6123 Commits

Author SHA1 Message Date
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
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
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29 
Merge back into master
 2015-07-02 13:34:42 -04:00
Alison Hodges
8ef05e0484 Carol's edits 2015-07-02 13:29:35 -04:00
Christine Lytwynec
0bb519c2a0 Merge pull request #8727 from edx/clytwynec/TE-878 
use 1 coveragerc file to generate 1 coverage report per build
 2015-07-02 12:13:59 -04:00
Andy Armstrong
281ebaa3b3 Merge pull request #8683 from edx/andya/run-optimized-devstack 
Support running Studio with optimized assets
 2015-07-02 11:39:37 -04:00
Andy Armstrong
85814f0bbf Support running Studio with optimized assets 2015-07-01 18:22:31 -04:00
Christine Lytwynec
e9e4e3cf65 use 1 coveragerc file to generate 1 coverage report per build 2015-07-01 16:07:49 -04:00
Sarina Canelake
4f991ebaab Merge pull request #8718 from open-craft/smarnach/add-poll-xblock 
Add the Poll XBlock to the requirements.
 2015-07-01 14:00:42 -04:00
Sven Marnach
e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. 2015-07-01 18:34:10 +02:00
Peter Fogg
890cd6a470 Add grading spec tests. 2015-07-01 09:08:39 -04:00
Peter Fogg
46ea862f04 Fix not being able to set course passing grades above 80%. 2015-07-01 09:08:39 -04:00
Albert Liang
4b332bfcf0 Add missing comma to tuple 
Currently, Python implicitly concatenates two string entries located next to
each other because there is no comma separating them.  The code concatenates
"*.pyc" and "sass/*.scss", creating a single entry called "*.pycsass/*.scss".
 2015-06-30 14:02:07 -07:00
Régis Behmo
bbe5494df1 Fix XBlock class loading in local resource view 
Some XBlock classes were being (randomly) incorrectly loaded. This was
due to an error in the way the XBlock.load_class method was called.
Error was happening randomly because of the cache mechanism in the class
loading method. (see PLUGIN_CACHE)
 2015-06-30 19:10:45 +02:00
Ali Mohammad
35f7cb75e4 Merge pull request #8715 from edx/resolve-merge-conflicts 
Resolve merge conflicts
 2015-06-30 11:00:50 -04:00
David Baumgold
a9c67c562e Merge pull request #8527 from edx/db/ensure-noseids-dir-exists 
Ensure noseid dir exists when running tests
 2015-06-30 10:03:56 -04:00
Syed Hassan Raza
482b31b9a4 Handle dates have year smaller than 1900 2015-06-30 14:07:26 +05:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components 
TNL-2303
 2015-06-30 13:26:18 +05:00
Alison Hodges
f4209803f2 Remove "instructor" label or change to "Admin" 
Clarifies what the roles are, makes Studio and LMS naming parallel.
 2015-06-29 17:03:18 -04:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Braden MacDonald
4e9db25281 Fix: users without course creation permission were not shown new library form 2015-06-29 13:14:04 -07:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -04:00
Davorin Sego
2c22a4d879 Responsive Homepage Hero, Header, Footer 2015-06-29 12:14:55 +02:00
Zia Fazal
bcbd1464d4 New course cannot be started till web certificate is active 
fixed broken test

changes based on feedback on 6/24

fixed broken unit test after feedback changes

added more checks and updated tests

fixed broken bok choy test

Fixed pylint quality error

trying to fix pylint quality error
 2015-06-29 12:53:21 +05:00