Commit Graph

186 Commits

Author SHA1 Message Date
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Carson Gee
4099fc9af0 Correct misaligned django-cas integration 2014-03-04 09:35:08 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release'
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-02-27 17:33:40 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
2014-02-27 14:53:05 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
2014-02-27 08:37:58 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Calen Pennington
1eec47a604 Fix STUD-1316
This bug affected unpublishing content (and would trigger an error
message in studio). The fix was to uncouple the rendering of the studio_view
of an xblock with the student_view, so that content that wasn't in
draft mode already wouldn't be modified by early rendering of the
studio_view.

[STUD-1316]
2014-02-19 14:58:41 -05:00
thedeadparrot
ff0a6fb778 Update cms urls for language preferences 2014-02-14 22:35:14 +00:00
Julia Hansbrough
7d81a510bc Moved UserPreferences to common 2014-02-14 10:32:11 -05:00
Carson Gee
5e0f781674 Major refactor and rename of feature
All forward facing wording changed to Export to Git
Export to git functions removed from management command and put in common file
Additional error checking and documentation improvements
Nitpicks and other minor fixes
2014-02-13 12:53:47 -05:00
Carson Gee
f02c074db9 Push To LMS updates
Added tests
Converted scripts to django commands
Removed advanced module requirement
Generalized to platform
Switched to subprocess for shell commands
Beefed up resiliency and error checking.
Refactored since #1910 removed get_location_and_verify_access
Added settings to aws for export directory and reworked test setup and teardown
Several review based fixes
Added line to Changelog
Changed URL handler to be accepting and moved git bare repo inside of test_root/data
Added exception logging to help trace issues
Added output in exception logging
Made the branch to commit to explicit instead of implicit
Skipping git identity test on condition of global configuration set
2014-02-13 10:21:18 -05:00
ichuang
e524f5be35 add push_to_lms to Studio; uses MITX_FEATURES['ENABLE_PUSH_TO_LMS'] 2014-02-13 10:01:28 -05:00
Chris Dodge
0d49305c4d add ability to have an optional password policy enforcement on account creation 2014-01-30 15:32:05 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors
[LMS-1614]
2013-12-20 14:05:53 -05:00
Ned Batchelder
c37ab38599 Remove needless non-package non-specs from urls.py 2013-12-20 10:26:34 -05:00
e0d
7be524d769 Removing duplicated initialization code. 2013-12-11 12:59:07 -05:00
David Baumgold
0d3490374e Refactor textbooks to use locator URLs
STUD-945
2013-12-05 13:13:28 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings
STUD-948
2013-11-26 10:17:52 -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
17864353a5 Restful course settings
STUD-946
STUD-947
2013-11-22 10:55:35 -05:00
Christina Roberts
3f44ff2f4b Merge pull request #1675 from edx/christina/tab-new
Convert tabs to use RESTful API
2013-11-21 07:39:31 -08:00
cahrens
1b2be30c45 Convert tabs to RESTful URL.
STUD-850
2013-11-21 10:19:43 -05:00
cahrens
d1c19cb563 Minor cleanup around public RESTful URLs.
STUD-849
2013-11-20 14:20:59 -05:00
cahrens
e7c06e3ab1 Change preview view method to use RESTful URL.
STUD-848
2013-11-19 16:56:24 -05:00
cahrens
569c86de74 Code review feedback. 2013-11-14 17:09: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
c20f3dbc8c Merge pull request #1569 from edx/dhm/restful_course
restful course_info access
2013-11-13 10:46:16 -08: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
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00
cahrens
16766a5ee9 Change delete_item to RESTful URL.
Part of STUD-847.
2013-11-06 13:49:24 -05:00
cahrens
763ff9c818 Make export URL restful.
STUD-846
2013-10-30 15:24:42 -04:00
Don Mitchell
f41816637e RESTful refactoring of /course access continued
Move index access into the url
Move course creation into the url
Add helper methods for testing to serialize json data and set accept header.
2013-10-30 13:28:22 -04:00
cahrens
a9d1d4eefc Convert import to new URL pattern. 2013-10-29 15:33:22 -04:00
cahrens
39a8d07e47 Update URLs for assets. 2013-10-24 16:00:56 -04:00
cahrens
355ebd62e3 Convert course team management to new URL scheme.
Move RESTful URLs into our "done" section.
2013-10-24 14:01:24 -04:00
Don Mitchell
f45abe3d9f Use new restful pattern instead 2013-10-24 13:18:23 -04:00
Don Mitchell
6b9797522b Write restful service to find all orphans
To help fix recent bugs re orphaned discussions and
to prototype a more restful json oriented api.
2013-10-24 13:18:22 -04:00
cahrens
12488db015 Get rid of course_index shim. 2013-10-24 11:35:02 -04:00
polesye
6c08708131 Merge pull request #1111 from edx/anton/video_subtitles
Add Timed Transcripts Editor.
2013-10-23 02:38:39 -07:00
cahrens
2c07bf7124 checklist_index is an integer. 2013-10-22 15:26:19 -04:00
Anton Stupak
aecc20af6b Add Timed Transcripts Editor. 2013-10-22 21:45:03 +03:00
cahrens
a6faa163f3 Convert checklists to new URL scheme. 2013-10-22 11:34:05 -04:00
Don Mitchell
8902a89fbc Have urls.py fully parse locator url 2013-10-22 10:44:03 -04:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets
Add asset pagination
2013-10-17 07:16:09 -07:00
Don Mitchell
010905eb99 RESTful api for getting course listing and opening course in studio.
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
2013-10-16 16:54:31 -04:00
Don Mitchell
70f77ce4bf Add pagination to asset retrieval
and push sorting down to the query
2013-10-10 17:26:23 -04:00
cahrens
70cb24a37f Delete unused static-pages.html. 2013-10-09 15:06:58 -04:00
Julian Arni
a108827564 Route ajax request to appropriate view, and show feedback only then
Hook up view

Fix getStatus function
2013-10-07 09:51:19 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00