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

22621 Commits

Author SHA1 Message Date
Brittany Cheng
67777ef5a2 left nav styles 2012-08-07 16:52:32 -04:00
Rocky Duan
272c7b8b0c Merge branch 'master' into merge 2012-08-07 16:49:54 -04:00
Brittany Cheng
8df3ec3dae Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:42:45 -04:00
Rocky Duan
2685a3b637 trending tags 2012-08-07 16:41:01 -04:00
Brittany Cheng
a2f0e31d90 Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:21:24 -04:00
Brittany Cheng
9ae21a878a recent activity 2012-08-07 16:21:19 -04:00
Rocky Duan
fddee7defa Merge branch 'brittany' of github.com:dementrock/mitx 
Conflicts:
	lms/templates/discussion/_recent_active_posts.html
 2012-08-07 16:19:10 -04:00
Brittany Cheng
d934142adf Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:16:32 -04:00
Bridger Maxwell
ec04b0cb13 Changed yield_module_descendents to be stack-based, so it plays nicer with the profiler. 2012-08-07 16:16:31 -04:00
Rocky Duan
7ba3bdfd61 show recently active posts user's following 2012-08-07 16:16:23 -04:00
Rocky Duan
6023aca559 scaffold for trending tags 2012-08-07 16:15:43 -04:00
Brittany Cheng
338a6788c8 recent activity 2012-08-07 16:11:24 -04:00
Arjun Singh
b9f2d4bc13 Remove coffee libraries (use the system coffee); don't set the OS NODE_PATH but rather just read it in once and then modify the temporary environments used when executing node. 2012-08-07 15:52:39 -04:00
Tom Giannattasio
d6e969a8c0 added collapsed state for text editor 2012-08-07 15:46:18 -04:00
Brittany Cheng
e1a564108b Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 15:41:29 -04:00
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00
ichuang
165ffe0a4d Merge pull request #362 from MITx/ichuang/minor-disable-django-debug-dev-ike 
disable diajgo debug toolbar on mit server (dev_ike.py)
 2012-08-07 12:32:52 -07:00
Bridger Maxwell
a9d67c3e8d Added has_score attribute to xmodule, for problem-like xmodules. 2012-08-07 15:20:47 -04:00
ichuang
8bbf433479 disable diajgo debug toolbar on mit server (dev_ike.py) 2012-08-07 15:10:00 -04:00
David Ormsbee
f4138cae70 re-enable ENABLE_LMS_MIGRATION in dev, fix the course check filter to use ACCESS_REQUIRE_STAFF_FOR_COURSE 2012-08-07 15:01:12 -04:00
David Ormsbee
fbd813ae3b disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed 2012-08-07 14:55:59 -04:00
Brittany Cheng
39dc6a63da cleanup css 2012-08-07 14:41:28 -04:00
Tom Giannattasio
6295bc3bc5 label font changes 2012-08-07 14:41:20 -04:00
Bridger Maxwell
735488fa51 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-07 14:40:37 -04:00
Calen Pennington
a237322b70 Merge pull request #359 from MITx/ichuang/minor-fix-edit-link 
change edit link showhide to use <a> instead of <input> type submit
 2012-08-07 11:40:31 -07:00
ichuang
9d2b821c26 change edit link showhide to use <a> instead of <input> type submit 
(fixes issues with edit links in multipart problems and video)
 2012-08-07 14:34:28 -04:00
Bridger Maxwell
638a5059da Added stores_state attribute for xmoduledescriptors as a way to declare if the module stores state in the database. 2012-08-07 14:34:05 -04:00
Brittany Cheng
ed8595ad95 error styles 2012-08-07 14:31:04 -04:00
Tom Giannattasio
8c366e2d59 tweaking the text editor 2012-08-07 14:25:05 -04:00
Brittany Cheng
7962813014 info styles 2012-08-07 13:53:57 -04:00
Brittany Cheng
49840933c0 error handling 2012-08-07 13:48:43 -04:00
Arjun Singh
26f31324c4 Moving a few static files out of lms into common 2012-08-07 13:39:59 -04:00
thomasxiii
258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style 
A bunch of various fixes and de-styling
 2012-08-07 10:20:10 -07:00
Rocky Duan
dbb467365b fixed error field for new post 2012-08-07 12:08:38 -04:00
Rocky Duan
aeb2d73cba Merge branch 'discussion3' of github.com:dementrock/mitx 2012-08-07 12:05:52 -04:00
Rocky Duan
a9b171c81f Merge branch 'discussion3' of github.com:dementrock/mitx 
Conflicts:
	lms/static/coffee/src/discussion/templates.coffee
 2012-08-07 12:05:46 -04:00
Brittany Cheng
391d173018 similar posts styles 2012-08-07 12:05:01 -04:00
Rocky Duan
0560bb7eb7 add hide similar post button 2012-08-07 12:03:41 -04:00
Tom Giannattasio
d5302a0bd0 thread updates: follow/unfollow, grid tweaks 2012-08-07 12:00:17 -04:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -04:00
Brittany Cheng
4b9358fb72 similar posts styles 2012-08-07 11:55:31 -04:00
kimth
a9a19f40c3 Merge master 2012-08-07 11:51:44 -04:00
kimth
b6dc622e42 Remove temporary datetime 2012-08-07 11:43:00 -04:00
Rocky Duan
0863e34619 display actual username 2012-08-07 11:40:58 -04:00
kimth
c39edb650b StudentModule lookups in queue callback use target user, rather than request.user 2012-08-07 11:38:04 -04:00
Brittany Cheng
5bec964606 Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 11:36:34 -04:00
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -04:00
Rocky Duan
6c2f53a495 to make it appear at least normal.. 2012-08-07 11:28:52 -04:00
Tom Giannattasio
00a72cf86a updated thread styles: voting, actions, comments, sort 2012-08-07 11:27:13 -04:00
Rocky Duan
25c05e702e Merge branch 'brittany' of github.com:dementrock/mitx 2012-08-07 11:23:19 -04:00