Commit Graph

3616 Commits

Author SHA1 Message Date
Arjun Singh
c4c8bc2fbe Adding the ability for javascript from problems to execute more intelligently; for example, errors from javascript included in the returned html will show up in the console when using this mechanism. 2012-07-26 16:35:33 -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
David Ormsbee
9cd3b013f3 Merge pull request #308 from MITx/feature/halogenandtoast/form-field-errors
Add field-error class to field with issues.
2012-07-26 12:54:04 -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
Matthew Mongeau
8e2ced916f Add field-error class to field with issues. 2012-07-26 14:06:29 -04:00
Arjun Singh
73261719ce Added TODO near temporary code. 2012-07-26 13:14:00 -04:00
Calen Pennington
1d554c76a0 Comment out really loud debug messages from xml.py 2012-07-26 12:05:23 -04:00
Calen Pennington
c6d160ad1e Ignore some spurious errors from pylint 2012-07-26 10:48:55 -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
9b032f08b8 Removing stray print statement 2012-07-25 21:46:01 -04:00
Arjun Singh
3002260de5 Compiling coffee files in course data directories on startup. 2012-07-25 21:45:01 -04:00
Arjun Singh
1d851713a0 Compiling coffee files in course data directories on startup. 2012-07-25 21:36:52 -04:00
David Ormsbee
e4073663e2 Have Bloomberg link point to Bloomberg article :-P 2012-07-25 18:47:26 -04:00
David Ormsbee
dd7b1374eb Merge pull request #305 from MITx/feature/dormsbee/press_copy_updates
Hotfix changes
2012-07-25 15:35:30 -07:00
David Ormsbee
5ad1791433 add a few items to the press links at the bottom of the front page 2012-07-25 18:31:57 -04:00
David Ormsbee
9671df3e25 minor typo fixes 2012-07-25 18:22:46 -04:00
Kyle Fiedler
8c079c8a72 Added styles for course images to always the right dimentions 2012-07-25 18:18:52 -04:00
David Ormsbee
a8610c3889 fixed twitter link to Berkeley Press Release 2012-07-25 18:15:37 -04:00
David Ormsbee
619d4cd989 fixed twitter link for course about pages 2012-07-25 18:14:05 -04:00
David Ormsbee
a86938ee93 New press articles 2012-07-25 18:09:26 -04:00
David Ormsbee
3a933aeab8 Update About Page text with new intro paragraph 2012-07-25 17:40:58 -04:00
David Ormsbee
26a14fd2c3 Merge pull request #304 from MITx/feature/halogenandtoast/press-page
Feature/halogenandtoast/press page
2012-07-25 14:35:42 -07:00
Matthew Mongeau
bd9da89fe9 Move press articles to json. 2012-07-25 17:31:34 -04:00
kylefiedler
c7648bc484 Merge pull request #297 from MITx/arjun/minor_css_fixes
change activation complete green and add styles for faq
2012-07-25 13:49:52 -07:00
Calen Pennington
34a32ce15a Merge pull request #302 from MITx/feature/fix-courseware
fix courseware css file so it imports the right files in the right order
2012-07-25 12:58:21 -07:00
Arjun Singh
cdea9488ef Fixing up bracket indentation 2012-07-25 15:58:14 -04:00
Kyle Fiedler
bb3dfc5c08 fix courseware css file so it imports the right files in the right order 2012-07-25 15:54:18 -04:00
jarv
5918cccdfb Merge pull request #293 from MITx/arjun/add_data_watcher
Adding script that restarts django when content in the data directories changes.
2012-07-25 12:28:50 -07:00
Calen Pennington
94a8421195 Merge pull request #295 from MITx/courseware-css
Courseware css
2012-07-25 12:01:18 -07:00
Kyle Fiedler
18dc689d4d Added fix for where the course.css is being brought in 2012-07-25 14:57:44 -04:00
Kyle Fiedler
00596d2f20 Added courseware css back into the main template 2012-07-25 14:57:44 -04:00
Brittany Cheng
388ddc5365 change activation complete green and add styles for faq 2012-07-25 14:57:00 -04:00
Calen Pennington
d1482e19ee Merge pull request #294 from MITx/jarv/wiki_enabled
reading WIKI_ENABLED from env.json
2012-07-25 11:18:41 -07:00
John Jarvis
dab92102d1 reading WIKI_ENABLED from env.json 2012-07-25 14:15:49 -04:00
Arjun Singh
60365a6446 Using /usr/bin/env rather than defaulting to ../python/bin/python 2012-07-25 13:40:47 -04:00
Arjun Singh
e6ee3d50ba Simplified server restart to just touching lms/__init__.py rather than killing and restarting the server. 2012-07-25 13:39:30 -04:00
Arjun Singh
c9a36a7085 Adding an option to watch all extensions; useful for a VIM user where the filesystem events aren't triggered when saving a file without disabling backups. 2012-07-25 13:25:03 -04:00
Arjun Singh
6376516568 Adding script that restarts django when content in the data directories changes. 2012-07-25 13:07:24 -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
8b1bab75bd Fixing up comments on xmodule components 2012-07-25 10:10:17 -04:00
Calen Pennington
29cf09763f Fixing up cms tests to only use data in common/test/data 2012-07-25 10:09:25 -04:00
Calen Pennington
7371b444bf Merge pull request #291 from MITx/jarv/enabled-features
adding enabled features to aws.py
2012-07-25 06:47:56 -07:00
John Jarvis
18b05fe78f enabled_features changed mitx_features 2012-07-24 21:50:45 -04:00
Calen Pennington
85adfde1f2 Update previews after a module is saved 2012-07-24 16:14:05 -04:00
Calen Pennington
bdf964a305 Modularize video css 2012-07-24 16:14:05 -04:00
Calen Pennington
6029c28695 Modularize sequence css 2012-07-24 16:14:04 -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
0a79130b11 Make problem previews work by saving problem state in the current request session 2012-07-24 16:14:04 -04:00
Calen Pennington
408726e678 Standardize how JS XModules are instantiated 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