Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

262 Commits

Author SHA1 Message Date
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
Chris Dodge
4f67c6c052 quick hack to give some protection from unauthorized users from making new courses. Make it so only is_staff people see the 'Create New Course' button. 2013-02-10 16:17:08 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Jay Zoldak
fde6d1ba1c Refactor tests for cms contentstore. 2013-02-06 10:42:21 -05:00
Calen Pennington
8360a7a7f5 Fix bug where we imported two functions w/ the same name 2013-02-05 16:23:10 -05:00
Calen Pennington
401f564e6a Fix data directory passed to replace_static_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Don Mitchell
1595bd9b0e Move dnd code from base.js to a js file only loaded by overview.html 2013-02-01 17:20:58 -05:00
Don Mitchell
756a071634 misspelled request (altho as an unused identifier) 2013-01-30 17:08:21 -05:00
Don Mitchell
85faab1dc6 Swallow event calls to squash 404 errors (and remove an unused var in 
another function)
 2013-01-30 15:18:51 -05:00
Chris Dodge
7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability 2013-01-30 11:50:11 -05:00
Chris Dodge
e5115953ad rework redorder tabs so that we account for the fact that static tabs can be in any arbitrary order (with respect to non-static tabs) when working with an imported course 2013-01-30 11:36:28 -05:00
Chris Dodge
855c8bb7e7 add unit test for tab reordering 2013-01-29 13:44:42 -05:00
Chris Dodge
28a2dd9a18 support reordering of static tabs in studio 2013-01-28 16:33:28 -05:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
 2013-01-16 15:40:14 -05:00
chrisndodge
fdba0e48dc Merge pull request #1270 from MITx/bug/dhm/jan13 
Fixed bug 114: randomized problems never right b/c state not preserved
 2013-01-14 06:21:47 -08:00
Don Mitchell
208ed0a438 Fixed bug 114: randomized problems never right b/c state not preserved 
on server
 2013-01-11 16:48:19 -05:00
Chris Dodge
9479ef3c84 fix up call signatures for get_parent_locations() 2013-01-11 14:29:53 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware 
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
 2013-01-10 13:55:46 -05:00
chrisndodge
ee9b9d0422 Merge pull request #1249 from MITx/feature/cas/speed-editor 
Feature/cas/speed editor
 2013-01-09 17:52:46 -08:00
Don Mitchell
2019c9d037 Bug 107 2013-01-09 09:47:43 -05:00
cahrens
d53669fcb9 Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor 2013-01-09 09:41:35 -05:00
Don Mitchell
83b7997d12 Added unit tests and generalized a catch 2013-01-08 16:43:42 -05:00
Don Mitchell
6e2b4a07d8 Added is_empty to model presented to unit.html 2013-01-08 11:18:57 -05:00
Chris Dodge
c7d81cc425 be sure to return an instance of the class 2013-01-07 16:28:30 -05:00
Don Mitchell
12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can 
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
 2013-01-07 10:55:10 -05:00
Chris Dodge
7a4d89b1ad add in static asset link rewriting to the Course Handout section 2012-12-28 11:34:45 -05:00
Chris Dodge
239b118abe add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup. 2012-12-27 15:31:12 -05:00
Chris Dodge
8e5fc2917a Merge branch 'feature/btalbot/cms-export' into feature/cdodge/export 2012-12-27 14:43:36 -05:00
Don Mitchell
a35c1386f2 Bug 99: don't show date as 'Unset' but leave out altogether if not set 
plus commented out failing unit tests until I can get someone to help
debug them.
 2012-12-26 11:30:31 -05:00
Brian Talbot
ed3f3b02d6 studio - course export UI alpha - roughing in states/views 2012-12-26 09:10:05 -05:00
Don Mitchell
e37180e074 Generalized the grader drop down and applied to edit_subsection 2012-12-19 17:31:06 -05:00
Don Mitchell
b689d19bec Ensure empty video string deletes the video record and doesn't create 
a partial descriptor. 
Use 400 not the contrived 515 for malformed html.
 2012-12-19 11:11:14 -05:00
Don Mitchell
b5fd6c9012 Send back error to client if failed to save malformed update and have it 
show an alert.
 2012-12-18 15:22:07 -05:00
Chris Dodge
2ae2e46880 initialize the tabs metadata on course if we go to the edit-tabs page. This will prevent the author from getting into a bad state in the LMS 2012-12-18 13:08:21 -05:00
Christina Roberts
e57b5b1431 Merge pull request #1160 from MITx/feature/btalbot/cms-gradable 
Overview page allows user to specify grading policy per subsection
 2012-12-14 14:09:28 -08:00
Don Mitchell
ac7b0334a6 Code review changes. 2012-12-14 16:51:40 -05:00
Chris Dodge
ab9b208605 add some permissions asserting 2012-12-14 16:26:15 -05:00
Don Mitchell
e0849e8b5a Cache to debug other branch 2012-12-13 16:34:58 -05:00
Brian Talbot
69c26a08e3 settings/style - general UI clean up - wip 2012-12-13 13:06:56 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
5ea5a7c0a7 It works!!! 2012-12-10 18:55:35 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
Christina Roberts
6acae5b440 Show error if organization name has invalid characters 2012-12-10 15:19:34 -05:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Don Mitchell
50d7e6160e Move models from common to cms. 
Add unit tests.
 2012-12-03 12:20:15 -05:00
Don Mitchell
8379e3038d Moved settings models from common to cms 2012-11-30 10:42:23 -05:00
Don Mitchell
111e8521db Hopefully the course-info changes I had made w/o link destruction 2012-11-30 10:40:19 -05:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00