Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4229 Commits

Author SHA1 Message Date
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
Chris Dodge
ba9a03410b remove unneeded debugging traces 2012-10-30 15:56:02 -04:00
Chris Dodge
f4822c23de lots of tweeks to better support importing of existing courseware 2012-10-30 11:52:31 -04:00
Chris Dodge
206b1e26d3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info 2012-10-26 10:02:45 -04:00
Chris Dodge
ba15735214 implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff 2012-10-25 14:27:26 -04:00
chrisndodge
550114704e Merge pull request #974 from MITx/feature/cale/cas-dont-delete-subsection-children 
Only update data in modules that have been set when passing into save_it...
 2012-10-25 11:04:45 -07:00
Calen Pennington
bd1233d38c Only update data in modules that have been set when passing into save_item, and don't force callers to set everything 2012-10-25 13:56:24 -04:00
Calen Pennington
f19ec64659 Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment 2012-10-25 10:47:41 -04:00
Calen Pennington
fb06344290 Allow for deletion of all components in a draft 2012-10-24 14:59:00 -04:00
Calen Pennington
2802302162 Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course 2012-10-24 11:51:25 -04:00
Calen Pennington
0f043f35d7 Remove unused github_sync app 2012-10-23 13:40:49 -04:00
Calen Pennington
b005587951 Merge pull request #948 from MITx/fix/cdodge/import-improvements 
have import be a bit more flexible in terms of the packaging of the cont...
 2012-10-22 13:30:46 -07:00
Chris Dodge
1530341d55 have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder. 2012-10-22 16:01:57 -04:00
Chris Dodge
50e545185f do a back-end check on remove_user to make sure caller does not remove him/herself 2012-10-18 21:00:33 -04:00
Chris Dodge
236d37b276 EDITOR_ROLE_NAME -> STAFF_ROLE_NAME 2012-10-18 10:00:08 -04:00
Chris Dodge
1a6845b07f optimize slightly, allow caller to pass in the list of units in a subsection, so we don't have to refetch 2012-10-17 16:17:52 -04:00
Chris Dodge
a88bb7caf3 hide 'View Live' button if no units have been published 2012-10-17 16:08:16 -04:00
chrisndodge
6011d6d333 Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks 
improvements on asset upload refresh. Now we don't need to refresh the w...
 2012-10-17 10:47:47 -07:00