Commit Graph

5408 Commits

Author SHA1 Message Date
Belen Curcio 694669bb85 Removing withRouter 2017-07-31 15:51:32 -03:00
Belen Curcio 4831d2d6a7 Merge branch 'new-queue' of github.com:coralproject/talk into new-queue 2017-07-31 15:47:42 -03:00
Belen Curcio d330bf9c25 Merge branch 'master' of github.com:coralproject/talk into new-queue 2017-07-31 15:47:12 -03:00
Belen Curcio 91d9d65372 Removing logic and adding active tabs 2017-07-31 15:46:06 -03:00
Kim Gardner d606f4d094 Merge branch 'master' into new-queue 2017-07-31 12:55:53 -04:00
Belen Curcio 344d1840f0 lingin 2017-07-31 13:41:13 -03:00
Belen Curcio 4079a74ab8 Updated componentWillReceiveProps 2017-07-31 13:18:54 -03:00
Belen Curcio 31112b3a20 Passing to the container 2017-07-31 12:36:58 -03:00
Kim Gardner 665bf5b102 Merge pull request #817 from coralproject/docs-update
Docs Updates
2017-07-31 11:00:39 -04:00
Belen Curcio 84391d9d69 Routes taking :id 2017-07-31 10:45:18 -03:00
Belen Curcio dbc8f87683 IndexRoute 2017-07-31 10:23:34 -03:00
Belen Curcio 7f85b842f0 Adding fallback for separate assets 2017-07-31 10:09:21 -03:00
Belen Curcio 371348ced5 changes 2017-07-31 10:03:58 -03:00
Belen Curcio 33a75aa4d0 Moving flag to the bottom 2017-07-31 09:46:51 -03:00
Belen Curcio 1b017daf62 changes 2017-07-31 09:42:35 -03:00
Belen Curcio 4f34827ec8 accepted to approved 2017-07-31 09:38:39 -03:00
Belen Curcio c9df0e5e40 Changes 2017-07-31 09:36:00 -03:00
Belen Curcio ea17c068dd Remove Index and Redirect 2017-07-31 09:33:29 -03:00
Wyatt Johnson 12e48efa9f some docs updates 2017-07-31 14:11:40 +10:00
Wyatt Johnson 2217c89aa7 Merge pull request #815 from coralproject/embed-control-object
Embed Control
2017-07-31 11:27:20 +10:00
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 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 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 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