Commit graph

1764 commits

Author SHA1 Message Date
Benjamin Neff
12cb2be641
Merge branch 'next-minor' into develop 2018-03-13 00:02:52 +01:00
Benjamin Neff
4d54c85eee
Start 0.7.5.0 cycle 2018-03-12 23:59:31 +01:00
Dennis Schubert
29daea1b0a
Merge branch 'next-minor' into develop 2018-03-10 04:46:01 +01:00
Benjamin Neff
3bb6d6d677
Bump rails-i18n
fixes #7527

closes #7731
2018-03-10 04:45:54 +01:00
Benjamin Neff
b263cf7e6d
Merge branch 'next-minor' into develop 2018-03-07 00:39:52 +01:00
Dennis Schubert
3643612b1c
Back to Top: Make sure to re-check the visibility after the scrolling is done
If a user scrolls just below the 1000px threshold and clicks the back-to-top button within 250ms, we'll never hide the button as the scroll event gets throttled away. That's rather inconvenient.

closes #7729
2018-03-07 00:39:36 +01:00
Dennis Schubert
f1d71eb592
Merge branch 'next-minor' into develop 2018-02-27 00:47:37 +01:00
Benjamin Neff
f883c6ede2
Add /camo/ to robots.txt
Camo only proxies images hosted somewhere else, so it doesn't make sense
to add the proxied versions to search engines. It only creates traffic
for camo when /camo/* urls are in search results.

closes #7726
2018-02-27 00:47:32 +01:00
Dennis Schubert
ab903af80b
Merge branch 'next-minor' into develop 2018-02-25 04:35:53 +01:00
Benjamin Neff
beeb073dbe
Fix followed tags posts in stream for posts with multiple tags
When there were posts with many followed tags they were returned
multiple times, resulting in less than 15 unique posts. That resulted in
some posts to be missed in the stream.

Fixes #4503

closes #7715
2018-02-25 04:35:49 +01:00
Dennis Schubert
5d23c6bfcf
Merge branch 'next-minor' into develop 2018-02-25 04:34:08 +01:00
Benjamin Neff
f0aca56c8f
Don't retry for PublicKeyNotFound
We only return `nil` when we know the person, but don't know the key or
the key is invalid, so it doesn't make sense to retry in this case. When
the person isn't known and can't be fetched we raise a DiscoveryError
which will be retried.

Also the errors were moved to the `Signable` module in the last release.

closes #7717
2018-02-25 04:34:04 +01:00
Dennis Schubert
3bc0fc16a2
Merge branch 'next-minor' into develop 2018-02-25 04:33:07 +01:00
Benjamin Neff
602a1dcd55
Store edited_at for relayables in additional_data
closes #7718
2018-02-25 04:33:03 +01:00
Dennis Schubert
1903bfd307
Merge pull request #7581 from Fensterbank/improved-profile-picture-editor
Profile photo upload with cropping function
2018-02-25 04:17:44 +01:00
Benjamin Neff
0cb2a8f4d7
Merge branch 'next-minor' into develop 2018-02-22 00:49:32 +01:00
Benjamin Neff
c89b2ad809
Prevent duplicate mention notifications when the post is received twice
closes #7721
2018-02-22 00:49:21 +01:00
Brad Koehn
b80eb01f34
piped bin/bundle commands to suppress warnings when run on readonly filesystems
closes #7719
2018-02-22 00:45:45 +01:00
Benjamin Neff
0b921c6657
Merge branch 'next-minor' into develop 2018-02-17 19:26:15 +01:00
cmrd Senya
3e31b91b11
Add @nophantomjs tag to default cucumber profile
Use this tag for tests which can't work with PhantomJS, but which we
can run with Selenium using some other profile (not implemented here).

closes #6418
2018-02-17 19:24:39 +01:00
Dennis Schubert
049db8626d
Merge branch 'next-minor' into develop 2018-02-10 16:13:44 +01:00
Saverio Miroddi
1ebb5dd72d
Don't print a warning when starting the server outside a Git repo
Currently, git checks are performed on server start, even when outside a git
repository.

This commit verify the presence of a git repository (via `git status` exit
code), and perform checks only if it exists.

closes #7712
2018-02-10 16:13:38 +01:00
Dennis Schubert
948e31b10c
Merge branch 'next-minor' into develop 2018-02-09 03:15:38 +01:00
Dennis Schubert
f8ce276ddc
Merge branch 'master' into next-minor 2018-02-09 03:15:18 +01:00
Dennis Schubert
b23696bb88
Merge branch 'hotfix/0.7.3.1' 2018-02-09 03:13:51 +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
e0687e8de3
Upgrade Nokogiri to fix a disclosed vulnerability in libxml2 2018-02-08 22:44:11 +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
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
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
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