Kim Gardner
3ea141d4b0
Merge branch 'master' into i18n-serverside-plugins
2017-12-18 16:44:23 -06:00
Kim Gardner
f783c8423d
Merge pull request #1211 from coralproject/premod-admin-comments
...
Fix new admin comments not showing up in premod
2017-12-18 16:44:15 -06:00
Kim Gardner
9d4a9861f2
Merge branch 'master' into premod-admin-comments
2017-12-18 16:34:13 -06:00
Kim Gardner
6d69286df6
Merge pull request #1214 from coralproject/confirmation-featured
...
Confirmation Dialog for Featuring Comments on the Admin Side
2017-12-18 16:34:01 -06:00
Kim Gardner
c0af51fbc0
Merge branch 'master' into confirmation-featured
2017-12-18 16:27:00 -06:00
Kim Gardner
ad85b0fcc8
Merge pull request #1216 from coralproject/change-permalink-share
...
Update permalink copy to "Share" on stream
2017-12-18 16:26:43 -06:00
Kim Gardner
5ad73b1c14
Merge branch 'master' into change-permalink-share
2017-12-18 16:17:31 -06:00
Kim Gardner
bf83f462e0
Merge pull request #1217 from coralproject/fix-login-profile
...
Fix sign in on profile tab
2017-12-18 16:17:19 -06:00
Kim Gardner
8dd79a19c3
Merge branch 'master' into fix-login-profile
2017-12-18 16:09:37 -06:00
Kim Gardner
a8368eb78d
Merge pull request #1218 from coralproject/ci-fix
...
Disabling Firefox/Edge on E2E until fix pass
v3.8.3
2017-12-18 13:58:02 -06:00
Wyatt Johnson
e88bac6e0f
Merge branch 'master' into ci-fix
2017-12-18 12:45:40 -07:00
Kim Gardner
281d1f65f1
Merge branch 'master' into i18n-serverside-plugins
2017-12-18 13:44:20 -06:00
Kim Gardner
2704d71b09
Merge branch 'master' into fix-login-profile
2017-12-18 13:43:45 -06:00
Wyatt Johnson
583ab0ff74
disabling firefox,edge
2017-12-18 12:42:58 -07:00
Belén Curcio
2a74e75506
Merge branch 'master' into confirmation-featured
2017-12-18 15:39:55 -03:00
Wyatt Johnson
fb7ad76b8b
Merge pull request #1215 from coralproject/ci-fix
...
*Fixes for sorted window handler
2017-12-18 11:36:47 -07:00
okbel
35c88ffab4
spreading the rest first
2017-12-18 15:21:02 -03:00
okbel
1cdef8f864
bounded
2017-12-18 15:20:06 -03:00
Kim Gardner
82fd56dc67
Update permalink copy to Share on stream
2017-12-18 13:09:39 -05:00
Chi Vinh Le
0e01d40aa7
Fix sign in on profile tab
2017-12-18 19:01:43 +01:00
Wyatt Johnson
f7d1543aa3
fixes for sorted window handler
2017-12-18 10:24:11 -07:00
Belén Curcio
d2ebc81e25
Merge branch 'master' into confirmation-featured
2017-12-18 13:52:01 -03:00
Belen Curcio
278e1cec1d
done
2017-12-18 13:42:59 -03:00
Kim Gardner
31436e627d
Merge branch 'master' into i18n-serverside-plugins
2017-12-18 10:39:27 -06:00
Kim Gardner
4e50865927
Merge branch 'master' into premod-admin-comments
2017-12-18 10:39:06 -06:00
Belen Curcio
6ad218782e
styling
2017-12-18 13:39:02 -03:00
Belen Curcio
8f1f875d76
less data to the store
2017-12-18 13:36:30 -03:00
Belen Curcio
9fb8e01cd2
working, still wip
2017-12-18 13:34:48 -03:00
Kim Gardner
950a35310b
Merge pull request #1212 from coralproject/user-detail-load-more-fix
...
Fix load more in UserDetail issue
2017-12-18 10:23:50 -06:00
Kiwi
12884cce01
Merge branch 'master' into i18n-serverside-plugins
2017-12-18 17:12:54 +01:00
Kiwi
c871f1c797
Merge branch 'master' into premod-admin-comments
2017-12-18 17:12:41 +01:00
Kiwi
9af7ae0357
Merge branch 'master' into user-detail-load-more-fix
2017-12-18 17:12:36 +01:00
Wyatt Johnson
073eea2847
Merge pull request #1213 from coralproject/version-bump
...
Version Bump
2017-12-18 09:11:52 -07:00
Wyatt Johnson
c699e044fd
Update package.json
2017-12-18 08:55:49 -07:00
Kiwi
7d3ec7da1e
Merge branch 'master' into premod-admin-comments
2017-12-18 16:55:38 +01:00
Belen Curcio
5d288da69d
Merge branch 'master' of github.com:coralproject/talk into confirmation-featured
2017-12-18 12:55:31 -03:00
Kiwi
4ef7abc132
Merge branch 'master' into user-detail-load-more-fix
2017-12-18 16:55:31 +01:00
Wyatt Johnson
9e486f3a9d
Merge pull request #1210 from coralproject/redis-optim
...
Redis Optimization Pass
2017-12-18 08:55:18 -07:00
Chi Vinh Le
fbcd390220
Fix load more issue
2017-12-18 16:52:57 +01:00
okbel
338c23dc3d
unnecesary class
2017-12-18 12:46:24 -03:00
okbel
4d6f38a3d9
wip
2017-12-18 12:43:46 -03:00
Chi Vinh Le
5b8f335b2a
Fix new admin comments not showing up in premod
2017-12-18 16:41:05 +01:00
Wyatt Johnson
f0330ed21c
fixed version paths
2017-12-18 08:35:17 -07:00
okbel
02da749c65
Adding containers and components
2017-12-18 12:20:20 -03:00
okbel
5a1393c039
Adding translations
2017-12-18 12:20:06 -03:00
okbel
d7a5e613fa
Adding reducer
2017-12-18 12:19:46 -03:00
Wyatt Johnson
75a944eba8
upgrades, fixes to comment count logic
2017-12-18 08:02:43 -07:00
Wyatt Johnson
6850dd1a53
redis optim
...
- removes call for comment count when we already have
totalCommentCount
- removes job processor cleaner on non-processing nodes
- fixed some template issues
2017-12-15 15:49:56 -06:00
Wyatt Johnson
ecb01224fd
Merge branch 'master' into i18n-serverside-plugins
2017-12-15 10:40:08 -06:00
Wyatt Johnson
fdd5cbb0d7
moved email contents to translation files
2017-12-14 16:56:24 -06:00