Commit Graph

9357 Commits

Author SHA1 Message Date
okbel 37919a11ab Adding a notification after saving 2018-04-24 13:39:13 -03:00
okbel eaf0df9573 final refactor, done. 2018-04-24 00:45:51 -03:00
okbel 5e3fc2b22a Adding translations, en, es, more 2018-04-24 00:20:10 -03:00
okbel 1d2be0cef0 Validation finished 2018-04-23 23:56:54 -03:00
okbel 493c4689c2 as InputField 2018-04-23 23:34:16 -03:00
okbel 76ede5c541 fix for large icons, reorder of styles 2018-04-23 15:32:21 -03:00
okbel f4f0400c4d Merge branch 'gdpr-password' of github.com:coralproject/talk into gdpr-password
* 'gdpr-password' of github.com:coralproject/talk:
  Renamed nl to nlTA. Sorted ta.register calls
  Added NL translation for Moment. Also, sorted locale imports alphabetically.
2018-04-23 15:23:14 -03:00
okbel 9bb3a9f7cb changes 2018-04-23 15:22:50 -03:00
Kim Gardner 89711b2010 Merge branch 'master' into gdpr-password 2018-04-23 12:07:52 -04:00
Kim Gardner 6dd0dd41e0 Merge pull request #1535 from sanoma/master
Fix Dutch locale for Moment.JS
2018-04-23 11:00:38 -04:00
D. Luijten 18e8f9c3dc Merge branch 'hotfix/fix_dutch_moment_locale'
* hotfix/fix_dutch_moment_locale:
  Renamed nl to nlTA. Sorted ta.register calls
2018-04-23 16:47:08 +02:00
D. Luijten c103a0c481 Renamed nl to nlTA.
Sorted ta.register calls
2018-04-23 16:46:42 +02:00
okbel 21f942a219 validations 2018-04-23 11:43:40 -03:00
Kim Gardner 89546c4066 Merge branch 'master' into master 2018-04-23 10:23:57 -04:00
okbel b5dd63aec1 Adding withChangePassword to mutations and plugins API, styles 2018-04-23 10:32:56 -03:00
okbel bc71366fd5 Frontend for Change Password 2018-04-20 18:23:46 -03:00
Wyatt Johnson aa80f47b1c Merge branch 'master' into gdpr-password 2018-04-20 12:03:59 -06:00
Wyatt Johnson 2a3b8e511c Merge pull request #1496 from coralproject/organization-contact
Organization Email Contact
2018-04-20 11:58:53 -06:00
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 d4fdb20436 Merge branch 'master' into master 2018-04-20 10:31:32 -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 825851f603 Merge branch 'master' into master 2018-04-18 16:57:38 -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
Wyatt Johnson 84360bfddf Merge branch 'master' into gdpr-password 2018-04-18 10:28:17 -06: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 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