Commit Graph

1961 Commits

Author SHA1 Message Date
Wyatt Johnson 7fac8ef073 Merge branch 'master' into subscriptions 2017-04-17 08:03:14 -06:00
Riley Davis 55cdc98303 add some proptypes 2017-04-14 15:36:29 -06:00
Riley Davis d5ff9d3eeb show the details 2017-04-14 15:32:06 -06:00
Riley Davis ff3cffdc8f load actions 2017-04-14 14:59:51 -06:00
Riley Davis 07ea548d46 Merge branch 'master' into flag-detail 2017-04-14 12:56:11 -06:00
Kim Gardner 71e1c01552 Merge branch 'master' into add_translations 2017-04-13 20:10:19 -04:00
Kim Gardner 193ed8c863 Merge branch 'master' into ignore 2017-04-13 20:00:59 -04:00
gaba d9c8882d8f More translations in the configuration. 2017-04-13 16:19:21 -07:00
gaba 902071c0fe Adds title of most flagged in dashboard. 2017-04-13 16:11:25 -07:00
gaba c395bc8849 Adds closedAt to state... and check that closedTimeout settings exists for the Asset. 2017-04-13 14:21:45 -07:00
gaba fa72a661ad Going back to previous setting state as I do not want it to re-render. 2017-04-13 12:43:24 -07:00
Riley Davis 6aaca9130a saving my place 2017-04-13 12:56:48 -06:00
gaba 9dae72dd8a Good catch. Use setState. 2017-04-13 11:44:08 -07:00
Benjamin Goering 118da885fd Merge branch 'master' of github.com:coralproject/talk into ignore_rb2 2017-04-13 12:12:10 -05:00
gaba abc7aa7b30 Uh... wrong element. 2017-04-12 18:39:56 -07:00
Belen Curcio 7969985f59 Merge branch 'master' of github.com:coralproject/talk into plugin_examples 2017-04-12 22:27:46 -03:00
Belen Curcio 32defa66e6 Clean up 2017-04-12 21:04:47 -03:00
Belen Curcio 78286d3374 Running CommentBox reducers and triggering actions from Plugins! 2017-04-12 20:51:18 -03:00
Belen Curcio 7424fc9774 Create comments with Tags 2017-04-12 19:42:39 -03:00
Belen Curcio 7fca451263 Immutable plugins 2017-04-12 19:21:55 -03:00
Gabriela Rodríguez Berón 42a1026f9c Merge branch 'master' into 143520971-stream-settings 2017-04-12 14:12:15 -07:00
gaba e04f0f7070 Moves settings into the state for the stream. Adds premodlinks to the query. 2017-04-12 14:08:55 -07:00
Belen Curcio c0913d8e98 Disable postButton and enable 2017-04-12 16:55:43 -03:00
Belen Curcio e8d9f8aab8 fix createComment Mutations 2017-04-12 16:51:41 -03:00
Kim Gardner 29fe5e2901 Fix broken links to Stories page 2017-04-12 15:40:34 -04:00
Belen Curcio 3837c316d5 Merge branch 'plugin_examples' of github.com:coralproject/talk into plugin_examples 2017-04-12 16:25:48 -03:00
Belen Curcio 336dd261ca createCommentInput 2017-04-12 16:23:13 -03:00
Kim Gardner d892d1327d Merge branch 'master' into fix-more-buttons 2017-04-12 15:12:27 -04:00
gaba cbde4cc8bc Removes handleClick as it is working now with the changeTab (as the viewAllComments was added). /cc @kiwi 2017-04-12 11:58:41 -07:00
Chi Vinh Le 81bd983f0b Handle empty stream case 2017-04-13 01:34:27 +07:00
Chi Vinh Le 92205a2c6f Fix load more buttons 2017-04-13 01:17:46 +07:00
gaba 48795b29bf Removes isAdmin for refetching when changing tabs. 2017-04-12 10:41:15 -07:00
gaba f4f8e5053f Remove the binding in the constructor. 2017-04-12 10:12:00 -07:00
Gabriela Rodríguez Berón 51774323de Merge branch 'master' into 143520139-permalink-show-all 2017-04-12 10:10:17 -07:00
Belen Curcio e256c4a014 Using Arrays instead of objects for Hooks 2017-04-12 13:50:56 -03:00
Belen Curcio 0254086c28 Using Arrays instead of objects for Hooks 2017-04-12 13:45:42 -03:00
Wyatt Johnson 9f8c9c7eb1 Merge branch 'master' into subscriptions 2017-04-12 10:37:15 -06:00
Belén Curcio 19f402ddc8 Merge branch 'master' into plugin_examples 2017-04-12 11:28:08 -03:00
Kim Gardner a19d6544a7 Don't need to escape single quotes within double quotes 2017-04-12 10:05:21 -04:00
Kim Gardner d74cdd938f Double quotes should be single 2017-04-12 09:51:32 -04:00
Belen Curcio ac632a69d2 unregister hooks names 2017-04-12 09:40:18 -03:00
Belen Curcio 72c698231b unregister hooks 2017-04-12 09:33:24 -03:00
Kim Gardner 143ce795c3 Merge branch 'master' into 143520139-permalink-show-all 2017-04-12 08:14:39 -04:00
Belén Curcio 7590cee986 Merge branch 'master' into plugin_examples 2017-04-12 08:52:03 -03:00
Belen Curcio 1a678a0cb3 Removing username -- with lintin 2017-04-12 08:21:39 -03:00
Belen Curcio cc0f757746 Removing username 2017-04-12 08:16:02 -03:00
Belén Curcio 2ecf64ae3e Merge branch 'master' into plugin_examples 2017-04-12 08:09:49 -03:00
Belen Curcio 2e3021e66b Linting 2017-04-11 22:17:04 -03:00
Belen Curcio 63b630833a Fake Comment Style 2017-04-11 22:12:10 -03:00
Belen Curcio e4aa98b87a Hidding login as 2017-04-11 22:00:55 -03:00