Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,635 Commits 1 Branch 0 Tags
d53e4bd38fc1ca1ef3cd2afcd05a0080b661cfcd
Commit Graph

3635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Fiedler
d53e4bd38f Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:49 -04:00
Kyle Fiedler
9d638d2ac0 Added some more style for cal view and nav bar 2012-07-30 09:50:25 -04:00
Kyle Fiedler
d94fd1542d Added Gemfile.lock to ignore 2012-07-30 09:50:24 -04:00
Bridger Maxwell
0a60881ca5 Merge branch 'master' of github.com:MITx/mitx 2012-07-27 08:50:07 -04:00
Bridger Maxwell
351ded6c05 Merge branch 'MITx/hotfix/1.0.2' 2012-07-27 08:49:33 -04:00
Calen Pennington
6abd1ec64a Merge pull request #309 from MITx/feature/tutorials_fix 
Add optional hide_from_toc attribute to XML elements
 2012-07-27 05:38:29 -07:00
Bridger Maxwell
dc021312dd Added faq about UC Berkeley's 'X University' Consortium. 2012-07-27 08:38:01 -04:00
Calen Pennington
aa855eec0f Merge pull request #307 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-27 05:37:57 -07:00
Calen Pennington
81d5c17a60 Merge pull request #310 from MITx/arjun/javascript_loading 
Adding the ability for javascript from problems to execute more intelligently
 2012-07-27 05:37:04 -07:00
David Ormsbee
72341569f9 Remove sections from ever getting appended in the first place if hide_from_toc is true 2012-07-27 01:22:07 -04:00
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
David Ormsbee
2671801f93 Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation). 2012-07-26 14:55:42 -04: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
kimth
6631848b53 CodeMirror fix in the new scss org 2012-07-26 10:49:10 -04:00
Calen Pennington
c6d160ad1e Ignore some spurious errors from pylint 2012-07-26 10:48:55 -04:00
kimth
848e4e5801 Pull clean codemirror.css from master 2012-07-26 10:27:59 -04:00
kimth
8e8ac35d46 restored responsetypes.py from master 2012-07-26 10:11:49 -04:00
kimth
07de2d9903 Merging master 2012-07-26 10:08:55 -04:00
kimth
1255ed130f Adjust comments 2012-07-26 09:15:07 -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
kimth
57810bb564 Consolidate textbox styling into codemirror.css 2012-07-25 16:53:07 -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
kimth
4680b9f9e5 Fix cursor/text mismatch in Code/External-Response styling 2012-07-25 16:11:21 -04: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