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

4005 Commits

Author SHA1 Message Date
Jay Zoldak
b6e82afb0e Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests 
Fix/will/fix broken jasmine lms tests
 2013-03-18 11:53:22 -07:00
Brian Talbot
16f9f6ef4f studio - tender widget: added initial reference and behavior 2013-03-18 13:15:01 -04:00
Chris Dodge
651465f1ad add HTML templates for 404/500 errors 2013-03-18 12:56:17 -04:00
Calen Pennington
a4f10bfdaf Small pylint cleanup 2013-03-18 12:45:46 -04:00
Brian Talbot
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Chris Dodge
2b677544a5 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio 2013-03-18 09:39:47 -04:00
Chris Dodge
9a18685c1c add a discussion module write through cache to speed up Forum rendering 2013-03-18 09:01:54 -04:00
Brian Talbot
a1ba97376a studio - sass cleanup: further revisions and box-sizing all elements for consistency 2013-03-16 12:18:35 -04:00
Chris Dodge
b54ebb3460 make discussion module use MetadataOnlyEditingDescriptor which will not present a code edit region and only display the metadata editor 2013-03-15 22:43:20 -04:00
Brian Talbot
06b118ae33 studio - sass cleanup: resolved static pages display issue after local merge master 2013-03-15 15:23:03 -04:00
Brian Talbot
84a5475d5a studio - sass cleanup: resolving conflicts with local master merge 2013-03-15 12:42:33 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
fd3ba7db2a Don't make cms.djangoapps a python module 2013-03-15 10:50:46 -04:00
Brian Talbot
1aa8786b53 studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently 2013-03-14 19:07:03 -04:00
Brian Talbot
97b44446a0 studio - checklists: added animation to collapse/expand toggle 2013-03-14 16:30:48 -04:00
Brian Talbot
13c38fa173 studio - checklists: revised input/label HTML and adjusted styling for each 2013-03-14 16:17:47 -04:00
Chris Dodge
d2f216615f move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled 2013-03-14 13:57:48 -04:00
cahrens
ac25b02ce6 Minor updates. 2013-03-14 13:48:17 -04:00
cahrens
9a7b0fb563 Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 
Conflicts:
	cms/templates/checklists.html
 2013-03-14 13:47:55 -04:00
Vik Paruchuri
10eb7e45ea Add in some docs 2013-03-14 13:42:41 -04:00
cahrens
017fd06bfc Pre-merge. 2013-03-14 13:37:22 -04:00
Vik Paruchuri
a717dffd48 Remove debug statements 2013-03-14 13:31:30 -04:00
Vik Paruchuri
4c8a45f85e Code to add in an open ended tab automatically 2013-03-14 13:29:26 -04:00
Brian Talbot
0aea85a4d9 studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators 2013-03-14 12:55:44 -04:00
cahrens
564374048e A little cleanup. 2013-03-14 09:35:26 -04:00
cahrens
065e850449 Merge with Brian's changes. 2013-03-14 09:32:54 -04:00
cahrens
e0207432ca Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists 2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1 Saving work. 2013-03-14 09:22:58 -04:00
Brian Talbot
1fce77d8b2 Merge branch 'master' into feature/btalbot/studio-checklists 2013-03-13 19:19:38 -04:00
Brian Talbot
7b74d972a1 studio - checklists: defaulting checklist visual progress to 0% 2013-03-13 19:18:47 -04:00
Brian Talbot
16f6744aef studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states 2013-03-13 19:13:26 -04:00
Chris Dodge
413aeed1b3 use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates) 2013-03-13 15:33:15 -04:00
Brian Talbot
bf71f099d4 studio - checklists: finished static styling, initial checklist content import, and some basic JS 2013-03-13 14:09:18 -04:00
Calen Pennington
531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.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/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-13 12:18:04 -04:00
Brian Talbot
66a8735a58 studio - Checklists: initial design and front end proofing/firming up - WIP 2013-03-13 10:50:34 -04:00
Brian Talbot
1b5f040021 studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI 2013-03-12 21:57:40 -04:00
Brian Talbot
36746fb729 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-12 16:05:54 -04:00
Brian Talbot
13a7e905f3 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-12 16:02:42 -04:00
Chris Dodge
e5ee0a77ed hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection 2013-03-12 15:24:10 -04:00
Don Mitchell
6922152165 Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge 
Advanced Settings changes.
 2013-03-12 09:13:16 -07:00
cahrens
eea5900591 Add in Mark's copy changes. 2013-03-12 11:15:50 -04:00
Calen Pennington
f6b4d3aa46 Make the markdown attribute default to None, to distinguish it from the empty string 2013-03-12 10:50:14 -04:00
Calen Pennington
1411fadd28 Fix access to children via definition 2013-03-12 10:41:10 -04:00
Calen Pennington
2a96c45677 Make default value for format setting None, and force lms and cms to be explicit about a string default 2013-03-12 10:16:14 -04:00
cahrens
bdf1b1b097 Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp-merge 2013-03-12 09:38:34 -04:00
cahrens
99f55266f5 Do not need to pass blacklist keys to client. 2013-03-12 09:27:46 -04:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
 2013-03-12 07:23:28 -04:00
Chris Dodge
bf0e5a2701 do a bunch of pylint improvements 2013-03-11 21:14:24 -04:00
cahrens
84f2137935 Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp 2013-03-11 16:57:07 -04:00
cahrens
7e8fcb85ff Updated Selenium test, deleted dead code related to Advanced Settings. 2013-03-11 16:56:24 -04:00