wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-16 11:22:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,127 Commits 10 Branches 125 Tags
a977ce4ac9012a806739daea73bdbd761db2ab68
Commit Graph
10127 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim GardnerandGitHub a977ce4ac9 Merge branch 'master' into update-readme 2018-06-18 13:43:15 +01:00
Kim GardnerandGitHub 18f6121797 Merge pull request #1695 from conversario/neutral-reactions-icon-whatshot 
Use the flame/What's hot as the generic reactions icon.
 2018-06-18 13:38:42 +01:00
Fabian Neumann 59531f32dc oops 2018-06-18 11:24:38 +02:00
Fabian Neumann 03ae85f5ac Use the flame/What's hot as the generic reactions icon. 2018-06-18 11:15:20 +02:00
Kim GardnerandGitHub 7ecf51a159 Merge pull request #1692 from conversario/neutral-reactions-icon 
Use neutral icon for aggregated reactions count
 2018-06-15 17:41:32 +01:00
Kim GardnerandGitHub 56c6633ef6 Merge branch 'master' into neutral-reactions-icon 2018-06-14 14:03:52 +01:00
Fabian Neumann 143d23bf9d Use neutral icon for aggregated reactions count 2018-06-14 11:44:10 +02:00
Kim Gardner 111b1b744f Update dependencies 2018-06-13 17:58:59 +01:00
Kim Gardner 29f8762ed7 Add translation for product guide link 2018-06-13 17:56:28 +01:00
Kim Gardner 959e5beb3c Merge branch 'update-readme' of git+ssh://github.com/coralproject/talk into update-readme 2018-06-13 17:54:09 +01:00
Kim GardnerandGitHub 7417a972b6 Merge branch 'master' into update-readme 2018-06-13 17:51:01 +01:00
Kim GardnerandGitHub 3da62f3471 Merge pull request #1688 from coralproject/feature/GH-1685 
GH-1685: Fix deploy to Heroku
 2018-06-13 17:00:26 +01:00
Kim Gardner cc668ef439 Fix grammar 2018-06-13 16:34:44 +01:00
Jeff Nelson 18fa98d8ea add config for MAILGUN_SMTP_PASSWORD to app.json 2018-06-13 07:13:39 -07:00
Kim GardnerandGitHub a245c2e7ea Merge branch 'master' into update-readme 2018-06-13 14:21:08 +01:00
Kim GardnerandGitHub a1745b26f7 Merge pull request #1686 from cristiandean/fix_translation 
Add translations in some missing pages and fix others
 2018-06-13 14:20:55 +01:00
Kim Gardner 35ca970650 Put Product Guide link in gear dropdown 2018-06-12 20:06:42 +01:00
Kim Gardner 6e8ab4f141 Tweak 2018-06-11 20:52:04 +01:00
Kim Gardner e48c2b9fd5 Add versioning info and cleanup README 2018-06-11 20:15:48 +01:00
Cristian 8c20376c95 Add translations in some missing pages and fix others 2018-06-11 12:34:54 -03:00
Kim GardnerandGitHub 93813adf97 Merge pull request #1678 from coralproject/user-detail 
User Detail Drawer Fixes
 2018-06-06 12:38:05 +01:00
Wyatt JohnsonandGitHub ee81a3d280 Merge branch 'master' into user-detail 2018-06-05 17:12:47 -06:00
KiwiandWyatt Johnson 41fab3e11c Introduce final form, i18n helper, validators and refactor AddEmailAddress (#1636) 
* Introduce final form, validators and refactor AddEmailAddress

* First i18n script

* Sort locales

* Add delete and copy action

* Copy over available validator translations

* Add comments

* Export validations in plugin-api

* Linting

* yarn.lock

* Sort locales

* Drop unused translations

* Add translations for validators

* Add action drop-unused

* Add comments

* Add note about limitation

* Fix desc
 2018-06-05 17:12:30 -06:00
Wyatt JohnsonandGitHub dae4eb123c Merge branch 'master' into user-detail 2018-06-05 17:11:45 -06:00
Kim GardnerandGitHub 6b6e59791a Merge pull request #1680 from conversario/translation-reply 
Translation fix for DE `common.reply`
 2018-06-05 20:44:09 +01:00
Wyatt JohnsonandGitHub ef97ef7217 Merge branch 'master' into translation-reply 2018-06-05 13:22:22 -06:00
Fabian NeumannandWyatt Johnson d407ac0c4a Small grammar fix (#1681) 2018-06-05 13:22:10 -06:00
Kim GardnerandGitHub 82b580d3a3 Merge branch 'master' into translation-reply 2018-06-05 13:46:48 +01:00
Kim GardnerandGitHub c2a9e0290c Merge pull request #1523 from coralproject/reject-username 
Reject username
 2018-06-05 13:44:01 +01:00
Fabian Neumann 01609a51f5 Translation fix for DE common.reply 2018-06-05 13:45:50 +02:00
Chi Vinh Le ccff6ed63b Resolve linter issues 2018-06-05 04:28:54 +02:00
Chi Vinh Le d9a1d739dc Set React version for linters 2018-06-05 04:28:31 +02:00
Chi Vinh Le 05088a7744 Set specific parser, as prettier now has no default 2018-06-05 04:18:55 +02:00
Chi Vinh Le 2387b46ba1 Resolve className and id conflicts 2018-06-05 03:32:15 +02:00
okbel 375c8789a4 updating yarn and nightwatch/selenium-standalone 2018-06-04 21:48:51 -03:00
Wyatt Johnson 7a13b64fbe feat: cleanup of user details drawer 2018-06-04 16:23:58 -06:00
KiwiandGitHub b8a12aef2f Merge branch 'master' into reject-username 2018-06-04 17:49:18 -03:00
Kim GardnerandGitHub 8feb67f2ea Merge pull request #1676 from coralproject/nvmrc 
Added .nvmrc file
 2018-06-04 21:41:31 +01:00
Chi Vinh Le 773eb34c3e Merge branch 'reject-username' of ssh://github.com/coralproject/talk into reject-username 2018-06-04 22:38:21 +02:00
Chi Vinh Le 5835845092 Fix write fragment 2018-06-04 22:37:31 +02:00
KiwiandGitHub 7627d37e22 Merge branch 'master' into reject-username 2018-06-04 17:32:44 -03:00
Chi Vinh Le 6674b657ab Move helper out of class 2018-06-04 22:32:23 +02:00
Chi Vinh Le 9c3d9e5943 Merge branch 'reject-username' of ssh://github.com/coralproject/talk into reject-username 2018-06-04 22:30:49 +02:00
Chi Vinh Le 636bc9efa4 Manage cache 2018-06-04 22:30:12 +02:00
Kim GardnerandGitHub 6f66ff6ccf Merge branch 'master' into nvmrc 2018-06-04 21:21:55 +01:00
Kim GardnerandGitHub bdf5b0c6a1 Merge pull request #1677 from coralproject/version-bump 
Version Bump
 2018-06-04 21:21:25 +01:00
Wyatt JohnsonandGitHub ef86938a0e Update package.json 2018-06-04 13:45:49 -06:00
Wyatt JohnsonandGitHub 01f7aa52a0 Merge branch 'master' into nvmrc 2018-06-04 13:44:39 -06:00
Cristian DeanandWyatt Johnson 6c73e5b818 Add scraper proxy support (#1674) 
* Add scraper proxy support
* review: doc updates
 2018-06-04 13:43:00 -06:00
Wyatt Johnson 3ac392e358 locked node version at 8 via nvmrc 2018-06-04 13:32:40 -06:00