Commit Graph
10091 Commits
Author SHA1 Message Date
Kim GardnerandGitHub 71d413004e Merge branch 'master' into indexes 2018-04-18 16:26:40 -04:00
Kim GardnerandGitHub 59658fcb29 Merge pull request #1504 from coralproject/155910162
Account History to User History
2018-04-18 16:18:26 -04:00
Kim GardnerandGitHub 6d2c4d215d Merge branch 'master' into 155910162 2018-04-18 16:09:06 -04:00
Kim GardnerandGitHub fe23b83044 Merge pull request #1507 from coralproject/155836892
Bug: User Comment History - After loading more comments, rejecting/accepting a comment reloads the user history
2018-04-18 16:08:49 -04:00
Kim Gardner c4cbefeb81 Change to UserHistory in UserDetail.js 2018-04-18 16:02:39 -04:00
Kim GardnerandGitHub d822d8343a Merge branch 'master' into 155836892 2018-04-18 15:54:07 -04:00
Kim GardnerandGitHub 3e8abf554e Merge branch 'master' into 155910162 2018-04-18 15:35:21 -04:00
Wyatt JohnsonandGitHub 431e9d8b09 Merge branch 'master' into gdpr-delete 2018-04-18 13:17:51 -06:00
Wyatt Johnson 2adec1bc34 added deletion graph endpoints 2018-04-18 13:13:41 -06:00
Wyatt Johnson 0e2a37ac91 Merge branch 'master' into gdpr-username 2018-04-18 10:29:18 -06:00
Wyatt Johnson 84360bfddf Merge branch 'master' into gdpr-password 2018-04-18 10:28:17 -06:00
Cristian DeanandGitHub ded8367b07 Merge branch 'master' into master 2018-04-18 10:04:49 -03:00
Wyatt JohnsonandCristian 1071e86f96 Check if token is in localStorage before logout 2018-04-18 10:02:48 -03:00
D. Luijten ea2552e173 Merge branch 'hotfix/fix_dutch_moment_locale'
* hotfix/fix_dutch_moment_locale:
  Added NL translation for Moment. Also, sorted locale imports alphabetically.
2018-04-18 14:29:02 +02:00
D. Luijten ca2070eada Added NL translation for Moment. Also, sorted locale imports alphabetically. 2018-04-18 14:28:42 +02:00
Clint Brown 3ae1051148 Add system withheld status to InactiveCommentLabel 2018-04-18 07:55:11 +10:00
Belén CurcioandGitHub 6b441291c0 Merge branch 'master' into organization-contact 2018-04-17 17:32:37 -03:00
Wyatt JohnsonandGitHub 786c91c4ff Merge pull request #1526 from kitwestneat/no-tabs-logged-out
don't show profile tab if user is logged out
2018-04-17 13:45:27 -06:00
Wyatt Johnson b6299c2d40 fix e2e test 2018-04-17 13:35:30 -06:00
Wyatt Johnson a257fdb623 removed deprecated not logged in ui for profile tab 2018-04-17 13:23:02 -06:00
Wyatt Johnson a6344d8e71 fixed proptype missing validation 2018-04-17 13:19:03 -06:00
Wyatt JohnsonandGitHub ec54db58dd Merge branch 'master' into no-tabs-logged-out 2018-04-17 13:11:32 -06:00
Wyatt JohnsonandGitHub da68b222b7 Merge branch 'master' into reject-username 2018-04-17 13:10:45 -06:00
Wyatt Johnson dcf10643a0 Merge branch 'master' into gdpr-download 2018-04-17 13:09:17 -06:00
Wyatt Johnson bc7c37241e Merge branch 'master' into organization-contact 2018-04-17 13:07:16 -06:00
Wyatt Johnson 360dbdf02d icon patch 2018-04-17 13:06:07 -06:00
Wyatt Johnson 6c8b281a82 Merge branch 'master' into indexes 2018-04-17 12:56:48 -06:00
Wyatt JohnsonandGitHub fb1d431948 Merge pull request #1522 from coralproject/server-jest
Serverside Jest Support
2018-04-17 12:42:00 -06:00
Wyatt Johnson 87a97d4053 Adds Author Index for Comments
- Fixes #1529
2018-04-17 12:31:31 -06:00
Belén CurcioandGitHub d17c704f38 Merge branch 'master' into server-jest 2018-04-17 13:01:19 -03:00
Wyatt Johnson ba9f034bfb Allow a user to change their own username 2018-04-16 17:37:08 -06:00
okbel 42ca5743aa flow checks 2018-04-16 16:07:00 -03:00
Wyatt Johnson ce291448f1 Added some change to mutators 2018-04-16 12:45:17 -06:00
Wyatt Johnson 8dbfa8f274 Merge branch 'organization-contact' into gdpr-password 2018-04-16 12:32:09 -06:00
Wyatt JohnsonandGitHub 0ccb8b6217 Merge branch 'master' into organization-contact 2018-04-16 12:30:45 -06:00
Wyatt Johnson 0fcb0be360 Password Change Graph Support 2018-04-16 12:29:37 -06:00
Wyatt Johnson f23f962adb Updated error styling 2018-04-16 10:47:09 -06:00
Wyatt Johnson 276cb03953 fixed missing partial 2018-04-13 18:27:40 -06:00
Wyatt Johnson 12bb886032 itterated on copy 2018-04-13 18:24:46 -06:00
Wyatt Johnson c2b14fca10 fixed mutation 2018-04-13 14:34:39 -06:00
Belén CurcioandGitHub 1f719e3aa5 Merge branch 'master' into 155836892 2018-04-13 12:52:28 -03:00
Kit Westneat e5a2152cfd don't show profile tab if user is logged out 2018-04-12 17:52:49 -04:00
Wyatt Johnson 392d7177f6 Merge branch 'master' into gdpr-download 2018-04-12 15:17:12 -06:00
Wyatt JohnsonandGitHub 87ffa45050 Merge pull request #1525 from coralproject/storage-fixes
Storage Fixes
v4.3.2
2018-04-12 13:50:08 -06:00
Wyatt Johnson 4a4357bc4c version bump 2018-04-12 13:37:42 -06:00
Wyatt Johnson bb11de562f Removed storage check 2018-04-12 13:24:56 -06:00
Wyatt Johnson 5125bb5d2d logic cleanup 2018-04-12 13:22:20 -06:00
Wyatt JohnsonandGitHub 6553096bc7 Merge branch 'master' into organization-contact 2018-04-12 13:11:35 -06:00
Wyatt Johnson 1c87181b17 cleanups around storageAccess 2018-04-12 12:58:30 -06:00
Wyatt Johnson 142f463211 Storage Fixes
- Implements storage fixes (fixes #1520)
- Implements updates to locale
2018-04-12 12:47:09 -06:00