Commit Graph

8775 Commits

Author SHA1 Message Date
okbel a8e09d4c89 Account History stable key 2018-01-04 12:25:29 -03:00
okbel 7bdaf74e1a SetUserRole using DataProxy 2018-01-04 12:08:26 -03:00
okbel f04c3cc059 Naming Conventions 2018-01-04 11:53:08 -03:00
okbel 8c5040d88b Naming conventions 2018-01-04 11:49:10 -03:00
okbel 3ca3b59802 Using user.id 2018-01-04 11:44:02 -03:00
okbel fa6aa4ae2d Search functionality on the Community People Section 2018-01-04 11:42:51 -03:00
okbel f6e5df2088 Merge branch 'next' of github.com:coralproject/talk into next
* 'next' of github.com:coralproject/talk:
  added user query by value to graph
2018-01-04 11:20:58 -03:00
okbel e343958b07 Merge branch 'master' of github.com:coralproject/talk into next
* 'master' of github.com:coralproject/talk:
  fixes default lang select bug
2018-01-04 11:02:50 -03:00
Belén Curcio 298cb5322e Merge pull request #1244 from coralproject/user-search
User Search
2018-01-04 11:02:28 -03:00
J. Heasly d7097ff729 Up patch version to match tag. 2018-01-03 17:51:58 -08:00
Wyatt Johnson 94f2b4397e Merge branch 'master' into feature/zh_tw 2018-01-03 14:57:50 -07:00
Wyatt Johnson 75e89591a8 Merge branch 'master' into safari-bs-changes 2018-01-03 14:54:58 -07:00
Wyatt Johnson 72b2211daa reduced complexity 2018-01-03 14:43:35 -07:00
Wyatt Johnson 0850b1f982 added some comments 2018-01-03 14:34:50 -07:00
Wyatt Johnson 375fbd3790 resolving code climate issues 2018-01-03 14:32:19 -07:00
Wyatt Johnson 82c84de33f code review 2018-01-03 14:22:52 -07:00
Wyatt Johnson 57972b3fb9 Merge branch 'master' into admin-pages 2018-01-03 14:08:55 -07:00
Wyatt Johnson 9dcb8f8f0e Merge branch 'next' into user-search 2018-01-03 14:08:38 -07:00
Wyatt Johnson 148d329ff8 Merge branch 'master' into next 2018-01-03 14:08:29 -07:00
Wyatt Johnson 517124cc93 Merge pull request #1236 from coralproject/i18n-bug-fix
i18n Default Language Fix
2018-01-03 14:08:11 -07:00
Wyatt Johnson 797cea4f63 added user query by value to graph 2018-01-03 14:01:51 -07:00
okbel cb2f032ae1 fix index for moderation actions, and view options 2018-01-03 17:38:22 -03:00
Belén Curcio 0572a1c97d Merge branch 'master' into next 2018-01-03 12:11:44 -03:00
liz bb8a75937a Fix for typo in plugin 2018-01-03 18:10:25 +08:00
Kiwi 8060d9c22e Merge branch 'master' into safari-bs-changes 2018-01-03 10:23:01 +01:00
liz 783e485aa5 Add traditional Chinese locales for plugins 2018-01-03 17:21:30 +08:00
liz 6f96bd416c Traditional Chinese locales 2018-01-03 17:19:11 +08:00
Wyatt Johnson 20e3d9065f Merge branch 'master' into i18n-bug-fix 2017-12-30 02:56:13 -07:00
Wyatt Johnson 7b6c59b6f1 Merge branch 'master' into admin-pages 2017-12-30 02:56:02 -07:00
Wyatt Johnson 0af8a31154 Merge pull request #1240 from gakhov/gakhov-patch-advanced-config
Fix a variable name for redis client configuration
2017-12-30 02:55:46 -07:00
Morten Nissen f47abfc3ad Merge pull request #2 from coralproject/master
update master
2017-12-29 22:18:44 +01:00
Andrii Gakhov 140bba23e0 Fix a variable name for redis client configuration
The documentation incorrectly stated that the advanced Redis Client configuration could be set using `TALK_REDIS_CLIENT_CONFIG`, while, in fact, the correct variable is `TALK_REDIS_CLIENT_CONFIGURATION`, as it parsed in https://github.com/coralproject/talk/blob/master/config.js#L114
2017-12-28 13:04:37 +01:00
MEL27 ae0407ed5e Refine zh_CN translation 2017-12-26 12:08:47 +08:00
MEL27 a5d7bca8c0 Refine zh_CN translation 2017-12-26 00:20:58 +08:00
MEL27 8a40093399 Refine zh_CN translation 2017-12-25 22:22:46 +08:00
MEL27 b3d76bba05 Miscellaneous zh_CN translation changes 2017-12-25 17:45:03 +08:00
Kim Gardner e5a00d0793 Merge branch 'master' into master 2017-12-24 16:01:39 -05:00
MEL27 5f0f97edbb Refine locales/zh_CN.yml 2017-12-24 16:55:10 +08:00
MEL27 19c46d3b32 Refine Simplified Chinese translation 2017-12-24 12:51:19 +08:00
MEL27 5b356e6249 Add initial Simplified Chinese translation 2017-12-24 12:22:44 +08:00
Wyatt Johnson 20878ba040 css and standardization on all admin pages 2017-12-21 23:27:37 -07:00
Wyatt Johnson 69e4c5478d fixes default lang select bug 2017-12-21 23:26:34 -07:00
Kim Gardner 0d70c87ea9 Fix merge conflict 2017-12-21 17:01:48 -05:00
Wyatt Johnson d3ce68e078 Merge branch 'master' into next 2017-12-21 14:51:56 -07:00
Wyatt Johnson 4fa46c4144 Merge pull request #1154 from coralproject/user-status-refactor
User status refactor
2017-12-21 14:35:23 -07:00
Wyatt Johnson c2a8a3e4a3 fixed tests 2017-12-21 14:26:44 -07:00
Kim Gardner 01707a5150 Merge branch 'master' into safari-bs-changes 2017-12-21 15:26:31 -05:00
Kim Gardner 5488d5a7fa Merge pull request #1234 from coralproject/modqueue-enh
Modqueue fixes and enhancements
2017-12-21 15:26:09 -05:00
Wyatt Johnson c8ab5cdbf6 fixed tests 2017-12-21 12:43:26 -07:00
Wyatt Johnson 4fb9910221 updates to cli
- removed -c,--config flag in favor of env only or .env files
- loads .env always if found
- scripts re-written to call cli-serve directly
2017-12-21 12:03:34 -07:00