Commit Graph

8345 Commits

Author SHA1 Message Date
gaba 44d82f8b13 Merge branch 'master' into i18n-emails 2017-06-01 16:26:44 -07:00
gaba 27e6372fe2 Get language from the header. 2017-06-01 16:24:15 -07:00
gaba 686dc96c5f An attempt to guess language. In process. 2017-06-01 15:44:44 -07:00
Riley Davis 8d25b766ff Merge branch 'master' into user-comment-history 2017-06-01 15:47:54 -06:00
Riley Davis 555d54425a implement kiwi's pagination changes 2017-06-01 15:34:05 -06:00
Kim Gardner f3f7fad68f Merge pull request #635 from StephanieDClark/master
Add isReply to commentInputDetailArea api
2017-06-01 14:38:36 -04:00
Riley Davis 9483922781 Merge branch 'master' into master 2017-06-01 12:31:48 -06:00
Kim Gardner 91d415b434 Merge pull request #632 from coralproject/losowsky-patch-2
Updated description
2017-06-01 14:25:55 -04:00
Kim Gardner 1943b38544 Merge branch 'master' into losowsky-patch-2 2017-06-01 14:20:45 -04:00
Kim Gardner 9344490514 Merge pull request #631 from coralproject/losowsky-patch-1
Added iPhone 7
2017-06-01 14:20:28 -04:00
StephanieDClark 1bf2053cb8 Add isReply to commentInputDetailArea api 2017-06-01 11:01:57 -07:00
Andrew Losowsky 9fe7b961ca Updated description
Added mention of Plugins
2017-06-01 13:43:30 -04:00
Andrew Losowsky ac0db69c27 Added iPhone 7
What about the Android devices? It says Galaxy S5 but that's up to S7, same with Nexus.
2017-06-01 13:41:08 -04:00
Riley Davis d981b5a85b Merge branch 'master' into user-comment-history 2017-06-01 10:52:24 -06:00
Kim Gardner 1fe6c79d88 Merge pull request #627 from coralproject/bump-version-1-8-0
Bump version in prep for 1.8.0 release
v1.8.0
2017-06-01 12:42:31 -04:00
Kim Gardner 8b3c1b275d Merge branch 'master' into bump-version-1-8-0 2017-06-01 12:24:34 -04:00
Kim Gardner c76e71ce31 Merge pull request #629 from coralproject/dec-inc-total-comment-count
Increase/Decrease totalCommentCount after mutation
2017-06-01 11:59:11 -04:00
Kim Gardner b8015506df Merge branch 'master' into dec-inc-total-comment-count 2017-06-01 11:54:49 -04:00
Kim Gardner 06e6730f04 Merge pull request #628 from coralproject/fix-translation-comment-count
Fix translation bug in CommentCount
2017-06-01 11:54:01 -04:00
Chi Vinh Le fa08450185 Increase/Decrease totalCommentCount after mutation 2017-06-01 22:39:05 +07:00
Chi Vinh Le d9acbbad96 Fix translation bug in CommentCount 2017-06-01 22:37:25 +07:00
David Erwin 4951527883 Merge pull request #626 from coralproject/pagination-refactor
Pagination refactor
2017-06-01 10:24:26 -04:00
Chi Vinh Le 33eff78a64 Always request comment id 2017-06-01 19:49:53 +07:00
Chi Vinh Le 5245755d49 Add some comments 2017-06-01 19:41:08 +07:00
Chi Vinh Le ebdd586d1e Fix mutation funkiness on permlink view 2017-06-01 18:47:07 +07:00
Chi Vinh Le 9a2b6b3ae1 Merge branch 'master' into pagination-refactor 2017-06-01 17:15:42 +07:00
gaba 276b2c7591 Merge branch 'master' into i18n-emails 2017-05-31 15:31:14 -07:00
gaba a126c94aa4 Adds service for translations in the backend. Clean yaml. 2017-05-31 13:55:27 -07:00
Kim Gardner 9bd75a5670 Bump version in prep for 1.8.0 release 2017-05-31 16:55:14 -04:00
Riley Davis 576cbed8e9 no more errors 2017-05-31 13:44:38 -06:00
Kim Gardner 4ce0431fba Merge pull request #623 from coralproject/add-trust-to-readme
Add trust to readme
2017-05-31 15:43:50 -04:00
Kim Gardner 93d8e0015b Remove space 2017-05-31 15:29:51 -04:00
Kim Gardner ac8e723e75 Copy changes 2017-05-31 15:29:50 -04:00
Kim Gardner c172260d74 Fix link 2017-05-31 15:29:49 -04:00
Kim Gardner 2a3941552d Update README with Trust info 2017-05-31 15:29:41 -04:00
Kim Gardner bf15354aa2 Merge branch 'master' into user-comment-history 2017-05-31 15:17:00 -04:00
Kim Gardner dd9e3247d2 Merge pull request #622 from coralproject/hide-comment-box-perm
Hide comment box during perm view
2017-05-31 15:12:41 -04:00
Chi Vinh Le b402f70f38 Hide comment box during perm view 2017-06-01 01:34:32 +07:00
Chi Vinh Le 30d4562383 Refactor pagination 2017-06-01 01:18:41 +07:00
riley 6e458e0149 resolve missing files 2017-05-31 10:54:34 -06:00
Riley Davis 259ce9c9fb merge master 2017-05-31 10:36:01 -06:00
Kim Gardner 93be1a91be Merge pull request #608 from coralproject/integrate-admin-graphql-framework
Integrate admin into GraphQL framework
2017-05-30 18:04:10 -04:00
Riley Davis 6599ed2b4c Merge branch 'master' into user-comment-history 2017-05-30 15:53:36 -06:00
Riley Davis 29753a958b show comments on the UserDetail drawer 2017-05-30 15:50:56 -06:00
Chi Vinh Le 109f4b2c0f Handle mutation errors 2017-05-31 00:44:16 +07:00
Kiwi 4f8ef88bd0 Merge branch 'master' into integrate-admin-graphql-framework 2017-05-31 00:24:06 +07:00
Kiwi 3160f6ae9e Merge pull request #604 from coralproject/graphql-errors-handling
Support response errors in the graphql framework
2017-05-31 00:21:14 +07:00
Kiwi 15a11dca4d Merge branch 'master' into graphql-errors-handling 2017-05-30 20:48:58 +07:00
Kiwi d28ba0028d Merge branch 'master' into integrate-admin-graphql-framework 2017-05-30 20:48:53 +07:00
Kiwi f42dd884c0 Merge pull request #617 from coralproject/forget-password-ports
Allow domains with ports
2017-05-30 20:48:42 +07:00