cahrens
|
044a8a5cf6
|
CodeMirror.
|
2013-02-11 12:37:31 -05:00 |
|
cahrens
|
039160f50c
|
Beginning of CodeMirror.
|
2013-02-11 11:20:14 -05:00 |
|
cahrens
|
ac732f6b07
|
Beginnings of feedback regarding unsaved and saved changes.
|
2013-02-08 17:19:19 -05:00 |
|
Don Mitchell
|
09e8628037
|
add editor to new entries and when key changes
|
2013-02-08 16:58:50 -05:00 |
|
Don Mitchell
|
5254af2918
|
Letting render do its thing. The wrap confused the this pointer.
|
2013-02-08 15:36:42 -05:00 |
|
cahrens
|
4718c9a51a
|
Forgot to define self when I moved code.
|
2013-02-08 11:17:02 -05:00 |
|
cahrens
|
950f5de3ca
|
Move getSession() call out of render method to avoid crash on Chrome.
|
2013-02-08 08:26:24 -05:00 |
|
cahrens
|
287715c6ff
|
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
|
2013-02-07 13:05:52 -05:00 |
|
cahrens
|
c907cf756c
|
Add ACE Editors.
|
2013-02-07 13:05:39 -05:00 |
|
Don Mitchell
|
277bd0dba6
|
Documentation update
|
2013-02-07 09:50:16 -05:00 |
|
Don Mitchell
|
1e68834e03
|
Remove from to-be-deleted list any readded keys w/ same name.
|
2013-02-06 17:42:00 -05:00 |
|
Don Mitchell
|
253bc10d9f
|
did other test cleanups which Christina mentioned (should have read the
note first)
|
2013-02-06 17:31:17 -05:00 |
|
Don Mitchell
|
7b3c81ca53
|
blacklist violations now properly trigger violation error
delete keys only after save completes
|
2013-02-06 17:25:12 -05:00 |
|
Don Mitchell
|
7668c70f62
|
Update test now updates existing attrs
|
2013-02-06 17:01:00 -05:00 |
|
cahrens
|
3f15b3b8ff
|
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
|
2013-02-06 15:29:36 -05:00 |
|
cahrens
|
c243eec604
|
Move to view file.
|
2013-02-06 15:29:17 -05:00 |
|
Brian Talbot
|
d8a6010d0f
|
studio - manual policy editor: added in example messages for confirm, error, warning
|
2013-02-06 15:13:44 -05:00 |
|
Brian Talbot
|
571e1106a4
|
studio - manual policy editor: styled error states to appear inline with row actions visually
|
2013-02-06 14:57:18 -05:00 |
|
Don Mitchell
|
8f18522d58
|
Unit tests for edit metadata
|
2013-02-06 12:01:22 -05:00 |
|
cahrens
|
08ce212bd5
|
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
Conflicts:
cms/static/js/models/settings/advanced.js
|
2013-02-06 10:35:12 -05:00 |
|
Don Mitchell
|
1cc62fae75
|
Catch null pointer for uninitialized dates
|
2013-02-06 10:23:29 -05:00 |
|
Don Mitchell
|
4ba7de3402
|
Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy
|
2013-02-06 09:56:19 -05:00 |
|
cahrens
|
8093de1d93
|
Set size of ACE Editor.
|
2013-02-06 09:49:27 -05:00 |
|
Don Mitchell
|
05ec0c11c6
|
Oops, when i alphabetized i got the value incorrectly.
Fixed cancel to not retain new entries.
|
2013-02-06 09:08:28 -05:00 |
|
Diana Huang
|
95d3957377
|
Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule
Patch peer grading tab to work
|
2013-02-06 06:07:18 -08:00 |
|
Don Mitchell
|
592d7e532b
|
Keys are sorted now
|
2013-02-06 08:58:20 -05:00 |
|
David Ormsbee
|
92f2149daa
|
Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph
Allow policy.json to disable progress graph
|
2013-02-06 05:48:03 -08:00 |
|
ichuang
|
6a7e30e331
|
add doc about disable_progress_graph
|
2013-02-06 04:01:28 +00:00 |
|
ichuang
|
0936f448fc
|
add disable_progress_graph key to course metadata
|
2013-02-06 03:45:10 +00:00 |
|
Don Mitchell
|
5275db9ab9
|
Cancel kind of works (reverts but leaves in new fields :-( )
Filter out system metadata fields
|
2013-02-05 19:17:43 -05:00 |
|
Victor Shnayder
|
6b468df57d
|
Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes
Revert "Fix permissions bug and add test cases for django comment client...
|
2013-02-05 15:54:25 -08:00 |
|
David Ormsbee
|
a3a886bd0f
|
Revert "Add tests for django-comment-client models" (which actually had
a model change as well)
This reverts commit 053547453e.
|
2013-02-05 18:51:16 -05:00 |
|
David Ormsbee
|
119b4206a4
|
Revert "Fix permissions bug and add test cases for django comment client permissions."
This reverts commit e745087455.
|
2013-02-05 18:42:01 -05:00 |
|
Don Mitchell
|
74d37327b2
|
Also this
|
2013-02-05 17:21:49 -05:00 |
|
Don Mitchell
|
8f16d639b7
|
CRUD on policy fields w/ some validation
|
2013-02-05 17:21:02 -05:00 |
|
Christina Roberts
|
3222e083eb
|
Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix
Fix bug where we imported two functions w/ the same name
|
2013-02-05 13:36:56 -08:00 |
|
Christina Roberts
|
0d8cfb9baa
|
Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404
change from throwing a Http404 exception, which I believe will try to re...
|
2013-02-05 13:36:28 -08:00 |
|
Vik Paruchuri
|
0133c7c669
|
Patch peer grading tab to work
|
2013-02-05 16:32:40 -05:00 |
|
David Ormsbee
|
b68aff72f2
|
Merge pull request #1436 from MITx/debug/dave/sass
undo pipeline changes
|
2013-02-05 13:26:22 -08:00 |
|
Chris Dodge
|
3fa1fe0cd6
|
change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404.
|
2013-02-05 16:26:07 -05:00 |
|
David Ormsbee
|
1ef9d6388f
|
re-add compression flag to sass
|
2013-02-05 16:25:59 -05:00 |
|
David Ormsbee
|
706a1072b9
|
undo pipeline changes
|
2013-02-05 16:24:53 -05:00 |
|
Calen Pennington
|
8360a7a7f5
|
Fix bug where we imported two functions w/ the same name
|
2013-02-05 16:23:10 -05:00 |
|
Christina Roberts
|
8c4b661292
|
Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote
studio - resolved HTML display issue with bold and blockquote
|
2013-02-05 13:13:44 -08:00 |
|
Diana Huang
|
120aa3cd3b
|
Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule
Feature/vik/peer grading xmodule
|
2013-02-05 12:55:48 -08:00 |
|
Brian Talbot
|
d713b288b5
|
studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style
|
2013-02-05 15:21:41 -05:00 |
|
Vik Paruchuri
|
ce87e6f221
|
Skip two tests
|
2013-02-05 14:57:59 -05:00 |
|
Vik Paruchuri
|
cae65706fd
|
Pare down on peer grading service
|
2013-02-05 14:37:08 -05:00 |
|
Vik Paruchuri
|
8027cc7024
|
Fix some issues with tests
|
2013-02-05 14:35:44 -05:00 |
|
Vik Paruchuri
|
134f2f7af7
|
Fix tests, bugfix for problem url error
|
2013-02-05 14:21:08 -05:00 |
|