3208 Commits

Author	SHA1	Message	Date
Belen Curcio	f1f9868028	Cleaning console.logs	2017-09-19 11:13:06 -03:00
Kim Gardner	f00e8dc335	Merge branch 'master' into flagged-count	2017-09-19 09:44:33 +01:00
Kim Gardner	00f98520f7	Merge branch 'master' into flagged-count	2017-09-19 09:12:15 +01:00
Belen Curcio	75635aff2b	Merge branch 'flagged-count' of github.com:coralproject/talk into flagged-count	2017-09-18 15:52:06 -03:00
Belen Curcio	ab2e036047	withFragments and parent withQuery added	2017-09-18 15:49:23 -03:00
Kiwi	abd458ab82	Merge branch 'master' into all-comments-translation	2017-09-18 19:48:09 +02:00
Chi Vinh Le	41afe9fae7	Replace hard-coded string on all comments tab with translation	2017-09-19 00:41:38 +07:00
Belén Curcio	7144f171ef	Merge branch 'master' into fix-notify-bugs	2017-09-18 14:20:33 -03:00
Kiwi	7a81a125f5	Merge branch 'master' into fix-safari-rendering-issues	2017-09-18 19:14:07 +02:00
Belén Curcio	79cdd65e30	Merge branch 'master' into flagged-count	2017-09-18 14:12:23 -03:00
Chi Vinh Le	ed22bc34fc	Add a comment	2017-09-19 00:11:49 +07:00
Chi Vinh Le	2c297d7c2f	Promote modqueue comment into own layer to fix safari issues	2017-09-19 00:08:09 +07:00
Belén Curcio	959193f8b5	Merge branch 'master' into flagged-count	2017-09-18 13:19:41 -03:00
Belen Curcio	a07d661655	Adding CountBadge and flaggedUsernamesCount	2017-09-18 11:53:52 -03:00
Chi Vinh Le	33822ff6c0	More linting error fixes	2017-09-18 20:38:32 +07:00
Chi Vinh Le	f19b333537	Fix some linter warnings	2017-09-18 18:56:52 +07:00
Kim Gardner	c6403b2da3	Merge branch 'master' into fix-notify-bugs	2017-09-18 12:54:46 +01:00
Wyatt Johnson	55ebd1df8e	Merge branch 'master' into view-context-no-tombstone	2017-09-15 17:16:07 -06:00
Wyatt Johnson	93afd793cb	Merge branch 'master' into detect-n-display-stream-errors	2017-09-15 17:10:46 -06:00
Wyatt Johnson	f864ebf2e3	Merge branch 'master' into fix-config	2017-09-15 15:56:46 -06:00
Chi Vinh Le	f386909748	Don't show tombstone during "view context"	2017-09-16 01:36:15 +07:00
Chi Vinh Le	aa4f781d25	Better error detection	2017-09-16 01:30:26 +07:00
Chi Vinh Le	4567b4565f	Detect and display stream errors	2017-09-16 01:19:59 +07:00
Chi Vinh Le	3133922100	Fix config parsing bug	2017-09-16 01:02:19 +07:00
Wyatt Johnson	f2e06d6d27	Merge branch 'master' into story/150636425	2017-09-15 09:57:57 -06:00
Chi Vinh Le	e31cdebc12	Make it appear in reported queue	2017-09-15 22:52:19 +07:00
Chi Vinh Le	dc7013187d	Merge branch 'master' into story/150636425	2017-09-15 19:11:31 +07:00
Wyatt Johnson	94456674df	fixed embed url link	2017-09-14 14:32:16 -06:00
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