Commit Graph

5308 Commits

Author SHA1 Message Date
Matthew Mongeau
476f4fa7ea Fix liking. 2012-08-30 13:16:19 -04:00
Matthew Mongeau
1acb6185de Get math working. 2012-08-30 13:06:37 -04:00
Matthew Mongeau
afd6126e36 Fix some styles. 2012-08-30 12:43:02 -04:00
Matthew Mongeau
6287e43f55 Add ability to create replies. 2012-08-30 11:50:58 -04:00
Tom Giannattasio
5267f03b97 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-08-30 11:38:46 -04:00
Matthew Mongeau
362bbb1794 Close form 2012-08-30 11:38:34 -04:00
Tom Giannattasio
1559b86e27 added new post markup, style and basic interactions 2012-08-30 11:37:50 -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
Victor Shnayder
25c83bbb5d xml format docs! 2012-08-26 21:55:55 -04:00
David Ormsbee
c6d06a3a27 Merge pull request #562 from MITx/feature/rocky/discussion
fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away
2012-08-26 13:02:28 -07: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
jarv
c1cd075853 Merge pull request #561 from MITx/feature/change_wiki_repo
Switch django-wiki dependency to a clone in our org
2012-08-25 09:21:55 -07:00
David Ormsbee
e7b67d7225 Switch django-wiki dependency to a clone in our org so that local changes are easier to make 2012-08-25 12:15:03 -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
David Ormsbee
d042578ab5 Merge pull request #560 from MITx/rocha/master
Important fix! Remove HTML tags from Markdown code.
2012-08-25 08:35:22 -07:00
Carlos Andrés Rocha
1f7a1065ef Important fix! Remove HTML tags from Markdown code. 2012-08-25 10:54:43 -04: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
David Ormsbee
828430d6c8 Merge pull request #557 from MITx/feature/tomg/courseware_signin
Added a log in button to the courseware when unauthenticated
2012-08-24 13:59:32 -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
David Ormsbee
d095b7771a Merge pull request #555 from MITx/jarv/empty-defaults-for-comments-params
empty default for comments_service_key and comments_url because it was b...
2012-08-24 12:12:50 -07: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
24de129900 Merge pull request #550 from MITx/rocha/master
Fixed WikiPath regexp.
2012-08-24 11:32:20 -07:00