Tom Giannattasio
|
a98cead8ee
|
added basic lms styles
|
2012-11-20 13:02:08 -05:00 |
|
Don Mitchell
|
f8ee5c2614
|
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings
Conflicts:
cms/templates/settings.html
|
2012-11-20 11:55:19 -05:00 |
|
Don Mitchell
|
339949f934
|
Another checkpoint before pull/merge
|
2012-11-20 11:37:14 -05:00 |
|
Brian Talbot
|
6c3c377619
|
settings - general class/ID naming convention cleaning
|
2012-11-20 11:34:16 -05:00 |
|
Brian Talbot
|
a69d3cb064
|
settings - discussion UI revision
|
2012-11-20 09:32:13 -05:00 |
|
Brian Talbot
|
278c731aef
|
settings - made assignment types user-determined fields vs. pre-set types in UI
|
2012-11-20 09:26:40 -05:00 |
|
Brian Talbot
|
f29f605f62
|
settings - refactored radio/checkbox input formatting
|
2012-11-20 08:40:45 -05:00 |
|
Tom Giannattasio
|
af908104df
|
fixed html tab; started adding upload within widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
c233740057
|
cleaning up of asset widget; html tab is broken
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
8abf93cc36
|
search and upload button added to widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
9613f92fad
|
asset widget inserts into tiny
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
f16e7b2ede
|
added asset library widget template
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
d521c850de
|
started adding asset widget
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
ac20da3f30
|
removed plugins, adjusted visualEditor reference
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
c7dbdc1242
|
added asset button to visual editor
|
2012-11-20 07:19:35 -05:00 |
|
Tom Giannattasio
|
10a4d4ec25
|
tiny mce styling
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
b38072207e
|
primary tiny mce integration
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
9c3c72ad3c
|
discussion editor and preview added; string response glitch fixed
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
daea87ebb9
|
simple html editor added
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
e446ed8118
|
removed stupid console log
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
f8ee3efc7a
|
simplified syntax to match arjun's for string and numerical response
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
f2eb665626
|
cheatsheet and advanced settings added
|
2012-11-20 07:19:34 -05:00 |
|
Tom Giannattasio
|
44fb9561e8
|
added a ton of speed editor goodness
|
2012-11-20 07:19:33 -05:00 |
|
Don Mitchell
|
7fecf1f212
|
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
feature/dhm/cms-settings
Conflicts:
cms/static/sass/_settings.scss
cms/templates/settings.html
|
2012-11-19 16:20:12 -05:00 |
|
Don Mitchell
|
241c9bb1ac
|
Checkpoint to rebase
|
2012-11-19 16:02:30 -05:00 |
|
Don Mitchell
|
a9233dfd44
|
Merge branch 'course-info' into feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/views.py
|
2012-11-19 16:00:27 -05:00 |
|
Brian Talbot
|
d370307917
|
settings - simplified course details fields per Mark's feedback and radio/checkbox UI
|
2012-11-19 15:48:57 -05:00 |
|
Brian Talbot
|
c7784e30fd
|
settings - radio/checkbox UI - wip
|
2012-11-19 14:59:25 -05:00 |
|
Brian Talbot
|
ab87ff6b20
|
settings - field alignment, radio/checkbox formatting
|
2012-11-19 14:55:32 -05:00 |
|
Don Mitchell
|
88cc5a080b
|
Everything tested and ready for Tom to fix
|
2012-11-19 10:38:58 -05:00 |
|
Don Mitchell
|
91a91f4ddb
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-19 10:38:58 -05:00 |
|
Brian Talbot
|
bc4d5f413d
|
settings - various style/alignment tweaks to inline/existinf fields
|
2012-11-19 09:54:08 -05:00 |
|
Brian Talbot
|
0114366c36
|
settings - revised discussion settings UI to include standard discussion categories and adding new ones
|
2012-11-19 08:05:52 -05:00 |
|
Brian Talbot
|
bf4f678bde
|
settings - revised faculty photo and syllabus states to either has or does not have
|
2012-11-19 07:38:59 -05:00 |
|
Brian Talbot
|
731ea22687
|
settings - added disabled states for course name/org/number
|
2012-11-19 07:19:13 -05:00 |
|
Don Mitchell
|
842bbe92d1
|
Everything tested and ready for Tom to fix
|
2012-11-16 12:53:49 -05:00 |
|
Don Mitchell
|
fbc48026f2
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-16 12:51:31 -05:00 |
|
Brian Talbot
|
8918762493
|
roughed in all form fields - wip
|
2012-11-16 12:17:36 -05:00 |
|
Brian Talbot
|
74dec7f172
|
settings - wip
|
2012-11-16 09:14:18 -05:00 |
|
Brian Talbot
|
6014a7a299
|
Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings
Conflicts:
cms/djangoapps/contentstore/views.py
|
2012-11-15 16:51:53 -05:00 |
|
Brian Talbot
|
4c220ea420
|
in progress discussion work
|
2012-11-15 16:45:16 -05:00 |
|
Brian Talbot
|
1a297674ce
|
added in fields for problems and discussions portions of CMS settings
|
2012-11-15 14:31:16 -05:00 |
|
Brian Talbot
|
65869461f8
|
finalized layout and styling for course details and faculty settings
|
2012-11-14 14:50:48 -05:00 |
|
Brian Talbot
|
39fda1ea9b
|
in progress staff section styling
|
2012-11-09 10:31:08 -05:00 |
|
Brian Talbot
|
b145112740
|
multi-input field markup and styling
|
2012-11-09 08:39:54 -05:00 |
|
Brian Talbot
|
f1e1f9e7e5
|
in progress field layout styling
|
2012-11-08 18:11:48 -05:00 |
|
Brian Talbot
|
8f2ab52215
|
in progress form styling of course info
|
2012-11-08 17:48:38 -05:00 |
|
Chris Dodge
|
b432db1aba
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit
|
2012-11-08 09:55:56 -05:00 |
|
Chris Dodge
|
7dbabce4db
|
fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model
|
2012-11-08 09:55:52 -05:00 |
|
chrisndodge
|
e3d65a0c08
|
Merge pull request #997 from MITx/feature/cale/js-tests
Feature/cale/js tests
|
2012-11-08 06:44:49 -08:00 |
|