David Ormsbee
fb1e7f3dc1
Make type check for self.code a little more robust, give default val for mmlans so it's never undefined
2013-02-10 19:03:25 -05:00
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
edf96036c8
Merge remote-tracking branch 'origin/master' into 7012x-clean
2013-02-06 18:53:14 -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
Victor Shnayder
739938f35f
add readme for symbolicresponse implementation (thanks Ike!)
2013-02-05 20:15:48 -05:00
Kevin Chugh
3009acbb10
showing group names
2013-02-04 14:50:53 -05:00
Kevin Chugh
1bd9366e40
Merge remote-tracking branch 'origin/master' into feature/kevin/groups
2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2
lms producing grouped content
2013-01-23 16:25:26 -05:00
Peter Baratta
45f2a690d0
Commented on high level functions
2013-01-22 01:40:13 -07:00
ichuang
9a0d85667c
symmath use https, no server cert verify
2013-01-05 12:29:03 -05:00
ichuang
bf3669395b
update symmath snuggletex server
2013-01-05 12:29:00 -05:00
ichuang
35569d1086
Merge pull request #731 from MITx/feature/ichuang/symmath_improvements
...
improvements in symbolic math checking.
Merging now because it is needed for Physics courses.
2012-09-25 19:36:02 -07: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
ichuang
b9af428b40
formula.py handle imaginary correctly; symmath_check add numerical option
2012-09-20 14:37:21 -04:00
Arjun Singh
6132b9b207
Alter some css; don't send the user if there is no user when retrieivng a thread
2012-09-20 02:11:27 -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
ichuang
672ede14d1
improvements in symbolic math checking - more standard functions,
...
use new capa_alert div for error messages, clean up debugging
2012-09-19 20:37:26 -04:00
Arjun Singh
c83a27ec02
Merge with lms pre-update fix
2012-09-19 06:17:19 -07:00
Rocky Duan
f6efa99f6c
unread count tracking
2012-09-19 06:15:48 -07:00
Arjun Singh
eab1737e83
Prepare lms for upcoming discussion service changes.
2012-09-19 05:57:30 -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
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
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
Arjun Singh
a83b9322ae
Allow for course subscriptions
2012-09-13 16:03:19 -07:00
Arjun Singh
8bad4c8dbc
Allow for course subscriptions
2012-09-13 16:00:48 -07:00
Arjun Singh
7ad9b39b98
Merge master
2012-09-10 15:33:59 -07:00
Arjun Singh
36b3524552
Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
2012-09-06 18:22:15 -10:00
Matthew Mongeau
366e9c674b
Code for displaying endorsed checkmark.
2012-09-06 17:46:04 -04:00
Arjun Singh
242f523d74
Explicit request timeout
2012-09-05 15:09:15 -07:00
Calen Pennington
4d2983cb99
Merge pull request #587 from MITx/feature/victor/forum-anon-user-500
...
Add some rudimentary error checking to forum views
2012-09-05 06:21:46 -07:00
Rocky Duan
fde77b7a89
fixed user link and back button
2012-08-31 23:46:13 -07:00
Ibrahim Awwal
b13c5acd4f
Save the user's selected sort order on the comments service.
...
Requires cs_comments_service to have the field default_sort_key on users.
2012-08-29 22:13:37 -07:00
Victor Shnayder
f5754f6d1e
Add some rudimentary error checking to forum views
...
[Hopefully fix #34992235 ]
2012-08-29 13:30:55 -04: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
Arjun Singh
7f3a4889b8
make discussions work for new users
2012-08-23 06:48:37 -07:00
David Ormsbee
ec4858801e
read the comment service shared key from django config
2012-08-23 08:02:19 -04:00
David Ormsbee
aeee2791ea
Merge remote-tracking branch 'rocky/master' into feature/dave/forum_fixes
...
Conflicts:
lms/lib/comment_client/utils.py
lms/templates/discussion/mustache/_content.mustache
2012-08-22 20:00:06 -04:00
David Ormsbee
2e39131b31
Tiny fix to handle when data_or_params isn't passed in
2012-08-22 19:16:28 -04:00
Rocky Duan
3cbaba1961
fixed autosubscribe
2012-08-22 14:11:19 -07:00
Rocky Duan
9b26a20989
fixed search highlighting
2012-08-22 12:04:32 -07:00
Rocky Duan
a90af0c471
render permalink in backend
2012-08-21 23:26:06 -07:00
Rocky Duan
fd0eff46e7
Merge branch 'feature/rocky/discussion_api_key' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
Rocky Duan
4b97e70a4c
fixed bug when no data is transmitted otherwise
2012-08-21 17:10:29 -07:00
Rocky Duan
e3a3f7094a
added shared key authentication
2012-08-21 15:45:41 -07:00
Rocky Duan
72e6588be4
Merge branch 'master' into refactor
2012-08-21 13:34:20 -07:00
Rocky Duan
2265713028
added shared key authentication
2012-08-21 13:22:48 -07:00
Rocky Duan
9dedd532c4
some progress
2012-08-20 23:43:47 -07:00
David Ormsbee
b6dfa50a73
Adjust settings so we can change the comments service URL from Django config
2012-08-20 17:33:45 -04:00
