Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,150 Commits 1 Branch 0 Tags
2e852d16ac24be248ea032ebf863bc93099faf1f
Commit Graph

141 Commits

Author SHA1 Message Date
ichuang
2e852d16ac Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation 
Conflicts:
	cms/envs/common.py
 2013-04-04 17:34:52 +00:00
Mark L. Chang
1d70509da1 fixed merge on env 2013-04-03 00:31:48 -04:00
Mark L. Chang
43f6f0ce8f put survey behind MITX_FEATURES flag 2013-04-03 00:28:08 -04:00
ichuang
1969a6633e if user course creation is disabled & if staff email given, add link to request course creation by email 2013-03-31 16:05:09 +00:00
Carlos Andrés Rocha
29efa84205 Enable dev env support for sass source maps 
Change the parameters of the sass compiler to output source
maps. Google Chrome uses the maps in the debugger to show the sass or
scss file that originated the style for a particular element.

More information here:

http://fonicmonkey.net/2013/03/25/native-sass-scss-source-map-support-in-chrome-and-rails/
 2013-03-29 18:34:02 -04:00
Don Mitchell
80f57db7c3 Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf 
Feature/cdodge/course overview perf
 2013-03-29 12:35:41 -07:00
Chris Dodge
bbb53a17f8 add some depth optimziations for edit subsection and unit pages as well 2013-03-29 09:58:03 -04:00
Chris Dodge
197f52539f add some unit tests 2013-03-28 11:37:53 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
cahrens
b5a587d8d0 Have to explicitly specify safe option on mongo insert, remove, update because the debug toolbar specifies a default of safe=False. 2013-03-19 16:57:19 -04:00
Chris Dodge
413aeed1b3 use django caching to hold computed metadata inheritence. Also invalidate the cache entries on writes (insert, updates) 2013-03-13 15:33:15 -04:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
cahrens
4434ca632e Disable Django toolbar-- breaking mongo updates. 2013-03-07 11:30:00 -05:00
cahrens
de225e6623 Enable Django debug toolbar on Studio (including Mongo panel). 2013-03-06 14:08:54 -05:00
Will Daly
2436d59e14 Merge branch 'master' into feature/deena/testing 
Conflicts:
	cms/djangoapps/contentstore/tests/factories.py
	lms/djangoapps/courseware/tests/test_access.py
 2013-03-04 16:30:41 -05:00
ichuang
4f33f7ffbc turn on tracking (helps with debugging) 2013-02-24 05:07:23 +00:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
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