 Wyatt Johnson
|
b8eacf43a6
|
Merge branch 'master' into embed-control-object
|
2017-07-31 10:25:43 +10:00 |
|
|
Wyatt Johnson
|
c1660030cd
|
Merge pull request #816 from coralproject/router-fix
Added more router fixes
|
2017-07-31 10:25:30 +10:00 |
|
|
Wyatt Johnson
|
299bb35c9d
|
added more path fixes
|
2017-07-31 09:52:46 +10:00 |
|
|
Belen Curcio
|
1b583fb945
|
Reported has priority over premod queue or new queue
|
2017-07-28 15:51:21 -03:00 |
|
|
Belen Curcio
|
9bfdfc86b9
|
Refactor menu too
|
2017-07-28 15:42:59 -03:00 |
|
|
Belen Curcio
|
3e6e991609
|
Merge branch 'new-queue' of github.com:coralproject/talk into new-queue
|
2017-07-28 15:32:39 -03:00 |
|
|
Belen Curcio
|
7ada3106d2
|
Default routing working
|
2017-07-28 15:23:40 -03:00 |
|
|
Kim Gardner
|
2af0f2bf65
|
Merge branch 'master' into new-queue
|
2017-07-28 14:03:05 -04:00 |
|
|
Kiwi
|
b9583dd55d
|
Merge branch 'master' into embed-control-object
|
2017-07-28 19:31:31 +02:00 |
|
|
Chi Vinh Le
|
85e478cf3f
|
Return an object on Talk.render to control the embed
|
2017-07-29 00:17:23 +07:00 |
|
|
Kim Gardner
|
993688837a
|
Merge pull request #814 from coralproject/optimize-permalink-queries
Optimize query during permalink view
|
2017-07-28 12:28:32 -04:00 |
|
|
Belén Curcio
|
3740dd98e8
|
Merge branch 'master' into feature/talk-plugin-toxic-comments
|
2017-07-28 13:22:29 -03:00 |
|
|
Belén Curcio
|
8aa086af02
|
Merge branch 'master' into optimize-permalink-queries
|
2017-07-28 13:21:59 -03:00 |
|
|
Kim Gardner
|
f5369802e6
|
Merge branch 'master' into new-queue
|
2017-07-28 11:39:12 -04:00 |
|
|
Kim Gardner
|
7f38c70e58
|
Merge pull request #812 from coralproject/view-context-non-public
Allow admins / mods to view context of rejected and premod comments
|
2017-07-28 11:04:30 -04:00 |
|
|
Kim Gardner
|
7dd20d740d
|
Merge branch 'master' into view-context-non-public
|
2017-07-28 10:58:54 -04:00 |
|
|
Kim Gardner
|
4db1cf2656
|
Merge branch 'master' into feature/talk-plugin-toxic-comments
|
2017-07-28 10:58:34 -04:00 |
|
|
Kim Gardner
|
50c8d3f314
|
Merge pull request #811 from coralproject/user-detail-everywhere
User detail everywhere
|
2017-07-28 10:56:59 -04:00 |
|
|
Belen Curcio
|
0f41165751
|
New Queue names
|
2017-07-28 11:16:49 -03:00 |
|
|
Belen Curcio
|
5ce9c950b8
|
Query search goes to the specific queue
|
2017-07-28 10:44:59 -03:00 |
|
|
Chi Vinh Le
|
91bc7eaa53
|
Make condition more clear
|
2017-07-28 20:10:03 +07:00 |
|
|
Belén Curcio
|
eb44c55e05
|
Merge branch 'master' into feature/talk-plugin-toxic-comments
|
2017-07-28 10:02:03 -03:00 |
|
|
Belén Curcio
|
58a6333e02
|
Merge branch 'master' into user-detail-everywhere
|
2017-07-28 09:57:34 -03:00 |
|
|
Belen Curcio
|
4b0eeca08b
|
Merge branch 'new-queue' of github.com:coralproject/talk into new-queue
|
2017-07-28 09:54:55 -03:00 |
|
|
Belen Curcio
|
0111e08bc1
|
lintin
|
2017-07-28 09:48:34 -03:00 |
|
|
Belén Curcio
|
0767c680fc
|
Merge branch 'master' into new-queue
|
2017-07-28 09:44:29 -03:00 |
|
|
Chi Vinh Le
|
7323c92b26
|
Optimize query during permalink view
|
2017-07-28 19:43:33 +07:00 |
|
|
Belen Curcio
|
c0ff056354
|
Old file
|
2017-07-28 09:39:12 -03:00 |
|
|
Chi Vinh Le
|
1f3d97fd6b
|
Allow admins / mods to view context of rejected or premod comments
|
2017-07-28 18:03:35 +07:00 |
|
|
Wyatt Johnson
|
4ed68259c6
|
Merge pull request #807 from coralproject/basepath
Added support for hosting Talk under a different path
|
2017-07-28 08:44:29 +10:00 |
|
|
Kiwi
|
d5b7fd0413
|
Merge branch 'master' into user-detail-everywhere
|
2017-07-27 22:12:52 +02:00 |
|
|
Chi Vinh Le
|
389ff0ca0d
|
Change reducer property names
|
2017-07-28 03:03:19 +07:00 |
|
|
Chi Vinh Le
|
7a9aa331c5
|
viewUserDetail everywhere
|
2017-07-28 02:50:32 +07:00 |
|
|
Kim Gardner
|
673cb0ed04
|
Merge branch 'master' into basepath
|
2017-07-27 15:21:31 -04:00 |
|
|
Kim Gardner
|
3f8b2b947c
|
Merge pull request #806 from coralproject/docs-update
Docs update
|
2017-07-27 15:09:15 -04:00 |
|
|
Belen Curcio
|
dd8167a204
|
Check premod by asset
|
2017-07-27 14:42:36 -03:00 |
|
|
Belen Curcio
|
fba4b23dd0
|
Reordering Menu
|
2017-07-27 14:20:15 -03:00 |
|
|
Belen Curcio
|
200d41f2a5
|
New Queue
|
2017-07-27 14:15:49 -03:00 |
|
|
Kim Gardner
|
75da26ff7a
|
Merge branch 'master' into feature/talk-plugin-toxic-comments
|
2017-07-27 13:02:53 -04:00 |
|
|
Kim Gardner
|
c9442c7412
|
Merge branch 'master' into docs-update
|
2017-07-27 13:02:50 -04:00 |
|
|
Kim Gardner
|
1994e44e94
|
Merge pull request #810 from coralproject/fix-viewing-options-plugin
Fix viewing options plugin
|
2017-07-27 13:02:25 -04:00 |
|
|
Belen Curcio
|
3c960db93d
|
Merge branch 'master' of github.com:coralproject/talk into new-queue
|
2017-07-27 14:01:53 -03:00 |
|
|
Belen Curcio
|
47d37e31d8
|
prefixing translations
|
2017-07-27 13:50:14 -03:00 |
|
|
Belen Curcio
|
447c3aa7cc
|
Wrong reducer name
|
2017-07-27 13:48:03 -03:00 |
|
|
Belen Curcio
|
b3d1ff8003
|
Renaming flag by reported
|
2017-07-27 13:43:40 -03:00 |
|
|
Chi Vinh Le
|
ce2f8f97e8
|
Move userDetail out of Moderation route
|
2017-07-27 23:23:40 +07:00 |
|
|
Kim Gardner
|
cf8528dcf1
|
Remove file
|
2017-07-27 12:23:18 -04:00 |
|
|
Kim Gardner
|
9bd3e6b541
|
Fix translation file
|
2017-07-27 12:20:07 -04:00 |
|
|
Kim Gardner
|
f8758bd755
|
Fix folders
|
2017-07-27 11:58:36 -04:00 |
|
|
Kim Gardner
|
93d0a265b5
|
Merge branch 'master' into feature/talk-plugin-toxic-comments
|
2017-07-27 11:05:17 -04:00 |
|