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

60 Commits

Author SHA1 Message Date
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag 
[LMS-226]
[LMS-2013]
 2014-01-10 11:40:03 -05:00
Don Mitchell
f5f24fcc12 Merge pull request #2022 from edx/dhm/locator_course_id 
Change course_id to package_id
 2013-12-23 11:15:48 -08:00
Don Mitchell
b7368ef69a Change course_id to package_id 
on new Locators to make it clear that they have a different syntax
than Location.course_id altho they represent the same info.
 2013-12-20 16:16:50 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors 
[LMS-1614]
 2013-12-20 14:05:53 -05:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id 
usage_id implies self-sufficiency. The block_id is relative to its structure.
 2013-12-17 12:15:32 -05:00
David Baumgold
d1f3e3a6b5 Merge pull request #1827 from edx/db/remove-mitx-from-features 
settings.MITX_FEATURES => settings.FEATURES
 2013-12-04 07:13:19 -08:00
Christina Roberts
2682a14d43 Merge pull request #1790 from edx/christina/transcripts 
Change video transcripts to use locators instead of locations.
 2013-12-04 06:41:44 -08:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
cahrens
5fdfc60957 Change video transcripts to use locators instead of locations. 
Part of STUD-870
 2013-11-26 16:52:56 -05:00
cahrens
b5d72a38d3 Updates from code review. Includes backing out the 
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
 2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Don Mitchell
7ab31f5478 Merge pull request #1710 from edx/dhm/restful_settings 
Restful course settings
 2013-11-22 08:23:12 -08:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
Александр
3bbc7430f2 BLD-530: Fix 500 error in transcripts. 2013-11-22 10:06:03 +02:00
cahrens
e7c06e3ab1 Change preview view method to use RESTful URL. 
STUD-848
 2013-11-19 16:56:24 -05:00
cahrens
a170c6f4e7 Change save_item and create_item to RESTful URL. 
Part of STUD-847.
 2013-11-14 11:03:31 -05:00
Don Mitchell
99e7daf796 RESTful refactoring for course_info updates and handouts. 
html page and update access use 2 different urls
GET update can get an individual update
STUD-944
 2013-11-13 13:16:41 -05:00
cahrens
16766a5ee9 Change delete_item to RESTful URL. 
Part of STUD-847.
 2013-11-06 13:49:24 -05:00
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings. 
BLD-426
 2013-11-04 12:13:23 +02:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers 
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
 2013-10-15 15:53:48 -04:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module" 
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
 2013-09-09 22:51:57 +03:00
Alexander Kryklia
7b637d49d6 Add comma in last item of list. 2013-09-09 19:16:15 +03:00
Valera Rozuvan
417ddcaaa1 LTI module with tests 2013-09-09 19:13:20 +03:00
Calen Pennington
38de05c76c Include mixins in advanced component class loading and preview modules 2013-09-06 13:37:03 -04:00
Don Mitchell
b81e5504db Fix pylint and typos 2013-09-06 12:19:51 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Julian Arni
80619da429 Review fixes 2013-08-15 10:24:38 -04:00
Julian Arni
3ed4198204 Contentstore views pylint fixes 2013-08-14 19:10:00 -04:00
Vasyl Nakvasiuk
b33b5c7bd4 Python: videoalpha -> video. 2013-08-12 14:31:48 +03:00
David Baumgold
248793c127 Fix some pylint issues 2013-07-31 15:42:11 -04:00
Vasyl Nakvasiuk
57bc010a0a gst integration into studio 2013-07-26 17:22:27 +03:00
Don Mitchell
541c98a3af POST requests were claiming request.method == 'PUT' 
So, changed handlers to look for either value.
 2013-07-19 11:14:01 -04:00
Calen Pennington
4b53478859 Require markdown to be explicitly set 2013-07-16 14:33:59 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
David Baumgold
628dff5398 pylint fixing 2013-07-09 19:16:43 -04:00
David Baumgold
4bc109708f Use django-method-override module 
Replacing the get_request_method function everywhere
 2013-07-09 19:16:09 -04:00
David Baumgold
ef81556cc5 Use JsonResponse when it makes sense 2013-07-09 19:16:08 -04:00
David Baumgold
cc4e01b4c6 Removed obsolete active_tab template variable 2013-07-09 19:15:58 -04:00
Don Mitchell
2fc7d3308c Customtags can't be inserted by studio 2013-07-01 12:33:08 -04:00
Don Mitchell
2ef4d82959 Standardize on get_default_time_display 2013-06-28 14:19:10 -04:00
Chris Dodge
d9ce3162e0 partial fix for STUD-145, catch invalid location errors and return a HTTP 400 error to client 2013-06-10 11:47:37 -04:00
chrisndodge
7735e37585 Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration 
Added videoalpha to advanced components in component.py file.
 2013-06-02 13:04:33 -07:00
Valera Rozuvan
37cffd0835 Added videoalpha to advanced components in component.py file. 2013-05-31 13:48:17 +03:00
cahrens
14eb9c9a3b Merge branch 'master' into feature/christina/metadata-ui 2013-05-30 12:27:03 -04:00
cahrens
522b76e847 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). 
https://edx.lighthouseapp.com/projects/102637/tickets/331
 2013-05-23 16:27:05 -04:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-05-23 11:41:12 -04:00
Arthur Barrett
cf502e2349 Fix advanced modules list. 2013-05-21 17:49:20 -04:00