Victor Shnayder
cb30850759
Config for integration tests
...
* move askbot repo into mitx as a submodule
* set settings as in 85865f7221
* remove test_mongo env.
* Refactor tests to use new config structure.
* Add real integration tests--not working due to bugs in course xml. Turned off.
2012-07-27 16:09:25 -04:00
Victor Shnayder
73b3826820
Initial integration tests!
...
* new env file to run integration tests with mongo backend
- needs askbot to get db in the right state
- needs wiki to load pages successfully
- not using migrations to make it run faster
* import test courses, check that each page loads without erroring.
* fix NonePointerException in index view to make tests pass
* misc formatting cleanups
2012-07-27 16:09:25 -04:00
Victor Shnayder
8a6b9a5666
update lms readme
2012-07-27 16:06:54 -04:00
Rocky Duan
104e4c9fc8
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 17:35:40 -04:00
Calen Pennington
6afe1709e7
Merge pull request #306 from MITx/arjun/compile_coffee
...
Compiling coffee files in course data directories on startup.
2012-07-26 13:31:46 -07:00
Victor Shnayder
08ce3944ab
Make logging work for xmodule and company.
...
* We do not want to disable existing loggers when setting up our own
2012-07-26 14:49:11 -04:00
Arjun Singh
73261719ce
Added TODO near temporary code.
2012-07-26 13:14:00 -04:00
Rocky Duan
9d2bccbee7
Merge branch 'master' of github.com:MITx/mitx
2012-07-26 10:43:42 -04:00
Calen Pennington
73d6565fac
Merge remote-tracking branch 'origin/hotfix/1.0.1'
...
Conflicts:
common/djangoapps/student/views.py
2012-07-26 09:05:57 -04:00
Arjun Singh
3002260de5
Compiling coffee files in course data directories on startup.
2012-07-25 21:45:01 -04:00
Rocky Duan
fb408a99b5
add discussion app & url conf
2012-07-25 18:09:34 -04:00
Matthew Mongeau
bd9da89fe9
Move press articles to json.
2012-07-25 17:31:34 -04:00
Kyle Fiedler
00596d2f20
Added courseware css back into the main template
2012-07-25 14:57:44 -04:00
John Jarvis
dab92102d1
reading WIKI_ENABLED from env.json
2012-07-25 14:15:49 -04:00
Calen Pennington
dde48f122e
Merge pull request #247 from MITx/feature/cms-problem-preview
...
Problem previewing in the CMS
2012-07-25 07:10:45 -07:00
Calen Pennington
29cf09763f
Fixing up cms tests to only use data in common/test/data
2012-07-25 10:09:25 -04:00
John Jarvis
18b05fe78f
enabled_features changed mitx_features
2012-07-24 21:50:45 -04:00
Calen Pennington
8a0270ea2b
Allow for modular css from XModules, and split capa module css out as a test
2012-07-24 16:14:04 -04:00
Calen Pennington
50f27bcfb7
Eagerly load all modules when reading the course from xml, so that users who are already on a problem page can check their answers
2012-07-24 16:14:04 -04:00
Calen Pennington
8481937f59
Move Logger and *withPrefix javascript into a common location
2012-07-24 16:14:03 -04:00
Calen Pennington
87ce82570d
Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware
2012-07-24 16:14:03 -04:00
Victor Shnayder
ba733fa5d1
add options to dev_mongo env
2012-07-24 16:14:01 -04:00
Victor Shnayder
49e8d08c1e
Add get_courses() to mongo modulestore
...
* Note: This doesn't run yet
* add config file for lms on mongo
* Some comment additions and cleanups
2012-07-24 16:14:01 -04:00
Calen Pennington
987fe17358
Load js fragments in order, so that Subview is loaded before the classes that use it
2012-07-24 16:14:00 -04:00
Calen Pennington
5026d6e9fb
Give all XModuleDescriptors a module_class, and make it inheritance of js_module_names work
2012-07-24 16:14:00 -04:00
Calen Pennington
3cdceab16c
Uniquify js fragments pulled from XModules, and load both XModuleDescriptor and XModule js into the cms
2012-07-24 16:13:59 -04:00
Calen Pennington
3fa636e060
Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory
2012-07-24 16:13:59 -04:00
John Jarvis
703293f785
adding enabled features to aws.py
2012-07-24 15:56:42 -04:00
Calen Pennington
98910a2d49
Address review comments
2012-07-24 14:46:46 -04:00
Calen Pennington
66f79251dc
Add feature flag for disabling course start dates
2012-07-24 13:22:50 -04:00
David Ormsbee
729070763f
Convert @mitx.mit.edu emails to @edx.org emails
2012-07-23 23:43:34 -04:00
Kyle Fiedler
e6465e420a
Changed around the css
2012-07-23 12:38:21 -04:00
Calen Pennington
d19e50aeb6
Merge remaining js files into django-pipeline groups
2012-07-23 11:27:22 -04:00
Calen Pennington
5dd4e19c0b
Move vendor js into a single file
2012-07-23 10:24:50 -04:00
Bridger Maxwell
9ebac1bdd7
Removed a bunch of non-necessary javascript from homepage. Most of it was put back in courseware. A new PIPELINE_JS group 'courseware' was created, for pipeline javascript files that should only be in the courseware.
2012-07-23 08:18:37 -04:00
David Ormsbee
5330396844
Merge pull request #251 from MITx/kf-multicourse-design
...
Kf multicourse design
2012-07-21 09:39:32 -07:00
Calen Pennington
64b92c35cc
Include ie fixes in via django-pipeline
2012-07-20 19:54:07 -04:00
Bridger Maxwell
7d8ded7bf3
Removed UpdateCacheMiddleware, which wasn't doing anything.
2012-07-20 14:06:49 -04:00
Bridger Maxwell
9f84d9b6fd
Merge remote-tracking branch 'origin/master' into release/1.0
2012-07-17 13:56:44 -04:00
Matthew Mongeau
171e16f177
Use local feed as default
2012-07-17 12:56:30 -04:00
Matthew Mongeau
2bfe0cb92d
Add parsed rss entries to home page with caching
2012-07-17 12:56:28 -04:00
Bridger Maxwell
2f4cf23b73
Merge remote-tracking branch 'origin/master' into course_start
...
Conflicts:
common/djangoapps/student/views.py
2012-07-17 12:53:27 -04:00
Bridger Maxwell
8ebaf8a761
Merge remote-tracking branch 'origin/master' into course_start
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
lms/urls.py
2012-07-17 10:52:39 -04:00
Bridger Maxwell
bde93aea99
Merge remote-tracking branch 'origin/master' into template_caching
...
Conflicts:
lms/templates/footer.html
lms/templates/signup_modal.html
2012-07-16 16:19:26 -04:00
Bridger Maxwell
70e2f7c0d5
Merged with master. Moved a bunch of static template files to their own urls (without /t/template).
2012-07-16 15:32:22 -04:00
Bridger Maxwell
4f4e751321
Merge
2012-07-16 12:42:49 -04:00
Calen Pennington
f889c9a099
Actually exclude things outside of the mitx repo, rather than only including those things
2012-07-16 12:36:52 -04:00
Calen Pennington
04469a4e8e
Strip out STATICFILES_DIRS that aren't in the mitx repo when running unit tests
2012-07-16 12:13:19 -04:00
Bridger Maxwell
eb7ae3540c
Added a simple, specific cache for the static_template_pages.
2012-07-16 09:12:50 -04:00
Bridger Maxwell
f9de962365
Merge remote-tracking branch 'origin/master' into course_start
2012-07-13 13:40:01 -04:00
