cahrens
|
594d28a653
|
Pass default value through.
|
2013-05-06 16:03:41 -04:00 |
|
cahrens
|
c01410626f
|
Jasmine test for changedMetadata method.
|
2013-05-02 13:39:20 -04:00 |
|
cahrens
|
46100fd258
|
Cleanup.
|
2013-05-02 12:32:32 -04:00 |
|
cahrens
|
93f10ae8a0
|
Only save changed metadata fields.
|
2013-05-02 11:41:38 -04:00 |
|
cahrens
|
01ede40b03
|
Switching branches
|
2013-05-02 09:43:03 -04:00 |
|
cahrens
|
8705ff8805
|
Remove system_metadata_fields.
|
2013-04-29 16:41:07 -04:00 |
|
Steve Strassmann
|
8baddc0645
|
Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n
|
2013-04-24 10:41:09 -04:00 |
|
Steve Strassmann
|
6e34c668bb
|
introduce i18n
|
2013-04-17 11:30:29 -04:00 |
|
Christina Roberts
|
c455710cca
|
Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements
Fix/cdodge/studio forum improvements
|
2013-04-11 10:37:49 -07:00 |
|
cahrens
|
40adfa950d
|
Get the "Edit High Level Source" link back in. Broken with xblock work.
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
|
2013-04-10 14:53:26 -04:00 |
|
Chris Dodge
|
07b9d6353e
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
|
2013-04-10 09:26:51 -04:00 |
|
Brian Talbot
|
e3a1279c8f
|
studio - corrected a typo and adjusted copy on the help sock
|
2013-04-08 14:10:38 -04:00 |
|
Chris Dodge
|
5b7d882e3e
|
Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements
|
2013-04-06 11:02:21 -04:00 |
|
Christina Roberts
|
33d39a85a9
|
Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock
Studio Help Sock
|
2013-04-05 11:37:57 -07:00 |
|
Chris Dodge
|
f84eaf01b8
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
|
2013-04-05 13:20:02 -04:00 |
|
Mark L. Chang
|
2852256898
|
added dummy analytics object
|
2013-04-04 23:44:40 -04:00 |
|
Mark L. Chang
|
1c7e13e1e8
|
copy change
|
2013-04-04 11:54:37 -04:00 |
|
Mark L. Chang
|
64b7603d37
|
outline page event tracking
|
2013-04-04 01:51:14 -04:00 |
|
Mark L. Chang
|
8439013f64
|
studio: added segment.io tracking
|
2013-04-04 01:51:14 -04:00 |
|
Chris Dodge
|
b640866748
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
common/lib/xmodule/xmodule/x_module.py
|
2013-04-03 14:05:59 -04:00 |
|
Brian Talbot
|
65768e813b
|
resolving local merge conflict
|
2013-04-03 10:00:38 -04:00 |
|
Mark L. Chang
|
1d70509da1
|
fixed merge on env
|
2013-04-03 00:31:48 -04:00 |
|
Mark L. Chang
|
43f6f0ce8f
|
put survey behind MITX_FEATURES flag
|
2013-04-03 00:28:08 -04:00 |
|
Brian Talbot
|
6952b8e63b
|
studio - revising design, interaction, and FED of help sock
|
2013-04-02 15:37:49 -04:00 |
|
Brian Talbot
|
6042f80703
|
studio - syncing up class naming conventions for icons
|
2013-04-02 09:02:59 -04:00 |
|
Brian Talbot
|
f07da92ab8
|
studio - adding in content/links to studio sock
|
2013-04-01 16:59:46 -04:00 |
|
Brian Talbot
|
57e5eb683b
|
studio - basic design, interaction, and content for static in-page help
|
2013-04-01 16:54:56 -04:00 |
|
Chris Dodge
|
8fdeee06ed
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
cms/one_time_startup.py
common/lib/xmodule/xmodule/modulestore/mongo.py
|
2013-03-28 13:27:29 -04:00 |
|
Brian Talbot
|
c8ab45cc57
|
studio - footer help ui revamp - animation, structure, styling - WIP
|
2013-03-27 17:40:24 -04:00 |
|
Brian Talbot
|
756f75951d
|
studio - in progress work on help UI
|
2013-03-27 16:28:49 -04:00 |
|
Brian Talbot
|
3a4bdf19fb
|
studio - tweaking footer navigation for tender widget label
|
2013-03-27 12:26:49 -04:00 |
|
Brian Talbot
|
e3c646492c
|
studio - made provide feedback conditional for logged in users
|
2013-03-27 01:39:24 -04:00 |
|
Brian Talbot
|
74439746cc
|
studio - made provide feedback conditional for logged in users
|
2013-03-27 01:38:36 -04:00 |
|
Brian Talbot
|
6889b2015b
|
studio - added in revised footer styles and fix for smoothscroll
|
2013-03-27 01:24:31 -04:00 |
|
Brian Talbot
|
8a4047d5dd
|
studio - added smoothscroll to top of view and wired footer tender widget link
|
2013-03-26 12:48:51 -04:00 |
|
Brian Talbot
|
7c68508b85
|
studio - finalized tender widget styling
|
2013-03-26 12:42:30 -04:00 |
|
Brian Talbot
|
175e1b46e9
|
studio - in progress styling of tender help widget
|
2013-03-26 08:32:49 -04:00 |
|
Brian Talbot
|
66ba0f9b81
|
studio - resolving local merge with master
|
2013-03-25 15:21:25 -04:00 |
|
cahrens
|
be4045cb86
|
Reduce pep8 warnings, move Checklistst to top of menu.
|
2013-03-21 22:17:46 -04:00 |
|
cahrens
|
6d6e144c35
|
Urls working.
|
2013-03-20 16:37:08 -04:00 |
|
Brian Talbot
|
c901cecdea
|
studio - tender widget: added compromise of style given iframe and clunky DOM elements that tender is using. meh.
|
2013-03-18 16:23:30 -04:00 |
|
cahrens
|
49ee903eda
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
|
2013-03-18 15:30:19 -04:00 |
|
Brian Talbot
|
16f9f6ef4f
|
studio - tender widget: added initial reference and behavior
|
2013-03-18 13:15:01 -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 |
|
cahrens
|
54156b7ac1
|
Saving work.
|
2013-03-14 09:22:58 -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 |
|
Calen Pennington
|
93db5acc15
|
Make display_name defaulting explicit
|
2013-03-08 14:58:09 -05:00 |
|
Calen Pennington
|
af3c92c47e
|
Remove old cms templates
|
2013-03-06 17:28:25 -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 |
|
Christina Roberts
|
69ef622afd
|
Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor
Fix latex high-level source editor in current version of cms / studio
|
2013-02-28 10:02:09 -08:00 |
|