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

1774 Commits

Author SHA1 Message Date
Don Mitchell
cfa13922f5 Change url for login from login to signin. 2013-02-15 17:30:24 -05:00
Calen Pennington
33a3d5dbb7 Make it so that cms doesn't try to run collectstatic on course content 2013-02-08 10:49:43 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Jay Zoldak
abf4ad36f4 Move modulestore unique naming in tests from the settings.py file into the ModuleStoreTestCase class. 2013-02-06 10:42:21 -05:00
Jay Zoldak
b329b0ea42 Remove toy dbs from CMS test settings.py file as they are not used. 2013-02-06 10:36:28 -05:00
Jay Zoldak
b63c3c5a67 Change modulestore name and subclass TestCase 2013-02-06 10:36:28 -05:00
David Ormsbee
e50652e733 Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic 
Free courses from the confines of collectstatic
 2013-02-05 10:32:54 -08:00
John Jarvis
bff477e8d3 Removing repos.json import 2013-02-05 11:35:12 -05:00
Calen Pennington
2551243dfa Install the static_replace app for the management command 2013-02-05 11:06:46 -05:00
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00
Deena Wang
25aca5866d Merge branch 'master' into feature/deena/testing 
Conflicts:
	lms/djangoapps/courseware/tests/test_access.py
 2013-02-01 10:19:40 -05:00
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -05:00
Deena Wang
85c412fc2e changed cms/env/tests, added test_views.py 2013-01-29 11:06:32 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
Victor Shnayder
87e92644b6 Make all tests pass 
caveat: with a bit of hackery.  Need to do better testing once things are live.
 2013-01-25 16:13:55 -05:00
Don Mitchell
7cca46e691 Requirejs doesn't belong here 2013-01-23 13:00:01 -05:00
Don Mitchell
21f5c2d89a Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing 
Set up the framework for running lettuce tests against studio
 2013-01-09 06:30:03 -08:00
Chris Dodge
b8074b8bb4 add required video setting 2013-01-09 09:11:43 -05:00
Jay Zoldak
f056f0624d Set up the framework for running lettuce tests against studio 2013-01-08 14:44:45 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course 
fix up some thumbnail issues. Also we need to manage the user permission...
 2012-12-27 09:26:51 -08:00
Chris Dodge
9dff39dd6d start adding clone unit test 2012-12-27 11:25:04 -05:00
cahrens
91ce214964 Fix for Studio #96. 2012-12-20 14:59:21 -05:00
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -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
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
2077f62dd5 Add test for index page, plus SOUTH migrations for faster test execution. 2012-11-08 14:16:51 -05:00
Calen Pennington
171e932266 Merge branch 'master' into feature/cale/cms-master 
Conflicts:
	rakefile
 2012-11-08 12:28:40 -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
Calen Pennington
255720abd7 Clean old javascript tests from CAS 2012-10-31 13:21:36 -04:00
Calen Pennington
6221baf3e5 Use TEST_ROOT log directory when running jasmine tests 2012-10-30 15:58:59 -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
Calen Pennington
e8be6b3111 Get jasmine tests running on cms 2012-10-30 11:33:21 -04:00
Calen Pennington
6d5a1264b9 Move jasmine tests to their own environment 2012-10-30 10:58:38 -04:00
Calen Pennington
0f043f35d7 Remove unused github_sync app 2012-10-23 13:40:49 -04:00
ichuang
69bfdac49f minor change in dev_ike for cms-master 2012-10-14 16:58:11 -04:00
ichuang
09d7d6d688 add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut 2012-10-14 16:40:04 -04:00
ichuang
bf959d8fc3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx 2012-10-13 22:54:14 -04:00
ichuang
f846f4c2ad add import filter capability to html & problem editing; provides latex2edx interface 2012-10-13 22:33:41 -04:00
Calen Pennington
607b99dece Make separate links for lms_preview and lms as needed 2012-10-12 15:03:06 -04:00
Chris Dodge
e27dea0fec fix up dev.py to include the new flag 2012-10-11 20:52:28 -04:00
Calen Pennington
cf19a43268 Set SESSION_COOKIE_DOMAIN from env.json 2012-10-11 12:32:23 -04:00
Calen Pennington
d4405375e5 Read contentstore from auth.json 2012-10-11 12:31:52 -04:00
Calen Pennington
658bb622ba Always import logsettings after common, so that paths are set 2012-10-11 12:31:52 -04:00
Calen Pennington
bc69ed8c9e Move logsettings to common, so that it's shared between cms and lms 2012-10-11 12:31:52 -04:00
Calen Pennington
05c02f0d5f Fixing tests from changes around draft mode 2012-10-10 12:49:51 -04:00
Calen Pennington
75f8b7c98d Add Draft module store that is used whenever any item is update in the CAS (but not during import, and not for templates) 2012-10-10 12:42:14 -04:00
Chris Dodge
a80e8ce3d5 respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS 2012-10-09 15:11:07 -04:00
Chris Dodge
68945fdc77 adhere to the naming conventions of user groups (instructor_* and staff_* of the LMS AuthZ implementation). While we're keeping our authz.py implementation - which is duplicative of LMS's access.py - in order to minimize code churn/risk-of-regression, there is data compatibility so the two systems will interpret the data the same way 2012-10-09 13:14:31 -04:00
Calen Pennington
aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-10-02 12:12:55 -04:00