 David Erwin
|
59b048002b
|
Merge pull request #555 from coralproject/fix-more-reply-count
Fix reply count polling
|
2017-04-28 14:57:50 -04:00 |
|
|
Kim Gardner
|
12e6501d4d
|
Merge branch 'master' into fix-more-reply-count
|
2017-04-28 14:51:01 -04:00 |
|
|
Kim Gardner
|
cfbff62d1c
|
Merge pull request #550 from coralproject/losowsky-patch-1
tiny typo that was bugging me
|
2017-04-28 14:43:41 -04:00 |
|
|
Chi Vinh Le
|
e486d48556
|
postComment should increase replyCount
|
2017-04-29 01:02:59 +07:00 |
|
|
Chi Vinh Le
|
8663aa0cb5
|
Fix polling reply count
|
2017-04-29 01:02:11 +07:00 |
|
|
Kim Gardner
|
4d0b5b7149
|
Merge branch 'master' into losowsky-patch-1
|
2017-04-28 11:24:27 -04:00 |
|
|
Kiwi
|
bfb2eb30e2
|
Merge pull request #552 from coralproject/fix-empty-slot-fragments
Ret empty string when encountering undefined fragment
|
2017-04-28 22:04:44 +07:00 |
|
|
Chi Vinh Le
|
5d26f8e3de
|
Ret empty string when encountering undefined fragment
|
2017-04-28 21:59:02 +07:00 |
|
|
Andrew Losowsky
|
a46c8528e1
|
tiny typo that was bugging me
|
2017-04-28 07:19:44 -04:00 |
|
|
Kim Gardner
|
78878b4295
|
Merge pull request #539 from coralproject/approved-comments-queue
Approved comments queue
|
2017-04-27 15:28:00 -04:00 |
|
|
Riley Davis
|
b1d4fff929
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 13:12:40 -06:00 |
|
|
riley
|
8cf11d83c8
|
Merge branch 'approved-comments-queue' of github.com:coralproject/talk into approved-comments-queue
|
2017-04-27 13:10:50 -06:00 |
|
|
riley
|
a3ec23c273
|
mange counts and such for all queue
|
2017-04-27 13:09:00 -06:00 |
|
|
Kim Gardner
|
af9f143b31
|
Merge pull request #547 from coralproject/lock-fix
Updated yarn.lock
|
2017-04-27 15:05:52 -04:00 |
|
|
Wyatt Johnson
|
48bffdbb3b
|
Updated yarn.lock
|
2017-04-27 13:00:30 -06:00 |
|
|
Kiwi
|
8f1448823c
|
Merge pull request #543 from coralproject/no-logic-user-box
Remove embed stream logic from UserBox
|
2017-04-28 01:07:56 +07:00 |
|
|
Kim Gardner
|
6a46fb822d
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 13:56:15 -04:00 |
|
|
Kiwi
|
b186a74199
|
Merge branch 'master' into no-logic-user-box
|
2017-04-28 00:55:50 +07:00 |
|
|
David Erwin
|
e96c5bbc8f
|
Merge pull request #542 from coralproject/optimise-initial-query
Only query once during initial render
|
2017-04-27 13:53:56 -04:00 |
|
|
David Erwin
|
06378209a2
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 13:49:12 -04:00 |
|
|
riley
|
f6cede3fda
|
add accepted to propTypes
|
2017-04-27 11:23:27 -06:00 |
|
|
riley
|
d5b800f590
|
add accepted rejected aciton buttons
|
2017-04-27 11:17:53 -06:00 |
|
|
Riley Davis
|
8cade04431
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 11:07:43 -06:00 |
|
|
David Erwin
|
efda925efc
|
Merge pull request #546 from coralproject/sub-fix
Moved subscription dep to devDeps
|
2017-04-27 12:53:04 -04:00 |
|
|
Wyatt Johnson
|
ec915208e5
|
Moved dep to devDeps
|
2017-04-27 10:48:03 -06:00 |
|
|
Kim Gardner
|
af80c4d8ad
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 11:59:30 -04:00 |
|
|
Kim Gardner
|
663bce2875
|
Merge branch 'master' into no-logic-user-box
|
2017-04-27 11:59:08 -04:00 |
|
|
Kim Gardner
|
d0090283c0
|
Merge pull request #535 from coralproject/report-popup-fix
position the reporting popup in a more reliable way
|
2017-04-27 11:58:43 -04:00 |
|
|
Chi Vinh Le
|
8c53bc2d22
|
Postpone first query until checked login
|
2017-04-27 22:55:36 +07:00 |
|
|
Kim Gardner
|
f47bd269e5
|
Merge branch 'master' into report-popup-fix
|
2017-04-27 11:48:17 -04:00 |
|
|
Kim Gardner
|
7a99c9358a
|
Merge pull request #533 from coralproject/143530761-remove-loading-when-searching
Only shows the Loading component when there is no search value
|
2017-04-27 11:47:50 -04:00 |
|
|
Riley Davis
|
6330d69649
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 09:42:28 -06:00 |
|
|
Kim Gardner
|
6e98d176e7
|
Merge branch 'master' into 143530761-remove-loading-when-searching
|
2017-04-27 11:41:51 -04:00 |
|
|
Kim Gardner
|
7b84b3daf1
|
Merge pull request #537 from coralproject/profanity-verbiage
update bad username copy
|
2017-04-27 11:41:24 -04:00 |
|
|
Riley Davis
|
40b7669ed8
|
Merge branch 'master' into approved-comments-queue
|
2017-04-27 09:40:30 -06:00 |
|
|
Kim Gardner
|
3bb994c562
|
Merge branch 'master' into profanity-verbiage
|
2017-04-27 11:35:47 -04:00 |
|
|
Riley Davis
|
ea8e469c1c
|
Merge branch 'master' into report-popup-fix
|
2017-04-27 09:28:00 -06:00 |
|
|
David Erwin
|
6e3159c7e1
|
Merge pull request #545 from coralproject/docker-fix
Fixed Dockerfile for regression with yarn
|
2017-04-27 10:34:26 -04:00 |
|
|
Wyatt Johnson
|
5559940967
|
Fixed dockerfile temp, updated yarn.lock
|
2017-04-27 08:29:16 -06:00 |
|
|
David Erwin
|
64eb16c3d6
|
Merge pull request #519 from coralproject/more-fragment-matcher
more matching on the fragment
|
2017-04-27 10:17:58 -04:00 |
|
|
Belén Curcio
|
f779c5fe01
|
Merge branch 'master' into no-logic-user-box
|
2017-04-27 11:12:55 -03:00 |
|
|
David Erwin
|
6972b87b0b
|
Merge branch 'master' into more-fragment-matcher
|
2017-04-27 10:10:19 -04:00 |
|
|
Belén Curcio
|
8c320d09da
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 11:04:11 -03:00 |
|
|
David Erwin
|
279ff0655f
|
Merge pull request #544 from coralproject/login-ios-safari
More reliable login support including IOS browsers
|
2017-04-27 10:03:29 -04:00 |
|
|
Chi Vinh Le
|
794cc0fc6c
|
Support login on all IOS browsers
|
2017-04-27 19:28:54 +07:00 |
|
|
Chi Vinh Le
|
7b16a71e9b
|
Remove embed stream logic from UserBox
|
2017-04-27 18:20:55 +07:00 |
|
|
Chi Vinh Le
|
20b4c4e2d0
|
Only query once during initial render
|
2017-04-27 17:30:43 +07:00 |
|
|
David Erwin
|
bb532b5eb2
|
Merge pull request #531 from coralproject/shortcuts-in-cog
shortcuts list should be accessible from the cog
|
2017-04-26 17:41:04 -04:00 |
|
|
David Erwin
|
5eb26946cb
|
Merge branch 'master' into profanity-verbiage
|
2017-04-26 17:21:34 -04:00 |
|
|
David Erwin
|
81680442f0
|
Merge branch 'master' into shortcuts-in-cog
|
2017-04-26 17:20:37 -04:00 |
|