Commit Graph

4030 Commits

Author SHA1 Message Date
Kiwi 99296ebe69 Merge branch 'master' into fix-notify-bugs 2017-09-14 17:25:50 +02:00
Chi Vinh Le 7600ce8d26 Fix error notification bugs 2017-09-14 22:22:16 +07:00
Chi Vinh Le ad361413c7 Reimplement wordlist on server using same regexp solution 2017-09-14 17:36:04 +07:00
Chi Vinh Le abc651c55d Add some optimizations 2017-09-14 00:50:01 +07:00
Chi Vinh Le fa335564ed Generate RegExp from phrases 2017-09-14 00:10:29 +07:00
Chi Vinh Le 6487072be1 Merge branch 'new-regexp-highlighter' of ssh://github.com/coralproject/talk into new-regexp-highlighter 2017-09-13 22:23:41 +07:00
Chi Vinh Le a16f101a12 Match phrases not just words 2017-09-13 22:20:32 +07:00
Kim Gardner 2905ffb5cb Merge branch 'master' into new-regexp-highlighter 2017-09-13 12:43:29 +01:00
Kim Gardner 7f517ed4fb Merge branch 'master' into stable-keys 2017-09-13 12:35:12 +01:00
Chi Vinh Le 7976aace00 Typo 2017-09-12 22:46:24 +07:00
Chi Vinh Le 98b95cab86 Reintroduce linkify 2017-09-12 21:31:59 +07:00
Chi Vinh Le d8ca9dfb07 Fix edit animation 2017-09-12 20:58:33 +07:00
Chi Vinh Le ee3cee2a50 Typo 2017-09-12 20:55:31 +07:00
Chi Vinh Le 65a6c408a7 Add some docs 2017-09-12 20:54:30 +07:00
Chi Vinh Le d18a9a057b Implement simple regexp based highlighter 2017-09-12 20:47:05 +07:00
Chi Vinh Le d1c30ab982 Remove talkUuid and use element key instead 2017-09-12 15:57:40 +07:00
Wyatt Johnson 49f09b87a0 Added new SYSTEM_WITHHELD comment status 2017-09-11 11:09:21 -06: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
Kim Gardner 8f1ce9cef6 Merge branch 'master' into remember-sort 2017-09-11 11:53:07 +01:00
Belén Curcio b75539fb57 Merge branch 'master' into reject-instream 2017-09-08 17:47:09 -03:00
Belen Curcio 72530e7501 Linting and Indenting 2017-09-08 17:17:03 -03:00
Belen Curcio 790c20e7ac Indent 2017-09-08 17:14:15 -03:00
Belen Curcio 2cbd59b4b5 Featured comments error in permalink view, handling permaview moderation and handling replies moderation 2017-09-08 17:05:20 -03:00
Kiwi d88919e27b Merge branch 'master' into remember-sort 2017-09-08 19:29:08 +02:00
Kiwi be86a6f3dc Merge branch 'master' into remember-sort 2017-09-08 19:28:26 +02:00
Chi Vinh Le 4046b6e0a6 Remove zombie files 2017-09-09 00:20:18 +07:00
Chi Vinh Le 6b74877d01 Implement and use pymStorage 2017-09-09 00:15:19 +07:00
Chi Vinh Le 9f33a77745 Implement and use pymStorage 2017-09-09 00:11:15 +07:00
Belen Curcio f33c31c70e Merge branch 'master' of github.com:coralproject/talk into reject-instream 2017-09-08 13:49:54 -03:00
Belen Curcio fefacf039f Featured comments should have ACCEPTED status 2017-09-08 13:25:23 -03:00
Chi Vinh Le 0cfd8afce7 Merge branch 'master' into remember-sort
Conflicts:
	.eslintignore
	.gitignore
2017-09-08 17:56:18 +07:00
Chi Vinh Le e5bd8e2a3b No need to check for loading config anymore 2017-09-08 17:47:02 +07:00
Chi Vinh Le 7051c76b40 Init step for plugins and bootstrap, introspection service 2017-09-08 17:37:27 +07:00
Kim Gardner 76fd261141 Merge branch 'master' into prop-types 2017-09-08 10:56:35 +01:00
Kim Gardner 299c6f1ffd Merge branch 'master' into feature/talk-plugin-toxic-comments 2017-09-08 10:16:40 +01:00
Wyatt Johnson f69703a8ba fixed missing 2017-09-08 00:47:08 -06:00
Wyatt Johnson 2e350c2244 Merge branch 'master' into prop-types 2017-09-08 00:44:09 -06:00
Wyatt Johnson 2b91bcffda fixes #923 2017-09-07 13:49:22 -06:00
Wyatt Johnson 96e37ac725 moved config loading to bootstrap 2017-09-07 10:58:58 -06:00
Belen Curcio f6b02a52fe Cache and Tombstoning rejected comment working 2017-09-07 13:08:52 -03:00
Kim Gardner b72bba96fb Merge branch 'master' into change-websocket-uri 2017-09-07 16:54:59 +01:00
Chi Vinh Le f1c5d479ad Merge branch 'master' into feature/talk-plugin-toxic-comments
Conflicts:
	graph/resolvers/root_mutation.js
	graph/typeDefs.graphql
2017-09-07 16:59:46 +07:00
Chi Vinh Le d8a956d09c Remove dependency on wrapResponse 2017-09-07 16:04:01 +07:00
Wyatt Johnson e96e9c0d5c Fixed old story search query 2017-09-06 09:18:22 -06:00
Chi Vinh Le a11f149c5a Refactor 2017-09-06 22:15:57 +07:00
Chi Vinh Le 6f82fd76f5 First draft of toxic-comments 2017-09-06 22:11:48 +07:00
Wyatt Johnson 48875294c8 initial support for changing the uri 2017-09-05 13:57:35 -06:00
Wyatt Johnson 7b27feee96 fixed typo 2017-09-05 09:45:31 -06:00