nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19795 commits 4 branches 0 tags 121 MiB
Commit graph

4842 commits

Author SHA1 Message Date
Benjamin Neff
4e22c4b211
Merge branch 'next-minor' into develop 2019-04-26 17:41:33 +02:00
Jonne Haß
d443401361
Stabilize Diaspora::Federation::Entities.build.builds a comment with edited_at 
closes #7994
 2019-04-26 17:41:25 +02:00
Jonne Haß
a38a93523d
Stabilize Diaspora::Federation::Receive.comment.saves the signature data 2019-04-26 17:40:48 +02:00
Jonne Haß
e3c05b5620 Stabilize Diaspora::Federation::Receive.comment.saves the signature data 2019-04-26 15:56:09 +02:00
Dennis Schubert
97805e6602
Merge branch 'next-minor' into develop 2019-01-13 02:17:22 +01:00
Benjamin Neff
2894984f57
Fix order of posts on tags-stream for tags including 'activity' 
closes #7959
 2019-01-13 02:17:15 +01:00
Benjamin Neff
b30c4e4e97
Merge branch 'next-minor' into develop 2018-11-17 21:08:23 +01:00
Benjamin Neff
6fb1e1f524
Bump jwt 2018-11-17 21:05:42 +01:00
Benjamin Neff
de5e22a543
Bump faraday 2018-11-17 21:04:37 +01:00
Benjamin Neff
652b0064e6
Merge branch 'next-minor' into develop 2018-11-08 20:58:35 +01:00
Benjamin Neff
25a9f5d5d7
Merge branch 'master' into next-minor 2018-11-08 20:58:22 +01:00
Benjamin Neff
32cd764786
Fix XSS via OpenGraph on mobile 2018-11-08 20:41:50 +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
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
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop 2018-10-08 02:50:36 +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
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
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
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
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
80bc90afa9
Fix preview with uploaded photos 2018-07-17 20:48:37 +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
6f812a5b8f
Add LinksController 
LinksController redirects requests for provided diaspora:// links to
respective entities urls.
 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
f9a59f2ff0
Merge branch 'next-minor' into develop 2018-06-20 00:50:34 +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
f3d2a54050
Merge branch 'next-minor' into develop 2018-06-16 04:36:13 +02:00
cmrd Senya
87968284ba
Support fetching StatusMessage by Poll guid 
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.

closes #7815
 2018-06-16 04:36:05 +02:00
Benjamin Neff
0cb212e6cb
Merge branch 'next-minor' into develop 2018-05-16 00:54:46 +02:00
cmrd Senya
a3378ae744
Account merging: handle duplicates for TagFollowing 
I missed it in #7803

closes #7807
 2018-05-16 00:54:16 +02:00
Benjamin Neff
2a60cb30a1
Merge branch 'next-minor' into develop 2018-05-03 21:33:10 +02:00
cmrd Senya
cb294fd3f4
Add completed_at to account_migrations 
Use completed_at datetime field as an indication of a performed migration

closes #7805
 2018-05-03 21:31:29 +02:00
cmrd Senya
e9f6dbdffd
Add unique index to poll participations on author_id and poll_id 
Previously we had only a Rails validation which ensured poll participation
uniqueness but this adds uniqueness control to the database level, so that
uniqueness is guaranteed even when changing data with avoiding Rails
validations.

closes #7798
 2018-05-03 21:28:38 +02:00
Benjamin Neff
22d1ad995c
Merge branch 'next-minor' into develop 2018-04-30 22:54:33 +02:00
cmrd Senya
8680b24a2e
Account merging support 
Adds support for merging accounts with account migration by eliminating
duplicate data in favor of the target user's data.

closes #7803
 2018-04-30 22:06:34 +02:00
Dennis Schubert
74bac8c495
Merge branch 'next-minor' into develop 2018-04-23 20:33:20 +02:00
HankG
211e5cd1bc
Bugfix 7714 twitter char overflow 
closes #7791
 2018-04-23 20:33:07 +02:00
Benjamin Neff
8daf934c45
Remove backporting of mention syntax 
fixes #7276, #7392 and #7640
 2018-04-15 15:49:23 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop 2018-04-12 02:49:11 +02:00
Benjamin Neff
9a661177f1
Replace rails-assets-perfect-scrollbar with rails-assets-utatti-perfect-scrollbar 
closes #7772
 2018-04-12 02:44:43 +02:00