cahrens
|
1ae9e9bde3
|
Tests for opening action links.
|
2013-03-21 13:56:11 -04:00 |
|
Don Mitchell
|
e7727fcc6e
|
Pylint muting via docstrings and line wraps
|
2013-03-21 12:30:33 -04:00 |
|
cahrens
|
8ca6e324af
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/sass/base-style.scss
cms/urls.py
|
2013-03-21 12:23:13 -04:00 |
|
Christina Roberts
|
e8401cf2bb
|
Merge pull request #1643 from MITx/fix/btalbot/studio-sasscleanup
Studio Sass Cleanup
|
2013-03-21 08:45:48 -07:00 |
|
Don Mitchell
|
11c9028f52
|
Merge pull request #1712 from MITx/fix/cdodge/get-import-to-work-with-conditionals
import needs to enumerate through the fields for all content scopes. Als...
|
2013-03-21 08:44:16 -07:00 |
|
cahrens
|
f44989e516
|
Use Brian's open external method.
|
2013-03-21 11:17:31 -04:00 |
|
Don Mitchell
|
bc8c0b6db2
|
Added unit test for what broke the system, but won't catch such a
regression in future b/c the problem was persisting under one parser and
reading under another.
|
2013-03-21 11:09:55 -04:00 |
|
chrisndodge
|
37a673012f
|
Merge pull request #1701 from MITx/bug/orphan
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
|
2013-03-21 07:21:16 -07:00 |
|
Brian Talbot
|
67c6852b5c
|
studio - checklists: removing not needed sass variable for animating height
|
2013-03-21 10:01:39 -04:00 |
|
Don Mitchell
|
ae55cd7533
|
One more unit test for json not containing expected fields.
|
2013-03-21 09:40:57 -04:00 |
|
Chris Dodge
|
9cd38d115e
|
import needs to enumerate through the fields for all content scopes. Also add unit test
|
2013-03-20 21:37:09 -04:00 |
|
Don Mitchell
|
9413364e55
|
Disambiguate the course_info url names.
|
2013-03-20 18:00:25 -04:00 |
|
Don Mitchell
|
3ea70eac9d
|
Also clean up children after sort saved.
|
2013-03-20 17:59:24 -04:00 |
|
Don Mitchell
|
bd2dd9408d
|
Unit tests and minor fixes to course_info_updates. Main fix was
returning the content in same form as it was saved rather than parroting
it back.
|
2013-03-20 17:49:03 -04:00 |
|
Brian Talbot
|
481aa063c4
|
Merge branch 'master' into feature/btalbot/studio-checklists
|
2013-03-20 17:10:07 -04:00 |
|
Brian Talbot
|
2876554cd7
|
Merge branch 'master' into fix/btalbot/studio-sasscleanup
|
2013-03-20 17:09:38 -04:00 |
|
Brian Talbot
|
3b80a90bd0
|
studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss
|
2013-03-20 16:54:14 -04:00 |
|
cahrens
|
fd9c29f449
|
Merge branch 'master' into feature/btalbot/studio-checklists
|
2013-03-20 16:37:56 -04:00 |
|
cahrens
|
284cfcc941
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
|
2013-03-20 16:37:26 -04:00 |
|
cahrens
|
6d6e144c35
|
Urls working.
|
2013-03-20 16:37:08 -04:00 |
|
Brian Talbot
|
994ced3c61
|
studio - notifications: organizing base variables
|
2013-03-20 16:34:21 -04:00 |
|
Brian Talbot
|
38df54dc53
|
studio - moved handling scrollable and new window links into their own functions for use throughout the app and not just on doc.ready + removed unused js plugin reference
|
2013-03-20 16:19:45 -04:00 |
|
Jay Zoldak
|
23364d8b0f
|
Merge branch 'master' into feature/zoldak/refactor-factories
|
2013-03-20 13:36:01 -04:00 |
|
Brian Talbot
|
f181a454e4
|
studio - added in basic JS confirm UI when deleting course updates
|
2013-03-20 11:20:16 -04:00 |
|
Brian Talbot
|
99cf432390
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-03-20 10:45:01 -04:00 |
|
Brian Talbot
|
8cf2cc6f78
|
studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles
|
2013-03-20 10:42:35 -04:00 |
|
Brian Talbot
|
9069d822a4
|
Merge branch 'master' into fix/btalbot/studio-sasscleanup
|
2013-03-20 10:38:07 -04:00 |
|
Jay Zoldak
|
3576a3154b
|
Repoint factory references in lettuce tests to world.
|
2013-03-20 09:38:52 -04:00 |
|
Jay Zoldak
|
74653ff8ad
|
Factory refactor working for lms lettuce tests.
|
2013-03-20 09:38:52 -04:00 |
|
Mark L. Chang
|
10ac7e04f8
|
copy finalized
|
2013-03-19 21:31:59 -04:00 |
|
Don Mitchell
|
af136e75ca
|
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
|
2013-03-19 18:07:46 -04:00 |
|
cahrens
|
b5a587d8d0
|
Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False.
|
2013-03-19 16:57:19 -04:00 |
|
cahrens
|
a03f6c3bf1
|
More Selenium test, code cleanup.
|
2013-03-19 14:02:07 -04:00 |
|
cahrens
|
dc89a4b3d5
|
Beginning of Selenium test, updates to work with master.
|
2013-03-18 21:25:44 -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 |
|
Chris Dodge
|
3e28ffa4f7
|
remove import and shortened line length
|
2013-03-18 15:10:17 -04:00 |
|
Chris Dodge
|
dc78a08ce5
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
|
2013-03-18 15:05:37 -04:00 |
|
cahrens
|
f6fb64f130
|
Saving checkbox state, client template for individual checklist.
|
2013-03-18 15:03:54 -04:00 |
|
Jay Zoldak
|
b6e82afb0e
|
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
Fix/will/fix broken jasmine lms tests
|
2013-03-18 11:53:22 -07:00 |
|
Brian Talbot
|
16f9f6ef4f
|
studio - tender widget: added initial reference and behavior
|
2013-03-18 13:15:01 -04:00 |
|
Chris Dodge
|
651465f1ad
|
add HTML templates for 404/500 errors
|
2013-03-18 12:56:17 -04:00 |
|
Calen Pennington
|
a4f10bfdaf
|
Small pylint cleanup
|
2013-03-18 12:45:46 -04:00 |
|
Brian Talbot
|
cdcdfd49e0
|
studio - alerts: resolving local master merge conflcits
|
2013-03-18 10:58:16 -04:00 |
|
Chris Dodge
|
2b677544a5
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/add-500-404-templates-to-Studio
|
2013-03-18 09:39:47 -04:00 |
|
Chris Dodge
|
9a18685c1c
|
add a discussion module write through cache to speed up Forum rendering
|
2013-03-18 09:01:54 -04:00 |
|
Brian Talbot
|
a1ba97376a
|
studio - sass cleanup: further revisions and box-sizing all elements for consistency
|
2013-03-16 12:18:35 -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 |
|
Brian Talbot
|
06b118ae33
|
studio - sass cleanup: resolved static pages display issue after local merge master
|
2013-03-15 15:23:03 -04:00 |
|
Brian Talbot
|
84a5475d5a
|
studio - sass cleanup: resolving conflicts with local master merge
|
2013-03-15 12:42:33 -04:00 |
|