Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,811 Commits 1 Branch 0 Tags
03e79cc81952836b63aa1c19eb96fd30bf03c816
Commit Graph

392 Commits

Author SHA1 Message Date
Chris Dodge
2524cd614a fix edit conflict 2012-11-26 09:36:59 -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
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Victor Shnayder
2846c61d15 Revert "remove (almost) all references to askbot." 
This reverts commit 793354a0dc.
 2012-11-09 18:18:37 -05:00
John Jarvis
01dcf291b6 Adding setting variable for CERT_QUEUE 2012-11-09 18:18:36 -05:00
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -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
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests 
Feature/cale/js tests
 2012-11-08 06:44:49 -08:00
David Ormsbee
ab0e7cf4ae Change AUTH_TOKENS index reference to a get so it doesn't explode the whole app if I did Puppet incorrectly. 2012-11-07 17:36:50 -05:00
David Ormsbee
4b02b2af2a Rearrange how we handle the auth tokens for our fake Pearson preliminary testing 2012-11-07 17:20:49 -05:00
David Ormsbee
528fcd7f4e Create a config option for enabling a Pearson login in a totally hacky manner. 2012-11-07 14:08:55 -05:00
Chris Dodge
918de8b4a9 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting 
Conflicts:
	requirements.txt
 2012-11-02 15:09:54 -04:00
Chris Dodge
b75a814f7a add django performance metering 2012-11-02 15:08:45 -04:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Calen Pennington
255720abd7 Clean old javascript tests from CAS 2012-10-31 13:21:36 -04:00
Victor Shnayder
11fc6e4c51 put back file upload config--needed for new discussion forums 2012-10-30 21:36:15 -04:00
Victor Shnayder
8c27e3a249 Revert overly aggressive killing. 
(don't worry--askbot is still dead)
 2012-10-30 20:49:10 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -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
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
Carlos Andrés Rocha
76ffbfc4a1 Increase the limit of files that can be uploaded by a student 2012-10-23 17:26:00 -04:00
Calen Pennington
cac8e3453c Remove more remnants of askbot 2012-10-23 13:40:50 -04:00
Calen Pennington
ef1ba6d9f7 Remove leftover merge garbage 2012-10-23 13:40:34 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Victor Shnayder
f50519ae48 Merge pull request #906 from MITx/victor/test-speedup 
Victor/test speedup
 2012-10-22 10:45:23 -07:00
Carlos Andrés Rocha
24d5c9162c Created Django App with commands to import software license numbers per class. 2012-10-15 18:46:31 -04:00
Victor Shnayder
4bf9323eed More test speedups: 
- Add tasks to test lib without coverage
- Add a coverage flag to test.py (set to True, for manual tweaking for now)
 2012-10-15 02:23:00 -04:00
Victor Shnayder
3f3df3fdb4 remove no-longer-used test dbs 2012-10-15 01:48:46 -04:00
Victor Shnayder
bc96203807 Use a faster hashing algorithm for testing 
http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/

rake fasttest_lms goes from 48 to 26 seconds.
 2012-10-15 01:34:45 -04:00
Calen Pennington
096d6853eb Allow for branding subdomains that are longer than a single . 2012-10-11 13:18:27 -04:00
Calen Pennington
9e9825cb88 Enable the edge virtual university landing page in the lms 2012-10-11 13:18:01 -04:00
Calen Pennington
d21c5761df Minor bug fixes from edge-configs merge 2012-10-11 12:49:48 -04:00
Calen Pennington
cf19a43268 Set SESSION_COOKIE_DOMAIN from env.json 2012-10-11 12:32:23 -04:00
Calen Pennington
284f0d6a22 Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content 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
20f84b2055 Use the right config as the base for lms.envs.cms.aws 2012-10-11 12:31:52 -04:00
Calen Pennington
eece835d9b Put in an empty contentstore for the LMS by default 2012-10-11 12:31:52 -04:00
Calen Pennington
46668d2634 Read CONTENTSTORE from auth.json in lms 2012-10-11 12:31:51 -04:00
Calen Pennington
0162e4c031 Remove more askbot remnants 2012-10-11 12:31:51 -04:00
Calen Pennington
f5a63f7375 Remove all askbot common settings 2012-10-11 12:31:51 -04:00
Calen Pennington
1114f66a98 Enable specification of modulestore in LMS aws config 2012-10-11 12:31:51 -04:00