Jonne Haß
e1b1491f75
Merge branch 'next-minor' into develop
2018-03-16 11:31:34 +01:00
Jonne Haß
300d09e258
add ja-KS fallback to ja
2018-03-16 11:31:11 +01:00
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
0b0070abeb
Bump yard
2018-03-10 04:45:10 +01:00
Benjamin Neff
11d30f9066
Bump rack-protection
2018-03-10 04:45:06 +01:00
Benjamin Neff
f14547b2ea
Merge branch 'next-minor' into develop
2018-03-10 00:01:36 +01:00
cmrd Senya
0ae19071ad
Set video click handler at app.views.ExpandedComment
...
fixes #7736
closes #7737
2018-03-10 00:01:13 +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
8e88f4b183
Add the back-to-top button to all views
...
fixes #7727
2018-03-07 00:39:26 +01:00
Benjamin Neff
e7c6496a09
Merge pull request #7730 from Fensterbank/fix-profile-picture-csp
...
Allow blob: URIs to be used as a content source in CSP header
2018-03-04 01:49:09 +01:00
Frédéric Bolvin
23e4062342
Allow blob: URIs to be used as a content source in CSP header
2018-03-03 21:12:18 +01:00
Dennis Schubert
c4839613ea
Merge branch 'next-minor' into develop
2018-02-27 00:48:47 +01:00
Benjamin Neff
4e5ee36675
Keep order of profile tags
...
closes #7724
2018-02-27 00:48:42 +01:00
Benjamin Neff
4cd8de5327
Refactor taggable tests to use let
2018-02-27 00:48:08 +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
Benjamin Neff
198dddd69e
Merge branch 'next-minor' into develop
2018-02-25 23:03:17 +01:00
Benjamin Neff
9fa254b898
Use https:// for media-embed tests
...
I overlooked this when reviewing #6418 since it is excluded on travis
because of the @nophantomjs tag (so it didn't fail). But since we block
http:// embeds now, we need to use https:// for the tests.
2018-02-25 22:59:27 +01:00
Benjamin Neff
74d027a3ab
Set frozen config as boolean
...
This is normalized to "true" in the config after running bin/bundle, so
rerunning script/configure_bundler resets this back to 1 (which is the
same, but we don't need to change this back and forth every time).
2018-02-25 22:56:57 +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
Benjamin Neff
0b4b3515a5
Start sending updated_at timestamp as edited_at for profiles
...
This can be used in later diaspora versions to order the profile updates
so we don't overwrite a newer profile with older data.
2018-02-25 04:32:19 +01:00
Benjamin Neff
86d52a0da3
Bump diaspora_federation
2018-02-25 04:32:19 +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
cmrd Senya
b32c844314
Support for embedding HTML5 media links
...
Use markdown-it-html5-embed plugin so user can embed audio and
video using the markdown link syntax []() in the HTML5 way.
2018-02-17 19:21:10 +01:00
Steffen van Bergerem
258b502cde
Bump devise
...
closes #7716
2018-02-17 19:20:15 +01:00
Steffen van Bergerem
fa14e1e368
Bump hamlit
2018-02-17 19:20:12 +01:00
Steffen van Bergerem
b786d237cd
Bump haml
2018-02-17 19:20:02 +01:00
Frédéric Bolvin
d7abaaced0
implemented new profile photo upload with cropping function
2018-02-16 19:43:32 +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
Dennis Schubert
005dd923c9
Pull updated German translations to fix "reshare" UX issues
2018-02-09 03:09:44 +01:00
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
