Commit Graph

2868 Commits

Author SHA1 Message Date
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
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API"
This reverts commit c94abd2705.
2015-07-08 16:55:38 -04:00
zubair-arbi
ab74f64e85 update credit eligibility ui text
ECOM-1648
2015-07-08 20:13:42 +05: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
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
Zia Fazal
9711cd5fc3 certificate add/update/delete operations permission check
address quality violation
2015-07-06 09:45:33 +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
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
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
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
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
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
Sarina Canelake
033d36c8f5 Merge pull request #8627 from Stanford-Online/nick/fix-tab-templates
Fix hint-problem tab bug TNL-2542
2015-06-26 13:11:46 -04:00
Nick Parlante
98730f3141 Fix hint-problem tab bug TNL-2542
Revert the removal of hint templates.
Move the 'tab' attribute in the new-problem yaml
files out one level, out of the 'metadata' section.
2015-06-26 09:22:04 -07:00
Braden MacDonald
24af22ca88 Remove restrictions on library creation in Studio 2015-06-25 12:57:56 -07:00
Diana Huang
5fb2a1fd8e Merge pull request #8583 from edx/diana/course-tab-cleanup
Make course tab refreshing safer.
2015-06-19 15:38:30 -04:00
Diana Huang
d779466f09 Make course tab refreshing safer. 2015-06-19 14:53:49 -04:00
Nimisha Asthagiri
84753740e3 Merge pull request #8570 from edx/mobile/video-upload-MA-844
MA-844 Video Upload: remove dependency on AssetMetaDataStore.
2015-06-19 11:21:50 -04:00
Nimisha Asthagiri
26d4a15d63 MA-844 Video Upload: remove dependency on AssetMetaDataStore. 2015-06-18 18:28:48 -04:00
Nick Parlante
77f3069655 Extended Feedback and Hints for Problems
Extends the common capa response types (string, numeric, multiple
choice, checkbox, dropdown) with feedback and hint
capabilities. "Feedback" refers to feedback shown to the student when
they check the problem, looking at their specific answer. "Hints"
refers to a Hint button in LMS which the student can click at any time
to see hints for that problem. The implementation extends the markdown
syntax to include feedback and hints. There are new Feedback-and-Hint
specific templates in Studio when the author clicks to add a new
problem.
2015-06-17 16:25:04 -07:00
Andy Armstrong
585eaf1c9e Merge pull request #8538 from edx/release
Merge hotfix-2015-06-16 back to master
2015-06-16 18:05:34 -04:00
Diana Huang
72a0d19531 Ensure that is_hidden does not affect equality checks. 2015-06-16 15:46:23 -04:00
Ali Mohammad
54f62a85f6 Merge pull request #8224 from Stanford-Online/kluo/course-creation-after-deletion
Allow course creation after deletion at same URL
2015-06-16 11:24:50 -04:00
Matt Drayer
5d2ef56b68 Merge pull request #8520 from edx/ziafazal/SOL-978
remove in-memory files
2015-06-16 10:29:26 -04:00
Zia Fazal
ed434c55d1 remove in-memory files
no need to create zero by in memory images

added contents to test upload files
2015-06-16 14:14:15 +05:00
Andy Armstrong
c28003b50d Merge pull request #8416 from edx/andya/common-list-component
Create a common paginated list view
2015-06-15 14:55:20 -04:00
Andy Armstrong
1689004189 Create a common paginated list view
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
2015-06-15 13:51:09 -04:00
Calen Pennington
9821323946 Merge pull request #8504 from cpennington/bdero/ccx-query-tests
A version of #8260 that is consistent on jenkins and locally
2015-06-15 11:51:33 -04:00
Brandon DeRosier
5c6ccc8f0b Add CCX SQL query/mongo read tests 2015-06-15 09:50:44 -04:00
Adam Palay
b199a72c62 Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	cms/djangoapps/contentstore/views/course.py
2015-06-12 16:22:06 -04:00
Diana Huang
a41d9a5491 Prevent duplication of tabs with different names. 2015-06-12 13:39:51 -04:00
Ben Patterson
4b6e2f4880 Merge pull request #8471 from edx/benp/flaky-cms-component-jun2015
Fix flaky lettuce test. TNL-1452
2015-06-12 12:28:38 -04:00
Ben Patterson
d96b581485 Fix flaky lettuce test. TNL-1452 2015-06-12 10:32:28 -04:00
Waheed Ahmed
36d321c4e3 Merge pull request #8496 from edx/waheed/plat674-improve-test-with-ddt
Specified number of mongo and split calls in xblock outline handler test with ddt.
2015-06-12 19:14:41 +05:00
Waheed Ahmed
4323109cad Specified number of mongo and split calls in xblock outline handler test with ddt.
PLAT-674
2015-06-12 17:17:59 +05:00
Syed Hassan Raza
c9778a5f57 add name param check_transcripts 2015-06-12 16:34:45 +05:00
zubair-arbi
3204c8b3fe show credit eligibility requirements in studio
ECOM-1591
2015-06-12 13:19:57 +05:00
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Waheed Ahmed
b328c0dcdc Fixed slow transaction on xblock outline handler.
TNL-2425
2015-06-10 21:03:52 +05:00
Syed Hassan Raza
ecc3473d36 transcript name param url 2015-06-09 20:04:16 +05:00
Awais Jibran
3cd48e4d61 Merge pull request #8317 from edx/aj/plat643-cms-export-command-export-to-wrong-place
Fixed cms course export using management command.
2015-06-09 18:59:03 +05:00
Awais Jibran
3e6670d1a4 PLAT-643
Fixed cms course export
2015-06-09 11:19:46 +05:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab
Refactor and merge CourseViewType and CourseTab.
2015-06-08 16:08:27 -04:00