Commit Graph

20868 Commits

Author SHA1 Message Date
Bridger Maxwell
85f1899cb6 Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet. 2012-08-14 17:15:44 -04:00
Rocky Duan
04387289fa fixed bugs caused by merging 2012-08-14 13:43:04 -07:00
Calen Pennington
49d3674601 Merge pull request #409 from MITx/feature/tomg/fall-design
started gradebook design; moved a few nav classes
2012-08-14 13:15:14 -07:00
Tom Giannattasio
a58a047582 moved global nav class 2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51 modified zebra stripes 2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159 basic gradebook template built; basic scroll functionality built 2012-08-14 16:09:32 -04:00
Tom Giannattasio
9871050f94 started gradebook 2012-08-14 16:09:32 -04:00
Calen Pennington
3ec0876618 Merge pull request #410 from MITx/feature/cale/queue_config
Feature/cale/queue config
2012-08-14 12:57:18 -07:00
Calen Pennington
9c0e41691c Make XQueueInterface a new-style class 2012-08-14 15:57:07 -04:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
2012-08-14 12:54:43 -07:00
Calen Pennington
d7fc2d6654 Merge pull request #408 from MITx/feature/fix_askbot_urls
Fix askbot URLs in the theme
2012-08-14 12:54:17 -07:00
Rocky Duan
3c32aff123 disable asc sorting for now 2012-08-14 12:50:22 -07:00
Rocky Duan
0992be3749 make top sort by last_activity_at for now 2012-08-14 12:45:22 -07:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
David Ormsbee
3c9f099026 Modify server group dev config to enable separate concurrent Askbot instances. 2012-08-14 14:31:39 -04:00
Bridger Maxwell
1f43ae6d3e Renamed namespace to wiki_slug in course_module.py. 2012-08-14 13:49:53 -04:00
Rocky Duan
28f0dd2759 make delete actually working again 2012-08-14 10:24:41 -07:00
Rocky Duan
60b2423c91 prompt window for deleting 2012-08-14 10:21:11 -07:00
Calen Pennington
814f55aad0 Fix the name of HTTPBasicAuth 2012-08-14 12:45:34 -04:00
Calen Pennington
6e88777126 Import HttpBasicAuth from the right place 2012-08-14 12:34:25 -04:00
Calen Pennington
8ce12b10b2 Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand 2012-08-14 12:32:52 -04:00
David Ormsbee
e85db61407 Fix simple navigation and JS includes on askbot 2012-08-14 12:21:20 -04:00
David Ormsbee
9687dc8397 Add social images to Askbot theme 2012-08-14 12:20:58 -04:00
Calen Pennington
c4bed2c128 Add basic authentication support for requests made to the xqueue server 2012-08-14 11:59:47 -04:00
Calen Pennington
43745dacca Add queue interface for test purposes 2012-08-14 11:59:46 -04:00
Calen Pennington
f09aca917f Fix name of XQueueInterface 2012-08-14 11:59:46 -04:00
Calen Pennington
09fc932a20 Add default XQUEUE_INTERFACE to the dev environment 2012-08-14 11:59:46 -04:00
Calen Pennington
91b6bb649c Move queue interface url and auth into configuration, rather than hardcoding it 2012-08-14 11:59:46 -04:00
David Ormsbee
137d4856cc We're loading static assets from the askbot theme directory in the lms proj now. 2012-08-14 11:54:02 -04:00
Calen Pennington
cfe712cb2a Merge pull request #407 from MITx/kimth/generic-coderesponse
Kimth/generic coderesponse
2012-08-14 08:48:50 -07:00
Bridger Maxwell
3dce1c2884 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-14 11:40:00 -04:00
Bridger Maxwell
eeeb677354 Fixed wiki urls bug. Fixed reverse for course wiki. 2012-08-14 11:39:49 -04:00
Bridger Maxwell
dd56fd0916 Added some comments for the mitxmako additions. 2012-08-14 09:13:42 -04:00
Bridger Maxwell
a2841af834 Added views for automatic course article creation. 2012-08-14 08:39:41 -04:00
Bridger Maxwell
c8fc7bed3e Small template change. 2012-08-14 08:39:19 -04:00
Rocky Duan
9d3c9e333f fixed tag autocomplete 2012-08-13 23:58:42 -07:00
Rocky Duan
1f4d2f3d8a fixed updating bug 2012-08-13 23:27:55 -07:00
Rocky Duan
38bdcabe53 reply now works again 2012-08-13 23:23:13 -07:00
Rocky Duan
19ba57858c fixed focus bug: mistakenly binded event twice 2012-08-13 22:55:08 -07:00
Rocky Duan
6fa0298546 make retrieved single thread/comment after update integrated with permissions 2012-08-13 21:42:28 -07:00
Rocky Duan
0fa0f2c8ae add cancel button for new post 2012-08-13 21:15:04 -07:00
kimth
895cf2c2ed Front end file size limit matches server-end limit 2012-08-13 21:18:49 -04:00
kimth
1c2d034283 LMS-side MAX_FILESIZE set in settings.py 2012-08-13 21:17:47 -04:00
Calen Pennington
d0e51a2df2 Merge pull request #406 from MITx/feature/ichuang/fix-signup-modal-for-ssl
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately ...
2012-08-13 18:01:21 -07:00
kimth
936f2c49f5 Server-side (LMS) checking of uploaded filesize 2012-08-13 21:00:29 -04:00
Calen Pennington
2504880e57 Merge pull request #404 from MITx/feature/ichuang/consistent-customresponse
fix customresponse be consistent with "no answer entered" behavior
2012-08-13 17:55:24 -07:00
kimth
d19244c48b Polling rerenders problem when individual queued items return 2012-08-13 20:41:16 -04:00
kimth
a4e283e975 File submission frontend checks for filesize 2012-08-13 20:20:19 -04:00