Commit Graph
1149 Commits
Author SHA1 Message Date
Belen Curcio 694669bb85 Removing withRouter 2017-07-31 15:51:32 -03:00
Belen Curcio 91d9d65372 Removing logic and adding active tabs 2017-07-31 15:46:06 -03: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
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 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 GardnerandGitHub f5369802e6 Merge branch 'master' into new-queue 2017-07-28 11:39:12 -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
Belén CurcioandGitHub 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 CurcioandGitHub 0767c680fc Merge branch 'master' into new-queue 2017-07-28 09:44:29 -03:00
Belen Curcio c0ff056354 Old file 2017-07-28 09:39:12 -03:00
KiwiandGitHub 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
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
Belen Curcio 3c960db93d Merge branch 'master' of github.com:coralproject/talk into new-queue 2017-07-27 14:01:53 -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
Chi Vinh Le 57fb77008a Make UserDetail work independently 2017-07-27 21:44:29 +07:00
Wyatt Johnson 0d7e4d6541 Added support for hosting Talk under a different path 2017-07-27 16:37:26 +10:00
Kim Gardner 22b3a59351 Merge branch 'master' into renaming-talk 2017-07-26 15:17:19 -04:00
Chi Vinh Le b00435bfe3 Click on flagged user shows correct drawer 2017-07-26 18:43:10 +07:00
Chi Vinh Le 8ea8bb521a Merge branch 'event-emitter' of ssh://github.com/coralproject/talk into event-emitter 2017-07-26 00:06:20 +07:00
Chi Vinh Le 1473c778a5 Refactor listener 2017-07-25 23:26:23 +07:00
Belén CurcioandGitHub a7adf3469d Merge branch 'master' into event-emitter 2017-07-25 13:04:08 -03:00
Kim GardnerandGitHub 589f5129c9 Merge branch 'master' into renaming-talk 2017-07-25 10:25:00 -04:00
Chi Vinh Le b4244b8671 More integration with the introspection query result
- Auto generate introspection on any change when using  `dev-start`
- Port client to use introspection matcher
2017-07-25 16:51:41 +07:00
Kim GardnerandGitHub 6383abd445 Merge branch 'master' into renaming-talk 2017-07-23 21:03:38 -04:00
Kim GardnerandGitHub 661354998f Merge branch 'master' into event-emitter 2017-07-22 18:54:35 -04:00
Belen Curcio 25bccde40f fix 2017-07-21 16:08:18 -03:00
Chi Vinh Le 970fe6fe04 Provide event emitter on admin side 2017-07-21 23:39:28 +07:00