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

4005 Commits

Author SHA1 Message Date
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
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
Victor Shnayder
b18136d0cd remove (almost) all references to askbot. 2012-11-19 10:18:03 -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
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08: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
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
Chris Dodge
9ae8558382 put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror 2012-11-15 20:35:45 -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
Chris Dodge
d21095367a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-15 13:16:02 -05:00
Jay Zoldak
0654665b20 Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy' 2012-11-15 11:40:29 -05:00
Jay Zoldak
edb9f8ce40 Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing 2012-11-14 15:16:17 -05:00
Jay Zoldak
6f5b3fa1bb Create factory for Xmodule items 2012-11-14 15:12:09 -05:00
Jay Zoldak
58fef4a32a Create factory for courses 2012-11-14 14:52:24 -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
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -05:00
Chris Dodge
1e598ad1f5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-13 10:34:31 -05:00
Calen Pennington
eb92ad1fd8 Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing 
Feature/jzoldak/cms unit testing
 2012-11-13 07:08:52 -08:00
Jay Zoldak
a060b8de9c Use xmodule.templates instead of hard coding them in the test 2012-11-13 08:35:22 -05:00
Jay Zoldak
5f926ebad0 Add better comments and modulestore cleanup. 2012-11-09 14:34:04 -05:00
Chris Dodge
da3c3e5f20 initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses. 2012-11-09 13:54:12 -05:00
Jay Zoldak
bc34d79dbf Improve assertions by using HTML matchers. 2012-11-09 12:14:11 -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
Jay Zoldak
7efaa87c19 Add test for clone item. Also change password hashing for faster tests. 2012-11-09 10:54:50 -05:00