Dennis Schubert
cd16f29c39
Merge branch 'next-minor' into develop
2018-11-08 05:14:36 +01:00
Benjamin Neff
3c55a425c7
Fix script domain for instagram in CSP header
...
closes #7920
2018-11-08 05:12:55 +01:00
Dennis Schubert
ffe6fc0aa1
Merge branch 'next-minor' into develop
2018-11-08 05:08:16 +01:00
flaburgan
e33466de89
Display raw images in gallery
...
closes #7890
2018-11-08 05:08:04 +01:00
Dennis Schubert
cee30c36a0
Merge branch 'next-minor' into develop
2018-11-08 05:06:53 +01:00
Hank Grabowski
cab0e0100b
7841 Post Unlike sets status icon correctly
...
closes #7882
fixes #7841
2018-11-08 05:06:34 +01:00
Benjamin Neff
0c2cd2ef1b
Merge branch 'next-minor' into develop
2018-11-04 03:07:50 +01:00
Bennett Goble
935ff66c96
Sharpen small and medium thumbnails
...
closes #7924
2018-11-04 03:07:42 +01:00
Benjamin Neff
2c56e447ed
Ignore invalid URLs for camo
...
When people only write `https://` as image URL, this would fail with
`Addressable::URI::InvalidURIError: Absolute URI missing hierarchical segment: 'https://'`.
closes #7922
2018-11-04 03:06:21 +01:00
Benjamin Neff
b2712ebf1d
Use libjemalloc if it's available for better memory usage
...
Fixes #6763
closes #7919
2018-11-04 03:04:39 +01:00
flaburgan
470efd4ec5
Move comment timestamp next to author name, add permalink
...
closes #7905
2018-11-04 03:01:27 +01:00
Benjamin Neff
d3bb7ade78
Merge branch 'next-minor' into develop
2018-11-02 01:39:11 +01:00
flaburgan
b977e9c39a
Save a screenshot of the page in tmp/capybara when a cucumber test is failing
...
closes #7912
2018-11-02 01:39:04 +01:00
flaburgan
65e0f90b86
Reword the web handler setting
...
fixes #7838
closes #7909
2018-11-02 01:35:44 +01:00
Dennis Schubert
c1e5f61502
Merge branch 'next-minor' into develop
2018-10-28 22:09:13 +01:00
CSammy
dae1717da8
Add docker setup for development
...
closes #7870
2018-10-28 22:09:06 +01:00
Dennis Schubert
0da2e9c102
Merge branch 'next-minor' into develop
2018-10-27 00:13:56 +02:00
Dennis Schubert
0133a9f354
updated 17 locale files [ci skip]
2018-10-27 00:13:47 +02:00
Dennis Schubert
a201e3b2c2
updated 17 locale files [ci skip]
2018-10-27 00:12:25 +02:00
Dennis Schubert
21f9a9d134
Merge branch 'next-minor' into develop
2018-10-15 02:45:09 +02:00
Dennis Schubert
2c8d75100c
Merge branch 'master' into next-minor
2018-10-15 02:44:43 +02:00
Dennis Schubert
d8c1b4f460
Merge branch 'release/0.7.7.0'
2018-10-15 02:43:19 +02:00
Dennis Schubert
53a7508222
Merge branch 'next-minor' into develop
2018-10-15 02:41:57 +02:00
Dennis Schubert
fcbc470b5c
Merge branch 'release/0.7.7.0' into next-minor
2018-10-15 02:41:22 +02:00
Dennis Schubert
af3e2e6d53
updated 33 locale files [ci skip]
2018-10-15 02:40:23 +02:00
Dennis Schubert
a928e40d7f
Merge branch 'next-minor' into develop
2018-10-14 06:03:12 +02:00
Zachary Rabinovich
c4fed4bbcc
Add the ability to assign roles in the admin panel
...
closes #7868
2018-10-14 06:03:06 +02:00
Dennis Schubert
bb84767a96
Merge branch 'next-minor' into develop
2018-10-08 02:58:01 +02:00
Dennis Schubert
4911782e9b
Merge branch 'release/0.7.7.0' into next-minor
2018-10-08 02:57:50 +02:00
Benjamin Neff
48ebd571d8
Bump diaspora_federation
...
closes #7876
2018-10-08 02:57:33 +02:00
Benjamin Neff
3be814ea0f
Bump nokogiri
...
Fixes:
* CVE-2016-9318
* CVE-2017-16932
* CVE-2017-18258
* CVE-2018-14404
* CVE-2018-14567
2018-10-08 02:56:56 +02:00
Benjamin Neff
56bb4be9d3
Bump rubyzip
...
Fixes CVE-2018-1000544
2018-10-08 02:52:53 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop
2018-10-08 02:50:36 +02:00
Dennis Schubert
89d9a865b6
Merge branch 'release/0.7.7.0' into next-minor
2018-10-08 02:50:29 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration
...
Facebook removed the API and facebook integration is broken now, so lets
remove it.
closes #7874
2018-10-08 02:50:25 +02:00
Dennis Schubert
26212ba3e0
Merge branch 'next-minor' into develop
2018-10-08 02:43:11 +02:00
Dennis Schubert
3cd6f9abbb
Start 0.7.8.0 cycle
...
[ci skip]
2018-10-08 02:42:10 +02:00
Dennis Schubert
a91579e92a
Merge branch 'next-minor' into develop
2018-10-04 04:38:10 +02:00
Benjamin Neff
d0c6495bba
Bump unicode-display_width
...
closes #7873
2018-10-04 04:38:05 +02:00
Dennis Schubert
3ebe0e56a8
Merge branch 'next-minor' into develop
2018-10-04 04:37:06 +02:00
Luna Gloaming
45b7f0b119
Added quotation marks for postgresql parameters.
...
As a new, novice user, I ran into an issue where my postgresql
password contained special characters. After a brief conversation
with DenSchub on #diaspora, it was noted that while the example
database configuration had quotes added for mysql, but not for
postgresql, and it was suggested this be improved.
closes #7875
2018-10-04 04:36:57 +02:00
Dennis Schubert
fe5c95e0ba
Merge branch 'next-minor' into develop
2018-09-30 21:44:49 +02:00
Benjamin Neff
44452749bc
Don't depend on the database content when loading the tests
...
closes #7872
2018-09-30 21:44:44 +02:00
Dennis Schubert
883eb54ecf
Merge branch 'next-minor' into develop
2018-09-30 18:00:57 +02:00
Benjamin Neff
d765b34018
Make sure URLs are encoded before sending them to camo
...
Otherwise camo crashes with:
TypeError [ERR_UNESCAPED_CHARACTERS]: Request path contains unescaped characters
closes #7871
2018-09-30 18:00:49 +02:00
Dennis Schubert
24c7e472d4
Merge branch 'next-minor' into develop
2018-09-30 17:59:12 +02:00
Benjamin Neff
b6333e0b1b
Remove reference to statistics.json
...
and mention /statistics and NodeInfo
closes #7867
2018-09-30 17:58:55 +02:00
Dennis Schubert
026e63b961
Merge branch 'next-minor' into develop
2018-09-08 02:25:44 +02:00
Benjamin Neff
49b63693c9
Fix i18n fallbacks
...
Fallbacks are set in config/initializers/locale.rb and this settings
conflicts with the fallbacks set there.
Fixes #7860
closes #7861
2018-09-08 02:25:36 +02:00
Benjamin Neff
c9f65332de
Merge branch 'next-minor' into develop
2018-09-06 02:33:43 +02:00
