This website requires JavaScript.
3ec658df56
merge tom's styles, warning: LOTS OF STUFF BROKE
2012-08-08 12:45:40 -04:00
eaf8279451
Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 12:04:41 -04:00
2b803b024e
fix MITx master bug in courseware.
2012-08-08 12:02:50 -04:00
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
5e6261ebb1
courseware still not working..
2012-08-08 11:30:11 -04:00
8627a5f33e
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 11:20:13 -04:00
dc5b8b51c4
placeholder and button color updates
2012-08-08 11:08:58 -04:00
80b8529f2f
Merge branch 'hotfix/1.0.4'
2012-08-08 11:05:26 -04:00
10ff6af3bb
discussion sidebar additions; inline text editor example
2012-08-08 10:56:59 -04:00
2e45b8c3c6
Merge branch 'ccp0101/moderation' into lol
2012-08-08 10:46:11 -04:00
b1e1cd57d8
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 10:45:04 -04:00
18fcdc4be2
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 10:44:24 -04:00
b2a048e6fc
limit permissions of a role to courses and fix bugs
2012-08-08 10:42:29 -04:00
696804da13
Changes from pull request comments.
2012-08-08 10:28:40 -04:00
c2f27a5f8e
some starting refactor ideas
2012-08-08 10:03:49 -04:00
e7bf3d0355
Merge pull request #367 from MITx/arjun/cs188_syllabus_styling
2012-08-08 06:23:38 -07:00
ebd0458d6d
Merge pull request #363 from MITx/feature/ichuang/improved-staff-debug-jquery
2012-08-08 05:57:51 -07:00
d8a1b5d574
adding some styling so that the syllabus lists display reasonably
2012-08-08 02:55:32 -04:00
f1dabe1575
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol
2012-08-07 18:55:34 -04:00
f3d44225cc
Merge branch 'brittany' of github.com:dementrock/mitx into brittany
2012-08-07 18:51:18 -04:00
690d97f28b
fixed merge bugs
2012-08-07 18:49:59 -04:00
e9c970e399
revert permanent link for comments
2012-08-07 18:45:26 -04:00
0fe2abbbdb
Added docstring.
2012-08-07 18:39:19 -04:00
718499d793
Fix test failure from recent commit.
2012-08-07 18:37:27 -04:00
9241841195
improve staff_problem_info jquery, so the histogram is also toggled
2012-08-07 18:36:04 -04:00
eb58f7c37c
Changed to more specific import of xmodule.util.decorators.
2012-08-07 18:32:53 -04:00
25662db914
Lazily loading capa problems (for faster grading).
2012-08-07 18:32:08 -04:00
2fb02f1a73
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-07 16:58:14 -04:00
1f1ea8ad5e
left nav styles
2012-08-07 16:56:53 -04:00
0fba4d9848
left nav styles
2012-08-07 16:54:13 -04:00
67777ef5a2
left nav styles
2012-08-07 16:52:32 -04:00
272c7b8b0c
Merge branch 'master' into merge
2012-08-07 16:49:54 -04:00
8df3ec3dae
Merge branch 'master' of github.com:dementrock/mitx into brittany
2012-08-07 16:42:45 -04:00
2685a3b637
trending tags
2012-08-07 16:41:01 -04:00
a2f0e31d90
Merge branch 'master' of github.com:dementrock/mitx into brittany
2012-08-07 16:21:24 -04:00
9ae21a878a
recent activity
2012-08-07 16:21:19 -04:00
fddee7defa
Merge branch 'brittany' of github.com:dementrock/mitx
2012-08-07 16:19:10 -04:00
d934142adf
Merge branch 'master' of github.com:dementrock/mitx into brittany
2012-08-07 16:16:32 -04:00
ec04b0cb13
Changed yield_module_descendents to be stack-based, so it plays nicer with the profiler.
2012-08-07 16:16:31 -04:00
7ba3bdfd61
show recently active posts user's following
2012-08-07 16:16:23 -04:00
6023aca559
scaffold for trending tags
2012-08-07 16:15:43 -04:00
338a6788c8
recent activity
2012-08-07 16:11:24 -04:00
1f34cf33fa
Speed improvements by making the mako rendering in CustomTagModule lazy.
2012-08-07 16:01:42 -04:00
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
d6e969a8c0
added collapsed state for text editor
2012-08-07 15:46:18 -04:00
e1a564108b
Merge branch 'master' of github.com:dementrock/mitx into brittany
2012-08-07 15:41:29 -04:00
5309592f01
scaffold for recent active posts
2012-08-07 15:40:36 -04:00
165ffe0a4d
Merge pull request #362 from MITx/ichuang/minor-disable-django-debug-dev-ike
2012-08-07 12:32:52 -07:00
35d6c773f1
Clean up code for generating env for running node
2012-08-07 15:24:20 -04:00
a9d67c3e8d
Added has_score attribute to xmodule, for problem-like xmodules.
2012-08-07 15:20:47 -04:00
f004f5febb
Cleaning up javascriptinput setup method
2012-08-07 15:18:30 -04:00
8bbf433479
disable diajgo debug toolbar on mit server (dev_ike.py)
2012-08-07 15:10:00 -04:00
d558e3a43f
Merge pull request #361 from MITx/feature/disable_staff_course_check_in_dev
2012-08-07 12:05:08 -07:00
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
fbd813ae3b
disable ENABLE_LMS_MIGRATION in dev mode, so courses are always displayed
2012-08-07 14:55:59 -04:00
98d4d44e45
Fixed test from previous commit.
2012-08-07 14:49:00 -04:00
39dc6a63da
cleanup css
2012-08-07 14:41:28 -04:00
6295bc3bc5
label font changes
2012-08-07 14:41:20 -04:00
735488fa51
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
2012-08-07 14:40:37 -04:00
a237322b70
Merge pull request #359 from MITx/ichuang/minor-fix-edit-link
2012-08-07 11:40:31 -07:00
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
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
ed8595ad95
error styles
2012-08-07 14:31:04 -04:00
8c366e2d59
tweaking the text editor
2012-08-07 14:25:05 -04:00
7962813014
info styles
2012-08-07 13:53:57 -04:00
49840933c0
error handling
2012-08-07 13:48:43 -04:00
f872e41d1d
Added descriptor to xmodule init. Now xmodules have pointer to their descriptor.
2012-08-07 13:43:30 -04:00
26f31324c4
Moving a few static files out of lms into common
2012-08-07 13:39:59 -04:00
9cba2232d5
Run all tests all the way through before quitting on errors
2012-08-07 13:31:29 -04:00
258b9eb530
Merge pull request #349 from MITx/feature/kfiedler/courseware-style
2012-08-07 10:20:10 -07:00
dbb467365b
fixed error field for new post
2012-08-07 12:08:38 -04:00
aeb2d73cba
Merge branch 'discussion3' of github.com:dementrock/mitx
2012-08-07 12:05:52 -04:00
a9b171c81f
Merge branch 'discussion3' of github.com:dementrock/mitx
2012-08-07 12:05:46 -04:00
391d173018
similar posts styles
2012-08-07 12:05:01 -04:00
0560bb7eb7
add hide similar post button
2012-08-07 12:03:41 -04:00
96252aea80
Merge pull request #358 from MITx/kimth/lms-coderesponse
2012-08-07 09:01:41 -07:00
d5302a0bd0
thread updates: follow/unfollow, grid tweaks
2012-08-07 12:00:17 -04:00
dd6ec19e80
Make the modal window work in the courseware
2012-08-07 11:59:49 -04:00
4b9358fb72
similar posts styles
2012-08-07 11:55:31 -04:00
05646fbed7
Provide default xqueue in ModuleSystem
2012-08-07 11:54:09 -04:00
a9a19f40c3
Merge master
2012-08-07 11:51:44 -04:00
c79da58175
add documentation on rake + unit tests
2012-08-07 11:48:01 -04:00
b6dc622e42
Remove temporary datetime
2012-08-07 11:43:00 -04:00
0863e34619
display actual username
2012-08-07 11:40:58 -04:00
c39edb650b
StudentModule lookups in queue callback use target user, rather than request.user
2012-08-07 11:38:04 -04:00
5bec964606
Merge branch 'master' of github.com:dementrock/mitx into discussion3
2012-08-07 11:36:34 -04:00
547114a823
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-07 11:31:26 -04:00
501f2ccf14
CodeResponse uses 'is_file' helper function
2012-08-07 11:30:21 -04:00
6c2f53a495
to make it appear at least normal..
2012-08-07 11:28:52 -04:00
00a72cf86a
updated thread styles: voting, actions, comments, sort
2012-08-07 11:27:13 -04:00
25c05e702e
Merge branch 'brittany' of github.com:dementrock/mitx
2012-08-07 11:23:19 -04:00
0c311b8f13
search for similar posts without any styling..
2012-08-07 11:22:41 -04:00
f6202e5631
Tests provide xqueue params, rather than ModuleSystem.__init__
2012-08-07 11:16:48 -04:00
1fb0e352b4
blank slate
2012-08-07 11:10:24 -04:00
e847bae267
Merge pull request #344 from MITx/feature/victor/file-per-descriptor
2012-08-07 08:09:59 -07:00
b4e400ba56
Make tests pass again again
2012-08-07 10:41:57 -04:00
932a9be747
Make tests pass again
2012-08-06 16:32:20 -04:00
55edb1ef32
always export metadata in alphabetical order
2012-08-06 14:01:13 -04:00
47b9441af5
a few pep8 cleanups
2012-08-06 11:39:36 -04:00
5523c2883e
Generate error module url_names using sha1
2012-08-06 11:14:59 -04:00
Brittany Cheng