Commit Graph

693 Commits

Author SHA1 Message Date
Arjun Singh
0e1b247a7b courseware context links in discussion 2012-09-04 10:38:28 -07:00
Arjun Singh
91aec6d38f Including courseware context in threads for non inline discussion 2012-09-04 09:55:18 -07:00
Arjun Singh
ebae40a392 fix search 2012-09-04 09:21:21 -07:00
Rocky Duan
b2821c5354 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 01:54:59 -07:00
Rocky Duan
d39e3de51b fit permission into new discussion view structure; admin actions not working yet 2012-09-04 01:54:39 -07:00
Ibrahim Awwal
e8ac5860e1 Oops, this was needed for replies to be rendered in the main forum view. 2012-09-04 01:28:36 -07:00
Ibrahim Awwal
32ccf51e97 Embedded discussions displayed with the new style but without replying yet.
Needs different CSS to make it more appropriate in the embedded view.
2012-09-04 01:14:18 -07:00
Arjun Singh
629a8e7ed5 allowing for 0 top level topics 2012-09-03 23:04:30 -07:00
Arjun Singh
098b90ebac Top level discussions 2012-09-03 23:02:14 -07:00
Ibrahim Awwal
f6ca91a504 Refactor some things more and make the forum index sort of work, although the sticky sidebar is broken, probably because there's no content in the thread view pane. 2012-08-31 23:43:13 -07:00
Arjun Singh
795c116389 populate dropdown 2012-08-31 03:27:02 -07:00
Matthew Mongeau
6ee27d02e4 Searching and fixes. 2012-08-30 15:55:46 -04:00
Matthew Mongeau
13ae85ac35 Navigating threads. 2012-08-29 14:20:03 -04:00
Matthew Mongeau
fb1368afa9 Move views and models out. 2012-08-29 11:43:09 -04:00
Matthew Mongeau
46d0d4c4f2 Hook up list to voting. 2012-08-29 11:19:29 -04:00
Matthew Mongeau
a5b1abb2a8 Remove log 2012-08-29 10:23:17 -04:00
Matthew Mongeau
e1113d9ca9 Get voting hooked up 2012-08-29 10:07:20 -04:00
Matthew Mongeau
82c9d045cd Initial work on single thread view. 2012-08-27 17:24:05 -04:00
Matthew Mongeau
91c5b88248 Initial sidebar 2012-08-27 16:21:12 -04:00
David Ormsbee
955dc94711 Merge pull request #554 from MITx/feature/victor/fix-staff-profile-view
Set request.user = student when impersonating a student
2012-08-25 08:39:46 -07:00
Victor Shnayder
7a6fa1dd41 Fix access control for impersonation case
- only relevant in tests due to start dates
- still irritatingly intricate logic...
2012-08-24 16:52:19 -04:00
kimth
115eebdb76 Use reverse for course_info url replacement 2012-08-24 16:47:50 -04:00
Victor Shnayder
b8659e084c Set request.user = student when impersonating a student
* currently only in the staff view of student progress page

[Fix #34379687]
2012-08-24 16:30:16 -04:00
kimth
31216ccd9f Do URL replacement in course info page 2012-08-24 16:16:26 -04:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
Arjun Singh
ed6317f37c getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service 2012-08-23 10:03:36 -07:00
Calen Pennington
f2c5a064aa Pull the http or https from the forwarded proto for the xqueue callback url 2012-08-23 11:49:23 -04:00
David Ormsbee
0b309ea40a Can't return Http404, have to raise it. 2012-08-23 11:27:54 -04:00
Arjun Singh
a075cc79fd remove stray import 2012-08-23 06:50:16 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
Calen Pennington
5af67c1bf2 Put course location urls in heartbeat page, rather than lists 2012-08-23 09:19:26 -04:00
Calen Pennington
57444bdd25 Make heartbeat url wait for courses to be loaded 2012-08-23 09:16:40 -04:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
Rocky Duan
e4890a8bff fixed pluralize 2012-08-23 02:52:51 -07:00
Rocky Duan
5d90366917 fixed file uploading 2012-08-23 02:50:26 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
007de179e1 add user profile page back 2012-08-22 23:44:50 -07:00
David Ormsbee
e3cdad0d2b change url regexp to handle discussions in coursenames with dashes 2012-08-23 01:17:49 -04:00
Rocky Duan
0e21ed030c removed new post button & added recent threads to single thread page 2012-08-22 19:22:35 -07:00
Rocky Duan
43ef4f6482 fixed recent threads & tags links 2012-08-22 19:09:58 -07:00
David Ormsbee
baa6eadfb5 Merge branch 'master' into feature/dave/forum_fixes 2012-08-22 20:30:49 -04:00
Victor Shnayder
1b25433a39 Allow error-template-rendering errors to propagate to top-level 500 handler
* hopefully won't come up, but if they do, our 500 page
  should be better than  HttpResponse("There was an unrecoverable error")
2012-08-22 20:21:10 -04:00
Rocky Duan
908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 14:11:44 -07:00
Rocky Duan
3b76fe16d8 make inline page working 2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
	lms/envs/dev.py
2012-08-22 14:04:34 -07:00
David Ormsbee
fafbe41644 Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack
Enrollment hack for allowing Berkeley to add their students.
2012-08-22 13:59:07 -07:00
Piotr Mitros
69a3ea63bc Fixed minor issues (removed two unnecessary lines) 2012-08-22 16:32:14 -04:00
David Ormsbee
c86ee73bd8 Merge pull request #504 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
2012-08-22 13:13:33 -07:00