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 |
|
Tom Giannattasio
|
a98cead8ee
|
added basic lms styles
|
2012-11-20 13:02:08 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
chrisndodge
|
13700316a6
|
Merge pull request #1025 from MITx/feature/cdodge/static-tab-edit
Feature/cdodge/static tab edit
|
2012-11-08 13:10:51 -08: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 |
|
Calen Pennington
|
171e932266
|
Merge branch 'master' into feature/cale/cms-master
Conflicts:
rakefile
|
2012-11-08 12:28:40 -05:00 |
|
Calen Pennington
|
3230345204
|
Make coverage reports only include code from the source directories
|
2012-11-08 12:25:12 -05:00 |
|
Ned Batchelder
|
28bb4724e7
|
Put the coverage data files in the reports dir, where they will be treated like the disposable things they are.
|
2012-11-08 11:20:23 -05:00 |
|
Ned Batchelder
|
3dc23eb131
|
Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'.
|
2012-11-08 11:20:22 -05:00 |
|
Ned Batchelder
|
90e3386751
|
WIP for quieter tests with coverage.
|
2012-11-08 11:19:33 -05:00 |
|
Ned Batchelder
|
7eb196df38
|
Run coverage directly instead of as a plugin. Also quiet the install and clean steps of tests.
|
2012-11-08 11:19:33 -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 |
|
chrisndodge
|
e3d65a0c08
|
Merge pull request #997 from MITx/feature/cale/js-tests
Feature/cale/js tests
|
2012-11-08 06:44:49 -08: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
|
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 |
|
Chris Dodge
|
afd8584569
|
remove explicit 'null' for child collection on saveName on unit code paths. I had seen cases where save was posting back an empty set on renames - deleting the components. But I can no longer reproduce it now.
|
2012-11-07 09:34:44 -05:00 |
|
Chris Dodge
|
55c69a1e13
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Conflicts:
lms/djangoapps/courseware/module_render.py
|
2012-11-06 14:20:59 -05:00 |
|
Chris Dodge
|
3f01bef1eb
|
Add changelog information
|
2012-11-06 10:34:51 -05:00 |
|
Chris Dodge
|
a9c4493a70
|
always make the spinner spin on unit renames
|
2012-11-05 12:26: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 |
|
Calen Pennington
|
255720abd7
|
Clean old javascript tests from CAS
|
2012-10-31 13:21:36 -04:00 |
|
Calen Pennington
|
827f7d5aa3
|
Merge pull request #988 from MITx/feature/cale/changelogs
Add changelogs for the CMS and LMS
|
2012-10-30 13:48:57 -07:00 |
|
Calen Pennington
|
d4a6b589f1
|
Add comment about the target of change log entries
|
2012-10-30 16:48:47 -04:00 |
|
Calen Pennington
|
6221baf3e5
|
Use TEST_ROOT log directory when running jasmine tests
|
2012-10-30 15:58:59 -04:00 |
|
Chris Dodge
|
ba9a03410b
|
remove unneeded debugging traces
|
2012-10-30 15:56:02 -04:00 |
|
Calen Pennington
|
cd9fbaeb02
|
Add timeout so that jasmine tests eventually fail if the server doesn't start
|
2012-10-30 15:51:21 -04:00 |
|
Chris Dodge
|
ded19f761a
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-30 15:10:06 -04:00 |
|