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
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00
cahrens
235ecff28b In progress. 2013-05-16 10:40:48 -04:00
Will Daly
3a981cfa05 Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py 2013-05-15 17:06:44 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Will Daly
b3e959773d Disabled logging of warnings/errors for acceptance tests 
to make the logs readable
 2013-05-15 11:31:52 -04:00
Will Daly
36fb8f91e0 Acceptance tests now use the same mongo db as the unit test suite. 
The LMS/CMS acceptance tests both use the collection acceptance_modules
 2013-05-14 12:45:38 -04:00
Will Daly
daef910494 Mae mongo DB and collection names consistent for all 
acceptance tests.
 2013-05-14 12:34:15 -04:00
Will Daly
72a42413e2 Fixed database to work on Jenkins (now stored in test_root), 
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
 2013-05-14 10:33:25 -04:00
Chris Dodge
cbe205328a Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2013-05-13 15:47:33 -04:00
David Baumgold
7c98981498 Install phantom-jasmine via npm, rather than git submodules 
Because removing a step from our install process is a Good Thing™
 2013-05-13 11:33:09 -04:00
Jason Bau
408e26a0c1 parameterizes CMS email settings 2013-05-10 13:42:28 -07:00
Chris Dodge
3858f1b706 update cms envs 2013-05-06 16:02:13 -04:00
Diana Huang
182d69e36c Add cookie name to the cms settings so we don't error out 
while looking for it
 2013-05-02 17:21:49 -04:00
Jay Zoldak
bdfe1cff39 Remove localization middleware from jasmine test execution 2013-05-01 11:34:28 -04:00
Calen Pennington
dfd369b9e9 Make ordering of js bundles during jasmine tests consistant 2013-04-30 14:09:17 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server 
Speed up local development
 2013-04-24 12:12:05 -07:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Steve Strassmann
6f10348836 addressed comments from pull request 2013-04-23 10:07:51 -04:00
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup 
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
 2013-04-18 15:19:19 -04:00
Jay Zoldak
8a2d08bbd6 Refactor choosing the browser for lettuce tests to settings.py 2013-04-18 10:18:35 -04:00
Calen Pennington
346aee8863 Make django-pipeline only work with raw js and css 2013-04-18 07:18:36 -04:00
Calen Pennington
d4df9eebac Merge pull request #1866 from MITx/feature/cale/enable-rednose 
Enable test colors in nosetests
 2013-04-17 10:15:25 -07:00
Steve Strassmann
6e34c668bb introduce i18n 2013-04-17 11:30:29 -04:00
Calen Pennington
f252c62f31 Enable test colors in nosetests 
Use setup.cfg to set up default settings when running nose tests. Enable
the rednose library to color test output.
 2013-04-17 09:58:52 -04:00
Calen Pennington
bf6b886ccd Fix pylint and pep8 errors 2013-04-16 11:45:21 -04:00
Calen Pennington
d7796f4d47 Put test database into test_root 2013-04-16 11:40:04 -04:00
Jay Zoldak
3ff63f78b0 Disable nps survey in test environment 2013-04-16 10:37:43 -04:00
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Mark L. Chang
2e9bf4ac0e Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics 
Conflicts:
	cms/envs/common.py
 2013-04-04 16:11:22 -04:00
Mark L. Chang
10377bc41c added a dummy key for segment.io so it doesn't ever fail 2013-04-04 16:08:10 -04:00
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
db1c0bf081 added dev key so tests run 2013-04-04 12:14:34 -04:00
Mark L. Chang
d9bbed305e newline 2013-04-04 01:51:14 -04:00
Mark L. Chang
8439013f64 studio: added segment.io tracking 2013-04-04 01:51:14 -04: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