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

5315 Commits

Author SHA1 Message Date
Kyle Fiedler
ab28e08591 Added new button classes 2012-08-20 13:22:21 -04:00
Tom Giannattasio
e9e6b1828e new header styles 2012-08-20 10:41:34 -04:00
Tom Giannattasio
8b4b1fddb5 added new wrapper styles 2012-08-20 10:15:28 -04:00
Tom Giannattasio
3b02e6a1ee started new nav styles 2012-08-20 09:02:18 -04:00
Rocky Duan
ff41338cad refactor attempt 2012-08-19 21:58:36 -07:00
David Ormsbee
c7d2e252e2 Fix errors that were preventing collectstatic from running 2012-08-19 22:31:05 -04:00
Rocky Duan
12d51334f8 mustache template 2012-08-19 16:03:42 -07:00
Rocky Duan
64e6160548 slight behavior change 2012-08-19 10:44:05 -07:00
Rocky Duan
991bb01af4 shouldn't commit env config 2012-08-19 10:42:45 -07:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
Rocky Duan
e49226e9e1 some refactor 2012-08-19 00:16:04 -07:00
Rocky Duan
238adb1a03 Merge branch 'master' into profile 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
 2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Bridger Maxwell
1470045b74 Fixed wiki circuit editor modal to be a little better styled. 2012-08-17 21:44:56 -04:00
Bridger Maxwell
a4b97c5f10 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 21:44:05 -04:00
Kyle Fiedler
8473188fea Added new styles for sequence nav and reset some of the styles for inputs 2012-08-17 17:41:45 -04:00
Tom Giannattasio
a2d0ada82c styled settings page 2012-08-17 17:01:45 -04:00
Tom Giannattasio
1bd790fabb finished attachment styles 2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297 added modal functionality for attachments page 2012-08-17 15:59:31 -04:00
Tom Giannattasio
e47f3ccf35 added CodeMirror styles for the circuit editor 2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb added Code Mirror styles 2012-08-17 15:10:24 -04:00
Bridger Maxwell
b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:48:06 -04:00
Bridger Maxwell
8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:44:25 -04:00
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
Tom Giannattasio
f67a356466 added additional bootstrap js files 2012-08-17 14:14:07 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Tom Giannattasio
b0b10aa598 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:35:56 -04:00
Bridger Maxwell
2de55d074b Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:34:38 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00
Tom Giannattasio
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04:00
Kyle Fiedler
24ed4a4dae MAnage images 2012-08-16 12:06:20 -04:00
Kyle Fiedler
ad7061e41f Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav 2012-08-16 11:33:05 -04:00
Calen Pennington
3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-16 07:31:56 -07:00
Bridger Maxwell
d064d29cd8 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-15 23:01:27 -04:00
Bridger Maxwell
48e9dc8031 Added bootstrap-modal for the wiki preview modals. 2012-08-15 20:07:05 -04:00
Mike Chen
2454c06b08 Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance 2012-08-15 16:14:17 -04:00
Tom Giannattasio
13c2bb588e added styles for main article, sidebar and breadcrumb 2012-08-15 15:59:46 -04:00
Rocky Duan
f7f6164351 slight styling adjustment 2012-08-15 11:36:14 -07:00
Kyle Fiedler
6d7225bebb Added some final touches to askbot 2012-08-15 13:51:10 -04:00
Kyle Fiedler
ff1f090737 Added more fixes for askbot also fixed some of the extra padding 2012-08-15 13:51:10 -04:00
Kyle Fiedler
0804ff7a75 Added styles for single question and profile view 2012-08-15 13:51:10 -04:00
Kyle Fiedler
bbe9432508 Lots of askbot fixes 2012-08-15 13:51:10 -04:00
Tom Giannattasio
8daea9c465 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-15 13:11:00 -04:00
Tom Giannattasio
abf26dced9 started styles 2012-08-15 13:10:47 -04:00
Mike Chen
7c22a39aca Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance 
Conflicts:
	common/lib/xmodule/xmodule/discussion_module.py
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/discussion/_thread.html
	lms/urls.py
 2012-08-15 11:05:20 -04:00
Rocky Duan
00ff1b9419 can retrieve all comments 2012-08-15 01:08:42 -07:00
Rocky Duan
e5fe54ca5d display active threads with only relevant contents 2012-08-15 00:46:28 -07:00
Rocky Duan
9ef1a11c28 fixed merge bug 2012-08-14 18:12:35 -07:00
Rocky Duan
449d665b00 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-14 17:48:08 -07:00