Commit Graph

1887 Commits

Author SHA1 Message Date
Matthew Mongeau
362bbb1794 Close form 2012-08-30 11:38:34 -04:00
Matthew Mongeau
abc0092fe1 Formatting around wmd 2012-08-30 11:23:06 -04:00
Matthew Mongeau
04e8e5378c Fix load order. 2012-08-30 11:12:16 -04:00
Matthew Mongeau
24c7632664 Start responses. 2012-08-30 10:17:47 -04:00
Matthew Mongeau
3a254380d5 Hook up comment counts 2012-08-29 17:26:18 -04:00
Matthew Mongeau
f683d3750c Show current following status in list view. 2012-08-29 16:52:39 -04:00
Matthew Mongeau
f23c8fa0d3 Comment details and comment voting. 2012-08-29 16:24:18 -04:00
Tom Giannattasio
30a42dd526 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-29 16:22:21 -04:00
Tom Giannattasio
5db29b87ee tweaked sidebar styles; added temp javascript functionality for sidebar 2012-08-29 16:22:14 -04:00
Matthew Mongeau
d6bece9bd2 Move user to window. Mark followed threads in list view. 2012-08-29 15:37:23 -04:00
Matthew Mongeau
4735ce0ab1 Display comments and active thread. 2012-08-29 15:22:01 -04:00
Matthew Mongeau
13ae85ac35 Navigating threads. 2012-08-29 14:20:03 -04:00
Tom Giannattasio
1026a17338 fixed sidebar styles 2012-08-29 14:02:09 -04:00
Tom Giannattasio
d19dc6a9b0 added new post button to primary nav 2012-08-29 13:34:30 -04:00
Tom Giannattasio
f12022b774 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-29 13:23:20 -04:00
Tom Giannattasio
d75bb87bdd started adding updated styles 2012-08-29 13:22:55 -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
19b14f446b Follow a thread 2012-08-29 10:28:02 -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
5d67e01f1c Style fixes 2012-08-27 16:41:52 -04:00
Matthew Mongeau
91c5b88248 Initial sidebar 2012-08-27 16:21:12 -04:00
Rocky Duan
eb8ee01d21 fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away 2012-08-25 12:12:57 -07: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
David Ormsbee
9734347c48 Merge pull request #556 from MITx/kimth/course-replace-in-infopage
Do URL replacement in course info page
2012-08-24 14:52:48 -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
Tom Giannattasio
4a06decafd Merge branch 'master' into feature/tomg/courseware_signin 2012-08-24 16:42:01 -04:00
Tom Giannattasio
7d14632c3a added log in button to unauthenticated courseware 2012-08-24 16:41:12 -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
John Jarvis
4c21abc433 empty default for comments_service_key and comments_url because it was breaking configs that do not have it in env.json 2012-08-24 15:05:18 -04:00
Calen Pennington
b5c90166df Merge pull request #553 from MITx/feature/bridger/new_wiki
Added SECURE_PROXY_SSL_HEADER to env/aws. Re-enabled wiki directories
2012-08-24 11:47:25 -07:00
Bridger Maxwell
268a87442e Added SECURE_PROXY_SSL_HEADER to env/aws. 2012-08-24 14:18:49 -04:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
Bridger Maxwell
8e9211d2dd Re-enabling link to wiki 'see all children'. The bug for which this was disabled is already fixed. 2012-08-24 14:04:17 -04:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
Tom Giannattasio
b72ec72528 pulled temp data from gradebook 2012-08-24 13:32:16 -04:00
David Ormsbee
d0f2f31063 Merge pull request #547 from MITx/feature/rocky/discussion
fixed profiled user id (toggle moderator status)
2012-08-24 08:25:42 -07:00
Tom Giannattasio
10c953e8a4 Merge pull request #534 from MITx/feature/kfiedler/wiki
fix wiki falsh message
2012-08-24 08:03:37 -07:00
Calen Pennington
2ac5b0a3bd Merge pull request #542 from MITx/feature/ichuang/fix-admin-page-url-load
admin page should be loaded based on settings.DEBUG not askbot
2012-08-24 08:01:56 -07:00
Arjun Singh
eb4068cc11 Make profile page look reasonable 2012-08-24 03:14:42 -07:00
Arjun Singh
eb65b95232 Removing stray return statement 2012-08-24 03:06:44 -07:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
cc5fbdd5a7 fixed appearance of loading icon near sort bar 2012-08-24 02:05:11 -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
88a3e828f6 don't use raw html when rendering 2012-08-24 01:04:11 -07:00
Rocky Duan
7e6656f2df fixed profiled user id (toggle moderator status) 2012-08-23 15:22:11 -07:00