Benjamin Neff
4fa92c1823
Remove flag for contacts visible to each other
...
This feature only worked on the same pod and was more confusing than
useful.
2018-04-12 01:39:11 +02:00
Benjamin Neff
c0a4895854
Enable Content-Security-Policy header by default
2018-04-10 21:29:34 +02:00
Benjamin Neff
89f7f97294
Merge branch 'next-minor' into develop
2018-04-10 01:58:07 +02:00
Benjamin Neff
9b83df9646
Merge branch 'master' into next-minor
2018-04-10 01:57:56 +02:00
Benjamin Neff
aa6f4d46c9
Merge branch 'hotfix/0.7.4.1'
2018-04-10 01:56:29 +02:00
Benjamin Neff
f4ea138a64
Don't return a SafeString after truncate
2018-04-10 01:54:29 +02:00
Dennis Schubert
ae17248b2e
Merge pull request #7734 from Fensterbank/client-side-picture-resize
...
Resize images on client-side before uploading
2018-04-02 10:38:51 +02:00
Benjamin Neff
c84411ea62
Merge branch 'next-minor' into develop
2018-03-25 08:37:11 +02:00
Jonathan Brielmaier
41377378ec
Bump mysql2
...
closes #7747
2018-03-25 08:37:03 +02:00
cmrd Senya
0080a2567f
StatusMessageController#create: respond 422 when aspect_ids are wrong
...
fixes #3862
closes #7742
2018-03-25 08:31:32 +02:00
cmrd Senya
e0e40f73c3
Spec for post creation bad aspects_ids issue
2018-03-25 08:28:59 +02:00
cmrd Senya
f632f8a1f8
Include templates to main.js
...
This is needed to properly initialize Handlebars partials without
a document ready handler.
fixes #7739
closes #7740
2018-03-25 08:27:23 +02:00
Besnik Bleta
bc3908a103
Update for sq translation
2018-03-25 08:24:38 +02:00
Jonne Haß
5e96cc6d89
add carrierwave error messages
2018-03-25 08:24:10 +02:00
Jonne Haß
b7fa28a5a1
Merge pull request #7746 from ujdhesa/develop
...
Update for sq translation
2018-03-24 17:49:14 +01:00
Besnik Bleta
a867d64631
Update for sq translation
2018-03-24 18:13:12 +02:00
Benjamin Neff
38d92cc84b
Merge branch 'next-minor' into develop
2018-03-22 23:17:15 +01:00
kas70
53b733f0cd
adds byebug history to gitignore
...
closes #7744
2018-03-22 23:15:38 +01:00
kas70
40fc175d6e
only include mutual sharing contacts in conversations form on contacts page
...
fixes #7377
2018-03-22 23:15:24 +01:00
Benjamin Neff
0d07d9f3de
Merge branch 'next-minor' into develop
2018-03-18 23:14:20 +01:00
Benjamin Neff
c7709e29f2
Merge branch 'master' into next-minor
2018-03-18 23:13:48 +01:00
Benjamin Neff
d031375610
Merge branch 'release/0.7.4.0'
2018-03-18 23:11:47 +01:00
Benjamin Neff
aadd64b0a5
updated 43 locale files [ci skip]
2018-03-18 23:05:19 +01:00
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
Frédéric Bolvin
6d55b15604
Resize images on client-side before uploading
2018-03-11 11:20:16 +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
