 Kim Gardner
|
ce4ab4e86c
|
Merge branch 'master' into next
|
2018-01-04 17:28:13 -05:00 |
|
|
Kim Gardner
|
0ab6cc3a0f
|
Merge pull request #1230 from coralproject/safari-bs-changes
Safari Browserstack changes
|
2018-01-04 17:26:05 -05:00 |
|
|
Kim Gardner
|
c617a3446d
|
Merge branch 'master' into safari-bs-changes
|
2018-01-04 17:15:47 -05:00 |
|
|
Kim Gardner
|
d76fe5350e
|
Merge pull request #1238 from MEL27/master
Add initial Simplified Chinese translation
|
2018-01-04 17:15:23 -05:00 |
|
|
Kim Gardner
|
927aa54feb
|
Merge branch 'master' into master
|
2018-01-04 17:03:10 -05:00 |
|
|
Kim Gardner
|
fc272ed1e1
|
Merge branch 'master' into master
|
2018-01-04 17:02:32 -05:00 |
|
|
Kim Gardner
|
882251864a
|
Merge pull request #1246 from coralproject/simplified-chinese-merge-fixes
Simplified Chinese merge fixes
|
2018-01-04 17:01:42 -05:00 |
|
|
Kim Gardner
|
4eaa234dd8
|
Merge branch 'master' into simplified-chinese-merge-fixes
|
2018-01-04 16:48:46 -05:00 |
|
|
Kim Gardner
|
bf1fbfe03f
|
Fix merge conflicts on master
|
2018-01-04 16:43:51 -05:00 |
|
|
Kim Gardner
|
d3f93644db
|
Merge branch 'master' into master
|
2018-01-04 16:07:18 -05:00 |
|
|
Kim Gardner
|
b9412dcb10
|
Merge branch 'master' into master
|
2018-01-04 15:55:18 -05:00 |
|
|
Kim Gardner
|
1125351cd1
|
Merge pull request #1243 from larrylizhao/feature/zh_tw
Adding traditional Chinese locales for Coral talk
|
2018-01-04 15:35:22 -05:00 |
|
|
Wyatt Johnson
|
c683dd8d32
|
fixed let -> const
|
2018-01-04 10:56:15 -07:00 |
|
|
Wyatt Johnson
|
843908dab2
|
changed beheviour of dotenv parsing
|
2018-01-04 10:52:15 -07:00 |
|
|
Wyatt Johnson
|
ad35a04cdf
|
pr review updates
|
2018-01-04 10:50:14 -07:00 |
|
|
Chi Vinh Le
|
d5bf44ada8
|
Keep localhost for mongodb and redis
|
2018-01-04 18:41:31 +01:00 |
|
|
okbel
|
7bfbeac368
|
Removing unused code
|
2018-01-04 13:59:37 -03:00 |
|
|
okbel
|
ca55097b5c
|
Removing unused code
|
2018-01-04 13:58:07 -03:00 |
|
|
okbel
|
ee0c510569
|
Adding warning
|
2018-01-04 13:55:00 -03:00 |
|
|
okbel
|
3d9eec825c
|
Merge branch 'next' of github.com:coralproject/talk into next
* 'next' of github.com:coralproject/talk:
Up patch version to match tag.
|
2018-01-04 13:37:36 -03:00 |
|
|
okbel
|
6d777944aa
|
Naming Conventions
|
2018-01-04 13:37:21 -03:00 |
|
|
okbel
|
841398c6c1
|
Removing pointer hover, adding proptypes
|
2018-01-04 13:23:41 -03:00 |
|
|
Kim Gardner
|
f8c1f1e63d
|
Merge branch 'master' into safari-bs-changes
|
2018-01-04 11:21:52 -05:00 |
|
|
Kim Gardner
|
c7176a4660
|
Merge branch 'master' into feature/zh_tw
|
2018-01-04 11:21:07 -05:00 |
|
|
Kim Gardner
|
e2534e7ca8
|
Merge branch 'master' into master
|
2018-01-04 11:20:57 -05:00 |
|
|
Kim Gardner
|
d09948e7f6
|
Merge branch 'master' into next
|
2018-01-04 11:20:18 -05:00 |
|
|
Wyatt Johnson
|
270f865ccd
|
Merge pull request #1245 from jheasly/version_fix
Up patch version to match tag.
|
2018-01-04 09:18:28 -07:00 |
|
|
okbel
|
e52793e918
|
Moving bulk actions to User tab
|
2018-01-04 12:50:53 -03:00 |
|
|
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
|
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 |
|