Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,510 Commits 1 Branch 0 Tags
0ebdbb92ca64f2fa0c1868bdaca2ac406421f9f9
Commit Graph

332 Commits

Author SHA1 Message Date
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -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
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
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
14f668a41e settings - revised assignment grace period text 2012-11-19 08:35:02 -05:00
Brian Talbot
cff581d5e6 settings - revised assignment due time field and provided UTC context/help 2012-11-19 08:16:48 -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
Brian Talbot
968b604b94 adding in datepicker functionality - wip 2012-11-16 12:25:06 -05:00
Brian Talbot
8918762493 roughed in all form fields - wip 2012-11-16 12:17:36 -05:00
Brian Talbot
6f52fea09c added and wired in SymbolSet font icon library assets 2012-11-16 09:23:33 -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
Chris Dodge
5c3db6f502 Change the Embed column in assest index page to just display the URL 2012-11-14 13:35:54 -05:00
Jay Zoldak
58eea1bc80 Remove section close tag that had no open tag. 2012-11-09 11:40:23 -05:00
Jay Zoldak
f249c227a5 Fix typo in close tag in header 2012-11-09 11:05:37 -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
Chris Dodge
a99277275d add new files 2012-11-07 15:56:16 -05:00
Chris Dodge
9cc1af5052 first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course 2012-11-07 15:27:44 -05:00
Brian Talbot
3b42ea7e9e added basic settings markup and revised sections based on additional fields/info needed 2012-11-07 15:00:48 -05:00
Tom Giannattasio
7887f92e3b removed log 2012-11-01 11:34:31 -04:00
Tom Giannattasio
a6d5edce5e polished grade range slider 2012-11-01 11:34:02 -04:00
Tom Giannattasio
ef4b2f044f basic settings framework – wip 2012-10-31 17:03:06 -04:00
Tom Giannattasio
d68945de33 started adding settings page 2012-10-30 15:04:21 -04:00
Tom Giannattasio
d63f82ae57 moved error message into form area; tweaked cancel behavior 2012-10-30 11:39:08 -04:00
Calen Pennington
684b98505d Make rake commands to run jasmine tests in browser and via phantomjs 2012-10-30 10:41:02 -04:00
chrisndodge
9cf1ac4ea8 Merge pull request #979 from MITx/feature/cale/text_fixes 
Fixing description of import format
 2012-10-26 11:08:18 -07:00
Calen Pennington
5ab8e312f5 Fixing description of import format 2012-10-25 13:23:11 -04:00
chrisndodge
b9d96df1bd Merge pull request #970 from MITx/feature/cale/cas-password-reset 
Point Studio forgot password at corresponding lms forgot password. There...
 2012-10-25 09:33:54 -07:00