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

40 Commits

Author SHA1 Message Date
Calen Pennington
6b15303d89 Make collectstatic compile .coffee files, and preserve the askbot workflow using guard 2012-05-18 15:10:10 -04:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline 
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
 2012-05-17 16:32:39 -04:00
Isaac Chuang
232e758c7a Integrating some of Ike's courseware changes 2012-05-13 19:36:01 -04:00
Piotr Mitros
0028b3345e jsonify in postJSON from multiple choice did -- indeed -- break things. Removed. 2012-05-11 14:02:09 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Lyla Fischer
13a095fc1e checkboxes 2012-05-07 21:04:10 -04:00
Kyle Fiedler
b24cf842dc Added more bug fixes 2012-04-24 11:09:32 -04:00
Kyle Fiedler
2be9a1e6d2 Removed fullscreen js as it breaks the video 2012-04-24 11:09:31 -04:00
Kyle Fiedler
3c60d7a69b Added hover over video bar and js to possibly go true full screen 2012-04-24 11:09:31 -04:00
Calen Pennington
7dcc6b38ae Moving sass compilation to django-pipeline 2012-04-20 14:20:09 -04:00
Calen Pennington
26a3e6cdf4 Merge pull request #11 from MITx/move_settings 
Reorganize settings files for different environments
 2012-04-19 07:52:02 -07:00
David Ormsbee
0d07ebc921 Merge branch 'master' into move_settings 
Conflicts:
	static/simplewiki
 2012-04-09 16:47:45 -04:00
Bridger Maxwell
a431ad19c7 Changed size of circuit schematic to be the same as old editor 2012-04-09 15:25:55 -04:00
Bridger Maxwell
202659cb1b Merged in master branch 2012-04-05 14:50:36 -04:00
Kyle Fiedler
7c2cb55d81 Added some firefox fixes 2012-04-04 11:43:26 -04:00
Kyle Fiedler
4225317dad Added some js to make the tooltip show the time 2012-04-04 10:26:14 -04:00
Kyle Fiedler
26c6fe29c1 Added tooltip for time on video 2012-04-04 10:26:13 -04:00
Bridger Maxwell
183774f637 Fixed codemirror arrowkey navigation bug. 2012-03-29 22:27:55 -07:00
Bridger Maxwell
d7383bf3c4 Small cleanups in codemirror. 2012-03-29 18:21:25 -07:00
Bridger Maxwell
d283bb5794 Moved bug fix to minified leanModal 2012-03-29 18:00:42 -07:00
Bridger Maxwell
4938fb63da Set size of wiki circuits 2012-03-29 16:39:06 -07:00
Bridger Maxwell
d51341301d Changed some css properties for proper sizing of elements. 2012-03-29 15:56:21 -07:00
Bridger Maxwell
b2fbf537e4 Properly escaping the schematic html attributes. 2012-03-29 00:16:03 -07:00
Bridger Maxwell
f62a43965b Fixed bug for selecting lines with non-integer heights. It put up a fight... 2012-03-28 22:50:23 -07:00
Bridger Maxwell
bb15d92381 Fixed leanModal bug that caused lots of overlays to be added. 2012-03-28 14:20:08 -07:00
Bridger Maxwell
f95aa496fa Better compatibility with the Codemirror editor and the markdown circuit extension. 2012-03-28 14:09:21 -07:00
Bridger Maxwell
99b8a51101 Removed debug comments. 2012-03-28 01:00:33 -07:00
Bridger Maxwell
3c015bb0a9 Another codemirror fix. 2012-03-28 00:56:44 -07:00
Bridger Maxwell
32384c8eb9 Fixed a lot of bugs with selection in codemirror. Seems to work pretty solidly now\! 2012-03-28 00:36:06 -07:00
Bridger Maxwell
43318b7213 Fixing deletion / insertion bugs and inconsistencies 2012-03-27 14:33:24 -07:00
Bridger Maxwell
952b754966 New method works without line wrapping too 2012-03-26 17:15:45 -07:00
Bridger Maxwell
5580c62ee4 Wiki editor now has wrapped lines. 2012-03-26 13:48:11 -07:00
Bridger Maxwell
8fce7066da You can now edit a circuit directly on the edit page of the wiki. These edits show up in the history. This hasn't been tested much. 2012-03-25 20:39:21 -07:00
Bridger Maxwell
3ed5b161ec Moved simplewiki autosuggest js (it didn't get migrated). Fixed a minor typo in settings.py (it suggested the wrong override location for the static js files) 2012-03-25 20:08:03 -07:00
David Ormsbee
e36f309bb8 update symlinks to keep references to static assets in wiki happy 2012-03-22 13:36:18 -04:00
Calen Pennington
71cc49184b Merge remote-tracking branch '3rdParty/master' 2012-03-19 11:10:49 -04:00
Calen Pennington
fc68777119 Fix up the symlinks to point to the right place 2012-03-19 11:10:44 -04:00
Calen Pennington
4f65c6e67a Remove file in 3rdParty 2012-03-19 11:10:43 -04:00
Calen Pennington
799816a31d Move to subdirectory in preparation for merge 2012-03-19 11:10:43 -04:00
Calen Pennington
70832c7db3 Import from hg 2012-03-19 11:05:25 -04:00