Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

180 Commits

Author SHA1 Message Date
Andy Armstrong
4fa33e25ed Studio support for cohorted courseware 
TNL-652
 2015-01-15 10:33:45 -05:00
Jonathan Piacenti
058176144e Removed the ability to add Discussion and advanced components to Content Libraries. 2015-01-12 13:37:55 +03:00
Braden MacDonald
3e0f08ebc2 Studio support for creating and editing libraries (PR 6046) 
SOL-1, SOL-2, SOL-3
 2015-01-12 13:37:50 +03:00
Adam Palay
59343ed63f fix preview link generation for course reruns (PLAT-336) 2014-12-15 09:21:38 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Brandon DeRosier
046e295322 Change has_course_access definition and doc string 
- has_course_access renamed to has_course_author_access for clarity
- Changed doc string to clearly state that it determines whether or not
  a user has write access to a course
 2014-12-02 22:08:58 -05:00
Brandon DeRosier
bdc64a7c70 Moved has_course_access from CMS to student.auth (common) 2014-12-02 19:36:38 -05:00
muhammad-ammar
a493348cf0 Remove ability to add new ORA 1 problems to courses 
TNL-827
 2014-11-24 11:31:59 +00:00
John Eskew
46cd9b0ad9 Add bulk_operations wrapper around all course-query-intensive Studio views. 2014-09-24 19:23:00 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:10 -04:00
Don Mitchell
1db107c2ce Add memoization for has_changes 2014-08-29 14:09:41 -04:00
Don Mitchell
ee8fc41b62 compute_publish_state -> has_published_version 
LMS-11213
 2014-08-27 11:48:10 -04:00
Ben McMorran
f3070e6796 Reduce mongo calls on course outline and container pages 2014-08-07 12:27:38 -04:00
Tim Babych
8d0e469cd3 Remove code and template responsible for subsection edit page 2014-08-07 12:27:25 -04:00
Daniel Friedman
529672ac0c Reduce calls to expensive methods in create_xblock_info 
Special-case the outline page requests.

STUD-1997
 2014-08-07 12:27:16 -04:00
Daniel Friedman
2118453e00 Include edited/published_by for container page only 2014-08-07 12:27:15 -04:00
cahrens
6d82cf09a4 Correct publish titles, code review feedback. 2014-08-07 12:27:14 -04:00
Andy Armstrong
ef581e1146 Apply code review comments and fix tests 2014-08-07 12:27:14 -04:00
Andy Armstrong
a359065329 Integrate visual styling into the course outline 2014-08-07 12:27:13 -04:00
cahrens
d447c07540 Support staff locking on the unit page 
STUD-1873
 2014-08-07 12:16:22 -04:00
Andy Armstrong
f061bbc08b Backbone version of the course outline page 
STUD-1726
 2014-08-07 12:16:20 -04:00
Ben McMorran
d40ef5e089 Adds warning when editing a container visible to students 
styling for editing a live unit
 2014-08-07 12:16:18 -04:00
Andy Armstrong
d65e887d1a New Publishing controls on Unit page. 
STUD-1707
 2014-08-07 12:16:17 -04:00
Andy Armstrong
b1eccdf2d4 Replace unit page with the container page. 
STUD-1754
 2014-08-07 12:16:17 -04:00
David Adams
9e45e8f982 Refactor ADVANCED_COMPONENT_TYPES 
Modified to a setting in CMS common.py and aws.py
    Also factored out are: ADVANCED_PROBLEM_TYPES

    This enables third parties to add XBlocks to their system
    without having to make a code change.

    Code also added to ensure that a component should exist in both
    ADVANCED_COMPONENT_TYPES and the course advanced module list
    in order for it to be enabled in the course.
 2014-08-04 12:17:45 -07:00
Ben McMorran
2cc72ca015 Show category when an xblock does not have a default display name 2014-07-30 10:30:18 -04:00
swdanielli
3f1e9993f5 recommender prototype 2014-07-17 11:21:01 -04:00
Mat Peterson
df1a9304c1 Made fill_in_run public in mongo and added fill_in_run to mixed which funnels to mongo 2014-07-11 15:40:09 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Tim Babych
34ac6abe1c Merge pull request #4316 from edx/anton/group-experiments 
BLD-1117, BLD-1217: Add read-only list of Group Configurations, Create feature flag.
 2014-07-07 20:03:43 +03:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
Calen Pennington
1c882da397 Make Studio able to handle deprecated key formats in urls 2014-06-30 14:29:10 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
Andy Armstrong
6704d59db0 Allow xblocks to be added as advanced problem types 2014-06-13 17:51:46 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
Piotr Mitros
16078ba8a7 Added completion and audio XBlocks 2014-06-03 11:17:24 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Don Mitchell
9d2db736df Merge pull request #3869 from edx/dhm/bug_get_children 
Redirect most studio access through draft modulestore
 2014-05-27 11:57:15 -04:00
Don Mitchell
1be1283f26 Redirect most studio access through draft modulestore 
rather than have caller figure out whether to call draft or direct.
Fixes get_children to always find draft children in studio.
STUD-1662
 2014-05-27 11:16:29 -04:00
louyihua
559a2c8888 i18n: Make XBlock buttons & components have localizable display names 
1. Current code uses type name as the display names for XBlock buttons, so the name of these five buttons can't be localized. This fix contains code that adds a 'display_name' field for the buttons, and makes their names localizable.
2. The display names of components in advanced, html and problem types can be localized now.
 2014-05-27 11:16:54 +08:00
Sarina Canelake
dd8d8fc5dd Merge pull request #3831 from lduarte1991/lduarte-harvardx-image 
Installing Image Annotation Tool for Upcoming June 2014 Course
 2014-05-23 15:40:39 -04:00
cahrens
94f050c418 Show the menus at the top of the page. 2014-05-23 15:32:27 -04:00
lduarte1991
0318c95537 Image Annotation Tool Fixes 
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
 2014-05-23 14:58:18 -04:00
Calen Pennington
35083ad9f9 Fix bad uses of course_id/location/locator in new code on master 2014-05-22 16:24:02 -04:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
Calen Pennington
0d88379eeb Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds all of cms.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-07 12:56:43 -04:00
Andy Armstrong
a3e26e6824 Implement next round of code reviews 2014-04-09 12:15:38 -04:00
Andy Armstrong
dce075a852 Changes based upon code review comments 2014-04-09 10:32:12 -04:00