David Ormsbee
|
d5dd59bcbb
|
Merge pull request #369 from MITx/feature/halogenandtoast/table_of_contents
Feature/halogenandtoast/table of contents
|
2012-08-08 11:45:52 -07:00 |
|
Rocky Duan
|
65f849637f
|
Merge branch 'ccp0101/moderation' into lol
Conflicts:
lms/urls.py
|
2012-08-08 14:39:10 -04:00 |
|
Tom Giannattasio
|
9b9bb22cda
|
tightened white space; fixed double margin in comments
|
2012-08-08 14:36:19 -04:00 |
|
Matthew Mongeau
|
bcdcd7341f
|
include courseware js
|
2012-08-08 14:13:34 -04:00 |
|
Matthew Mongeau
|
0b03834f51
|
XML based table of contents for books.
|
2012-08-08 14:13:20 -04:00 |
|
Calen Pennington
|
7facb262fc
|
Remove openid link when feature is disabled. https://www.pivotaltracker.com/story/show/34090805
|
2012-08-08 14:10:05 -04:00 |
|
Brittany Cheng
|
3ec658df56
|
merge tom's styles, warning: LOTS OF STUFF BROKE
|
2012-08-08 12:45:40 -04:00 |
|
Mike Chen
|
eaf8279451
|
Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation
Conflicts:
lms/urls.py
|
2012-08-08 12:04:41 -04:00 |
|
Mike Chen
|
2b803b024e
|
fix MITx master bug in courseware.
|
2012-08-08 12:02:50 -04:00 |
|
Bridger Maxwell
|
14a35b9605
|
Upgrading to django 1.4.
|
2012-08-08 11:57:15 -04:00 |
|
Mike Chen
|
5e6261ebb1
|
courseware still not working..
|
2012-08-08 11:30:11 -04:00 |
|
Mike Chen
|
8627a5f33e
|
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation
|
2012-08-08 11:20:13 -04:00 |
|
Tom Giannattasio
|
dc5b8b51c4
|
placeholder and button color updates
|
2012-08-08 11:08:58 -04:00 |
|
Calen Pennington
|
80b8529f2f
|
Merge branch 'hotfix/1.0.4'
Conflicts:
common/djangoapps/util/middleware.py
|
2012-08-08 11:05:26 -04:00 |
|
Tom Giannattasio
|
10ff6af3bb
|
discussion sidebar additions; inline text editor example
|
2012-08-08 10:56:59 -04:00 |
|
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 |
|
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 |
|
ichuang
|
9241841195
|
improve staff_problem_info jquery, so the histogram is also toggled
|
2012-08-07 18:36:04 -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 |
|
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 |
|