Victor Shnayder
1411bd1a88
fix tests--nosetests is overly excited about my code
2013-01-18 15:39:28 -05:00
Diana Huang
89055da8ba
Take out useless logging.
2013-01-18 15:38:59 -05:00
Diana Huang
0e3aeb4041
Merge branch 'master' into diana/fix-sa-tests
2013-01-18 15:21:50 -05:00
Don Mitchell
f10a5c4f83
Oops, forgot new class
2013-01-18 15:21:21 -05:00
Diana Huang
bd6d153126
Fix failing self-assessment unit tests
2013-01-18 15:18:13 -05:00
Deena Wang
1565cd5bd3
Test cases for lms/djangoapps/courseware/module_render in test_module_render
2013-01-18 14:44:17 -05:00
David Ormsbee
bdc55d3686
Merge pull request #1308 from MITx/feature/rocha/sort-by-announcement-date
...
Sort courses by announcement date
2013-01-18 11:20:18 -08:00
David Ormsbee
33093e2d7a
Merge pull request #1313 from MITx/feature/ichuang/fix-bug-in-idashboard
...
fix bug in instructor dashboard groups code
2013-01-18 11:17:30 -08:00
ichuang
6d73a399b1
fix bug in instructor dashboard groups code
2013-01-18 14:04:01 -05:00
Diana Huang
f500958439
More fixes for the merge and some display updates.
2013-01-18 13:52:50 -05:00
Your Name
b8e3cfcf96
added get_cohort_ids
2013-01-18 13:50:05 -05:00
Your Name
dba39e2431
add group support to lms
2013-01-18 12:50:25 -05:00
chrisndodge
381ede20e1
Merge pull request #1312 from MITx/feature/christina/misc
...
Need path to tiny mce JS file now.
2013-01-18 07:54:11 -08: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
Christina Roberts
b4de7fac26
Merge pull request #1311 from MITx/style/btalbot/cms-tinymce
...
studio - adding in LMS synced styles for TinyMCE WYSIWYG preview
2013-01-18 07:25:51 -08:00
Brian Talbot
72fc192f6e
studio - adding in LMS synced styles for TinyMCE WYSIWYG preview
2013-01-18 10:24:29 -05:00
Ashley Penney
aeee13ab91
Fix the virtualenv creation for Jenkins.
2013-01-18 10:01:21 -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
Christina Roberts
71e358d72b
Merge pull request #1305 from MITx/style/btalbot/cms-component-submenus
...
Removed editor type icon/text from all component sub menus except problem
2013-01-18 06:12:46 -08: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
chrisndodge
9753ff5677
Merge pull request #1307 from MITx/feature/christina/tiny-mce
...
Feature/christina/tiny mce
2013-01-17 18:18:25 -08: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
jmvt
bc268aa791
Merged to lastest master.
2013-01-17 17:39:12 -05:00
David Ormsbee
7ac36d2f43
Merge pull request #1306 from MITx/fix/vik/remove-mitxmako
...
Fix/vik/remove mitxmako
2013-01-17 14:19:23 -08: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
Don Mitchell
30c87be20f
Subsection drag between sections should work now.
2013-01-17 17:09:31 -05:00
Brian Talbot
5b82a68c18
studio - removing extra line/whitespace in sass
2013-01-17 17:06:07 -05:00
Brian Talbot
66a3e9621b
studio - removed editor type icon and text for all components except for problems
2013-01-17 17:04:28 -05:00
jarv
af086c2029
Merge pull request #1304 from MITx/mysql-python
...
Add MySQL-Python back in for AWS.
2013-01-17 12:56:20 -08:00
Ashley Penney
2d55f871ee
While this is a pain for content developer local environment updates it breaks the LMS in EC2 which is vastly more important. We'll jsut have to address helping individual content people with installing MySQL if needed. This is a real dependency in production and I think those belong in here.
2013-01-17 15:51:26 -05:00
chrisndodge
f64ffd2577
Merge pull request #1303 from MITx/feature/christina/tiny-mce
...
Feature/christina/tiny mce
2013-01-17 12:44:54 -08:00
marco
2b23c40345
minor tweaks to dropdown text and addition of dropdown menu (without data links) for intructor visilibility dropdown in main discussion forum;
2013-01-17 15:25:35 -05:00
Don Mitchell
ac09e18b9e
Now traps out of bounds as implying no change. Seems very slow.
2013-01-17 15:09:23 -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
John Jarvis
08b8a9f674
Better help message for the force-gen option
2013-01-17 14:36:08 -05: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
