Commit Graph
9739 Commits
Author SHA1 Message Date
Chi Vinh Le f018ccf33e Prevent showing add email address dialog when usernam is not set 2018-05-11 18:38:41 +02:00
KiwiandGitHub d67c25a791 Merge branch 'master' into email-attach-fix 2018-05-11 13:21:20 -03:00
KiwiandGitHub 93359d8250 Merge pull request #1613 from coralproject/wyattjoh-patch-1
Delete package-lock.json
2018-05-11 12:37:28 -03:00
Wyatt JohnsonandGitHub ba2985e891 Merge branch 'master' into email-attach-fix 2018-05-11 09:33:55 -06:00
Wyatt Johnson 42d4abf842 review updates 2018-05-11 09:33:29 -06:00
Wyatt JohnsonandGitHub 29ffe287cd Delete package-lock.json 2018-05-11 09:21:55 -06:00
Kim GardnerandGitHub 47c7125190 Merge pull request #1612 from mkonikov/capitalize
Capitalize "Information"
2018-05-11 11:17:29 -04:00
Mendel Konikov f57f8397fe Capitalize "Information" 2018-05-11 11:01:15 -04:00
Kim GardnerandGitHub ac7bea209e Merge branch 'master' into email-attach-fix 2018-05-10 18:53:39 -04:00
Wyatt JohnsonandGitHub 462f5e8206 Merge pull request #1603 from coralproject/losowsky-patch-2
Corrections and clarity
2018-05-10 14:55:12 -06:00
Wyatt JohnsonandGitHub 524aa3e863 Merge branch 'master' into losowsky-patch-2 2018-05-10 14:46:09 -06:00
Andrew LosowskyandGitHub e0cada5bde Update 03-07-product-guide-trust.md 2018-05-10 13:44:03 -07:00
Wyatt JohnsonandGitHub dd0381d22a Merge branch 'master' into email-attach-fix 2018-05-10 14:43:37 -06:00
Wyatt Johnson 2e37f78705 Email Attach Fixes 2018-05-10 13:31:00 -06:00
Kim GardnerandGitHub 4413e5616c Merge pull request #1596 from coralproject/tombstone-copy
Small tweak to tombstone copy
2018-05-10 15:23:07 -04:00
Kim GardnerandGitHub 38f9c2f458 Merge branch 'master' into tombstone-copy 2018-05-10 13:42:26 -04:00
Kim GardnerandGitHub fc14c5ab1c Merge pull request #1598 from coralproject/mobile-fix
Fit Delete My Account modals on mobile
2018-05-10 13:42:06 -04:00
Wyatt JohnsonandGitHub 75f9a697cb Merge branch 'master' into tombstone-copy 2018-05-10 11:34:11 -06:00
Kim GardnerandGitHub 85f45f390c Merge branch 'master' into mobile-fix 2018-05-10 13:33:15 -04:00
Kim GardnerandGitHub 10317671ee Merge branch 'master' into losowsky-patch-2 2018-05-10 10:41:01 -04:00
Kim GardnerandGitHub b16f15e47d Merge pull request #1601 from coralproject/check-correct-email
Allow changing email back and forth
2018-05-10 10:40:34 -04:00
Andrew LosowskyandGitHub 2554b26110 Corrections and clarity
Fixed the incorrect thresholds and made the description clearer
2018-05-10 10:21:44 -04:00
Chi Vinh Le a092a197cf Check correct email 2018-05-09 23:45:53 +02:00
Kim GardnerandGitHub e069d823a4 Merge pull request #1600 from coralproject/cli-fix
CLI Fixes
2018-05-09 16:50:59 -04:00
Wyatt Johnson ca3d56def8 asset refresh patched 2018-05-09 14:40:24 -06:00
Wyatt Johnson 9af3772087 Added json output for assets list
- Fixes #1597
2018-05-09 14:28:04 -06:00
Wyatt Johnson 51525de679 fixed set-role description 2018-05-09 14:17:43 -06:00
okbel 0ded5c72e9 adding media 2018-05-09 14:23:22 -03:00
Kim Gardner 1517611c9e Update tombstone copy 2018-05-09 11:00:02 -04:00
Kim GardnerandGitHub eda9a0cadf Merge pull request #1594 from coralproject/ignore-user
Fixed Ignore User Error
v4.4.0
2018-05-08 18:08:42 -04:00
Wyatt JohnsonandGitHub 763e091e3f Merge branch 'master' into ignore-user 2018-05-08 16:00:56 -06:00
Kim GardnerandGitHub 02d5a503c4 Merge pull request #1593 from coralproject/reply-missing-postdontagree
Pass postDontAgree to replies
2018-05-08 18:00:33 -04:00
Kim GardnerandGitHub 13ffeb5889 Merge branch 'master' into reply-missing-postdontagree 2018-05-08 17:49:13 -04:00
Chi Vinh Le b50fde619e Pass postDontAgree to replies 2018-05-08 23:46:33 +02:00
Wyatt Johnson 7348bfc7c9 fixed error 2018-05-08 15:46:24 -06:00
Kim GardnerandGitHub b27bfda759 Merge pull request #1592 from coralproject/delete-fix
Delete Fix
2018-05-08 17:40:08 -04:00
Wyatt Johnson 1815bd4d75 fix translation copy 2018-05-08 15:30:12 -06:00
Wyatt Johnson 8c29b0f1d4 fix for delete 2018-05-08 15:20:56 -06:00
KiwiandGitHub eb66cef4fc Merge pull request #1590 from coralproject/deleted-comments
Exclude deleted comments
2018-05-08 17:11:27 -03:00
Wyatt Johnson 17a0297911 fixed bug.. 2018-05-08 14:03:11 -06:00
Wyatt Johnson a1edbcf974 disallow adding a tag to a deleted comment 2018-05-08 14:03:11 -06:00
Kim Gardner 8c304c762d Merge branch 'deleted-comments' of git+ssh://github.com/coralproject/talk into deleted-comments 2018-05-08 15:49:51 -04:00
KiwiandGitHub d64af05093 Merge branch 'master' into deleted-comments 2018-05-08 16:25:05 -03:00
KiwiandGitHub 8aff2f69b3 Merge pull request #1591 from coralproject/translation-patch
Update translations.yml
2018-05-08 16:24:53 -03:00
KiwiandGitHub 4e9cf2b912 Merge branch 'master' into deleted-comments 2018-05-08 16:24:48 -03:00
Kim GardnerandGitHub b10141716f Merge branch 'master' into translation-patch 2018-05-08 15:00:58 -04:00
Wyatt JohnsonandGitHub 4973a2021d Merge pull request #1589 from coralproject/notification-fixes
Fixes for notifications
2018-05-08 12:41:33 -06:00
Wyatt JohnsonandGitHub 7b86ec7d0a Update translations.yml 2018-05-08 12:06:52 -06:00
Wyatt Johnson e14af46c68 prevent actions against deleted comments 2018-05-08 12:02:04 -06:00
Wyatt Johnson 74dbfda633 Exclude deleted comments 2018-05-08 11:53:49 -06:00