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

282 Commits

Author SHA1 Message Date
Don Mitchell
c4f4da5e46 Giving up for now on unit tests which mock http posts 2012-12-11 17:10:04 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
5ea5a7c0a7 It works!!! 2012-12-10 18:55:35 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00
Christina Roberts
6acae5b440 Show error if organization name has invalid characters 2012-12-10 15:19:34 -05:00
Chris Dodge
130de49b49 support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed 2012-12-07 09:45:12 -05:00
Don Mitchell
50d7e6160e Move models from common to cms. 
Add unit tests.
 2012-12-03 12:20:15 -05:00
Don Mitchell
8379e3038d Moved settings models from common to cms 2012-11-30 10:42:23 -05:00
Don Mitchell
d943f44f10 Append screw up (naive python goof) 2012-11-30 10:41:10 -05:00
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00
Don Mitchell
111e8521db Hopefully the course-info changes I had made w/o link destruction 2012-11-30 10:40:19 -05:00
chrisndodge
89ad8cc564 Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup 
Static tabs cleanup
 2012-11-29 06:49:28 -08:00
Don Mitchell
c0da6e4249 Details done except for syllabus 2012-11-28 17:10:41 -05:00
Don Mitchell
a48a392eb2 Trying to get scss back 2012-11-28 10:02:01 -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
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
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -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
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
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
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
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
7efaa87c19 Add test for clone item. Also change password hashing for faster tests. 2012-11-09 10:54:50 -05:00
Chris Dodge
da8efc17de Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-09 09:37:21 -05:00
Chris Dodge
01889df686 need to pass in course namespace when rewrite static links in the CMS 2012-11-09 09:23:48 -05:00
Jay Zoldak
14564b2310 Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing 2012-11-09 08:58:48 -05:00
Jay Zoldak
ddfbf3b678 Add test for course overview page 2012-11-08 17:16:25 -05:00
Chris Dodge
3774c95b5e Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-08 16:12:26 -05:00
Chris Dodge
981f5cee45 initial buildout of a 'xlint' test to verify legacy coursewar 2012-11-08 16:07:17 -05:00
Jay Zoldak
2077f62dd5 Add test for index page, plus SOUTH migrations for faster test execution. 2012-11-08 14:16:51 -05:00
Chris Dodge
c3c6a7af7e address feedback from cale 2012-11-08 13:29:46 -05:00
Jay Zoldak
50a8cf4aea Add test for course creation 2012-11-08 10:59:09 -05:00
Chris Dodge
7ca49f3a14 remove debug log msg 2012-11-08 10:54:56 -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
Calen Pennington
59ee0c5abf Merge pull request #1018 from MITx/fix/cdodge/delete-last-component-does-not-stick 
Fix/cdodge/delete last component does not stick
 2012-11-08 05:52:02 -08: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
Chris Dodge
6b45b4c741 bind the disabling/enabling of the unit name input field based on whether the page state is public or not. We shouldn't be able to edit when public. 2012-11-05 12:02:08 -05:00