keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
35718 commits 4 branches 0 tags 179 MiB
Commit graph

35718 commits

This branch
This branch
All branches
Author SHA1 Message Date
MarekBenjamin
e86a2e047d
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-08 23:16:28 +01:00
Hypolite Petovan
74be29e822
Merge pull request #12372 from loma-one/patch-3 
Change icon size button comments
 2022-12-08 16:57:58 -05:00
Hypolite Petovan
3e431bda1e
Merge pull request #12371 from loma-one/patch-1 
Change oversized buttons
 2022-12-08 16:57:31 -05:00
loma-one
69e2b45f39
Titel H2 2022-12-08 22:14:47 +01:00
loma-one
5d1aeea41e
Änderung Icon-Größe Schaltfläche Kommentare 
Using the glocal css "template-icon" to show the correct size of the buttons
 2022-12-08 21:47:52 +01:00
Hypolite Petovan
a521c1adaf
Merge pull request #12370 from loma-one/patch-2 
css specification for oversized button in composer
 2022-12-08 15:00:36 -05:00
loma-one
c285e4160b
css specification for oversized button in composer 
In order to specify the buttons in the composer in the correct size again, an additional specification has been added. This can also be used for other oversized buttons.
 2022-12-08 20:42:28 +01:00
MarekBenjamin
75d857c595
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-08 20:40:58 +01:00
Marek Bachmann
d270a98e86 Image grid logic 2022-12-08 20:39:51 +01:00
loma-one
c95882125d
Change oversized buttons 
Additional css specification in global.css to resize the button in the composer. ".template-icon"
Use ".template-icon" in additional buttons that are currently displayed oversized.
 2022-12-08 20:38:44 +01:00
Hypolite Petovan
d84dad20ca
Merge pull request #12368 from tobiasd/20221208-de2 
DE translation update
 2022-12-08 12:17:30 -05:00
Tobias Diekershoff
9cd72cfec6 DE translation update 2022-12-08 18:11:16 +01:00
Hypolite Petovan
60a6503f6f
Merge pull request #12366 from tobiasd/20221208-fr 
FR translation update THX kalon33
 2022-12-08 12:00:14 -05:00
Tobias Diekershoff
350f542220 FR translation update THX kalon33 2022-12-08 17:52:34 +01:00
Philipp
fc675a1736
Merge pull request #12365 from MrPetovan/bug/fatal-errors 
Address a couple of fatal error messages
 2022-12-08 17:14:51 +01:00
Hypolite Petovan
d9e69fc543 Fix OPTIONS responses 2022-12-08 10:10:40 -05:00
Hypolite Petovan
15eba181a0 Initialize parameter with $server for all Router cases including Maintenance mode 
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1339614287
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1339909728
 2022-12-08 10:10:23 -05:00
Hypolite Petovan
6fddcb2c04
Merge pull request #12363 from annando/bulk-images 
Add images in a loop (preparation for a gallery)
 2022-12-08 08:38:52 -05:00
Michael
741469a5c5 Add images in a loop (preparation for a galery) 2022-12-08 07:16:25 +00:00
Michael Vogel
7fcc813028
Merge pull request #12362 from tobiasd/20221208-de 
DE translation update
 2022-12-08 08:03:54 +01:00
Tobias Diekershoff
3fcf35a5bc
Merge pull request #12361 from annando/issue-12345 
Issue 12345: No link preview on DFRN posts
 2022-12-08 06:59:04 +01:00
Tobias Diekershoff
5954af2e81 DE translation update 2022-12-08 06:55:55 +01:00
Michael
7d51fa47d5 Issue 12345: No link preview on DFRN posts 2022-12-08 05:49:25 +00:00
Hypolite Petovan
16f5dc92f8
Merge pull request #12350 from annando/link-preview 
The appearance of the link preview is now configurable
 2022-12-07 16:34:18 -05:00
MarekBenjamin
74ff7bae59
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-07 18:52:20 +01:00
Marek Bachmann
d590df9a72 set character encoding to utf-8 for parsing rendered-html 2022-12-07 18:50:16 +01:00
Hypolite Petovan
35cf093086
Merge pull request #12352 from foss-/patch-4 
Doc > FAQ.md: AddTwidereX iOS, Remove deprecated and non-functional clients
 2022-12-07 09:01:37 -05:00
Marek Bachmann
c8b43e688f Merge remote-tracking branch 'origin/new_image_presentation' into new_image_presentation 2022-12-07 13:22:56 +01:00
Marek Bachmann
99e20d1b00 Temporary hack to remove images after last text line by DOM inspection 2022-12-07 13:22:28 +01:00
foss-
63a628460e
AddTwidereX iOS, Remove deprecated and non-functional clients 
- add TwidereX to iOS
- Remove Twidere Android (currently broken and no longer under development. fun fact: its Google Play link was already going to TwidereX)
- Remove B4X Android + iOS (Google Play Link dead https://github.com/AnywhereSoftware/B4X-Pleroma, website unmaintained, no commits for over a year)
- Remove Tootle iOS, Linux (repo archived: https://github.com/bleakgrey/tootle, no development in almost 3 years)
 2022-12-07 13:16:08 +01:00
Michael
b9cb94c432 Updated messages.po 2022-12-07 07:12:56 +00:00
Michael
498a957009 The appearanxe of the link preview is now configurable 2022-12-07 07:02:04 +00:00
Hypolite Petovan
8d1bc02f8f
Merge pull request #12349 from annando/hidewall 
Fix "Missing hidewall key" message
 2022-12-06 23:57:09 -05:00
Michael
e5ff71f839 Fix "Missing hidewall key" 2022-12-06 22:23:43 +00:00
Tobias Diekershoff
05f8303034
Merge pull request #12348 from annando/api-search-offset 
API: Only search for direct hit without offset
 2022-12-06 21:05:32 +01:00
Michael
6965614f00 API: Only search for direct hit without offset 2022-12-06 18:47:43 +00:00
Tobias Diekershoff
215c332a94
Merge pull request #12347 from annando/add-parents 
Fix post completion
 2022-12-06 19:21:22 +01:00
Michael
5e40b47a17 Fix post completion 2022-12-06 17:45:18 +00:00
Tobias Diekershoff
59088161e8 bump version to 2022.12-rc 2022-12-06 14:34:03 +01:00
MarekBenjamin
de83be11ac
Merge branch 'friendica:develop' into new_image_presentation 2022-12-06 11:35:09 +01:00
Hypolite Petovan
9b8b1be3e7
Merge pull request #12340 from nupplaphil/bug/friendica-12339 
[frio] Fix preview function when creating posts
 2022-12-05 20:49:03 -05:00
Marek Bachmann
9778b60e64 cleaned up my git mess :-/ anyways, should work now 2022-12-06 01:14:15 +01:00
Marek Bachmann
2205ef0574 Merge remote-tracking branch 'origin/new_image_presentation' into new_image_presentation 
# Conflicts:
#	src/Model/Item.php
 2022-12-06 01:02:04 +01:00
Marek Bachmann
458f22d303 Support more than 2 images 2022-12-06 00:59:48 +01:00
Marek Bachmann
7fb0f018df First draft for using a image grid to display attached images. 2022-12-06 00:59:47 +01:00
Marek Bachmann
8145454707 Revert "Merge branch 'develop' into new_image_presentation" 
This reverts commit 76f4ba7685, reversing
changes made to 733543505b.
 2022-12-06 00:48:28 +01:00
Marek Bachmann
76f4ba7685 Merge branch 'develop' into new_image_presentation 
# Conflicts:
#	src/Object/Image.php
 2022-12-05 23:36:57 +01:00
Philipp
8543174bf1
Merge pull request #12341 from annando/fix-small-preview 
The BlurHash function must not change the original image
 2022-12-05 21:45:37 +01:00
Michael
a260e97b6f The BlurHash function must not change the original image 2022-12-05 20:38:21 +00:00
Philipp
c6e627d45c
Fix preview function when creating posts 2022-12-05 21:10:14 +01:00