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
marco
33e8621af6
cursor state for discussions (not inline) span text needed to be set to pointer
2013-05-16 10:29:34 -04:00
marco
18759b21d6
capitalization on tooltips
2013-05-16 10:29:34 -04:00
Your Name
90e7a84570
show inline pinning and flagging
2013-05-16 10:29:34 -04:00
Your Name
121f678f1b
restore flagging to inline thread
2013-05-16 10:29:33 -04:00
Jay Zoldak
ed5ad46192
Revert "Revert "fix merge conflict""
...
This reverts commit 2df3fe9344
2013-05-16 10:29:33 -04:00
Diana Huang
2df3fe9344
Revert "fix merge conflict"
...
This reverts commit acfd0d9fd6e4194c99d8
2013-04-26 12:40:35 -04:00
Steve Strassmann
8baddc0645
Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n
2013-04-24 10:41:09 -04:00
Your Name
acfd0d9fd6
fix merge conflict
2013-04-23 10:30:51 -04:00
Kevin Chugh
649578ea2f
unify flag moderator permissions
2013-04-21 06:15:23 -04:00
Steve Strassmann
6e34c668bb
introduce i18n
2013-04-17 11:30:29 -04:00
Kevin Chugh
f59b74e27f
fix nitpick and merge master
2013-04-08 17:19:28 -04:00
Kevin Chugh
daa0cd22d5
filter implemented for flagged
2013-04-01 23:16:22 -04:00
Kevin Chugh
5534d8bdce
fix mega merge conflicts
2013-03-29 07:33:52 -04:00
Your Name
32f75bfe9e
added pinning UI to inline
2013-03-20 11:58:47 -04:00
Kevin Chugh
359de858b4
merge master
2013-03-20 09:21:51 -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
0a53ec3ee6
updates
2013-03-15 11:37:58 -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
fc907fe055
candidate without inline
2013-03-13 18:50:00 -04:00
Your Name
117be695cb
candidate without inline
2013-03-13 18:40:10 -04:00
Your Name
08bc073fa5
updates
2013-03-13 16:40:04 -04:00
Your Name
a2f9e4d565
almost there
2013-03-13 15:29:57 -04:00
Your Name
8280c55992
pinning .1
2013-03-12 17:40:26 -04:00
Kevin Chugh
a2be6dd420
first cut of UI
2013-03-12 10:31:05 -04:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
Calen Pennington
1962d247bf
Make allow_anonymous and allow_anonymous_to_peers use field access in templates
2013-03-08 13:23:06 -05:00
Calen Pennington
e7900859b6
Remove the 'title' alias for lms.display_name
2013-03-06 15:11:08 -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
7761f6cb04
make cohort filter visibility conditional on selected commentable cohortedness
2013-02-08 17:22:29 -05:00
Your Name
b980399f5f
change cohort dropdown verbiage
2013-02-08 15:41:11 -05:00
Your Name
df0b6aca7d
inline mustache working
2013-02-08 14:41:36 -05:00
Your Name
21c06c741b
inline mustache working
2013-02-08 14:28:48 -05:00
Kevin Chugh
727843d32e
added cohorted mustache template for inline
2013-02-08 10:39:59 -05:00
Kevin Chugh
c6bece8620
more updates
2013-02-08 09:11:41 -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
Your Name
6b4a1dfd34
minor tweaks after testing
2013-02-06 12:54:06 -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
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
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
