 Kim Gardner
|
38f9c2f458
|
Merge branch 'master' into tombstone-copy
|
2018-05-10 13:42:26 -04:00 |
|
|
Kim Gardner
|
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 Johnson
|
75f9a697cb
|
Merge branch 'master' into tombstone-copy
|
2018-05-10 11:34:11 -06:00 |
|
|
Kim Gardner
|
85f45f390c
|
Merge branch 'master' into mobile-fix
|
2018-05-10 13:33:15 -04:00 |
|
|
Kim Gardner
|
b16f15e47d
|
Merge pull request #1601 from coralproject/check-correct-email
Allow changing email back and forth
|
2018-05-10 10:40:34 -04:00 |
|
|
Chi Vinh Le
|
a092a197cf
|
Check correct email
|
2018-05-09 23:45:53 +02:00 |
|
|
Kim Gardner
|
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 Gardner
|
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 Johnson
|
763e091e3f
|
Merge branch 'master' into ignore-user
|
2018-05-08 16:00:56 -06:00 |
|
|
Kim Gardner
|
02d5a503c4
|
Merge pull request #1593 from coralproject/reply-missing-postdontagree
Pass postDontAgree to replies
|
2018-05-08 18:00:33 -04:00 |
|
|
Kim Gardner
|
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 Gardner
|
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 |
|
|
Kiwi
|
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 |
|
|
Kiwi
|
d64af05093
|
Merge branch 'master' into deleted-comments
|
2018-05-08 16:25:05 -03:00 |
|
|
Kiwi
|
8aff2f69b3
|
Merge pull request #1591 from coralproject/translation-patch
Update translations.yml
|
2018-05-08 16:24:53 -03:00 |
|
|
Kiwi
|
4e9cf2b912
|
Merge branch 'master' into deleted-comments
|
2018-05-08 16:24:48 -03:00 |
|
|
Kim Gardner
|
b10141716f
|
Merge branch 'master' into translation-patch
|
2018-05-08 15:00:58 -04:00 |
|
|
Wyatt Johnson
|
4973a2021d
|
Merge pull request #1589 from coralproject/notification-fixes
Fixes for notifications
|
2018-05-08 12:41:33 -06:00 |
|
|
Wyatt Johnson
|
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 |
|
|
Wyatt Johnson
|
44ba77b202
|
Merge branch 'master' into notification-fixes
|
2018-05-08 10:38:26 -06:00 |
|
|
Wyatt Johnson
|
9cee164a15
|
Merge pull request #1582 from coralproject/settings
Settings Cache Refactor
|
2018-05-08 10:38:13 -06:00 |
|
|
Wyatt Johnson
|
231dfe7997
|
Fixes for notifications
|
2018-05-08 09:32:14 -06:00 |
|
|
okbel
|
d02bb20333
|
removing extra
|
2018-05-08 11:33:39 -03:00 |
|
|
okbel
|
e9c18faf32
|
Deleted Comment display in Queues
|
2018-05-08 11:30:33 -03:00 |
|
|
okbel
|
2f94674b78
|
Adding CommentDeletedTombstone
|
2018-05-08 11:08:46 -03:00 |
|
|
Kim Gardner
|
b7b60e6436
|
Merge branch 'master' into settings
|
2018-05-07 20:22:26 -04:00 |
|
|
Kim Gardner
|
778064d756
|
Merge pull request #1585 from coralproject/docs-fixes
Links, typos, updates for docs
|
2018-05-07 20:21:34 -04:00 |
|
|
Kim Gardner
|
57917335cb
|
Merge branch 'master' into settings
|
2018-05-07 20:21:17 -04:00 |
|
|
Wyatt Johnson
|
7926c5ccbf
|
Merge branch 'master' into docs-fixes
|
2018-05-07 18:13:16 -06:00 |
|
|
Kim Gardner
|
7aad40b0e3
|
Merge pull request #1587 from coralproject/email
Fixed email in use error
|
2018-05-07 20:11:09 -04:00 |
|
|
Wyatt Johnson
|
a7c9f01125
|
fixed bug
|
2018-05-07 17:59:43 -06:00 |
|
|
Kim Gardner
|
e74b8c9099
|
Merge branch 'master' into email
|
2018-05-07 19:55:37 -04:00 |
|
|
Kim Gardner
|
c6a76990f4
|
Merge pull request #1586 from coralproject/password
Fixed bug with password form
|
2018-05-07 19:55:21 -04:00 |
|
|
Wyatt Johnson
|
08a857e07c
|
Fixed email in use error
|
2018-05-07 17:51:46 -06:00 |
|
|
Wyatt Johnson
|
10a99aab88
|
Fixed bug with password form
|
2018-05-07 17:47:02 -06:00 |
|
|
Wyatt Johnson
|
15c3a96291
|
fixed settings
|
2018-05-07 17:16:52 -06:00 |
|