Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 9425bbba60 Address other comment on #413 Victor Shnayder 2012-08-15 10:28:08 -04:00
• 9a14af4ba1 address comment on #412 Victor Shnayder 2012-08-15 10:27:07 -04:00
• 1b84e6e43c Merge branch 'master' into kimth/sjsu kimth 2012-08-15 10:15:57 -04:00
• 42ea4f3271 Rename acquire_lock to select_for_update, add docstring kimth 2012-08-15 10:13:35 -04:00
• 808c70caf5 Quick workaround courses hierarchy kimth 2012-08-15 09:39:13 -04:00
• b2df6d9456 Merge pull request #412 from MITx/feature/victor/start-dates Calen Pennington 2012-08-15 05:24:34 -07:00
• 12682827d2 Merge pull request #411 from MITx/kimth/xqueue_callback_blocking Calen Pennington 2012-08-15 05:03:36 -07:00
• 00ff1b9419 can retrieve all comments Rocky Duan 2012-08-15 01:08:42 -07:00
• e5fe54ca5d display active threads with only relevant contents Rocky Duan 2012-08-15 00:46:28 -07:00
• 5d9fad5a52 Minor cleanups before pull request Victor Shnayder 2012-08-14 23:16:02 -04:00
• e4fb9ec63a Remove is_staff from ModuleSystem Victor Shnayder 2012-08-14 23:03:43 -04:00
• b782e2ff5d Make start dates work for all modules Victor Shnayder 2012-08-14 22:56:56 -04:00
• 2df3a6ef11 Big access control refactor Victor Shnayder 2012-08-14 16:10:07 -04:00
• 9ef1a11c28 fixed merge bug Rocky Duan 2012-08-14 18:12:35 -07:00
• 449d665b00 Merge branch 'master' of github.com:MITx/mitx into merge Rocky Duan 2012-08-14 17:48:08 -07:00
• 308772500e fixed permalink Rocky Duan 2012-08-14 17:45:09 -07:00
• b68a69cd7b Merge branch 'brittany' of github.com:dementrock/mitx into merge Rocky Duan 2012-08-14 17:37:29 -07:00
• ea07d0697e fixed openclose thread Rocky Duan 2012-08-14 17:37:19 -07:00
• b9875b80e0 edit panel styles Brittany Cheng 2012-08-14 17:36:27 -07:00
• 5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge Rocky Duan 2012-08-14 17:32:30 -07:00
• 46f2407e39 style fixes Brittany Cheng 2012-08-14 17:29:58 -07:00
• f20659f525 style fixes Brittany Cheng 2012-08-14 17:23:40 -07:00
• 00775a05a7 Merge branch 'brittany' of github.com:dementrock/mitx into profile Rocky Duan 2012-08-14 17:18:35 -07:00
• 6d24972678 similar post and search highlight Brittany Cheng 2012-08-14 17:18:07 -07:00
• a701e703fd Merge branch 'brittany' of github.com:dementrock/mitx into profile Rocky Duan 2012-08-14 17:16:48 -07:00
• 623b82eeff similar post and search highlight Brittany Cheng 2012-08-14 17:16:22 -07:00
• d0a339bec6 fixed similar posts suggestion Rocky Duan 2012-08-14 17:13:27 -07:00
• 8d492bbd6c Merge branch 'profile' of github.com:dementrock/mitx into brittany Brittany Cheng 2012-08-14 17:00:29 -07:00
• dd80cbc423 confirm before changing moderator status Rocky Duan 2012-08-14 16:57:20 -07:00
• 700594263e Merge branch 'brittany' of github.com:dementrock/mitx into profile & small fix Rocky Duan 2012-08-14 16:52:43 -07:00
• 457b7f468f toggle moderator status Rocky Duan 2012-08-14 16:43:33 -07:00
• f457381b95 Merge branch 'profile' of github.com:dementrock/mitx into brittany Brittany Cheng 2012-08-14 16:41:37 -07:00
• 97f1e2f5e4 removed debug line Rocky Duan 2012-08-14 16:39:22 -07:00
• f983867e6b moderator styles Brittany Cheng 2012-08-14 16:28:45 -07:00
• 9f770ef921 Visiting the wiki from a course you aren't in does a redirect to the regular wiki. Bridger Maxwell 2012-08-14 19:16:45 -04:00
• eef24a5ebe added administrator role Rocky Duan 2012-08-14 15:58:04 -07:00
• 529c323771 fixed bug caused by missing course_id in retrieved comments Rocky Duan 2012-08-14 15:57:02 -07:00
• ceaa6a4ff2 You can now click around in the wiki without losing your course nav bar. Bridger Maxwell 2012-08-14 18:44:23 -04:00
• 75eee443ff Xqueue callback acquires lock on StudentModule to avoid race condition kimth 2012-08-14 18:13:53 -04:00
• d4f024ed26 small bug fix Rocky Duan 2012-08-14 15:06:54 -07:00
• 50e95de9ef a place to start for the user profiel & fixed some bugs Rocky Duan 2012-08-14 15:04:36 -07:00
• 85f1899cb6 Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet. Bridger Maxwell 2012-08-14 17:15:35 -04:00
• 04387289fa fixed bugs caused by merging Rocky Duan 2012-08-14 13:43:04 -07:00
• 49d3674601 Merge pull request #409 from MITx/feature/tomg/fall-design Calen Pennington 2012-08-14 13:15:14 -07:00
• a58a047582 moved global nav class Tom Giannattasio 2012-08-14 15:11:10 -04:00
• 5aefda8d51 modified zebra stripes Tom Giannattasio 2012-08-14 11:43:59 -04:00
• dd92f51f02 added fluid widths Tom Giannattasio 2012-08-14 11:38:02 -04:00
• d673895eaa added drag functionality Tom Giannattasio 2012-08-14 11:17:08 -04:00
• defa5b3159 basic gradebook template built; basic scroll functionality built Tom Giannattasio 2012-08-13 17:18:16 -04:00
• 9871050f94 started gradebook Tom Giannattasio 2012-08-13 15:20:06 -04:00
• 3ec0876618 Merge pull request #410 from MITx/feature/cale/queue_config Calen Pennington 2012-08-14 12:57:18 -07:00
• 9c0e41691c Make XQueueInterface a new-style class Calen Pennington 2012-08-14 15:57:07 -04:00
• eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge Rocky Duan 2012-08-14 12:54:43 -07:00
• d7fc2d6654 Merge pull request #408 from MITx/feature/fix_askbot_urls Calen Pennington 2012-08-14 12:54:17 -07:00
• 3c32aff123 disable asc sorting for now Rocky Duan 2012-08-14 12:50:22 -07:00
• 0992be3749 make top sort by last_activity_at for now Rocky Duan 2012-08-14 12:45:22 -07:00
• 49e840d62b adjust new post button in forum view Rocky Duan 2012-08-14 12:43:15 -07:00
• 3c9f099026 Modify server group dev config to enable separate concurrent Askbot instances. David Ormsbee 2012-08-14 14:31:39 -04:00
• 1f43ae6d3e Renamed namespace to wiki_slug in course_module.py. Bridger Maxwell 2012-08-14 13:49:53 -04:00
• 28f0dd2759 make delete actually working again Rocky Duan 2012-08-14 10:24:41 -07:00
• 60b2423c91 prompt window for deleting Rocky Duan 2012-08-14 10:21:11 -07:00
• 814f55aad0 Fix the name of HTTPBasicAuth Calen Pennington 2012-08-14 12:45:34 -04:00
• 6e88777126 Import HttpBasicAuth from the right place Calen Pennington 2012-08-14 12:34:25 -04:00
• 8ce12b10b2 Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand Calen Pennington 2012-08-14 12:32:52 -04:00
• e85db61407 Fix simple navigation and JS includes on askbot David Ormsbee 2012-08-14 12:21:20 -04:00
• 9687dc8397 Add social images to Askbot theme David Ormsbee 2012-08-14 12:20:58 -04:00
• c4bed2c128 Add basic authentication support for requests made to the xqueue server Calen Pennington 2012-08-14 11:32:39 -04:00
• 43745dacca Add queue interface for test purposes Calen Pennington 2012-08-14 09:31:42 -04:00
• f09aca917f Fix name of XQueueInterface Calen Pennington 2012-08-14 09:17:37 -04:00
• 09fc932a20 Add default XQUEUE_INTERFACE to the dev environment Calen Pennington 2012-08-14 09:14:31 -04:00
• 91b6bb649c Move queue interface url and auth into configuration, rather than hardcoding it Calen Pennington 2012-08-09 13:28:13 -04:00
• 137d4856cc We're loading static assets from the askbot theme directory in the lms proj now. David Ormsbee 2012-08-14 11:54:02 -04:00
• cfe712cb2a Merge pull request #407 from MITx/kimth/generic-coderesponse Calen Pennington 2012-08-14 08:48:50 -07:00
• 3dce1c2884 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-14 11:40:00 -04:00
• eeeb677354 Fixed wiki urls bug. Fixed reverse for course wiki. Bridger Maxwell 2012-08-14 11:39:49 -04:00
• dd56fd0916 Added some comments for the mitxmako additions. Bridger Maxwell 2012-08-14 09:13:42 -04:00
• a2841af834 Added views for automatic course article creation. Bridger Maxwell 2012-08-14 08:39:41 -04:00
• c8fc7bed3e Small template change. Bridger Maxwell 2012-08-14 08:39:07 -04:00
• 9d3c9e333f fixed tag autocomplete Rocky Duan 2012-08-13 23:58:42 -07:00
• 1f4d2f3d8a fixed updating bug Rocky Duan 2012-08-13 23:27:55 -07:00
• 38bdcabe53 reply now works again Rocky Duan 2012-08-13 23:23:13 -07:00
• 19ba57858c fixed focus bug: mistakenly binded event twice Rocky Duan 2012-08-13 22:55:08 -07:00
• 6fa0298546 make retrieved single thread/comment after update integrated with permissions Rocky Duan 2012-08-13 21:42:28 -07:00
• 0fa0f2c8ae add cancel button for new post Rocky Duan 2012-08-13 21:15:04 -07:00
• 895cf2c2ed Front end file size limit matches server-end limit kimth 2012-08-13 21:18:49 -04:00
• 1c2d034283 LMS-side MAX_FILESIZE set in settings.py kimth 2012-08-13 21:17:47 -04:00
• d0e51a2df2 Merge pull request #406 from MITx/feature/ichuang/fix-signup-modal-for-ssl Calen Pennington 2012-08-13 18:01:21 -07:00
• 936f2c49f5 Server-side (LMS) checking of uploaded filesize kimth 2012-08-13 21:00:29 -04:00
• 2504880e57 Merge pull request #404 from MITx/feature/ichuang/consistent-customresponse Calen Pennington 2012-08-13 17:55:24 -07:00
• d19244c48b Polling rerenders problem when individual queued items return kimth 2012-08-13 20:41:16 -04:00
• a4e283e975 File submission frontend checks for filesize kimth 2012-08-13 20:20:19 -04:00
• 3db07bca5f Frontend polling rate aware of queue length at time of submission kimth 2012-08-13 19:42:08 -04:00
• dd4f89638d hide empty brackets when not filtering through tags Rocky Duan 2012-08-13 16:38:18 -07:00
• 62bc1aaef7 make following and recent tags display actual things Rocky Duan 2012-08-13 16:32:08 -07:00
• 2dde3b00d5 removed edit button in the bottom bar Rocky Duan 2012-08-13 16:23:32 -07:00
• ce9b5b0750 update discussion.md Rocky Duan 2012-08-13 16:16:40 -07:00
• 7142b69259 instructions for setting up the environment Rocky Duan 2012-08-13 16:12:09 -07:00
• ae80ae0f62 Merge pull request #402 from MITx/kimth/generic-coderesponse ichuang 2012-08-13 16:08:52 -07:00
• afd78febfb Frontend queue polling doesn't render HTML until content changes kimth 2012-08-13 19:07:44 -04:00
• 66d1259d4b Created copy of main.html that is django template. Using this for wiki instead of converting every view. Bridger Maxwell 2012-08-13 19:07:41 -04:00