Rocky Duan
|
2e45b8c3c6
|
Merge branch 'ccp0101/moderation' into lol
|
2012-08-08 10:46:11 -04:00 |
|
Rocky Duan
|
b1e1cd57d8
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 10:45:04 -04:00 |
|
Rocky Duan
|
18fcdc4be2
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 10:44:24 -04:00 |
|
Mike Chen
|
b2a048e6fc
|
limit permissions of a role to courses and fix bugs
|
2012-08-08 10:42:29 -04:00 |
|
Bridger Maxwell
|
696804da13
|
Changes from pull request comments.
|
2012-08-08 10:28:40 -04:00 |
|
Rocky Duan
|
c2f27a5f8e
|
some starting refactor ideas
|
2012-08-08 10:03:49 -04:00 |
|
Calen Pennington
|
e7bf3d0355
|
Merge pull request #367 from MITx/arjun/cs188_syllabus_styling
adding some styling so that the syllabus lists display reasonably
|
2012-08-08 06:23:38 -07:00 |
|
Calen Pennington
|
ebd0458d6d
|
Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery
improve staff_problem_info jquery, so the histogram is also toggled
|
2012-08-08 05:57:51 -07:00 |
|
Arjun Singh
|
d8a1b5d574
|
adding some styling so that the syllabus lists display reasonably
|
2012-08-08 02:59:15 -04:00 |
|
Rocky Duan
|
f1dabe1575
|
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol
|
2012-08-07 18:55:34 -04:00 |
|
Rocky Duan
|
f3d44225cc
|
Merge branch 'brittany' of github.com:dementrock/mitx into brittany
|
2012-08-07 18:51:18 -04:00 |
|
Rocky Duan
|
690d97f28b
|
fixed merge bugs
|
2012-08-07 18:49:59 -04:00 |
|
Mike Chen
|
e9c970e399
|
revert permanent link for comments
|
2012-08-07 18:45:26 -04:00 |
|
Bridger Maxwell
|
0fe2abbbdb
|
Added docstring.
|
2012-08-07 18:39:19 -04:00 |
|
Bridger Maxwell
|
718499d793
|
Fix test failure from recent commit.
|
2012-08-07 18:37:27 -04:00 |
|
ichuang
|
9241841195
|
improve staff_problem_info jquery, so the histogram is also toggled
|
2012-08-07 18:36:04 -04:00 |
|
Bridger Maxwell
|
eb58f7c37c
|
Changed to more specific import of xmodule.util.decorators.
|
2012-08-07 18:32:53 -04:00 |
|
Bridger Maxwell
|
25662db914
|
Lazily loading capa problems (for faster grading).
|
2012-08-07 18:32:08 -04:00 |
|
Rocky Duan
|
2fb02f1a73
|
Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
lms/urls.py
|
2012-08-07 16:58:14 -04:00 |
|
Brittany Cheng
|
1f1ea8ad5e
|
left nav styles
|
2012-08-07 16:56:53 -04:00 |
|
Brittany Cheng
|
0fba4d9848
|
left nav styles
|
2012-08-07 16:54:13 -04:00 |
|
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 |
|
Bridger Maxwell
|
1f34cf33fa
|
Speed improvements by making the mako rendering in CustomTagModule lazy.
|
2012-08-07 16:01:42 -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 |
|
Arjun Singh
|
35d6c773f1
|
Clean up code for generating env for running node
|
2012-08-07 15:24:20 -04:00 |
|
Bridger Maxwell
|
a9d67c3e8d
|
Added has_score attribute to xmodule, for problem-like xmodules.
|
2012-08-07 15:20:47 -04:00 |
|
Arjun Singh
|
f004f5febb
|
Cleaning up javascriptinput setup method
|
2012-08-07 15:18:30 -04:00 |
|
ichuang
|
8bbf433479
|
disable diajgo debug toolbar on mit server (dev_ike.py)
|
2012-08-07 15:10:00 -04:00 |
|
Calen Pennington
|
d558e3a43f
|
Merge pull request #361 from MITx/feature/disable_staff_course_check_in_dev
Feature/disable staff course check in dev
|
2012-08-07 12:05:08 -07: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 |
|
Bridger Maxwell
|
98d4d44e45
|
Fixed test from previous commit.
|
2012-08-07 14:49:00 -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 |
|