 Wyatt Johnson
|
55ebd1df8e
|
Merge branch 'master' into view-context-no-tombstone
|
2017-09-15 17:16:07 -06:00 |
|
|
Wyatt Johnson
|
c427691bef
|
Merge pull request #958 from coralproject/detect-n-display-stream-errors
Detect and display stream errors
|
2017-09-15 17:15:34 -06:00 |
|
|
Wyatt Johnson
|
93afd793cb
|
Merge branch 'master' into detect-n-display-stream-errors
|
2017-09-15 17:10:46 -06:00 |
|
|
Wyatt Johnson
|
35232cf015
|
Merge pull request #957 from coralproject/fix-config
Fix config parsing bug
|
2017-09-15 16:56:24 -06:00 |
|
|
Wyatt Johnson
|
f864ebf2e3
|
Merge branch 'master' into fix-config
|
2017-09-15 15:56:46 -06:00 |
|
|
Wyatt Johnson
|
a9cc78b61d
|
Merge pull request #943 from coralproject/story/150848457
Added support for deep comment counts
|
2017-09-15 15:55:35 -06:00 |
|
|
Wyatt Johnson
|
2c3a52b48c
|
Merge branch 'master' into story/150848457
|
2017-09-15 15:49:30 -06:00 |
|
|
Wyatt Johnson
|
0b1a75726c
|
Merge pull request #956 from coralproject/story/150636425
Status SYSTEM_WITHHELD
|
2017-09-15 15:49:11 -06:00 |
|
|
Wyatt Johnson
|
384c126d9e
|
added docs
|
2017-09-15 15:29:20 -06:00 |
|
|
Wyatt Johnson
|
f97094177a
|
revamped configuration for moderation phases
|
2017-09-15 14:23:18 -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 |
|
|
Kiwi
|
e9bd5e4476
|
Merge branch 'master' into story/150848457
|
2017-09-15 19:53:00 +02: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 |
|
|
Wyatt Johnson
|
c7b755d2ff
|
Merge pull request #954 from coralproject/url-fix
Fixed embed url link
|
2017-09-15 08:40:55 -06: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 |
|
|
Wyatt Johnson
|
83f10a4863
|
Merge branch 'master' into story/150848457
|
2017-09-14 13:27:53 -06:00 |
|
|
Wyatt Johnson
|
d820d2d2c3
|
moved support for deepReplyCount to seperate field
|
2017-09-14 13:08:01 -06:00 |
|
|
Kim Gardner
|
7ace5b369a
|
Merge pull request #951 from coralproject/update-readme
Update README
|
2017-09-14 16:49:40 +01:00 |
|
|
Kim Gardner
|
cf66c10262
|
Update README
|
2017-09-14 16:45:19 +01:00 |
|
|
Kim Gardner
|
26256b979e
|
Merge branch 'master' into story/150848457
|
2017-09-14 16:20:20 +01:00 |
|
|
Kim Gardner
|
0113f02994
|
Merge pull request #944 from coralproject/new-regexp-highlighter
Better wordlist service and highlighter
|
2017-09-14 16:20:06 +01:00 |
|
|
Wyatt Johnson
|
b3eb3361bb
|
Merge branch 'master' into new-regexp-highlighter
|
2017-09-14 08:47:40 -06:00 |
|
|
Wyatt Johnson
|
fce65e616d
|
Merge pull request #949 from coralproject/fix-moderator-rest-permission
Allow Moderator to have read access on assets and settings
|
2017-09-14 08:47:28 -06:00 |
|
|
Chi Vinh Le
|
c41ab58109
|
Allow Moderator to have read access on assets and settings
|
2017-09-14 21:11:40 +07:00 |
|
|
Chi Vinh Le
|
76a6a0e82b
|
Remove natural package
|
2017-09-14 18:10:24 +07:00 |
|
|
Chi Vinh Le
|
bea25f2a11
|
Merge branch 'new-regexp-highlighter' of ssh://github.com/coralproject/talk into new-regexp-highlighter
|
2017-09-14 17:40:01 +07:00 |
|
|
Chi Vinh Le
|
ad361413c7
|
Reimplement wordlist on server using same regexp solution
|
2017-09-14 17:36:04 +07:00 |
|
|
Kim Gardner
|
cf61d9e2ca
|
Merge branch 'master' into story/150848457
|
2017-09-14 10:07:04 +01:00 |
|
|
Kim Gardner
|
77ef9ff111
|
Merge branch 'master' into new-regexp-highlighter
|
2017-09-14 10:06:43 +01:00 |
|
|
Kim Gardner
|
c8cc5e6a34
|
Merge pull request #948 from coralproject/docs-update
Documentation Update
|
2017-09-14 09:16:17 +01:00 |
|
|
Wyatt Johnson
|
1574e08197
|
fixes #947
|
2017-09-13 12:02:20 -06: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
|
647502d701
|
Merge branch 'master' into new-regexp-highlighter
|
2017-09-13 15:11:35 +01:00 |
|
|
Kim Gardner
|
d728065fe5
|
Merge branch 'master' into story/150848457
|
2017-09-13 15:11:30 +01:00 |
|
|
Kim Gardner
|
18b8a18f1d
|
Merge pull request #946 from coralproject/typo-fix-en-yml
Fix typo
|
2017-09-13 15:05:20 +01:00 |
|
|
Kim Gardner
|
1089807086
|
Fix typo
|
2017-09-13 15:00:00 +01:00 |
|
|
Kim Gardner
|
90a649db9b
|
Merge branch 'master' into story/150848457
|
2017-09-13 13:18:56 +01:00 |
|
|
Kim Gardner
|
17ec666d97
|
Merge branch 'master' into new-regexp-highlighter
|
2017-09-13 13:18:47 +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
|
2905ffb5cb
|
Merge branch 'master' into new-regexp-highlighter
|
2017-09-13 12:43:29 +01:00 |
|
|
Kim Gardner
|
433b0d310e
|
Merge branch 'master' into story/150848457
|
2017-09-13 12:43:16 +01:00 |
|