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 |
|
Senya
|
2be60eab1b
|
Update archive-format.json
/ was missing in the profile entity $ref
closes #7835
|
2018-07-17 01:23:56 +02:00 |
|
Benjamin Neff
|
1289b3b541
|
Merge branch 'next-minor' into develop
|
2018-07-13 10:22:04 +02:00 |
|
Dennis Schubert
|
af500dabbc
|
Add section in the User's settings to register the protocol handler
closes #7833
|
2018-07-13 10:19:43 +02:00 |
|
Dennis Schubert
|
f8a4a2c510
|
Gracefully ignore exceptions when trying to register the ProtocolHandler
|
2018-07-13 10:18:48 +02:00 |
|
Dennis Schubert
|
8709c45d30
|
Move the protocol handler into a proper helper module
Previous file history in 80dfdcd6af, couldn't keep it.
|
2018-07-13 10:18:48 +02:00 |
|
Dennis Schubert
|
4430f9e887
|
Add VSCode-related files to the .gitignore
|
2018-07-13 10:17:44 +02:00 |
|
Benjamin Neff
|
ea15403d57
|
Merge pull request #7655 from Flaburgan/6721-fix-upload-progress-bar
Fix multiple photos upload progress bar
|
2018-07-11 01:37:02 +02:00 |
|
Benjamin Neff
|
dcbdb69e22
|
Merge branch 'next-minor' into develop
|
2018-07-11 01:35:50 +02:00 |
|
cmrd Senya
|
a7cc0645e0
|
Cuke for web+diaspora:// link handler
closes #7826
|
2018-07-11 01:28:53 +02:00 |
|
cmrd Senya
|
80dfdcd6af
|
Add web+diaspora:// links handler installation
|
2018-07-11 01:26:43 +02:00 |
|
cmrd Senya
|
6f812a5b8f
|
Add LinksController
LinksController redirects requests for provided diaspora:// links to
respective entities urls.
|
2018-07-11 01:24:28 +02:00 |
|
cmrd Senya
|
2e0b382699
|
Use 'post' prefix for status message route helpers
This is required to make url_for(StatusMessage.new) work
|
2018-07-11 01:24:28 +02:00 |
|
flaburgan
|
af02d01d41
|
Fix progress when uploading multiple photo at the same time
|
2018-07-09 17:48:30 +02:00 |
|
Benjamin Neff
|
9ff1646cbb
|
Merge branch 'next-minor' into develop
|
2018-06-30 23:27:39 +02:00 |
|
Benjamin Neff
|
ac868c9c06
|
Get processor count with ruby (on linux and mac)
closes #7830
|
2018-06-30 23:27:32 +02:00 |
|
Benjamin Neff
|
4aa08ddf14
|
Merge branch 'next-minor' into develop
|
2018-06-27 02:46:26 +02:00 |
|
Benjamin Neff
|
c2fa0b1eba
|
Merge branch 'master' into next-minor
|
2018-06-27 02:46:04 +02:00 |
|
Benjamin Neff
|
2b3bbc1a6c
|
Merge branch 'release/0.7.6.0'
|
2018-06-27 02:42:00 +02:00 |
|
Benjamin Neff
|
097754e493
|
updated 6 locale files [ci skip]
|
2018-06-27 02:31:52 +02:00 |
|
Benjamin Neff
|
b94ef57bbc
|
Merge branch 'next-minor' into develop
|
2018-06-20 01:56:25 +02:00 |
|
Benjamin Neff
|
67d6d2ff25
|
Prepare 0.7.7.0 cycle
|
2018-06-20 01:38:17 +02:00 |
|
Benjamin Neff
|
f9a59f2ff0
|
Merge branch 'next-minor' into develop
|
2018-06-20 00:50:34 +02:00 |
|
Benjamin Neff
|
23fcac6550
|
Bump sprockets
Fixes CVE-2018-3760
closes #7829
|
2018-06-20 00:50:24 +02:00 |
|
HankG
|
5a8bdc1e71
|
Facebook plugin always appends (via D* post URL) to cross-posts
fixes #7770
closes #7774
|
2018-06-20 00:47:12 +02:00 |
|
Benjamin Neff
|
0b9ba559c7
|
Merge branch 'next-minor' into develop
|
2018-06-18 02:48:47 +02:00 |
|