Diana Huang
f500958439
More fixes for the merge and some display updates.
2013-01-18 13:52:50 -05:00
cahrens
700b0f14fd
Need path to tiny mce JS file now.
2013-01-18 10:48:42 -05:00
Chris Dodge
575ff02f8a
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
...
Conflicts:
jenkins/test.sh
2013-01-18 10:26:44 -05:00
Brian Talbot
d2f79f10f0
studio - synced LMS common content styles with HTML component display/edit rendering styles
2013-01-18 09:59:08 -05:00
Diana Huang
2e791043e8
Merge branch 'master' into diana/open-ended-ui-updates
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
common/lib/xmodule/xmodule/open_ended_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
2013-01-18 09:21:38 -05:00
Diana Huang
481580c702
Remove hints from self-assessment and misc display fixes
2013-01-18 08:48:50 -05:00
chrisndodge
031e79ec24
Merge pull request #1310 from MITx/fix/cdodge/discussion-fixes
...
only cache discussion forum info for 5 minutes before flushing. This is ...
2013-01-17 20:59:27 -08:00
Chris Dodge
c6276c8394
only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata
2013-01-17 23:58:07 -05:00
Carlos Andrés Rocha
ef69b738c9
Sort courses announcement date
...
If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.
If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.
2013-01-17 21:46:58 -05:00
Brian Talbot
70457176f1
studio - stubbed in basic LMS styling to HTML displaygst
2013-01-17 21:28:14 -05:00
cahrens
a4196ffa00
Relative path seems to work.
2013-01-17 21:15:38 -05:00
cahrens
8cca193903
Add a comment.
2013-01-17 21:06:05 -05:00
cahrens
a1bb533b60
Workaround for sandbox.
2013-01-17 21:04:17 -05:00
Chris Dodge
44cfcb88a3
Merge branch 'master' into feature/cdodge/cms-master-merge4
2013-01-17 20:30:22 -05:00
Chris Dodge
0e2d8be442
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
2013-01-17 20:29:41 -05:00
Vik Paruchuri
18dc59c93a
Error message fix
2013-01-17 17:18:10 -05:00
Vik Paruchuri
eaa6701c6f
Remove mitxmako dependencies, make rubric and oechild inherit fro object
2013-01-17 17:13:31 -05:00
David Ormsbee
18d5792025
Merge pull request #1302 from MITx/bugfix/brian/pearson-reg
...
Bugfix/brian/pearson reg
2013-01-17 11:42:00 -08:00
Diana Huang
87990b36f4
Rubric sizing tweaks and text improvements.
2013-01-17 14:35:49 -05:00
cahrens
77865f7ab2
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-17 14:22:18 -05:00
Diana Huang
7171e6b7cc
Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates
2013-01-17 14:02:00 -05:00
Diana Huang
18a3d5e734
Merge branch 'master' into feature/diana/rubric-input
2013-01-17 14:00:43 -05:00
Diana Huang
3646ff53d8
Display updates and fixes.
2013-01-17 14:00:02 -05:00
cahrens
5f05ec83f1
Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.
2013-01-17 13:11:47 -05:00
Chris Dodge
fe964ec8ba
disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate
2013-01-17 13:11:16 -05:00
Chris Dodge
45bb511e15
remove obsolete test (per Vik)
2013-01-17 12:06:21 -05:00
Diana Huang
2b4e9f45b9
Updates to the CSS and html formatting for statuses
...
and self-assessment
2013-01-17 11:34:44 -05:00
cahrens
b6fcf3a51e
Some refactoring from Brian's submission.
2013-01-17 10:36:04 -05:00
Brian Wilson
80b2f45ac5
move pearson_import to another branch
2013-01-17 10:14:55 -05:00
Diana Huang
280a2f290e
Merge branch 'master' into diana/open-ended-ui-updates
2013-01-17 10:09:16 -05:00
Diana Huang
df8d088492
Display updates to the xmodule.
2013-01-17 09:44:47 -05:00
Diana Huang
589e848fd4
Pass along the correct display name to the controller
2013-01-17 09:44:13 -05:00
Chris Dodge
48cbf38a41
resolve merge conflicts
2013-01-17 09:36:09 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
chrisndodge
358c56da9e
Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes
...
Fix/cdodge/filesystem xml fixes
2013-01-17 05:55:22 -08:00
Alexander Kryklia
176be15998
removed unnecssary debug information
2013-01-17 14:25:28 +02:00
Alexander Kryklia
f22af62f2c
removed jstat, added javascript_loader
2013-01-17 14:22:13 +02:00
Alexander Kryklia
1d36e7baf9
now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first
2013-01-17 14:21:52 +02:00
Brian Wilson
4a59125bf9
add pearson import confirmation tool
2013-01-16 17:51:31 -05:00
Brian Wilson
fea6feb04f
Strip whitespace off of registration demographics before validation
2013-01-16 17:39:33 -05:00
Brian Talbot
db7443ce7c
studio html editor - added in visual assets needed for previous UI syncing
2013-01-16 16:56:22 -05:00
Brian Talbot
f34fd5c426
studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js
2013-01-16 16:55:11 -05:00
Brian Wilson
e68e612ee1
Return 404 in begin_exam_registration when course or exam are not valid
2013-01-16 16:40:28 -05:00
Diana Huang
9079c66a32
Some interface cleanup stuff for the combined open ended module.
2013-01-16 16:35:58 -05:00
Brian Wilson
1de67be788
clear upload_status if user makes changes to TestCenterUser or TestCenterRegistration (so the change is pending, rather than rejected)
2013-01-16 15:43:15 -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
Brian Talbot
e8ba078d4e
studio HTML editor - codemirror/tinymce toggle work - wip
2013-01-16 14:54:28 -05:00
Diana Huang
db366d4ebb
Update CSS to make rubric even narrower.
2013-01-16 14:36:08 -05:00
Brian Wilson
1d6b1be888
fix missing indirection in log message
2013-01-16 14:30:30 -05:00
cahrens
cc5a5e2996
Fix multiple choice checkbox.
...
#117
2013-01-16 12:52:05 -05:00
