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

2636 Commits

Author SHA1 Message Date
Tobias Diekershoff 09a44b3039
Merge pull request #6456 from annando/long-url 
This fixes a problem when the URL is too long
 2019-01-17 07:44:15 +01:00
Michael 98d44ce7c7 The "]" had been at the wrong place 2019-01-17 05:32:06 +00:00
Michael ce37e981cb This fixes a problem when the URL is too long 2019-01-16 22:34:57 +00:00
Michael fe0339dabe Fixing a bug, adding some logging 2019-01-16 22:19:41 +00:00
Michael c359c162a7 Issue 6282: Update the contact data regularly (including the network) 2019-01-16 21:39:56 +00:00
Michael ae2a8b796c Avoid a notice in HTTP signature check, preparation for authentication 2019-01-15 06:31:12 +00:00
Michael 9bec202232 Adding the date to signed get requests as well 2019-01-14 16:33:23 +00:00
Michael 2f2184cf12 Date check added for HTTP signatures 2019-01-14 16:03:13 +00:00
Hypolite Petovan 90e25faf44
Merge pull request #6447 from annando/peertube 
Enable communication with Peertube
 2019-01-14 08:40:42 -05:00
Hypolite Petovan 990bbea19d
Merge pull request #6446 from annando/approve 
Now storing the "manually approve" data / fix update routine
 2019-01-14 08:38:08 -05:00
Michael aa4aaf1971 Enable communication with Peertube 2019-01-14 12:10:11 +00:00
Michael 5554448162 Now storing the "manually approve" data / fix update routine 2019-01-14 06:36:08 +00:00
Hypolite Petovan 795268eb7a Fix undefined offset notices in Protocol\Email 2019-01-14 00:05:51 -05:00
Michael c1dec50248 Avoiding some notices 2019-01-13 18:03:13 +00:00
Michael 8b5b66838d Issue 6438: Avoid fatal error 2019-01-13 16:00:27 +00:00
Hypolite Petovan 72516191ef
Merge pull request #6435 from annando/nextcloud 
Making Friendica compatible to Nextcloud Social
 2019-01-13 07:57:37 -05:00
Michael 236c7718d3 Fixing some notice again 2019-01-13 09:44:04 +00:00
Michael d113ccd93c Making Friendica compatible to Nextcloud Social 2019-01-13 09:38:01 +00:00
Michael 297a549590 Issue 6282: Update the forum status of contacts 2019-01-12 16:09:27 +00:00
Hypolite Petovan c4038e7af1
Merge pull request #6432 from annando/deleted-pending 
Don't show deleted contacts, changed "pending" behaviour
 2019-01-12 09:08:31 -05:00
Michael 28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00:00
Michael Vogel 2fbf1d54e2
Merge pull request #6428 from MrPetovan/bug/5148-get-cookies-from-safari-2 
Add variable query parameter to stylesheet URL for iOS Safari
 2019-01-12 09:33:35 +01:00
Michael Vogel cd3ab5ddc9
Merge pull request #6426 from MrPetovan/bug/6425-fix-infinite-scroll-url 
Fix infinite scroll base URL
 2019-01-12 09:25:06 +01:00
Hypolite Petovan a9b8eb4d56 Refactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist 2019-01-12 02:26:16 -05:00
Hypolite Petovan abf20368b0 Rework Profile::getThemeUid to ignore query parameter and include $a->profile_uid 
- Use new version in frio default.php file
- Use new version in Theme::getStylesheetPath
 2019-01-12 02:23:01 -05:00
Hypolite Petovan 6d1bc974a0 Add time parameter for iOS Safari to stylesheet URL 2019-01-11 20:49:16 -05:00
Hypolite Petovan f6092ebebb Add App->mobileDetect property 2019-01-11 20:48:29 -05:00
Hypolite Petovan ffcd9fb78d
Revert "Change stylesheet path name for mobile browsers" 2019-01-11 20:01:42 -05:00
Hypolite Petovan c5632a061f Fix output of Pager->getBaseQueryString 2019-01-11 19:30:33 -05:00
Hypolite Petovan eaea24f98b Remove Pager->ensureQueryParameter 2019-01-11 19:29:55 -05:00
Hypolite Petovan ec8b313c2d Replace Pager->ensureQueryParameter by Strings::ensureQueryParameter 2019-01-11 19:29:39 -05:00
Hypolite Petovan a20fa6a3a9 Add ensureQueryParameter method to Util\Strings 2019-01-11 19:27:56 -05:00
Michael e3576fa0bd Don't accept private answers to public parents 2019-01-10 22:51:03 +00:00
Tobias Diekershoff 59f701d5a9
Merge pull request #6419 from annando/unfollow 
Unfollow should now work with Pleroma again
 2019-01-10 11:08:23 +01:00
Tobias Diekershoff 6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules 
Add password rules
 2019-01-10 10:37:32 +01:00
Michael 1a702359f1 Unfollow should now work with Pleroma again 2019-01-10 07:24:12 +00:00
Hypolite Petovan cd48b7a68e
Merge pull request #6415 from annando/pending 
Don't show deleted contacts, set new AP contacts as "pending" until accepted
 2019-01-09 18:40:30 -05:00
Michael defc89fa9a Fixing the Accepting of contact requests 2019-01-09 22:30:26 +00:00
Michael Vogel 4f5fb40202
Merge pull request #6414 from MrPetovan/bug/4609-add-support-hubzilla-forum-link 
Add support for Hubzilla forum mentions (starting with !)
 2019-01-09 20:25:28 +01:00
Michael 6ae6a8a983 Don't show deleted contacts, set new AP contacts as "pending" until they are accepted 2019-01-09 13:23:11 +00:00
Hypolite Petovan b7b7b1b664 Add support for Hubzilla forum mentions (starting with !) 2019-01-08 20:56:01 -05:00
Hypolite Petovan 3b80f335fa
Merge pull request #6412 from annando/issue-6149 
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
 2019-01-08 09:17:05 -05:00
Michael 8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
Hypolite Petovan e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
Hypolite Petovan 4bf2701912
Merge pull request #6400 from annando/issue-6394 
Issue 6394: The contact location has to be BBEncoded
 2019-01-06 16:37:43 -05:00
Michael 7e19506435 Issue 6394: The contact location has to be BBEncoded 2019-01-06 21:04:10 +00:00
Michael Vogel b7bf335e94
Merge pull request #6380 from MrPetovan/bug/5148-get-cookies-from-safari 
Change stylesheet path name for mobile browsers
 2019-01-06 20:37:33 +01:00
Michael 9a4fc0f8bd Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems 2019-01-06 07:43:11 +00:00
Michael 3022abe74c Reset the "forum" and "prv" field 2019-01-05 23:02:58 +00:00
Michael e88734e218 Periodically update contacts / update the contact type 2019-01-05 22:04:32 +00:00
Hypolite Petovan cb635fb3cb Change stylesheet path name for mobile browsers 2019-01-04 20:18:31 -05:00
Hypolite Petovan fc87c51bb4
Merge pull request #6377 from annando/ostatus-notice 
Prevent a notice ... again
 2019-01-04 11:28:31 -05:00
Michael d8d5031935 Prevent a notice ... again 2019-01-04 15:34:53 +00:00
Hypolite Petovan 5e1ceb57de Escape global namespaced get_app() calls 
- Add deprecated status
 2019-01-03 21:27:36 -05:00
Hypolite Petovan e86b8ef782 Use nickname instead of email for Login Name 2019-01-03 20:42:29 -05:00
rabuzarus 67a8f9dbd4 Bugfix - the remote user also has magicLinks again 2019-01-02 17:47:53 +01:00
Hypolite Petovan 61664ee659 Update usages of User::updatePassword 
- Add password rules in mod/settings display
 2019-01-01 01:15:52 -05:00
Hypolite Petovan 58adb5b431 Add password checks in User::updatePassword 2019-01-01 01:15:51 -05:00
Hypolite Petovan 909c9d0309 Increase auto-generated passwords to 12 chars + leading capital 2019-01-01 01:14:45 -05:00
Hypolite Petovan 961f737f36 Use User::updatePasswordHashed directly when re-hashing a password 2019-01-01 01:14:44 -05:00
Tobias Diekershoff e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications 
Clear private message notifications
 2018-12-31 08:21:55 +01:00
Tobias Diekershoff 034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings 
Fix site theme settings modal form
 2018-12-30 10:35:44 +01:00
Hypolite Petovan 3095d4aa70 Add parent to private message notifications 
- Fix item id for Diaspora private message notification
 2018-12-30 01:10:10 -05:00
Hypolite Petovan 5abc22f6c5 Replace q() with DBA methods, fix code style 
- Remove unused variables
- Fix doc block
- Fix indentation
 2018-12-30 01:08:51 -05:00
Hypolite Petovan 979230da27 Allow theme setting in module 
- Restore theme name caching
 2018-12-29 15:40:04 -05:00
Hypolite Petovan 166b8ad440
Merge pull request #6342 from annando/notices 
Warning and notice fixed
 2018-12-29 12:16:37 -05:00
Tobias Diekershoff 7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array 
Remove util/ folder
 2018-12-29 11:43:55 +01:00
Michael fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
Hypolite Petovan 37c7a18d00 Replace latin-1 by latin1 in charset detection 
- Simplify conditional for charset conversion
 2018-12-29 00:43:00 -05:00
Michael Vogel 94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile 
Rework mod/match and mod/msearch
 2018-12-27 18:04:06 +01:00
Hypolite Petovan fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
Hypolite Petovan 620395378e Normalize uses of Strings::formatNetworkName to $network_link 
- Unescape HTML template variable $network_link
 2018-12-26 11:11:38 -05:00
Hypolite Petovan 5b74f066f2 Fix formatting in Util\Strings 2018-12-26 11:02:50 -05:00
Michael f274357ad6 Issue-6329: Prevent double encoding 2018-12-26 11:21:42 +00:00
Hypolite Petovan 761e94d134 Remove redundant htmlentities/htmlspecialchars 2018-12-25 11:37:57 -05:00
Hypolite Petovan 56d612b2f0
Merge pull request #6323 from annando/issue-6316 
Issue 6316: Do not double encode / Avoid notice
 2018-12-25 11:26:54 -05:00
Michael ccb9be8f28 Issue 6316: Do not double encode / Avoid notice 2018-12-25 12:12:59 +00:00
Hypolite Petovan a8b0aa8c8d Normalize expected format for event fields summary, desc and location 
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
 2018-12-24 23:00:35 -05:00
Hypolite Petovan c9c9fc3a96 Code cleanup in events 
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
 2018-12-24 23:00:35 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Michael c43bd890a5 The "Follow" activity shouldn't be send to Diaspora 2018-12-24 14:50:21 +00:00
Hypolite Petovan 1938ec3ebe Rework mod/match 
- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link
 2018-12-24 00:56:14 -05:00
Hypolite Petovan a16e8d97f6
Merge pull request #6312 from annando/check-json 
Checks if JSON is enabled
 2018-12-23 18:53:32 -05:00
Hypolite Petovan d53ff9c34d Add support for FULLTEXT indices in Database\DBStructure 2018-12-23 15:40:49 -05:00
Hypolite Petovan 48a356dba2 Fix formatting in Database\DBStructure 2018-12-23 15:32:23 -05:00
Hypolite Petovan 2af0542eaa
Merge pull request #6310 from annando/issue-6122 
Handles issue 6122 - the self contact will be updated when invalid
 2018-12-22 18:15:02 -05:00
Michael 732308ce6d Hopefully this fixes the tests again 2018-12-22 22:04:47 +00:00
Michael 439afc89b6 Checks if JSON is enabled 2018-12-22 20:40:00 +00:00
Michael faa30adf68 Handles issue 6122 - the self contact will be updated when it seems to be invalid 2018-12-22 20:12:32 +00:00
Michael c06f7ad11e The curl result is an object, not an array 2018-12-22 17:00:28 +00:00
Jeroen De Meerleer 2d9f4b560f Too fast 2018-12-22 17:23:18 +01:00
Jeroen De Meerleer 27eddfee27 Fixed bug 
$curlResult is not an array
 2018-12-22 17:19:34 +01:00
Hypolite Petovan 21a055f670
Merge branch '2018.12-rc' into task/6208-escape-html-true 2018-12-18 08:36:36 -05:00
Hypolite Petovan f413abb82b
Merge pull request #6277 from annando/nextcloud-ap 
Fix ActivityPub with Nextcloud
 2018-12-17 15:28:22 -05:00
Michael c485ca6f06 Fix ActivityPub with Nextcloud 2018-12-17 20:13:56 +00:00
Hypolite Petovan faff105f86
Fix feed display in browser when using emojis 2018-12-16 22:58:43 -05:00
Hypolite Petovan 6d90d35d25 Enable Smarty default HTML escaping 2018-12-16 22:38:30 -05:00
Hypolite Petovan 38109665c7 Various improvements/fixes 
- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
 2018-12-16 22:38:30 -05:00
Hypolite Petovan b6e1571b1e Fix various notices 2018-12-15 04:32:47 -05:00
Hypolite Petovan 607f7daf51 Add PHP 5 compatible recursive dirname() 2018-12-15 02:46:08 -05:00
Michael b08e5ab41b Issue 6259: Suppress contact group widget only on network page 2018-12-14 06:33:57 +00:00
Hypolite Petovan 5a802bc474
Merge pull request #6261 from annando/fix-magic 
Fix for magic auth
 2018-12-13 17:03:44 -05:00
Michael 9ea0864394 Some added to-do 2018-12-13 21:41:19 +00:00
Michael 705211100b Fix for magic auth 2018-12-13 21:19:57 +00:00
Michael Vogel e2f1fd1efb
Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote 
Add check for relationship with remote user for connect display
 2018-12-13 22:18:24 +01:00
Hypolite Petovan 7c11194a2c Use Contact::isFollower instead 2018-12-13 11:53:15 -05:00
Hypolite Petovan 096093766a Add check for relationship with remote user for connect display 2018-12-12 22:22:43 -05:00
Michael cced018825 Possibly fix a memory issue with large posts 2018-12-11 18:48:33 +00:00
Michael f2e2066d33 Non public content is now displayed again to visitors. 2018-12-09 13:09:49 +00:00
Michael 8fbe0d46e9 Fix for remote authentication when visiting contact's pages 2018-12-08 20:28:01 +00:00
Michael a041c7c0fa Issue 6236: Handle account removal messages with very low priority 2018-12-06 10:04:16 +00:00
Michael d52d4ca355 Avoids the notice "array_merge(): Argument #1 is not an array" 2018-12-05 06:01:58 +00:00
Michael 95c150ef28 Added to-do 2018-12-04 14:20:25 +00:00
Michael 5c20f21dd8 Improved fallback when the probing fails 2018-12-04 14:17:55 +00:00
Michael 491fc5f78a Issue 6168: "redir" now mostly use OWA 2018-12-04 07:12:55 +00:00
Hypolite Petovan 89f5a9c550
Merge pull request #6231 from annando/notice 
Fix for notice
 2018-12-03 15:08:36 -05:00
Michael 6733b77b73 Make it simpler 2018-12-03 19:29:06 +00:00
Michael d76003797a Fix for notice 2018-12-03 16:32:03 +00:00
Michael fb68b50139 Fix for exceptions on external redirects 2018-12-03 15:59:53 +00:00
Hypolite Petovan bfe809f60d
Merge pull request #6229 from annando/issue-5911 
Issue 5911: Fix for fetching the correct user
 2018-12-03 07:40:14 -05:00
Michael 51bce11b69 Issue 5911: Fix for fetching the correct user 2018-12-03 06:16:25 +00:00
Hypolite Petovan f7c9ed5108 Add DB connection status check in Update::check 2018-12-02 20:57:41 -05:00
Hypolite Petovan 3a9db3f637
Merge pull request #6222 from annando/long-uri 
Avoid problems with too long URI (should only happen with some RSS feeds)
 2018-12-02 19:18:45 -05:00
Hypolite Petovan 57695d48b4
Merge pull request #6223 from annando/ap-dba-error 
Fix for "Unknown column 'guid' in 'field list'"
 2018-12-02 19:18:36 -05:00
Hypolite Petovan 69a73678eb
Merge pull request #6226 from annando/oembed-array 
Ignoring OEmbed array values
 2018-12-02 19:16:13 -05:00
Michael 58b614bea1 Ignoring OEmbed array values 2018-12-02 21:36:46 +00:00
Hypolite Petovan c5558cc459
Merge pull request #6224 from annando/dba-delete-contact 
Avoid duplicated contacts, improve contact deletion, avoid memory issues
 2018-12-02 16:16:59 -05:00
Hypolite Petovan 5e60fa8210
Merge pull request #6225 from annando/http-error 
Using the standard function to return http errors
 2018-12-02 16:15:04 -05:00
Michael 649228cd3d More detailled HTTP error explanations 2018-12-02 20:10:53 +00:00
Michael 066a040cc7 Avoid duplicated contacts, improve contact deletion, avoid memory issues 2018-12-02 16:25:25 +00:00
Hypolite Petovan 924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all 2018-12-02 10:24:50 -05:00
Michael 2fd65503da Avoid database error that the field "guid" is not present in the contact table 2018-12-02 15:01:08 +00:00
Michael 3d14977b73 Avoid problems with too long URI (should only happen some RSS feeds) 2018-12-02 14:49:28 +00:00
Michael Vogel 5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x 
Remove x()
 2018-12-01 23:40:51 +01:00
Hypolite Petovan f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129 
Fixing permanent deletion counter
 2018-12-01 08:19:38 -05:00
AndyHee 14b4fac818 Fixing permanent deletion counter 2018-12-01 13:21:54 +07:00
Hypolite Petovan 458981f75c Replace x() by isset(), !empty() or defaults() 
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
 2018-11-30 09:06:22 -05:00
Michael 4a1f9a9bdd Improved url detection for redirects 2018-11-30 11:27:17 +00:00
Hypolite Petovan 663ba65f17 Remove "all" value for nets parameter 2018-11-30 05:43:07 -05:00
Hypolite Petovan 11a0dd4d4c Remove util directory 2018-11-28 23:10:21 -05:00
Hypolite Petovan e02295e8e8 Move testargs to bin 2018-11-28 23:10:05 -05:00
Hypolite Petovan 9102a37b37 Move master translation file away from util 
- Rewrite translation documentation
- Delete unused util/strings.php
- Updated references to util/messages.po and util/strings.php
 2018-11-28 22:57:55 -05:00
Jonny Tischbein f0d290eb18 Fix Term exists check on link which isn't stored for hashtags anymore to check on term. 2018-11-27 22:54:16 +01:00
Michael Vogel ea4e772b1e
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array 
Move config to PHP array
 2018-11-26 23:57:56 +01:00
Michael 4f9f86e310 We are now escaping many template fields 2018-11-25 18:56:26 +00:00
Hypolite Petovan c964e193b9 Replace *.ini.php by *.config.php in comments 2018-11-25 01:44:51 -05:00
Hypolite Petovan 98d90e131d Update install to generate config/local.config.php 2018-11-25 01:44:09 -05:00
Hypolite Petovan d6eb1135e5 Add support for PHP array config files 
- Add new base config files
- Remove useless DIRECTORY_SEPARATOR instances
 2018-11-25 01:42:05 -05:00
Hypolite Petovan 6eb6cc94c7 Move config/dbstructure.php to config/dbstructure.config.php 2018-11-25 01:14:44 -05:00
Hypolite Petovan 92556e5161 Fix user account removal expiration delay 2018-11-24 20:59:18 -05:00