Jonne Haß
d13bcc00e0
Merge branch 'next-minor' into develop
2020-03-21 19:15:14 +01:00
Vitalie Ciubotaru
827a2ce991
Remove links to deleted profiles in admin user stats
...
closes #8063
closes #8061
2020-03-21 19:14:56 +01:00
Benjamin Neff
984b739eb4
Merge branch 'next-minor' into develop
2020-02-12 00:38:14 +01:00
Benjamin Neff
c432a658dd
Start 0.7.14.0 cycle
2020-02-12 00:36:21 +01:00
Benjamin Neff
4139ae2549
Merge branch 'next-minor' into develop
2020-02-12 00:13:19 +01:00
Dennis Schubert
b0181fbbb9
Bump mini_magick.
...
closes #8108
2020-02-12 00:09:54 +01:00
Jonne Haß
2da33408f9
Merge branch 'next-minor' into develop
2020-01-27 09:30:14 +01:00
Jonne Haß
1e642be040
Hide sign up link in mobile header when registrations are disabled
...
closes #8060
2020-01-27 09:30:11 +01:00
Dennis Schubert
500763294d
Merge pull request #8086 from jhass/api
...
API
2020-01-22 22:38:15 +01:00
Jonne Haß
1da075e30b
Merge branch 'next-minor' into develop
2020-01-22 21:09:20 +01:00
Dennis Schubert
1d72f95705
Issue #8062 - Drop rails-assets.org.
...
and replace it with our own Gem cache. This isn't pretty, as we have to manage that one ourselves, and pushing updates requires a core-team member, but rails-assets.org has become way too unreliable for us to be a viable option.
closes #8087
2020-01-22 21:08:06 +01:00
Benjamin Neff
1cbb3f9a7c
Merge pull request #8069 from denschub/remove-chat
...
Remove the JSXC/Prosody integration.
2019-10-25 01:32:37 +02:00
Benjamin Neff
6bb2e2fadd
Merge branch 'next-minor' into develop
2019-10-25 01:24:19 +02:00
Jonne Haß
36b4076af6
set better example values for unicorn stdout/stderr log settings
...
[ci skip]
closes #8058
2019-10-25 01:24:08 +02:00
Dennis Schubert
862fa38f8b
Remove the JSXC/Prosody integration.
...
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718 , nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
2019-10-18 23:14:14 +02:00
Jonne Haß
995f3394a8
Merge branch 'next-minor' into develop
2019-09-01 02:44:02 +02:00
Jonne Haß
ba16185b8e
install ghostscript on travis
...
closes #8049
2019-09-01 02:43:51 +02:00
Benjamin Neff
11caf4f86f
Merge pull request #8036 from theRealNG/develop
...
Do not show getting started after account import
fixes #8018
2019-07-03 13:33:22 +02:00
Benjamin Neff
a26e20ab7d
Merge branch 'next-minor' into develop
2019-07-03 13:25:49 +02:00
Benjamin Neff
df4e79b842
Cleanup pending photos which were never posted with cronjob
...
Only delete photos older than a day, so we don't delete photos for posts
which were uploaded 10 minutes ago and the author is still writing the
post for it.
closes #8041
2019-07-03 13:24:27 +02:00
Benjamin Neff
6f14f1b850
Merge branch 'next-minor' into develop
2019-06-17 01:20:42 +02:00
Benjamin Neff
d674f53910
Start 0.7.13.0 cycle
2019-06-17 01:19:44 +02:00
Benjamin Neff
5602dc4418
Use username parameter first if present
...
this makes sure we don't use an old otp_user_id from an old session
closes #8031
2019-06-17 01:14:22 +02:00
flaburgan
78538d034a
Harmonize markdown titles sizes
...
fixes #7757
closes #8029
2019-06-17 01:10:41 +02:00
Jonne Haß
700e5588e0
Merge branch 'next-minor' into develop
2019-05-24 22:43:13 +02:00
Jonne Haß
1227f34b2a
Pass normalized URI to OpenGraphReader
...
This ensures the hostname is downcase and thus subsequent third party library
assumptions hold, namely http-cookie (pulled through faraday-cookie_jar) doesn't
raise
closes #8021
2019-05-24 22:43:08 +02:00
Benjamin Neff
314239ff2a
Merge branch 'next-minor' into develop
2019-05-12 00:25:52 +02:00
Benjamin Neff
e5ba9a1a46
Move translations to registrations.closed
...
And remove unused translations and make "another pod" translatable.
closes #7896
2019-05-12 00:25:36 +02:00
flaburgan
6826e89a95
Change design, add a link to the official website
...
fixes #7910
closes #7966
2019-05-12 00:12:12 +02:00
Benjamin Neff
4d02aee375
Merge branch 'release/0.7.11.0' into next-minor
2019-05-12 00:07:36 +02:00
Jonne Haß
2d23a2601e
fix old photos without a remote_photo_path or remote_photo_name
...
closes #8012
2019-05-11 22:07:48 +02:00
Dennis Schubert
cb5f26a709
Merge branch 'next-minor' into develop
2019-05-05 04:23:09 +02:00
Dennis Schubert
3704be8bec
Prepare 0.7.12.0 cycle
...
[ci skip]
2019-05-05 04:22:10 +02:00
Dennis Schubert
39b86ed486
Remvoe unused Changelog headline
...
[ci skip]
2019-05-05 04:21:37 +02:00
Jonne Haß
dfeea521f5
Merge branch 'next-minor' into develop
2019-05-03 17:18:53 +02:00
flaburgan
83a9877def
Improve likes steps
...
closes #8002
2019-05-03 17:17:32 +02:00
Benjamin Neff
d486fbce8c
Merge branch 'next-minor' into develop
2019-04-30 00:21:55 +02:00
Benjamin Neff
607659939d
Enable paranoid mode for devise
...
fixes #8001
closes #8003
2019-04-30 00:21:00 +02:00
Jonne Haß
f7103267a1
Merge branch 'next-minor' into develop
2019-04-28 23:25:04 +02:00
lislis
9d5b981809
Two factor authentication ( #7751 )
2019-04-28 23:24:40 +02:00
Benjamin Neff
8372fb2240
Merge branch 'next-minor' into develop
2019-04-28 16:48:49 +02:00
Benjamin Neff
17af65e22c
Allow links with only the diaspora ID to link to a profile
...
closes #8000
2019-04-28 16:48:31 +02:00
Benjamin Neff
cf350c3e92
Merge pull request #7660 from cmrd-senya/archive-import-backend
...
Archive import backend implementation
2019-04-27 19:07:09 +02:00
Benjamin Neff
6ba9b24c1a
Merge branch 'next-minor' into develop
2019-04-27 18:00:40 +02:00
flaburgan
2073791cee
Add a manifest.json file as a first step to make diaspora* a PWA
...
fixes #7997
closes #7998
2019-04-27 18:00:14 +02:00
Dennis Schubert
c30ea112df
Merge branch 'next-minor' into develop
2019-02-19 03:04:13 +01:00
Dennis Schubert
189923040d
Merge branch 'release/0.7.10.0' into next-minor
2019-02-19 03:03:51 +01:00
Dennis Schubert
a3a0a1fba9
Fix incorrect bug number in the changelog
...
Good one, eh? [ci skip]
2019-02-19 03:03:20 +01:00
Benjamin Neff
d5735c7981
Merge branch 'next-minor' into develop
2019-02-19 01:58:32 +01:00
Benjamin Neff
4687d7e1ea
Start 0.7.11.0 cycle
2019-02-19 01:48:11 +01:00
Benjamin Neff
707e358e48
Merge branch 'next-minor' into develop
2019-02-19 01:30:08 +01:00
Dennis Schubert
e47d0d9675
Replace dandelion.jpg with a public domain photo
...
Closes #7972
closes #7976
2019-02-19 01:29:52 +01: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
7ad758a8d9
Merge branch 'next-minor' into develop
2019-01-07 02:04:26 +01:00
Benjamin Neff
71595b4cbd
Start 0.7.10.0 cycle
2019-01-07 02:03:06 +01:00
Benjamin Neff
cf1b0fb414
Merge branch 'next-minor' into develop
2019-01-06 22:32:39 +01:00
Benjamin Neff
654b524397
Fix typo in changelog for 0.7.9.0
2019-01-06 22:27:15 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop
2019-01-06 22:18:48 +01:00
Benjamin Neff
efcaa860ac
Revert "Bump bootstrap-switch-rails"
...
It looks like 3.3.4 is broken :(
Fixes #7940
This reverts commit 5205e3c526closes #7955
2019-01-06 22:16:02 +01:00
flaburgan
3f700c3960
Fix photos galley when too many thumbnails by adding a scroll-x
...
fixes #7942
closes #7943
2019-01-06 22:12:38 +01:00
flaburgan
c8a1f308c6
Rename 'toggle mobile' to 'switch to touch-optimized mode' or 'switch to standard mode'
...
closes #7926
2019-01-06 22:04:22 +01:00
flaburgan
6804132c15
Do not autofollow back a user you are ignoring
...
fixes #7808
closes #7913
2019-01-06 22:02:10 +01:00
Hank Grabowski
58d2ce7ba6
Ignore Users in Mobile UI
...
fixes #7840
closes #7884
2019-01-06 21:55:33 +01:00
Benjamin Neff
3fe0ef350f
Merge branch 'next-minor' into develop
2018-12-28 01:39:56 +01:00
CSammy
a21cde4c00
Speed up public stream and remove obsolete indexes
...
closes #7944
2018-12-28 01:39:49 +01:00
Benjamin Neff
6824ef5baf
Merge branch 'next-minor' into develop
2018-11-25 22:38:03 +01:00
Benjamin Neff
5a0381f832
Merge branch 'master' into next-minor
2018-11-25 22:37:43 +01:00
Benjamin Neff
95032bae92
Fix typo in changelog for 0.7.8.0
2018-11-20 22:03:15 +01:00
Benjamin Neff
0d45e709f2
Merge branch 'next-minor' into develop
2018-11-19 00:51:10 +01:00
Benjamin Neff
2d6a68c28f
Start 0.7.9.0 cycle
...
[ci skip]
2018-11-19 00:50:04 +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
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
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
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
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
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
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
f66248c315
Merge branch 'next-minor' into develop
2018-09-05 03:19:44 +02:00
Benjamin Neff
08e108d3d8
Fix comment notification subject for posts without text
...
Fixes #7854
2018-09-05 03:17:58 +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
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
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
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
flaburgan
3d83fbdbe5
Link to the pod in the emails footer
...
closes #7814
2018-06-18 02:47:56 +02:00
Benjamin Neff
299c04a24a
Merge pull request #7781 from SuperTux88/enable-csp-by-default
...
Enable Content-Security-Policy header by default
2018-06-16 21:21:07 +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
212da3a2b7
Merge branch 'next-minor' into develop
2018-06-16 01:23:10 +02:00
Alex Tribble
1b03265c2e
Allow fonts to be served from asset host in CSP.
...
Closes #7796
closes #7825
2018-06-16 01:22:22 +02:00
Benjamin Neff
fa615533f6
Bump kostya-sigar
...
Fixes compatibility with newer glibc
closes #7828
2018-06-16 01:19:36 +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
Benjamin Neff
b7cd9d6238
Merge branch 'master' into next-minor
2018-04-30 22:54:03 +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
360ea20367
Merge branch 'next-minor' into develop
2018-04-23 20:37:03 +02:00
Dennis Schubert
8d6c891ecb
Prepare 0.7.6.0 cycle
2018-04-23 20:35:18 +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
c061425022
Add changelog entry for #7788 [ci skip]
2018-04-16 01:32:41 +02:00
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop
2018-04-16 01:26:56 +02:00
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs
...
closes #7787
2018-04-16 01:26:48 +02:00
Benjamin Neff
66175f6908
Merge branch 'next-minor' into develop
2018-04-12 01:56:07 +02:00
Benjamin Neff
686310fb8e
Simplify /podmin redirect
...
Some podmins were confuse how they can disable this redirect and I think
the rule with two users can actually be a little confusing. I think the
main goal of this page to give the podmin a little start and I think
after they configured everything, the pod works and they found the link
to the wiki to make themself an admin, it is OK to remove the redirect.
Also it's bad for single-user pods where this page always stays active,
even if they are an admin, but have only one user. It's more useful for
single-user pods to have the login on the home page.
closes #7783
2018-04-12 01:55:46 +02:00
Steffen van Bergerem
4aec9fbb42
Fix mention syntax backport for two immediately consecutive mentions
...
Fixes #7695 .
closes #7777
2018-04-12 01:44:44 +02:00
Steffen van Bergerem
01ae004518
Make public stream accessible for logged out users
...
Fixes #6564 .
closes #7775
2018-04-12 01:42:17 +02:00
Benjamin Neff
7d6623d069
Remove contacts page on profiles
...
closes #7769
2018-04-12 01:40:49 +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
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
