Commit Graph

6174 Commits

Author SHA1 Message Date
Kim Gardner 90a649db9b Merge branch 'master' into story/150848457 2017-09-13 13:18:56 +01:00
Kim Gardner cda86a67ab Merge pull request #942 from coralproject/instream-updates
In-Stream Moderation Updates
2017-09-13 13:18:28 +01:00
Kiwi 32d72129e5 Merge branch 'master' into instream-updates 2017-09-13 14:11:35 +02:00
Kim Gardner 433b0d310e Merge branch 'master' into story/150848457 2017-09-13 12:43:16 +01:00
Kim Gardner 08848057a5 Merge pull request #941 from coralproject/stable-keys
Provide stable keys for slot elements
2017-09-13 12:43:02 +01:00
Kim Gardner 7f517ed4fb Merge branch 'master' into stable-keys 2017-09-13 12:35:12 +01:00
Kim Gardner c364b3e307 Merge pull request #945 from coralproject/fix-edit-animation
Fix edit animation
2017-09-13 12:34:42 +01:00
Kim Gardner 008df99100 Merge branch 'master' into story/150848457 2017-09-13 11:29:20 +01:00
Belen Curcio bfdfd98135 Linting 2017-09-12 15:11:01 -03:00
Belen Curcio 64be131047 Final 2017-09-12 15:09:11 -03:00
Belen Curcio 7115d4c31f Missing async 2017-09-12 15:02:29 -03:00
Belen Curcio a944cd2608 Correct branch 2017-09-12 15:01:15 -03:00
Belen Curcio 0e7d74559f Notify errors 2017-09-12 14:08:19 -03:00
Belen Curcio 297b905163 Hiding after action 2017-09-12 13:42:49 -03:00
Belen Curcio 9c08b586ec Hiding after action 2017-09-12 13:40:26 -03:00
Belen Curcio dbeca830a2 Closing after featuring and unfeaturing 2017-09-12 13:30:15 -03:00
Belen Curcio 0042767fad No approve button for Approved comments 2017-09-12 13:12:35 -03:00
Belen Curcio 6bac6ee5c5 Removed old code 2017-09-12 12:59:48 -03:00
Belen Curcio aa364e1abe Renaming Fragment and variable name 2017-09-12 12:58:25 -03:00
Belen Curcio 6e88cc94e0 Merge branch 'reject-instream' of github.com:coralproject/talk into reject-instream 2017-09-12 12:56:07 -03:00
Kiwi 1261e4e25c Merge branch 'master' into instream-updates 2017-09-12 17:20:08 +02:00
Chi Vinh Le d8ca9dfb07 Fix edit animation 2017-09-12 20:58:33 +07:00
Kiwi b27e3e0a7f Merge branch 'master' into stable-keys 2017-09-12 11:11:08 +02:00
Kiwi f2804f2394 Merge pull request #930 from coralproject/fix-graphql-warnings
Fix graphql warnings
2017-09-12 11:10:44 +02:00
Chi Vinh Le d1c30ab982 Remove talkUuid and use element key instead 2017-09-12 15:57:40 +07:00
Wyatt Johnson ca411a3227 added support for deep comment counts 2017-09-11 18:01:01 -06:00
Belen Curcio 5e4a48f4cc Updates 2017-09-11 15:38:42 -03:00
Belen Curcio c93b53c25b pdates 2017-09-11 15:11:22 -03:00
Belen Curcio 51f6c0738d Containers 2017-09-11 15:02:01 -03:00
Belen Curcio 06c45faeb0 Read/Write Fragments to update the cache 2017-09-11 13:57:24 -03:00
Kiwi 70eee3d4b2 Merge branch 'master' into stable-keys 2017-09-11 18:51:18 +02:00
Chi Vinh Le ecd4267ea9 Remove getSlotComponents completely 2017-09-11 23:46:16 +07:00
Chi Vinh Le 4f0e8d9e47 Provide stable keys for slot elements 2017-09-11 23:43:00 +07:00
Kiwi a9c4c12824 Merge branch 'master' into fix-graphql-warnings 2017-09-11 16:49:10 +02:00
Belen Curcio a22ee3fefe Removing can since thats already checked 2017-09-11 11:44:01 -03:00
Belen Curcio 1e9cc82b17 Using redux to handle the tooltip state 2017-09-11 11:31:59 -03:00
Belen Curcio 65085fea65 No need to handle errors here 2017-09-11 11:02:02 -03:00
Belen Curcio 908b3c20b4 Adding FeaturedButton (we already have Button with Coral-UI) 2017-09-11 10:59:16 -03:00
Belen Curcio 59e21cccba Container for Button 2017-09-11 10:51:27 -03:00
Kim Gardner ab1f1dee3e Merge pull request #936 from coralproject/remember-sort
Init, Introspection service, pymStorage, and talk-plugin-remember-sort
2017-09-11 12:05:41 +01:00
Kim Gardner 04ad649f01 Merge branch 'master' into remember-sort 2017-09-11 12:00:18 +01:00
Kim Gardner 18e36af50a Merge pull request #940 from bocoup/improve-docs
improve docker compose getting started docs
2017-09-11 11:59:40 +01:00
Kim Gardner 8f1ce9cef6 Merge branch 'master' into remember-sort 2017-09-11 11:53:07 +01:00
Kim Gardner e47cb9732e Merge branch 'master' into fix-graphql-warnings 2017-09-11 11:49:45 +01:00
Kim Gardner 851c5fbfbc Merge branch 'master' into improve-docs 2017-09-11 11:48:35 +01:00
Kim Gardner 0bc9ede8bc Merge pull request #938 from coralproject/story/150381206
Comment Status Fixes
2017-09-11 11:46:45 +01:00
Kim Gardner d8d758255d Merge branch 'master' into story/150381206 2017-09-11 11:39:38 +01:00
Kim Gardner c1e52ba494 Merge pull request #937 from coralproject/reject-instream
In-Stream Moderation - Accept, Reject and Feature!
2017-09-11 11:39:11 +01:00
Kiwi b7e501f7a3 Merge branch 'master' into story/150381206 2017-09-11 10:37:08 +02:00
Boaz Sender ee41cc690c add link to new location for config vars, and include min needed docker env vars in example 2017-09-09 18:05:08 -04:00