Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

2692 Commits

Author SHA1 Message Date
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
Rocky Duan
b68a69cd7b Merge branch 'brittany' of github.com:dementrock/mitx into merge 2012-08-14 17:37:29 -07:00
Brittany Cheng
b9875b80e0 edit panel styles 2012-08-14 17:36:27 -07:00
Rocky Duan
5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py
 2012-08-14 17:32:30 -07:00
Brittany Cheng
46f2407e39 style fixes 2012-08-14 17:29:58 -07:00
Brittany Cheng
f20659f525 style fixes 2012-08-14 17:23:40 -07:00
Rocky Duan
00775a05a7 Merge branch 'brittany' of github.com:dementrock/mitx into profile 2012-08-14 17:18:35 -07:00
Brittany Cheng
6d24972678 similar post and search highlight 2012-08-14 17:18:07 -07:00
Rocky Duan
a701e703fd Merge branch 'brittany' of github.com:dementrock/mitx into profile 2012-08-14 17:16:48 -07:00
Brittany Cheng
623b82eeff similar post and search highlight 2012-08-14 17:16:22 -07:00
Rocky Duan
d0a339bec6 fixed similar posts suggestion 2012-08-14 17:13:27 -07:00
Rocky Duan
dd80cbc423 confirm before changing moderator status 2012-08-14 16:57:20 -07:00
Rocky Duan
700594263e Merge branch 'brittany' of github.com:dementrock/mitx into profile & 
small fix

Conflicts:
	lms/templates/discussion/user_profile.html
 2012-08-14 16:52:43 -07:00
Rocky Duan
457b7f468f toggle moderator status 2012-08-14 16:43:33 -07:00
Brittany Cheng
f983867e6b moderator styles 2012-08-14 16:28:45 -07:00
Rocky Duan
50e95de9ef a place to start for the user profiel & fixed some bugs 2012-08-14 15:04:36 -07:00
Rocky Duan
04387289fa fixed bugs caused by merging 2012-08-14 13:43:04 -07:00
Tom Giannattasio
a58a047582 moved global nav class 2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51 modified zebra stripes 2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159 basic gradebook template built; basic scroll functionality built 2012-08-14 16:09:32 -04:00
Tom Giannattasio
9871050f94 started gradebook 2012-08-14 16:09:32 -04:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07:00