Commit Graph

9315 Commits

Author SHA1 Message Date
Wyatt Johnson 80f219513b fixed e2e 2018-04-20 11:39:34 -06:00
Wyatt Johnson 7d4102e3aa Merge branch 'master' into organization-contact 2018-04-20 10:57:47 -06:00
Wyatt Johnson 3b657e120f fix for logger 2018-04-20 10:52:03 -06:00
Wyatt Johnson 5a88fda511 Merge pull request #1537 from sanoma/fix_translation_staff
Added translation to staff label in comment stream.
2018-04-20 10:31:15 -06:00
okbel 99cb9da0b1 Merge branch 'organization-contact' of github.com:coralproject/talk into organization-contact
* 'organization-contact' of github.com:coralproject/talk: (48 commits)
  Change to UserHistory in UserDetail.js
  Add system withheld status to InactiveCommentLabel
  fix e2e test
  removed deprecated not logged in ui for profile tab
  fixed proptype missing validation
  icon patch
  Adds Author Index for Comments
  don't show profile tab if user is logged out
  version bump
  Removed storage check
  logic cleanup
  cleanups around storageAccess
  Storage Fixes
  adjusted env
  adjusted index creation and managemen
  autocapitalize off for the username field
  added beforeTest to wait for mongoose to be ready
  small fixes
  Jest for server
  Authors cannot see their own status history
  ...
2018-04-19 14:07:51 -03:00
okbel 84b373ed95 Validation Added 2018-04-19 14:07:24 -03:00
Wyatt Johnson b4e2712dfb Merge branch 'master' into fix_translation_staff 2018-04-19 08:59:29 -06:00
Tibo Beijen 43fa0d2b58 Added translation to staff label in comment stream. 2018-04-19 10:43:41 +02:00
Kim Gardner 31a8de852c Merge branch 'master' into organization-contact 2018-04-18 17:01:13 -04:00
Kim Gardner d9a2b10afd Merge pull request #1530 from clintabrown/fix-view-context-system-withheld
Fix admin View Context view for comments with SYSTEM_WITHHELD status
2018-04-18 16:51:05 -04:00
Kim Gardner 06c2f328d1 Merge branch 'master' into fix-view-context-system-withheld 2018-04-18 16:44:08 -04:00
Kim Gardner 5aea8d71da Merge pull request #1531 from coralproject/indexes
Adds Author Index for Comments
2018-04-18 16:32:44 -04:00
Kim Gardner 71d413004e Merge branch 'master' into indexes 2018-04-18 16:26:40 -04:00
Kim Gardner 59658fcb29 Merge pull request #1504 from coralproject/155910162
Account History to User History
2018-04-18 16:18:26 -04:00
Kim Gardner 6d2c4d215d Merge branch 'master' into 155910162 2018-04-18 16:09:06 -04:00
Kim Gardner 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 Gardner d822d8343a Merge branch 'master' into 155836892 2018-04-18 15:54:07 -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
Belén Curcio 6b441291c0 Merge branch 'master' into organization-contact 2018-04-17 17:32:37 -03:00
Wyatt Johnson 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 Johnson ec54db58dd Merge branch 'master' into no-tabs-logged-out 2018-04-17 13:11:32 -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 Johnson 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 Curcio d17c704f38 Merge branch 'master' into server-jest 2018-04-17 13:01:19 -03:00
Wyatt Johnson 0ccb8b6217 Merge branch 'master' into organization-contact 2018-04-16 12:30:45 -06:00
Belén Curcio 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 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 Johnson 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
Wyatt Johnson 96733ade4d Merge pull request #1518 from coralproject/ignored-users-reply
Ignored User Reply Notifications
2018-04-12 11:04:49 -06:00
Wyatt Johnson 9598e6d426 Merge branch 'master' into ignored-users-reply 2018-04-12 10:54:00 -06:00
Wyatt Johnson 91c4197fd7 Merge pull request #1512 from coralproject/autocomplete-off
Disable autocomplete on username signup field
2018-04-12 10:53:48 -06:00
Wyatt Johnson 8042083f6c Merge branch 'master' into autocomplete-off 2018-04-12 10:46:04 -06:00
Belén Curcio 8232ae3e76 Merge branch 'master' into ignored-users-reply 2018-04-12 13:45:32 -03:00
Wyatt Johnson 5178529083 adjusted env 2018-04-12 09:44:17 -06:00
Wyatt Johnson 10d11c1615 adjusted index creation and managemen 2018-04-12 09:37:17 -06:00
okbel 4e63cff57f Merge branch 'autocomplete-off' of github.com:coralproject/talk into autocomplete-off
* 'autocomplete-off' of github.com:coralproject/talk:
  updated version
  FrenchCorrections
  New version of the translation
  added missing translations
  add missing strings in fr locale
  Add Finnish translation
2018-04-12 12:18:53 -03:00