Commit Graph

9665 Commits

Author SHA1 Message Date
Kim Gardner 0d1f3d1da3 Merge branch 'master' into settings 2018-05-07 17:19:54 -04:00
Kim Gardner 1c7606b651 Merge pull request #1583 from coralproject/security
Node Security Patch
2018-05-07 17:19:27 -04:00
Wyatt Johnson cb50a1e709 updated excemptions 2018-05-07 15:12:37 -06:00
Wyatt Johnson 86595b4dd0 Added exception for metascraper 2018-05-07 15:07:21 -06:00
Wyatt Johnson fa2730a661 Upgraded lodash 2018-05-07 15:06:53 -06:00
Wyatt Johnson 732ff98f9b fixed test 2018-05-07 14:50:03 -06:00
Wyatt Johnson 3024300a3f Merge branch 'master' into settings 2018-05-07 14:43:07 -06:00
Kim Gardner 7f543f543b Merge pull request #1581 from coralproject/fix-add-email-dialog
Fix Add Email Dialog
2018-05-07 16:36:31 -04:00
Wyatt Johnson c9957add72 Merge branch 'master' into settings 2018-05-07 14:31:09 -06:00
Wyatt Johnson 2b1108cd88 Settings Cache Refactor 2018-05-07 14:27:00 -06:00
Chi Vinh Le 5953ed711a Remove unused code 2018-05-07 22:21:25 +02:00
Chi Vinh Le 8c2733734a Fix Add Email Dialog 2018-05-07 22:16:36 +02:00
Kim Gardner 66bb61ed13 Merge pull request #1580 from coralproject/save-icon
Fix save icon
2018-05-07 15:35:23 -04:00
Kim Gardner f2ea3bdd42 Merge branch 'master' into save-icon 2018-05-07 15:23:11 -04:00
Kim Gardner 71bda42cfb Merge pull request #1577 from coralproject/inputfield-controlled
Fix InputField controlled / uncontrolled mode
2018-05-07 15:23:02 -04:00
Kim Gardner 030b805290 Merge branch 'master' into save-icon 2018-05-07 15:22:09 -04:00
Kim Gardner 1ca7fd58bd Merge branch 'master' into inputfield-controlled 2018-05-07 15:10:45 -04:00
Kim Gardner 7aa31b7cb2 Merge pull request #1571 from coralproject/change-pass-error-bug
Change Password Errors BUG
2018-05-07 15:10:09 -04:00
Chi Vinh Le 4fb511e488 Fix save icon 2018-05-07 21:07:46 +02:00
Kim Gardner e3fa99100b Merge branch 'master' into change-pass-error-bug 2018-05-07 14:59:05 -04:00
Kim Gardner 5aeb16fc99 Merge pull request #1579 from coralproject/bug-fixes
Fixes password validation field for Change Email Dialog
2018-05-07 14:58:56 -04:00
Kim Gardner 21e92b92f3 Merge branch 'master' into bug-fixes 2018-05-07 14:38:55 -04:00
Kim Gardner ecf05d76c0 Merge branch 'master' into inputfield-controlled 2018-05-07 14:37:51 -04:00
Kim Gardner 0f47378ae3 Merge pull request #1576 from coralproject/restore-cancel
Restore cancel buttons
2018-05-07 14:37:00 -04:00
Belen Curcio 46e5efbd55 validation for password input in change email 2018-05-07 15:00:55 -03:00
Chi Vinh Le 06abccabb4 Fix InputField controlled / uncontrolled mode 2018-05-07 18:26:37 +02:00
Chi Vinh Le 565ba2af06 Restore cancel buttons 2018-05-07 17:54:59 +02:00
Wyatt Johnson 802a3bd656 Merge pull request #1573 from coralproject/copy-changes
Copy and bug fixes
2018-05-05 10:04:56 -06:00
Wyatt Johnson 413b6a2a60 Merge branch 'master' into copy-changes 2018-05-05 09:40:50 -06:00
Wyatt Johnson e37346f544 Merge pull request #1572 from coralproject/csv-copy-changes
CSV Copy Changes
2018-05-05 09:40:06 -06:00
Kim Gardner ce92765218 Swap DeletedOn and DeletedFor 2018-05-04 17:40:10 -04:00
Kim Gardner 8b5cb9d96d Copy tweaks 2018-05-04 17:36:05 -04:00
Kim Gardner 7cf991d672 Change copy 2018-05-04 17:03:22 -04:00
Belen Curcio 4312b8d024 bug 2018-05-04 17:49:40 -03:00
Kim Gardner 910beb0f40 Merge pull request #1547 from jerodb/es-translations
Changed general spanish translations
2018-05-04 16:23:04 -04:00
Kim Gardner 810cb222f9 Merge branch 'master' into es-translations 2018-05-04 15:48:56 -04:00
Jero 7a7dcdd7c6 corrections in spanish translations 2018-05-04 16:35:24 -03:00
Kim Gardner 66f1fd7d8a Merge pull request #1569 from coralproject/username-change-fixes
Username Change Fixes
2018-05-04 14:55:44 -04:00
Wyatt Johnson 7362c6c993 Merge branch 'master' into username-change-fixes 2018-05-04 12:09:52 -06:00
Wyatt Johnson a0fbfe4ff4 Merge pull request #1568 from coralproject/forgot-password-change
Forgot password in Change Password
2018-05-04 12:09:38 -06:00
Wyatt Johnson 103543f830 Merge branch 'master' into forgot-password-change 2018-05-04 11:59:10 -06:00
Wyatt Johnson f2d8e49d5b Merge branch 'master' into username-change-fixes 2018-05-04 11:58:46 -06:00
Kim Gardner ade9b99a09 Merge pull request #1570 from coralproject/small-styling-tweaks
GDPR styling tweaks
2018-05-04 13:53:39 -04:00
Wyatt Johnson 6bad9e5306 Fixed bug with button placement 2018-05-04 11:50:37 -06:00
Wyatt Johnson 2a5075f434 Form update 2018-05-04 11:33:20 -06:00
Chi Vinh Le d41984f171 Remove unused field 2018-05-04 19:32:29 +02:00
Chi Vinh Le 4bc8a167a4 Styling tweaks 2018-05-04 19:29:05 +02:00
Wyatt Johnson 9a8f0e98a4 Username Change Fixes 2018-05-04 11:16:53 -06:00
Belén Curcio 05ec8eaee2 Merge branch 'master' into forgot-password-change 2018-05-04 13:40:22 -03:00
Belen Curcio eabcbc36c6 forgot password 2018-05-04 13:34:20 -03:00