Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9
Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 965e3b4c491a7d2a06a8
2013-02-06 20:27:01 -05:00
Kevin Chugh
1dd0ef274d
addressed somme comments in pull request and instructor fixes and blank group fix
2013-02-06 18:26:41 -05:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Kevin Chugh
c7a133470d
inline discussions working
2013-02-05 22:43:09 -05:00
Your Name
d5b70d7bfc
inline cohorting working
2013-02-05 18:38:06 -05:00
Your Name
837f54c055
inline cohorting almost done
2013-02-04 20:10:08 -05:00
Kevin Chugh
f7ba14ae5e
move group logic to get_threads
2013-02-04 16:31:28 -05:00
Kevin Chugh
3009acbb10
showing group names
2013-02-04 14:50:53 -05:00
Kevin Chugh
69225f6435
cohort ID showing, have to translate to display text
2013-02-04 08:33:33 -05:00
Kevin Chugh
fcbd4bd1cd
produce and consume group_id from dropdowns
2013-02-02 05:46:11 -05:00
Your Name
8fd32ed502
update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names
2013-02-01 13:01:54 -05:00
Your Name
c25cd33214
remove print
2013-01-31 17:22:54 -05:00
Your Name
3fa67c1425
allow moderators and students to select cohort on post creation
2013-01-31 17:05:15 -05:00
Your Name
1fc26de945
merge master
2013-01-30 15:19:43 -05:00
Your Name
5bfd2c33b0
send cohort to post view context
2013-01-29 17:34:52 -05:00
Your Name
3404011f16
update front end to support selection and display of cohort ids
2013-01-29 17:23:08 -05:00
Victor Shnayder
39a9c47512
make links look like links
2013-01-29 11:33:26 -05:00
Victor Shnayder
66934ce220
Address Dave's comments on https://github.com/MITx/mitx/pull/1350
2013-01-25 13:33:19 -05:00
Victor Shnayder
9e84ae14d4
Started integration work with Kevin's cohort changes
...
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.
Next: testing :)
2013-01-24 15:14:33 -05:00
Kevin Chugh
def2d8adf2
fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable
2013-01-24 14:20:18 -05:00
Kevin Chugh
59b3dc61a2
lms producing grouped content
2013-01-23 16:25:26 -05:00
Ibrahim Awwal
939b927fbd
Merge branch 'master' into feature/ibrahim/followed-threads
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
2012-09-20 23:55:13 -07:00
Arjun Singh
55a9da933a
DRY things slightly
2012-09-20 02:15:51 -07:00
Arjun Singh
3567e23a9d
Unneeded imports
2012-09-20 02:13:35 -07:00
Arjun Singh
117c0b6927
Mark threads as read once they are fetched; change viewed to read
2012-09-20 00:24:36 -07:00
Rocky Duan
f6efa99f6c
unread count tracking
2012-09-19 06:15:48 -07:00
Ibrahim Awwal
6315fe3fe6
Allow sorting followed threads (works same as sorting anything else).
2012-09-18 14:50:38 -07:00
Ibrahim Awwal
53a1611eee
Change following=>followed.
2012-09-18 14:50:14 -07:00
Ibrahim Awwal
ef8ca23dee
Fix pagination and sorting for followed threads. Also fixed sorting so that it always retrieves a new set of threads from the server for the initial set.
2012-09-18 04:35:32 -07:00
Ibrahim Awwal
a444166d98
Add a followed threads entry to the topic dropdown in the discussion sidebar.
...
Also fixed up some random bugs with content_info, and changed pagination code a little. Needs comments service update for the subscribed threads API call.
2012-09-18 04:09:38 -07:00
Arjun Singh
90f37b3344
Don't use the search API to retrieve all threads.
2012-09-17 14:10:58 -07:00
Arjun Singh
f656da46ec
bump inline count, fix tiny bug for server startup
2012-09-14 06:00:01 -07:00
Arjun Singh
edf02dd90e
Fix context links for the 123187th time
2012-09-14 04:07:04 -07:00
Arjun Singh
8f63ec4d44
merge
2012-09-14 02:56:34 -07:00
Arjun Singh
fff7bcc5a7
Remove more tags; anonymity to peers
2012-09-14 02:50:08 -07:00
Ibrahim Awwal
154cb843dd
Bump up threads per page again, because I don't think showing 5 threads at a time is
...
particularly useful.
2012-09-14 02:48:49 -07:00
Ibrahim Awwal
2d58f8dea1
Fix load more pages button on single thread.
2012-09-14 02:37:46 -07:00
Ibrahim Awwal
910be64aa2
Make pagination respect any filters or searches or sort keys. Searches and filters will
...
query the comment service to get their results rather than filtering threads that have
already been loaded.
2012-09-14 02:13:53 -07:00
Ibrahim Awwal
4d59013955
Remove dead code.
2012-09-13 19:58:17 -07:00
Arjun Singh
e4c7a5ea97
Fix courseware context links; filter out unstarted topics.
2012-09-13 19:41:07 -07:00
Matthew Mongeau
5b9967e5a0
Paging wip
2012-09-13 17:35:29 -04:00
Ibrahim Awwal
58fc3eca12
Fix staff markers for inline threads and double staff markers for threads with deeply nested comments.
2012-09-13 02:20:35 -07:00
Ibrahim Awwal
712e59a68d
Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/static/sass/_discussion.scss
2012-09-12 15:18:34 -07:00
Ibrahim Awwal
b4828db1e3
User profile page redone to act like the inline discussion, except threads are
...
loaded into the page in a data attribute instead of loaded on request via ajax.
The user profile page also does not provide facilities for adding
comments/responses, which I think would clutter the page too much.
Also removed some unused stuff from views.py.
2012-09-12 15:16:35 -07:00
Carlos Andrés Rocha
18b5a1f5a2
Temporary fix to get the discussion profile page rendering
2012-09-12 13:20:04 -04:00
Matthew Mongeau
1a402f7fda
Mark responses and comments as staff
2012-09-12 11:09:36 -04:00
Arjun Singh
a900998145
Fix anonymity leak; fix editing when rendering from main page.
2012-09-12 04:32:32 -07:00
Ibrahim Awwal
f97d4fe983
Add @login_required to forum views so that they redirect to a login page if you're not logged in.
2012-09-11 13:41:30 -07:00
