Nate Hardison
cc7b2942ee
Handle Heroku's 503 maintenance mode response
...
The LMS comment client previously would try to parse the response
as JSON, choke, and return a 500 to the client. Now, the LMS client
displays a message indicating that the forums are down for
maintenance.
2013-05-21 10:03:51 -07:00
Jay Zoldak
71626f4ff6
Pep8 fixes of django_comment_client code
2013-05-16 15:57:34 -04:00
Jay Zoldak
ed5ad46192
Revert "Revert "fix merge conflict""
...
This reverts commit 2df3fe9344
2013-05-16 10:29:33 -04:00
David Baumgold
b344976fe7
Making linters happier
2013-05-03 15:08:28 -04:00
Diana Huang
2df3fe9344
Revert "fix merge conflict"
...
This reverts commit acfd0d9fd6e4194c99d8
2013-04-26 12:40:35 -04:00
Your Name
3f1d97b065
Merge branch 'master' into feature/kevin/flagging
2013-04-22 17:22:33 -04:00
Your Name
5e73e8f286
Merge branch 'master' of github.com:MITx/mitx
2013-04-22 17:22:24 -04:00
Your Name
0bcef4ddb7
fix merge conflicts
2013-04-22 12:54:33 -04:00
Your Name
7994e1b344
pep8 fixes
2013-04-22 12:53:30 -04:00
Kevin Chugh
7bc75844b2
fix indentation
2013-04-21 06:24:23 -04:00
Kevin Chugh
649578ea2f
unify flag moderator permissions
2013-04-21 06:15:23 -04:00
Your Name
0a627bb5d9
update permissions for flagging
2013-04-19 17:40:13 -04:00
Kevin Chugh
de7c511328
flagging working again
2013-04-05 16:39:22 -04:00
Kevin Chugh
0e8ef28347
flagging almost done
2013-04-05 13:23:09 -04:00
Kevin Chugh
daa0cd22d5
filter implemented for flagged
2013-04-01 23:16:22 -04:00
Kevin Chugh
2f4310713b
fix index
2013-04-01 13:22:56 -04:00
Kevin Chugh
5534d8bdce
fix mega merge conflicts
2013-03-29 07:33:52 -04:00
Brian Wilson
99778b1b5b
add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.
2013-03-27 17:59:56 -04:00
Your Name
9964e4c2bb
local fix to merge conflict
2013-03-20 09:16:26 -04:00
Your Name
6ddff7fcb3
stash merge
2013-03-20 09:04:14 -04:00
e0d
39d451d92a
Merge pull request #1687 from MITx/hotfix/edz/pinning
...
Allow backwards compatibility for forums pinning UI.
2013-03-19 09:31:14 -07:00
Your Name
a761e2e829
make pinning backward compatible
2013-03-15 12:38:28 -04:00
Your Name
470e402723
patch for backward compatibility
2013-03-15 10:51:34 -04:00
Calen Pennington
029d8c8085
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
2013-03-15 09:46:47 -04:00
Your Name
97eb7eb58b
remove whitespace
2013-03-13 19:07:46 -04:00
Your Name
117be695cb
candidate without inline
2013-03-13 18:40:10 -04:00
Your Name
a2f9e4d565
almost there
2013-03-13 15:29:57 -04:00
Kevin Chugh
a2be6dd420
first cut of UI
2013-03-12 10:31:05 -04:00
Calen Pennington
cec3475c9d
Remove references to .definition and .metadata in modules
2013-03-06 18:07:56 -05:00
Ned Batchelder
97f1e04282
Fix some 2-space indents
2013-03-04 10:57:25 -05:00
Your Name
e1ef6a8323
clean up commments
2013-03-01 16:43:55 -05:00
Your Name
b7a6eadca4
new cohorts tested
2013-03-01 16:33:27 -05:00
Your Name
8a953241c1
first pass
2013-03-01 10:45:48 -05:00
Your Name
21c06c741b
inline mustache working
2013-02-08 14:28:48 -05:00
Kevin Chugh
c6bece8620
more updates
2013-02-08 09:11:41 -05:00
Your Name
7dd252178c
cohort filter almost done
2013-02-07 18:14:46 -05:00
Your Name
3965f9129d
cohort filter almost done
2013-02-07 18:13:53 -05:00
Kevin Chugh
d047d826c7
update coffeescript to hide cohort choice if first commmentable is not cohorted
2013-02-06 22:00:03 -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
