Kim Gardner and GitHub
22467ac123
Merge branch 'master' into admin-user-details
2018-02-08 11:26:11 -05:00
Wyatt Johnson and GitHub
3c04e6c7ec
Merge branch 'master' into patch-1
2018-02-07 10:40:14 -07:00
Wyatt Johnson and GitHub
77723e3fb3
Merge branch 'master' into patch-2
2018-02-07 10:32:34 -07:00
Leandro
bba14f502a
Merge branch 'admin-user-details' of https://github.com/leeeandroo/talk into admin-user-details
2018-02-07 09:14:28 +01:00
Leandro
44913864eb
remove identification changes on UserDetails
2018-02-07 09:12:39 +01:00
Matt Montgomery and GitHub
3c66401546
Providers username for subscription fields
2018-02-06 16:29:25 -07:00
Kim Gardner and GitHub
a5c08129ce
Merge branch 'master' into admin-user-details
2018-02-06 14:20:26 -05:00
Kim Gardner and GitHub
7c859ad4c3
Merge branch 'master' into patch-2
2018-02-06 14:20:00 -05:00
Kim Gardner and GitHub
b9cfddc5c0
Merge branch 'master' into keep-drafts
2018-02-06 14:06:57 -05:00
Kim Gardner and GitHub
caa588f11d
Merge branch 'master' into keep-drafts
2018-02-06 11:36:31 -05:00
Matt Montgomery and GitHub
9c139eb703
Fixes prettier/prettier linting error
2018-02-05 17:46:10 -07:00
Matt Montgomery and GitHub
c289ed149f
Adds logout for non-admin users
2018-02-05 17:17:51 -07:00
Matt Montgomery and GitHub
05d80a0549
Use translate-able sign_out
2018-02-05 17:03:44 -07:00
Kim Gardner and GitHub
8bef21274d
Merge branch 'master' into admin-user-details
2018-02-05 11:31:28 -05:00
Chi Vinh Le
cb077a87dc
Remove semicolon
2018-02-05 17:22:13 +01:00
Kim Gardner and GitHub
6d662e4469
Merge branch 'master' into admin-user-details
2018-02-05 10:59:42 -05:00
Chi Vinh Le
aec0251c4f
Fix zen mode
2018-02-02 15:50:43 +01:00
Leandro
f75924e683
translate ViewOptions componenet
2018-02-02 10:34:46 +01:00
Leandro
30cd16fd56
make user details texts translatable and change email to identification
2018-02-02 10:22:16 +01:00
Nat Welch and GitHub
219fcdddea
Change text wrapping of Stories table
2018-02-01 13:26:34 -05:00
Chi Vinh Le
4464183b42
Linting
2018-02-01 18:25:35 +01:00
Kiwi and GitHub
ed8d9e985c
Merge branch 'master' into keep-drafts
2018-02-01 18:19:30 +01:00
Chi Vinh Le
91e08cb117
Rename storage to localStorage in context
2018-02-01 13:28:28 +01:00
Chi Vinh Le
d6ddd9c195
Clearly remove auth data from storage
2018-02-01 12:13:33 +01:00
Wyatt Johnson and GitHub
0f9387dbb9
Merge branch 'master' into user-perms
2018-01-30 11:03:42 -07:00
Wyatt Johnson
ec54376a53
blocked user actions in username change process
2018-01-30 11:00:48 -07:00
Kiwi and GitHub
1c4b8a0a67
Merge branch 'master' into notify-on-edit
2018-01-30 18:10:47 +01:00
Kiwi and GitHub
e77e62236c
Merge branch 'master' into fix-ie11-sideactions
2018-01-30 17:57:04 +01:00
Chi Vinh Le
3d57122a65
Add IE CSS fixes
2018-01-30 17:56:15 +01:00
Kiwi and GitHub
bd2c4d4bfc
Merge branch 'master' into notify-on-edit
2018-01-30 17:37:15 +01:00
Kim Gardner and GitHub
7dd7f9ca54
Merge branch 'master' into approve-reject-button-style
2018-01-30 10:14:22 -05:00
Chi Vinh Le
b33cde03c3
Removes some weird characters
2018-01-30 15:59:02 +01:00
Chi Vinh Le
d80cd6f0a2
More Refactor
2018-01-30 15:49:28 +01:00
Fabian Neumann
efe84f3f98
Make Approve/Reject button styles more robust for long texts.
...
For other languages than English the 'Approve' text did not fit
into the button. This commit makes the CSS a bit more flexible by
removing some very pixel-specfic styles.
2018-01-30 14:50:35 +01:00
Kim Gardner and GitHub
9645ccb6cd
Merge branch 'master' into better-change-detection
2018-01-29 14:40:48 -05:00
Chi Vinh Le
2bfa99fa1a
Remove unused proptype
2018-01-29 14:52:26 +01:00
Chi Vinh Le
c12fe526b8
Better detect edits
2018-01-29 14:52:09 +01:00
Kim Gardner and GitHub
7d31487275
Merge branch 'master' into zen-mode
2018-01-26 15:31:22 -05:00
Chi Vinh Le
9a36473c8f
Merge branch 'activity-dot-subscription' of ssh://github.com/coralproject/talk into activity-dot-subscription
2018-01-26 17:30:16 +01:00
Chi Vinh Le
3fa2af975c
Bug fixes
2018-01-26 17:28:21 +01:00
Kiwi and GitHub
c00e534984
Merge branch 'master' into activity-dot-subscription
2018-01-26 01:49:04 +01:00
Chi Vinh Le
b638b783fe
Refactor
2018-01-26 01:42:46 +01:00
Chi Vinh Le
ce25cfb159
Reconstruct previous comment state more accurately
2018-01-25 22:03:37 +01:00
Kim Gardner
63347dc0eb
Change s to z for zen mode shortcut and update copy and docs
2018-01-25 14:50:06 -05:00
Chi Vinh Le
426025f8c2
Subscribe to edited + bug fixes
2018-01-25 20:49:57 +01:00
Chi Vinh Le
6fd4d1576e
Correct logic for disabling activity subscriptions
2018-01-25 20:08:57 +01:00
Chi Vinh Le
26ca3622c2
Integrate featured into activity indicator subscription
2018-01-25 20:01:25 +01:00
Chi Vinh Le
66934cbb82
Implement indicator subscriptions for moderation
2018-01-25 16:45:19 +01:00
Chi Vinh Le
2246b16cf4
Add some comments
2018-01-24 23:34:53 +01:00
Chi Vinh Le
1fc07e8649
Implement activity tracking for flagged accounts
2018-01-24 23:31:31 +01:00