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
Diana Huang
8a0dae01f0
Add in some sorting and validation of the options list
2012-12-18 14:32:10 -05:00
Don Mitchell
fc2b6f034b
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-18 14:29:10 -05:00
Don Mitchell
0192a04b20
Fixed course_info parsing bug.
...
Addressed some of Christina's review comments.
2012-12-18 14:28:53 -05:00
chrisndodge
a34b42b8d2
Merge pull request #1174 from MITx/bug/btalbot/cms-userstab
...
cms - added users tab back into course navigation
2012-12-18 10:19:30 -08:00
Don Mitchell
dd758c06f7
Merge pull request #1175 from MITx/fix/cdodge/initializing-tabs
...
initialize the tabs metadata on course if we go to the edit-tabs page. T...
2012-12-18 10:13:35 -08: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
Diana Huang
dfe438dc73
Initial work on the rubric input type including the most basic parsing
...
without error handling
2012-12-18 13:02:17 -05:00
Brian Talbot
af5d007a8f
cms - added users tab back into course navigation
2012-12-18 12:50:04 -05:00
Don Mitchell
5709ff34f5
Refactored videos to a much simpler impl b/c about videos don't have
...
speeds and don't use the video/default.yaml format.
2012-12-18 12:46:54 -05:00
David Ormsbee
1b8dfadc8e
Merge pull request #1173 from MITx/feature/jarv/pin-mitx-versions
...
pinning versions to what is currently on stage
2012-12-18 08:01:51 -08:00
Brian Wilson
c7d379beb6
add first pass at wiring test registration dialog
2012-12-18 03:20:02 -05:00
John Jarvis
c7a00cd2ba
pinning versions to what is currently on stage
2012-12-17 19:07:23 -05:00
Brian Wilson
b2117c1194
first dialogs
2012-12-17 17:59:44 -05:00
Don Mitchell
b74c542902
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into bug/dhm/dec12
2012-12-17 17:22:26 -05:00
Don Mitchell
598922b4cb
Dont' warn about name change on initial creation.
...
Fixed overview to save correctly (not overwrite w/ old value)
2012-12-17 17:22:08 -05:00
Don Mitchell
f7703dadee
Alert for assignment type name change referential integrity.
...
Fixed orphaned graders (manifested as url not defined)
To keep assignment type blur from spamming warnings, I made all blurs
check whether the data changed before doing any other behaviors.
2012-12-17 17:10:56 -05:00
David Ormsbee
0ddea6d0ae
Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx
...
Feature/alex/video timeframe mitx
2012-12-17 13:20:47 -08:00
Calen Pennington
8b3c408d14
Merge pull request #1171 from MITx/fix/zoldak/common-coveragerc
...
Exclude settings.py files from coverage reports and configure titles for...
2012-12-17 12:09:29 -08:00
Jay Zoldak
cc54c37359
Exclude settings.py files from coverage reports and configure titles for the reports.
2012-12-17 15:00:11 -05:00
David Ormsbee
91c73fc034
Merge pull request #1170 from MITx/bugfix/dave/requests_version
...
Our code breaks on requests >= 1.0, so locking in a version for dev
2012-12-17 10:44:36 -08:00
David Ormsbee
eba4629f59
Our code breaks on requests >= 1.0, so locking in a version for dev
2012-12-17 13:35:33 -05:00
chrisndodge
c407012f2d
Merge pull request #1168 from MITx/bug/dhm/dec12
...
Import default grading_policy was setting it to a unicode empty string
2012-12-17 10:17:23 -08:00
chrisndodge
288e1ec9c2
Merge pull request #1169 from MITx/fix/cdodge/course-id-on-mongo-system
...
pin requests to a known version, as we believe there's been an upgrade w...
2012-12-17 10:00:04 -08:00
Chris Dodge
02b0f011a5
pin requests to a known version, as we believe there's been an upgrade which is incompatible to our usage
2012-12-17 12:58:34 -05:00
Calen Pennington
c546c36858
Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine
...
Do not copy already compiled coffee to js files from xmodule video and a...
2012-12-17 09:39:43 -08:00
Don Mitchell
e2526a37d3
Import default grading_policy was setting it to a unicode empty string
...
rather than an empty dict and thus screwing up later updates.
2012-12-17 11:50:40 -05:00
chrisndodge
c74be27a91
Merge pull request #1167 from MITx/fix/cdodge/course-id-on-mongo-system
...
fix crash of custom tags when running against Mongo datastores. Mongo's ...
2012-12-17 07:50:06 -08:00
Chris Dodge
d18f42224c
fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store
2012-12-17 10:41:54 -05:00
chrisndodge
39d292a058
Merge pull request #1166 from MITx/bug/dhm/dec12
...
Fixed course info bug (and simplified parsing). Incidentally fixed 2
2012-12-15 14:03:58 -08:00
Don Mitchell
7223c8ce13
Found cut/paste error which was causing intermittent bug due to
...
overloaded template name.
2012-12-15 16:36:23 -05:00
Don Mitchell
521fa938b3
Fixed course info bug (and simplified parsing). Incidentally fixed 2
...
other course info bugs (not editing/deleting right element if > 10,
putting new elements at end rather than beginning of list).
Made Location more robust against parsing errors.
2012-12-15 15:56:51 -05:00
Chris Dodge
f5d07b1521
just tickle a file to for build cms-master. I dont seem to have the rights to force a jenkins build.
2012-12-15 15:15:45 -05:00
chrisndodge
368abbe669
Merge pull request #1165 from MITx/bug/btalbot/pullrequest1160-untangling
...
cms pull request 1160 - CSS resolutions
2012-12-15 11:50:07 -08:00
Brian Talbot
2ee488733c
cms pull request 1160 - brought back all css changes lost in this request - mostly overview related
2012-12-15 00:25:29 -05:00
Don Mitchell
2a353068ab
Merge pull request #1163 from MITx/feature/christina/misc
...
Feature/christina/misc
2012-12-14 14:29:53 -08: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
Christina Roberts
dbd9ac6e59
Merge pull request #1162 from MITx/fix/cdodge/security-holes
...
add some permissions asserting
2012-12-14 13:37:12 -08:00
chrisndodge
9d2062875f
Merge pull request #1161 from MITx/bug/btalbot/cms-pagestext
...
pages - made intro text visible again and styled it some
2012-12-14 13:29:07 -08:00
cahrens
e3b302f5fe
Merge branch 'feature/cale/cms-master' into feature/christina/misc
2012-12-14 16:28:50 -05:00
Chris Dodge
ab9b208605
add some permissions asserting
2012-12-14 16:26:15 -05:00
cahrens
808cf8c692
Some JavaScript cleanup (also addresses Studio #60 ).
2012-12-14 16:24:01 -05:00
Tom Giannattasio
f3067cd8c8
restyling of dashboard with pearson exam notifications
2012-12-14 16:17:03 -05:00
Brian Talbot
7d1a08d481
pages - made intro text visible again and styled it some
2012-12-14 16:15:01 -05:00
chrisndodge
795b38f0fb
Merge pull request #1159 from MITx/bug/btalbot/cms-tooltips
...
tooltips - removed bad js reference and added in unit tooltips
2012-12-14 12:22:01 -08:00
Don Mitchell
0b762fa35f
Remove ability to set gradability at the section level (commented out
...
until we decide the inheritance)
Remove Policy from subsection editor
Commented out Graded as: _____ from subsection settings
Fix menu dismissa
Fix ambiguous selection
2012-12-14 15:19:14 -05:00
Brian Talbot
e4f4f32c1b
tooltips - removed duplicate/incorrect tooltip_manager.js reference in base.html and added tooltips to unit actions
2012-12-14 15:18:45 -05:00
Don Mitchell
0fc16dffee
Gradable impl'd for overview page
2012-12-14 12:29:57 -05:00
chrisndodge
fbffe13d53
Merge pull request #1157 from MITx/bug/btalbot/cms-editingui
...
Course Info and Settings Editor UI Bug Fixes
2012-12-14 09:02:27 -08:00
