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
Dennis Schubert
65a2b8da12
Include PostsHelper in NotifierHelper
...
Fixes #7852
closes #7853
2018-09-06 02:33:33 +02:00
Dennis Schubert
232f76e69d
Merge branch 'next-minor' into develop
2018-09-06 01:40:55 +02:00
Benjamin Neff
f130ec414e
Bump ffi
...
Fixes CVE-2018-1000201
closes #7859
2018-09-06 01:40:47 +02:00
Dennis Schubert
f66248c315
Merge branch 'next-minor' into develop
2018-09-05 03:19:44 +02:00
Benjamin Neff
cd30a2814d
Bump json-jwt and openid_connect
...
Fixes CVE-2018-1000539
2018-09-05 03:18:59 +02:00
Benjamin Neff
08e108d3d8
Fix comment notification subject for posts without text
...
Fixes #7854
2018-09-05 03:17:58 +02:00
Dennis Schubert
60b5443850
Merge pull request #7857 from SuperTux88/fix-comment-title-without-text
...
Fix comment notification subject for posts without text
2018-09-05 03:13:45 +02:00
Dennis Schubert
11dac58dc7
Merge pull request #7856 from SuperTux88/bump-json-jwt
...
Bump json-jwt
2018-09-05 03:12:52 +02:00
Benjamin Neff
4c4c3d8bf0
Bump json-jwt and openid_connect
...
Fixes CVE-2018-1000539
2018-09-05 02:19:34 +02:00
Benjamin Neff
2eb17e109b
Fix comment notification subject for posts without text
...
Fixes #7854
2018-09-05 01:32:36 +02:00
Benjamin Neff
76c64ec1f8
Merge branch 'next-minor' into develop
2018-08-24 19:49:37 +02:00
lislis
546ef080c5
bump fixture_builder to 5.2rc3
...
closes #7849
2018-08-24 19:49:23 +02:00
Benjamin Neff
9b3f90dc90
Merge branch 'next-minor' into develop
2018-07-20 11:07:18 +02:00
Benjamin Neff
79907b78b9
Use podname for web+diaspora:// protocol handler
...
closes #7839
2018-07-20 11:07:11 +02:00
Benjamin Neff
7fef695e29
Merge pull request #7834 from SuperTux88/fix-photo-uploader-preview
...
Fix preview with uploaded photos
2018-07-18 01:56:57 +02:00
Benjamin Neff
d06ef4505c
Wait for the image actually uploaded and removed again
2018-07-17 20:48:37 +02:00
Benjamin Neff
80bc90afa9
Fix preview with uploaded photos
2018-07-17 20:48:37 +02:00
Benjamin Neff
e5687dd7e0
Merge branch 'next-minor' into develop
2018-07-17 01:25:53 +02:00
