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

122 Commits

Author SHA1 Message Date
Andy Armstrong
f002ce4908 Changed unit identifier to be readonly, not disabled 
STUD-863
 2013-11-25 16:53:38 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -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
cahrens
16766a5ee9 Change delete_item to RESTful URL. 
Part of STUD-847.
 2013-11-06 13:49:24 -05:00
cahrens
12488db015 Get rid of course_index shim. 2013-10-24 11:35:02 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Brian Talbot
38b04f2a9e Studio: adds in older styling dependent class to unit <body> elem 2013-10-03 11:53:10 -04:00
chrisndodge
b76e7387aa Merge pull request #452 from edx/feature/cdodge/add-jump-to-substituions 
add a /jump_to_id/ shortcut for producing more durable links between cou...
 2013-07-23 12:15:31 -07:00
Brian Talbot
059450c0de Studio: revises HTML and styling around new unit ID on unit view 2013-07-23 12:10:49 -04:00
Chris Dodge
1c79b9c874 add a /jump_to_id/ shortcut for producing more durable links between courseware in Studio 2013-07-23 12:10:49 -04:00
Julian Arni
4f9a290a32 Link section to course outline 2013-07-22 14:26:47 -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
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Peter Fogg
70736c1da8 Remove tabs from unit.html for the third time. 2013-06-04 13:23:09 -04:00
Peter Fogg
bf88e5ce6a Be more explicit about template location. 2013-06-03 15:48:07 -04:00
Peter Fogg
8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. 2013-06-03 15:36:55 -04:00
Peter Fogg
ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. 2013-06-03 14:21:50 -04:00
Peter Fogg
457bd30c68 Make sure advanced component creation shows even a single template. 2013-06-03 10:26:52 -04:00
Peter Fogg
cce65ce9ae Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation 2013-06-03 09:15:52 -04:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Peter Fogg
68581610a4 Allow single-click creation of course components that only have one template. 2013-05-31 16:22:51 -04:00
Peter Fogg
6eeb12ad1c Add Lettuce tests for autoplay in Studio. 2013-05-30 11:34:15 -04:00
cahrens
f3bd9ab234 Get rid of empty, store ID. 2013-05-21 14:29:33 -04:00
cahrens
1c9ebbc9ef Put colon on Visibility back in. 2013-05-17 11:02:25 -04:00
marco
1f43fa163a internationalization stripped out 2013-05-17 10:29:24 -04:00
marco
29b7778461 initial i18n changes to unit.html, component.html, and the individual setting type template files 2013-05-16 17:17:43 -04:00
Brian Talbot
512e4fe3bd resolving local merge with master and sprucing style and templates for merge with master 2013-04-05 15:13:21 -04:00
Mark L. Chang
8fb6ce2eca added tracking to unit page and components 2013-04-04 01:51:15 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00
Brian Talbot
b4e6b792cf studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit 2013-03-22 12:01:58 -04:00
Brian Talbot
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -05:00
Brian Talbot
cbdf9ea25b studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling 2013-03-05 09:57:14 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Brian Talbot
8552b2d614 local merge with master - WIP 2013-03-01 15:47:23 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
Brian Talbot
d7bbfbc707 studio - alerts: basic layout and general alert styling WIP 2013-02-22 13:52:24 -05:00
Brian Talbot
22639adc63 studio - alerts WIP 2013-02-21 14:31:24 -05:00
cahrens
b49325009a Merge branch 'master' into feature/btalbot/studio-softlanding 2013-02-15 13:14:46 -05:00
Don Mitchell
18ecd11583 Only tabify the problems submenu. 2013-02-13 16:33:19 -05:00
Don Mitchell
62d389c853 Added empty metadata attribute instead of using name to determine which 
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
 2013-02-13 16:33:19 -05:00
marco
c238fc3d74 cleaned up css and advanced tab shows proper component list, also using jquery.ui.js 2013-02-13 16:33:19 -05:00
marco
9eb87e1eac final css tweaks prior to jquery bug resolution 2013-02-13 16:33:19 -05:00
marco
fc0a26ae74 styled header of problem component adding menu and made it only visible when you are in the problem menu 2013-02-13 16:33:19 -05:00
marco
a57e91ef47 revision of visual styling per product team feedback round 2013-02-13 16:33:18 -05:00
marco
3a3e0f6322 removed green entirely, increases size of fonts and buttons for adding of new components 2013-02-13 16:33:18 -05:00
marco
c09a50f54d draft styles for problem type header closer, need design consistency/standards review to proceed 2013-02-13 16:33:18 -05:00
marco
a147c66257 partial styles for problem type header, still work remains. 2013-02-13 16:33:18 -05:00