github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-01-09 23:28:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
20,979 Commits 4 Branches 95 Tags
452f46a548b773b9f31679e9eb68d72a5a2dbea5
Commit Graph

2073 Commits

Author SHA1 Message Date
Thorsten Claus
2a99cc93ba diaspora should send AccountMigration message back when a federation message received for a moved account 
I use Senya's Patch for this
The extra check is for satisfying tests, which don't create real database objects.

fixes #7902
closes #8288
 2021-09-19 02:20:38 +02:00
Benjamin Neff
2081f39a72 Merge pull request #8010 from cmrd-senya/fix-archive-edge-cases 
Fix archive edge cases

closes #8017
closes #8257
 2021-09-18 19:29:56 +02:00
Benjamin Neff
750186319e Merge branch 'next-minor' into develop 2021-09-18 19:24:20 +02:00
Thorsten Claus
8f9ac33649 Using shared markdown options for plain text 
fixes #7960
closes #8277
 2021-09-18 19:22:27 +02:00
Thorsten Claus
8392c894d2 ensure ./log folder exists 
closes #8287
 2021-09-18 19:18:03 +02:00
Benjamin Neff
e2b96c81f2 Merge branch 'next-minor' into develop 2021-08-16 00:24:47 +02:00
Pirate Praveen
20a3abd864 Switch to terser gem from uglifier for JS compression 
closes #8268
 2021-08-16 00:21:17 +02:00
Benjamin Neff
d02848c216 Merge branch 'next-minor' into develop 2021-07-26 02:37:40 +02:00
Thorsten Claus
07a49de7e1 Using galleries default border radius Small indicator images in image gallery are round ones, this doesn't correspond with preview shown in stream. It also doesn't look good on real-world images. (may look OK for User profile images) 
closes #8275
 2021-07-26 02:37:22 +02:00
Benjamin Neff
8d5abe8892 Merge pull request #8264 from tclaus/migration_importing_blocks 
Migration: Importing user blocks
 2021-07-13 01:40:04 +02:00
Benjamin Neff
2e6ae8c967 Merge pull request #8254 from tclaus/8106_set_contact_status_on_account_migration 
Migration: set share status in contacts

closes #8106
 2021-07-13 01:36:48 +02:00
Benjamin Neff
4c46ca1a94 Merge branch 'next-minor' into develop 2021-07-04 22:09:32 +02:00
Dennis Schubert
407f51d5a3 Allow points and dashes in the username. 
This reverts b3ca504c40. We don't quite know why that was added, but we assume it's because of format strings. Some pre-2011 users exist that still have dots or dashes in their username, and those accounts are somewhat broken now.

closes #8266
 2021-07-04 22:07:21 +02:00
Benjamin Neff
8f804e376a Don't export chat_enabled flag anymore 
The chat is already removed for 0.8, so there is no need to still export
this data since it can't be imported anyway.

Related to #8069

closes #8265
 2021-07-04 22:03:37 +02:00
Benjamin Neff
caeeac6c59 Merge branch 'next-minor' into develop 2021-07-03 03:03:32 +02:00
Thorsten Claus
b31f9106a1 Migration: Exporting user blocks 
closes #8263
 2021-07-03 02:51:41 +02:00
Benjamin Neff
1dd2382d03 Merge pull request #8243 from tclaus/8192_drop_relay_example 
drop relay example and implementation

closes #8192
 2021-06-13 01:35:42 +02:00
Benjamin Neff
a6c79f5e57 Merge pull request #8232 from tclaus/local_public_posts 
Show Local public posts

closes #8220
 2021-06-13 01:32:24 +02:00
Benjamin Neff
a17fca02ff Merge branch 'next-minor' into develop 2021-06-13 01:27:34 +02:00
Thorsten Claus
43d489edda Fixed test 
closes #8244
 2021-06-13 01:26:27 +02:00
Pirate Praveen
92a096f03c Add closing tags to replace invalid self-closing tags 
closes #8251
closes #8158
 2021-06-13 01:14:03 +02:00
Thorsten Claus
1f510d0b40 Wrapped local_comments also in a cache 
closes #8241
closes #7992
 2021-06-13 01:09:44 +02:00
Jonne Haß
85bb022b2a Merge branch 'next-minor' into develop 2021-04-18 13:15:14 +02:00
Jonne Haß
ba905334f7 Start 0.7.16.0 cycle 2021-04-18 13:14:29 +02:00
Jonne Haß
f4dc6d0dc7 Merge branch 'next-minor' into develop 2021-04-11 17:23:46 +02:00
gabrielrumiranda
394eafccc5 Actually implement validation error case in Photo#ownserhip_of_status_message 
closes #8214
closes #8048

Co-authored-by: Thorsten Claus <thorstenclaus@web.de>
 2021-04-11 17:22:40 +02:00
Jonne Haß
5f00b4a4e6 Merge branch 'next-minor' into develop 2021-04-11 17:13:46 +02:00
Gayathrir1666
ef9e764f7a Add scrollbar to aspect dropdowns 
closes #8213
closes #7696

Co-authored-by: Hank Grabowski <hankgrabowski@gmail.com>
Co-authored-by: Thorsten Claus <thorstenclaus@web.de>
 2021-04-11 17:13:25 +02:00
Jonne Haß
2c8bf3b5da Merge branch 'next-minor' into develop 2021-04-11 13:16:21 +02:00
Thorsten Claus
a420ba2cfc Formatting post per user fractions 
closes #8227
 2021-04-11 13:16:15 +02:00
Jonne Haß
cc5fca99be Fixup rubocop warnings from factory_bot introduction 2021-04-11 01:59:47 +02:00
Jonne Haß
e0af180c9b Merge branch 'next-minor' into develop 2021-04-11 01:46:52 +02:00
Thorsten Claus
a98fdc8079 Remove 'heidelberg' tile map service. 
Updated settings for MapTiles as recommended by leaflet.js
Updating current licence text

Closes #8209
closes #8215
 2021-04-11 01:45:05 +02:00
Jonne Haß
7d9f18fda1 Merge branch 'next-minor' into develop 2021-04-10 23:17:47 +02:00
Jonne Haß
7154fc3ccc Port cukes from poltergeist to aparition 
closes #8234
 2021-04-10 23:17:39 +02:00
Jonne Haß
bbeb24b398 Merge branch 'next-minor' into develop 2021-04-10 11:33:27 +02:00
Pirate Praveen
79133df4a9 Update mimemagic (0.3.5 is removed from rubygems.org) 
closes #8231
 2021-04-10 11:33:22 +02:00
Dennis Schubert
d4f92a8fae Merge branch 'next-minor' into develop 2021-02-21 19:45:00 +01:00
Thorsten Claus
d7941230a4 Replace some http links with their https counterparts. 
closes #8207
 2021-02-21 19:44:42 +01:00
Dennis Schubert
4c74136c53 Merge branch 'next-minor' into develop 2021-02-14 18:51:05 +01:00
Ashley Nelson
d5d53baa1c Delete user invitation code during account deletion 
closes #8202
 2021-02-14 18:49:48 +01:00
Dennis Schubert
ecd2b87475 Merge pull request #8206 from denschub/lowercase-tags 
Enforce lowercase tags and migrate existing uppercase tags for Postgres.
 2021-02-13 04:45:02 +01:00
Dennis Schubert
1ef0cef74c Merge pull request #8205 from tclaus/8189-filter-upload-image-types 
File selection dialog accepts only image types
 2021-02-13 04:39:42 +01:00
Jonne Haß
6a4a983fa1 Merge branch 'next-minor' into develop 2020-11-02 15:34:08 +01:00
David Morley
9793f89761 Update poduptime link to diaspora only list 
closes #8174
 2020-11-02 15:33:38 +01:00
Dennis Schubert
31e13dcff7 Merge branch 'next-minor' into develop 2020-10-24 14:25:45 +02:00
Thorsten Claus
d0eb711ca0 In single post view deleting a comment updates the counter 2020-10-24 14:25:32 +02:00
Jonne Haß
15c11b87ca Merge branch 'next-minor' into develop 2020-09-04 21:58:57 +02:00
Jonne Haß
08395cc877 Migrate configuration to TOML 
YAML is just too easy to get wrong

closes #8132
 2020-09-04 21:48:54 +02:00
Dennis Schubert
fb46e77339 Merge branch 'next-minor' into develop 2020-06-14 21:50:13 +02:00