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 |
|
Calen Pennington
|
6b64b4214f
|
Make relative imports explicitly relative
|
2013-03-15 11:23:22 -04:00 |
|
Calen Pennington
|
fd3ba7db2a
|
Don't make cms.djangoapps a python module
|
2013-03-15 10:50:46 -04:00 |
|
Brian Talbot
|
1aa8786b53
|
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
|
2013-03-14 19:07:03 -04:00 |
|
Brian Talbot
|
97b44446a0
|
studio - checklists: added animation to collapse/expand toggle
|
2013-03-14 16:30:48 -04:00 |
|
Brian Talbot
|
13c38fa173
|
studio - checklists: revised input/label HTML and adjusted styling for each
|
2013-03-14 16:17:47 -04:00 |
|
Chris Dodge
|
d2f216615f
|
move the instantiation of the metadata cache out of modulestore.py as it was causing a circular import dependency when running on AWS. Put instantiation into one_time_startup.py which I believe is run before any Django requests are handled
|
2013-03-14 13:57:48 -04:00 |
|
cahrens
|
ac25b02ce6
|
Minor updates.
|
2013-03-14 13:48:17 -04:00 |
|
cahrens
|
9a7b0fb563
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
Conflicts:
cms/templates/checklists.html
|
2013-03-14 13:47:55 -04:00 |
|
Vik Paruchuri
|
10eb7e45ea
|
Add in some docs
|
2013-03-14 13:42:41 -04:00 |
|
cahrens
|
017fd06bfc
|
Pre-merge.
|
2013-03-14 13:37:22 -04:00 |
|
Vik Paruchuri
|
a717dffd48
|
Remove debug statements
|
2013-03-14 13:31:30 -04:00 |
|
Vik Paruchuri
|
4c8a45f85e
|
Code to add in an open ended tab automatically
|
2013-03-14 13:29:26 -04:00 |
|
Brian Talbot
|
0aea85a4d9
|
studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators
|
2013-03-14 12:55:44 -04:00 |
|
cahrens
|
564374048e
|
A little cleanup.
|
2013-03-14 09:35:26 -04:00 |
|
cahrens
|
065e850449
|
Merge with Brian's changes.
|
2013-03-14 09:32:54 -04:00 |
|
cahrens
|
e0207432ca
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
|
2013-03-14 09:23:05 -04:00 |
|
cahrens
|
54156b7ac1
|
Saving work.
|
2013-03-14 09:22:58 -04:00 |
|
Brian Talbot
|
1fce77d8b2
|
Merge branch 'master' into feature/btalbot/studio-checklists
|
2013-03-13 19:19:38 -04:00 |
|
Brian Talbot
|
7b74d972a1
|
studio - checklists: defaulting checklist visual progress to 0%
|
2013-03-13 19:18:47 -04:00 |
|
Brian Talbot
|
16f6744aef
|
studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states
|
2013-03-13 19:13:26 -04:00 |
|