Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1184 Commits

Author SHA1 Message Date
Tom Giannattasio
59c30ecdbc slightly smaller class names 2012-10-03 09:49:13 -04:00
Tom Giannattasio
f2be01fd8f removed visibility toggles; added private tag 2012-10-03 09:48:50 -04:00
Tom Giannattasio
44d4a4b0d9 started asset library template -wip 2012-10-02 17:02:47 -04:00
Tom Giannattasio
423dbd17b5 new unit publish settings 2012-10-02 10:40:05 -04:00
chrisndodge
d108af8848 Merge pull request #799 from MITx/feature/cale/cms-codemirror-background 
Feature/cale/cms codemirror background
 2012-10-02 07:10:29 -07:00
Calen Pennington
55542c1d47 Make editor display immediately, and with a white background 2012-10-02 09:42:19 -04:00
Tom Giannattasio
8478f7af64 styled course list page 2012-10-01 16:37:24 -04:00
Tom Giannattasio
8f0b068459 styled log in form 2012-10-01 16:30:28 -04:00
Tom Giannattasio
d2549b6346 fixed header styles 2012-10-01 16:11:04 -04:00
Tom Giannattasio
4d985dc0c7 added release button; cleaned up toggle button 2012-10-01 15:51:29 -04:00
Calen Pennington
60e7914580 Add WIP markers 2012-10-01 15:28:12 -04:00
Calen Pennington
aa0aa65301 Clean up unit.html with layout/css from tom 2012-10-01 15:28:12 -04:00
Calen Pennington
96a914216c Fix up overview page with new design mockup 2012-10-01 15:28:12 -04:00
Calen Pennington
2ad7b11f6a Make padding correct on unit page 2012-10-01 15:28:12 -04:00
Calen Pennington
805798600b Clean up display of templates 2012-10-01 15:19:35 -04:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Calen Pennington
dc062f5668 Make edit and delete buttons show up on cms unit editing page 2012-10-01 15:17:41 -04:00
Calen Pennington
f53217e523 Add padding around courseware content 2012-10-01 15:17:40 -04:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00
Calen Pennington
4381674ec5 Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms 2012-10-01 15:17:40 -04:00
Calen Pennington
d240b5b1eb Consolidate bourbon and link to it from both cms and lms 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
Calen Pennington
d534855b54 Make the overview page pull data from the db, rather than static content 2012-10-01 15:16:30 -04:00
Calen Pennington
ea8ab0f809 Add basic overview.html from tom's wireframe to CMS 2012-10-01 15:12:29 -04:00
Calen Pennington
0492c8e3bd Enable wip flag 2012-09-18 13:17:52 -04:00
Calen Pennington
0758d21d6a Re-enable wip markers in cms css 2012-09-18 10:44:12 -04:00
Kyle Fiedler
7a248f0154 Added fixes to some style and one Cale fix to get things working properly 2012-09-11 14:05:07 -04:00
Kyle Fiedler
8a112b0cca Added fix for cms sass 2012-08-21 16:01:48 -04:00
Kyle Fiedler
20d9e6e86d Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red 2012-08-20 15:45:05 -04:00
Kyle Fiedler
6c3ec99f9e Start to change to ems and remove all of cream 2012-08-01 17:36:10 -04:00
Victor Shnayder
f3567ddd66 Change absolute paths to relative in scss 
* makes collectstatic happy
 2012-07-31 16:15:49 -04:00
Kyle Fiedler
44168deffc Added styles for buttons 2012-07-30 09:51:50 -04:00
Kyle Fiedler
270f0f3ae4 Added more styles includeing the index page more color changes and header styles 2012-07-30 09:51:50 -04:00
Kyle Fiedler
b777d2c057 Added some more style for cal view and nav bar 2012-07-30 09:51:50 -04:00
Kyle Fiedler
1d5ce54140 Added styles for buttons 2012-07-30 09:51:49 -04:00
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
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
Victor Shnayder
339e9a68f4 Make end-to-end tests work again 
* NOTE: successfully running the tests depends on an updated version of
  django-pipeline, which fixes a unicode bug (efaba4ac63)

Config changes:
* Use separate db for the cms
* Run collectstatic before running tests--needed to get everything in the right place for loading pages
* fix some paths related to this
* Turn off JS compressor for CMS
* add empty test_root/uploads dir

Code changes:
* Add cms tests to check that home page and signup pages load
* Add cms account creation test
* Make github sync tests clean out repo dirs before running.
 2012-07-13 11:51:33 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
 2012-07-10 13:39:19 -04:00
Kyle Fiedler
6f40b46415 Fixed overflow and fixed hover on new module 2012-07-09 12:02:38 -04:00
Kyle Fiedler
8a4d860a1e put normalize in vendor folder 2012-07-09 11:26:46 -04:00
Kyle Fiedler
389fd7111a Get rid of comments 2012-07-09 11:08:07 -04:00
Kyle Fiedler
93f8f7685a Added more wip and fixed issue with after 2012-07-09 10:37:37 -04:00
Kyle Fiedler
19bd613f6d Readd the wip class 2012-07-09 10:25:52 -04:00
Kyle Fiedler
dbcad03ddd Added some fixes for some small things adn reset the js 2012-07-09 10:22:55 -04:00
Kyle Fiedler
c8da987436 Added new icons for all of the content 2012-07-09 10:04:20 -04:00