Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

2444 Commits

Author SHA1 Message Date
Don Mitchell
5331ae055f Got time change hooked up but gained a spurious call to change on date 
change.
 2012-11-27 15:15:28 -05:00
Brian Talbot
075bc75a7d settings - adjusted markup to leverage Timepicker's datepair functionality for validating start/end dates 2012-11-27 15:00:19 -05:00
Don Mitchell
d165da3f81 Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 13:33:19 -05:00
Don Mitchell
5e2dba6bad Minor cache to pull talbott's changes 2012-11-27 13:22:44 -05:00
Brian Talbot
bffd425562 settings - revised date and time picker markup to use already set conventions with the .datepair class 2012-11-27 13:05:00 -05:00
Don Mitchell
8a27e1776b Merge branch 'feature/btalbot/cms-settings' of 
git@github.com:MITx/mitx.git into feature/dhm/cms-settings

Conflicts:
	cms/static/sass/bourbon
	cms/templates/settings.html
	lms/static/sass/bourbon
 2012-11-27 12:12:43 -05:00
Don Mitchell
2238019539 Details tab works except for file references 2012-11-27 11:32:03 -05:00
Brian Talbot
c3e11b4217 settings - added in additional time fields for course dates 2012-11-27 09:50:25 -05:00
Tom Giannattasio
153285c3ea reset default tab 2012-11-26 16:28:52 -05:00
Tom Giannattasio
bb2e78ce30 reworked slider logic 2012-11-26 15:54:46 -05:00
Chris Dodge
b3dcc140b7 made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button 2012-11-26 14:22:13 -05:00
Brian Talbot
be848023a2 settings - added in example of anon discussions disabled state 2012-11-26 14:21:01 -05:00
Brian Talbot
4027576e15 settings - resolved date and time picker UI bugs 2012-11-26 14:01:11 -05:00
Brian Talbot
4097bc1022 settings - revised grading slider UI cosmetics 2012-11-26 13:33:57 -05:00
Brian Talbot
ef95e1d95f settings - added in controls for sorting discussion categories 2012-11-26 11:48:56 -05:00
Calen Pennington
4e3da342d7 Merge pull request #1048 from MITx/feature/cdodge/xlint 
Feature/cdodge/xlint
 2012-11-26 08:11:34 -08:00
Chris Dodge
fff3782884 cleave xlint entry point in xml_importer.py to be separate from the import method 2012-11-26 11:05:57 -05:00
Tom Giannattasio
f2fec99efa fixed header float bug 2012-11-26 10:46:02 -05:00
Calen Pennington
ee618d4223 Merge pull request #1069 from MITx/feature/cas/tom/lms-styles 
added basic lms styles
 2012-11-26 06:57:57 -08:00
Calen Pennington
c6a9f722cc Merge pull request #1049 from MITx/feature/jzoldak/cms-unit-testing 
Add Studio integration with factory boy for creating XModule objects in the data store
 2012-11-26 06:54:50 -08:00
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Brian Talbot
baf8b481c8 settings - added in drag and drop anchors - wip 2012-11-21 13:58:56 -05:00
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
9c06a4fc07 updated cheatsheet to match simpler syntax 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