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 |
|
Calen Pennington
|
05b9e6cab2
|
Standardize more of css between lms and cms
|
2012-10-01 15:17:40 -04:00 |
|
Calen Pennington
|
44805ca383
|
Make discussion js work for cms as well as lms so that inline discussion xmodules load
|
2012-10-01 15:16:54 -04:00 |
|
Calen Pennington
|
c0ca7fe697
|
Make expansion/contraction work on overview page
|
2012-10-01 15:16:54 -04:00 |
|
Chris Dodge
|
27016465f4
|
support some simple authorization scheme to view/edit courses
|
2012-10-01 15:13:19 -04:00 |
|
Chris Dodge
|
85e6c23386
|
work-in-flight for uploading/serving of static content for courses
|
2012-09-27 10:24:53 -04:00 |
|
Calen Pennington
|
d4377d4ada
|
Make imports into the CMS ignore broken modules, while still loading bad xml as error modules in the LMS
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
7d8095cd97
|
Initial port of templates into filesystem based storage
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
2554413291
|
Hook up link to create modules from templates
|
2012-09-25 10:10:44 -04:00 |
|
Calen Pennington
|
2223d2007b
|
Only display the LMS link if it's set up, and don't error if it isn't
|
2012-09-25 09:18:54 -04:00 |
|
Calen Pennington
|
c7209a736e
|
Add links from the editing page for the cms to the corresponding page in the lms
|
2012-09-25 09:18:54 -04:00 |
|
Victor Shnayder
|
6017aa698b
|
add ENABLE_DISCUSSION_SERVICE: "False" to cms config
|
2012-09-06 17:28:12 -04:00 |
|
Calen Pennington
|
3b36fbf914
|
Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore
|
2012-08-16 12:49:42 -04:00 |
|
Calen Pennington
|
c4bed2c128
|
Add basic authentication support for requests made to the xqueue server
|
2012-08-14 11:59:47 -04:00 |
|
Calen Pennington
|
91b6bb649c
|
Move queue interface url and auth into configuration, rather than hardcoding it
|
2012-08-14 11:59:46 -04:00 |
|
David Ormsbee
|
510435ada5
|
Sketchy adding of test dbs to the cms test.py config file -- these are required for the Student (shared django app) tests to run
|
2012-08-13 00:35:51 -04:00 |
|
Calen Pennington
|
6abc2d733f
|
Merge pull request #370 from MITx/feature/bridger/django1.4
Feature/bridger/django1.4
|
2012-08-08 12:52:33 -07:00 |
|
Bridger Maxwell
|
7ae0005afd
|
Fixed CMS setting for 1.4 transition.
|
2012-08-08 13:30:43 -04:00 |
|
Calen Pennington
|
80b8529f2f
|
Merge branch 'hotfix/1.0.4'
Conflicts:
common/djangoapps/util/middleware.py
|
2012-08-08 11:05:26 -04:00 |
|
Calen Pennington
|
8059008bde
|
Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors
|
2012-08-06 10:13:12 -04:00 |
|
Victor Shnayder
|
2f4bf5f606
|
Minor fixes to cms
* make logging work properly in cms, dev
* fix a comment
|
2012-08-01 19:25:47 -04:00 |
|
Victor Shnayder
|
46775386d3
|
make CACHE_TIMEOUT messages go away
|
2012-08-01 11:40:12 -04:00 |
|