Benjamin Neff
e9e08831e6
Merge branch 'next-minor' into develop
2018-02-08 23:20:12 +01:00
Benjamin Neff
3033e915e5
Merge branch 'next-minor' of github.com:diaspora/diaspora into next-minor
2018-02-08 23:19:57 +01:00
Benjamin Neff
fc2397c062
Merge branch 'next-minor' into develop
2018-02-08 22:55:43 +01:00
Benjamin Neff
a8fcbb3365
Merge branch 'master' into next-minor
2018-02-08 22:55:30 +01:00
Benjamin Neff
1f3ad2fa65
Merge branch 'release/0.7.3.0'
2018-02-08 22:54:14 +01:00
Benjamin Neff
aff4be8821
updated 21 locale files [ci skip]
2018-02-08 22:46:45 +01:00
Benjamin Neff
e0687e8de3
Upgrade Nokogiri to fix a disclosed vulnerability in libxml2
2018-02-08 22:44:11 +01:00
Dennis Schubert
ea606b374a
Merge branch 'next-minor' into develop
2018-02-03 16:43:30 +01:00
Fla
35535d5bfb
Remove unnecessary quotes in database.yml.examle
...
[ci skip]
closes #7711
2018-02-03 16:42:51 +01:00
Dennis Schubert
3121de7954
Merge branch 'next-minor' into develop
2018-02-01 23:49:55 +01:00
Dennis Schubert
7abb0518e9
Start 0.7.4.0 cycle
...
[ci skip]
2018-02-01 23:48:04 +01:00
Dennis Schubert
f6e359a669
Merge branch 'next-minor' into develop
2018-02-01 23:42:04 +01:00
Benjamin Neff
5e157dc9c3
Send participation after receiving a public post
...
This is to let the author of the post know, that this pod is interested
in updates about this post.
The sending user is only used to verify that the participation was sent
from this pod, but lets use an admin/podmin account if available.
closes #7708
2018-02-01 23:40:51 +01:00
Benjamin Neff
6c5b8b73af
Fix post_message for posts without text
...
fixes #7700
closes #7706
2018-02-01 23:39:18 +01:00
Benjamin Neff
a32cac06ab
Retry Contact messages 20 time (about two weeks)
...
closes #7705
2018-02-01 23:37:53 +01:00
Benjamin Neff
b9787cc632
Start sending the blocking flag
2018-02-01 23:35:35 +01:00
Benjamin Neff
815cf121ab
Remove participants limit for conversations
...
The limit was added in 2012 to prevent spam, but since the participants
need to be a mutual contact with the author nowadays, I don't think it's
a spam problem anymore.
2018-02-01 23:35:35 +01:00
Benjamin Neff
80bfc3fcfd
Bump diaspora_federation
2018-02-01 23:35:35 +01:00
Benjamin Neff
746ff52256
Fix mention in #newhere message when invited by another person
...
fixes #7701
closes #7702
2018-02-01 23:35:04 +01:00
Benjamin Neff
f23966ef87
Make mobile bookmarklet work the same way as with desktop UI
...
This fixes that it fails when you call it without notes parameter.
closes #7698
2018-02-01 23:33:36 +01:00
Benjamin Neff
750481497f
Merge branch 'next-minor' into develop
2018-01-31 22:17:07 +01:00
Fla
a72feee812
Changelog misspelling [ci skip]
...
closes #7710
2018-01-31 22:15:27 +01:00
Benjamin Neff
1d683295e1
Merge branch 'next-minor' into develop
2018-01-21 21:30:59 +01:00
flaburgan
b156c2f1a3
Use current-password and new-password for password autocomplete
...
closes #7642
fixes #7633
2018-01-21 21:29:06 +01:00
Dennis Schubert
9ec07911de
Merge branch 'next-minor' into develop
2018-01-12 17:56:17 +01:00
Dennis Schubert
5a6bd47000
Merge branch 'master' into next-minor
2018-01-12 17:56:01 +01:00
Dennis Schubert
a40824cd2b
Merge branch 'hotfix/0.7.2.1'
2018-01-12 17:54:27 +01:00
Benjamin Neff
5bc4473e11
Fix notifications when people remove their birthday date
...
Some people may remove their birthday date after the notification was
sent, which then breaks the notification page for other users. Let's
just display the date when the notification was created, and not display
the users updated birthday date. When users update from date A to B it
always looks weird anyway, when we display the same new date B twice on
different days, or display two different dates for the same user.
We could remove notifications when users change or remove their
birthday, but that would be way more complex and also we usually don't
remove notifications (not even for deleted posts).
Fixes #7689
closes #7691
2018-01-12 17:52:57 +01:00
Benjamin Neff
b3d3445a7e
Merge branch 'next-minor' into develop
2018-01-09 00:06:44 +01:00
Brad Koehn
1a3c16eb6e
update to support 280 character Twitter
...
closes #7694
closes #7662
fixes #7661
2018-01-09 00:05:33 +01:00
Dennis Schubert
13d24cc611
Merge branch 'next-minor' into develop
2018-01-08 21:15:49 +01:00
Janakas
0347507b20
Delete archive files when closing an account
...
closes #7684
2018-01-08 21:15:41 +01:00
Janakas
d4e5d13a8f
Remove old export archives after 2 weeks
...
Fixes #5727
2018-01-08 21:14:06 +01:00
Janakas
497c647983
Rearrange userdata-export section and change timestamp to timeago
2018-01-08 21:14:01 +01:00
Benjamin Neff
e059b8ad48
Merge branch 'next-minor' into develop
2018-01-05 03:46:06 +01:00
Janakas
d150a6b2af
Fix invite link on /contacts
...
closes #7690
2018-01-05 03:45:54 +01:00
Benjamin Neff
d3632e116a
Merge branch 'next-minor' into develop
2018-01-05 01:50:27 +01:00
Benjamin Neff
c135ace407
Fix notifications when people remove their birthday date
...
Some people may remove their birthday date after the notification was
sent, which then breaks the notification page for other users. Let's
just display the date when the notification was created, and not display
the users updated birthday date. When users update from date A to B it
always looks weird anyway, when we display the same new date B twice on
different days, or display two different dates for the same user.
We could remove notifications when users change or remove their
birthday, but that would be way more complex and also we usually don't
remove notifications (not even for deleted posts).
Fixes #7689
closes #7691
2018-01-05 01:50:11 +01:00
Benjamin Neff
a2ca74265c
Merge branch 'next-minor' into develop
2017-12-30 15:41:04 +01:00
Janakas
2e3b7dee1e
Check for a running redis in script/server
...
Fixes #5267
closes #7685
2017-12-30 15:40:30 +01:00
Benjamin Neff
03ee954c10
Merge branch 'next-minor' into develop
2017-12-26 03:38:10 +01:00
Benjamin Neff
25d41429bc
Merge branch 'master' into next-minor
2017-12-26 03:37:57 +01:00
Benjamin Neff
cf2bd66005
Merge branch 'release/0.7.2.0'
2017-12-26 03:36:49 +01:00
Benjamin Neff
a9cce95a74
updated 32 locale files [ci skip]
2017-12-26 03:30:32 +01:00
Benjamin Neff
151a169791
Merge branch 'next-minor' into develop
2017-12-25 20:55:27 +01:00
Benjamin Neff
ba85f35ae9
Merge branch 'release/0.7.2.0' into next-minor
2017-12-25 20:55:22 +01:00
Benjamin Neff
e0eb76eb2a
Remove aspect_ids parameter from publisher
...
closes #7683
2017-12-25 20:54:10 +01:00
Benjamin Neff
70c659192f
Fix default aspects on profile page and bookmarklet publisher
...
Fixes #7679
2017-12-25 20:54:05 +01:00
Benjamin Neff
fb084e47af
Merge branch 'next-minor' into develop
2017-12-24 02:50:36 +01:00
Benjamin Neff
53b7dcd8ca
Merge branch 'release/0.7.2.0' into next-minor
2017-12-24 02:50:28 +01:00
