clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
35,497 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

35497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 8609fe2f5e
Merge pull request #12207 from MrPetovan/bug/12187-register-uid-0 
Ensure register records aren't created with uid = 0
 2022-11-19 15:52:53 +01:00
Hypolite Petovan 336c8eba4f
Merge pull request #12211 from Schnoop/feature/fixImportLink 
Fix route for user import.
 2022-11-19 09:21:13 -05:00
Thorsten d77fece367 Fix route for user import. 2022-11-19 15:17:42 +01:00
Hypolite Petovan 805fa6024f Update main translation file after adding strings 2022-11-19 07:53:55 -05:00
Hypolite Petovan 6460218c0e Ensure register records aren't created with uid = 0 
- uid = 0 matches system account and public contact records, giving unexpected display in pending user list. More importantly, the originally created user can't be approved since its user id is lost.
 2022-11-18 16:04:02 -05:00
Hypolite Petovan c07af2a0ed
Merge pull request #12202 from Schnoop/develop 
Add meta tag to attachment to show images in mastodon app.
 2022-11-18 14:44:05 -05:00
Schnoop 528e1661e4
Merge pull request #1 from Schnoop/Schnoop-patch-1 
Update main.js
 2022-11-18 20:08:10 +01:00
Schnoop 565ade02a4
Update main.js 
Revert trailing slash changes as this will lead to wrong urls.
 2022-11-18 20:07:46 +01:00
Schnoop 99c319734d
Merge branch 'friendica:develop' into develop 2022-11-18 19:50:24 +01:00
Thorsten 45badbf0f8 Changed ddev config to match supported PHP version. 2022-11-18 19:43:47 +01:00
Thorsten 2edbd1a3e2 Reverted some changes that won't work with PHP7.3 2022-11-18 19:41:56 +01:00
Hypolite Petovan 061653a9a5
Merge pull request #12205 from tobiasd/20221118-de 
DE translation update
 2022-11-18 10:30:18 -05:00
Tobias Diekershoff d7946dd985 DE translation update 2022-11-18 16:11:07 +01:00
Thorsten 7a39be8270 DDEV and some PHP8.1 fixes. 2022-11-18 12:03:55 +01:00
Thorsten efaf84631d Merge branch 'develop' of github.com:Schnoop/friendica into develop 2022-11-18 10:03:09 +01:00
Thorsten 74b10708ae Add meta tag to attachment to show images in mastodon app. 2022-11-18 09:42:53 +01:00
Thorsten 8a71bdc1a0 Add meta tag to attachment to show images in mastodon app. 2022-11-18 09:38:02 +01:00
Hypolite Petovan e354f48765
Merge pull request #12200 from annando/ignore-view 
"View" activities are now ignored
 2022-11-17 15:28:34 -05:00
Michael cdbfa34066 "View" activities are now ignored 2022-11-17 20:01:32 +00:00
Philipp 19db2ab184
Merge pull request #12198 from MarekBenjamin/patch-1 
Update README.md
 2022-11-17 20:11:54 +01:00
MarekBenjamin d1abb690a0
Update README.md 
Removed "post on facebook" since Facebook add-ons are deprecated (https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector)
Changed preposition in  "(...) receive any content on Tumblr, Wordpress or RSS." to "receive any content from Tumblr, Wordpress or RSS."
 2022-11-17 19:35:27 +01:00
Philipp 944f4733be
Merge pull request #12196 from MrPetovan/bug/12182-icon-size 
Add global styles for .icon
 2022-11-17 07:01:48 +01:00
Hypolite Petovan 47ad922f9a Add global styles for .icon 
- Normalize user/contact profile pictures size
 2022-11-16 20:12:36 -05:00
Philipp fa675de710
Merge pull request #12194 from MrPetovan/bug/12193-contact_template 
Replace remaining references to contact_template.tpl by contact/entry.tpl
 2022-11-16 22:30:19 +01:00
Hypolite Petovan a6d96bf1b7 Replace remaining references to contact_template.tpl by contact/entry.tpl 2022-11-16 16:23:47 -05:00
Hypolite Petovan 293f147867
Merge pull request #12186 from nupplaphil/mod/editpost 
Move mod/editpost.php to src\Module\Post\Edit
 2022-11-16 16:14:07 -05:00
Philipp 81b21c4131
Revert "Remove geotag" 
This reverts commit 5dc9319b
 2022-11-16 21:20:24 +01:00
Philipp 5204d79dee
Merge pull request #12190 from annando/no-view 
Fix memory issue on displaying conversations
 2022-11-16 10:52:18 +01:00
Philipp 9621279572
Make PHP-CS happy ... 2022-11-16 10:49:12 +01:00
Philipp 12fb897f54
Adhere PHP-CS 2022-11-16 08:56:37 +01:00
Philipp e7fd4a4cd1
Remove legacy comments 2022-11-16 08:56:19 +01:00
Philipp 5dc9319bb2
Remove geotag 2022-11-16 08:50:57 +01:00
Philipp db7af4c45b
Remove jotnets 2022-11-16 08:49:48 +01:00
Michael ec92f7a81c Fix memory issue on displaying conversations 2022-11-16 04:57:46 +00:00
Philipp 09e01b9356
Replace $_SESSION 2022-11-15 22:52:23 +01:00
Philipp 01c2a775e4
Update messages.po 2022-11-15 22:34:31 +01:00
Philipp 00883c9dcb
Move mod/editpost.php to src\Module\Post\Edit 2022-11-15 22:32:46 +01:00
Philipp 53f3454874
Merge pull request #12184 from annando/duplicated-media 
This fixes duplicated media in quoted posts
 2022-11-15 21:17:19 +01:00
Hypolite Petovan 403b025b5d
Merge pull request #12179 from nupplaphil/mod/display 
Move mod/(update_)display.php to src\Module
 2022-11-15 15:14:17 -05:00
Michael 348156dbcf Simplify the check 2022-11-15 19:55:03 +00:00
Michael eca52627c1 This fixes duplicated media in quoted posts 2022-11-15 19:48:43 +00:00
Philipp 59c97234f8
PHP-CS and license .. 2022-11-15 20:15:25 +01:00
Philipp 584e7a7e6d
Remove trailing slash in update_ calls 2022-11-15 20:11:38 +01:00
Philipp eff7740a67
Address feedback 2022-11-15 19:53:53 +01:00
Michael Vogel 1a54fc2140
Merge pull request #12181 from MrPetovan/bug/warnings 
Address a couple of warnings
 2022-11-15 17:58:24 +01:00
Hypolite Petovan 952e6c688c Suppress warning when /phots route is used without a nickname 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1314964388
 2022-11-15 09:04:12 -05:00
Hypolite Petovan 3a7586e3f7 Fix wrong user table field name in Repository\Notify 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1314954594
 2022-11-15 09:03:43 -05:00
Philipp ba0b83b0b0
Make PHP-CS happy 2022-11-15 01:10:49 +01:00
Philipp 9d455a5d0b
Update messages.po 2022-11-15 01:00:29 +01:00
Philipp 3259bd17dc
Move mod/(update_)display.php to src\Module 2022-11-15 00:57:47 +01:00