okbel
ff7ee2aefc
Updating cache
2018-05-01 17:18:58 -03:00
Wyatt Johnson
ea0be250c1
Merge branch 'master' into gdpr-delete
2018-04-20 12:07:10 -06:00
Wyatt Johnson
e0ebbf5119
Merge branch 'master' into gdpr-delete
2018-04-20 10:30:29 -06:00
Wyatt Johnson
8e34fd1925
implemented tombstoning
2018-04-18 17:22:39 -06:00
Kim Gardner
31a8de852c
Merge branch 'master' into organization-contact
2018-04-18 17:01:13 -04:00
Kim Gardner
06c2f328d1
Merge branch 'master' into fix-view-context-system-withheld
2018-04-18 16:44:08 -04:00
Kim Gardner
3e8abf554e
Merge branch 'master' into 155910162
2018-04-18 15:35:21 -04:00
Clint Brown
3ae1051148
Add system withheld status to InactiveCommentLabel
2018-04-18 07:55:11 +10:00
Wyatt Johnson
12bb886032
itterated on copy
2018-04-13 18:24:46 -06:00
okbel
1ceb1b4014
Save, and edit changes
2018-04-10 11:46:32 -03:00
okbel
91aa95d3f2
Merge branch 'master' of github.com:coralproject/talk into organization-contact
...
* 'master' of github.com:coralproject/talk: (36 commits)
Fixes #1505
PropTypes
Removin actions, using routes, and continuing the transition when the user makes an action
fixes related to external auth
Adding size, and proptypes
IfSlotIsNotEmpty Bug
Style and translations
allow plugin code from clients to be parsed by webpack
SaveChangesDialog
Spanish translations
Adding translations
alert route hook ready!
Removing plugin
Restore Links
Removing plugin
Save changes / discard changes dialohg
router and state lifted
routes
renaming slot :D
renaming
...
2018-04-09 16:51:06 -03:00
okbel
1a39727e38
account history to user history
2018-04-03 10:29:07 -03:00
okbel
e4358ac3a1
Style and translations
2018-04-02 16:09:47 -03:00
okbel
4ed04d1c39
Adding translations
2018-04-02 14:12:02 -03:00
okbel
6c815c1132
Working on the admin side
2018-03-28 10:39:50 -03:00
okbel
6a22cd54ec
Adding OrganizationDetails
2018-03-28 10:04:14 -03:00
okbel
480428b4a2
PropTypes and adding field
2018-03-28 09:44:02 -03:00
Wyatt Johnson
34fa2fb891
Verification link copy
2018-03-22 12:50:37 -06:00
Chi Vinh Le
9ad92e38c0
Move profile settings to core
2018-03-13 17:48:54 +01:00
Chi Vinh Le
c2406df46f
comment history blank state
2018-03-08 15:59:12 +01:00
Wyatt Johnson
8b4fe46120
added support for new system icon
2018-02-23 12:32:49 -07:00
Wyatt Johnson
139d036b42
changed styles + added translations
2018-02-22 17:32:37 -07:00
Chi Vinh Le
c7ee8307e6
Merge branch 'master' into auth-refactor
2018-02-13 16:33:17 +01:00
Chi Vinh Le
87af05c0d9
Fix translations
2018-02-13 15:33:50 +01:00
Facu
4b2aa04ef6
error msg when suspenden user try to post
2018-02-11 23:37:33 -03:00
Chi Vinh Le
4b6a3b5b9d
More refactoring
2018-02-09 23:18:21 +01:00
Kim Gardner
5ebb99740b
Merge branch 'master' into admin-user-details
2018-02-08 12:07:12 -05:00
Kim Gardner
18cc8b9389
Update stream.comment_not_found text
2018-02-08 11:28:21 -05:00
Leandro
44913864eb
remove identification changes on UserDetails
2018-02-07 09:12:39 +01:00
Leandro
f75924e683
translate ViewOptions componenet
2018-02-02 10:34:46 +01:00
Leandro
0966aa9463
insert new admin keys about user details
2018-02-02 10:25:08 +01:00
Kiwi
8e142a5ecb
Merge branch 'master' into fix-gender
2018-01-30 17:56:31 +01:00
Chi Vinh Le
665d8c1ef0
Fix gender translation
2018-01-30 17:42:30 +01:00
Wyatt Johnson
335349963c
adjusted flow for changed usernames, e2e
2018-01-29 17:46:03 -07: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
Kim Gardner
81d049e533
Merge branch 'master' into live-reported
2018-01-22 13:33:15 -05:00
Kim Gardner
0f6cc20478
Update error message
2018-01-22 13:08:28 -05:00
Chi Vinh Le
1e34af6aa3
Fixes for report dialog
2018-01-22 18:20:36 +01:00
Kiwi
e653a5f9c0
Merge branch 'master' into live-reported
2018-01-19 16:04:43 +01:00
Chi Vinh Le
ddf3816f5a
Better notifications
2018-01-18 20:00:31 +01:00
Wyatt Johnson
45d4c79c26
added reply bug
2018-01-16 12:30:38 -07:00
okbel
1f6d38c4ad
Updating copy
2018-01-10 17:43:55 -03:00
Wyatt Johnson
9c595b7f84
Merge branch 'master' into next
2018-01-05 11:10:32 -07:00
Wyatt Johnson
20878ba040
css and standardization on all admin pages
2017-12-21 23:27:37 -07:00
okbel
570c0edfb3
merge conficts
2017-12-20 16:06:55 -03:00
Kim Gardner
3ea141d4b0
Merge branch 'master' into i18n-serverside-plugins
2017-12-18 16:44:23 -06:00
Kim Gardner
82fd56dc67
Update permalink copy to Share on stream
2017-12-18 13:09:39 -05:00
Wyatt Johnson
fdd5cbb0d7
moved email contents to translation files
2017-12-14 16:56:24 -06:00
Wyatt Johnson
2d70caf03d
Merge branch 'next' into user-status-refactor
2017-12-04 15:42:57 -07:00
Wyatt Johnson
419784f6d1
Merge branch 'master' into next
2017-12-04 15:28:41 -07:00
okbel