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

4539 Commits

Author SHA1 Message Date
Michael 838a233bfc Handling reshares of Friendica posts with titles via Diaspora 2019-12-05 05:11:14 +00:00
Michael b9619ee89a Put the title in the body 2019-12-04 23:49:07 +00:00
Michael 22c66e1811 Add data for shared posts from the original 2019-12-04 22:57:09 +00:00
Tobias Diekershoff 9a4240c3b2
Merge pull request #7898 from annando/ap-announce 
Make quoted announces look better / more announce improvements
 2019-12-04 11:24:42 +01:00
Michael 8f4f3e00e2 Return more data in the announce object 2019-12-04 09:36:46 +00:00
Michael 276d6fddd1 Function renamed - we don't return an object 2019-12-04 09:15:03 +00:00
Michael ef3664e6d4 Check if reshared item is an AP item 2019-12-04 08:08:48 +00:00
Michael abed3ba906 Remove unused function 2019-12-04 07:13:29 +00:00
Michael d34052b332 Make quoted announces look better / more announce improvements 2019-12-04 07:02:39 +00:00
Hypolite Petovan f989c331a3 Fix warnings about unexpected parameter array values type in ACL::getFullSelectorHTML 
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-560503744
 2019-12-03 06:59:51 -05:00
Michael 3d701dd459 Only show the difference between posting and receive date when there is a difference 2019-12-03 07:23:01 +00:00
Michael fd706cf9a7 Group selection: Respect "pubmail" and ignore atchived or blocked contacts 2019-12-02 23:04:11 +00:00
Philipp 6531819971
Merge pull request #7884 from MrPetovan/bug/7834-ignore-reload 
Restore post reload after (un)ignore
 2019-12-02 09:40:31 +01:00
Hypolite Petovan 01b81f7bba
Merge pull request #7885 from nupplaphil/bug/7881_allowed_themes 
Themes are now saved just once
 2019-12-01 08:12:20 -05:00
nupplaPhil 7ebd5e6b15
Themese are now saved just once 2019-12-01 08:43:50 +01:00
Hypolite Petovan c3d88aca39 Update the return value of Item\Ignore to integer 
- Array is unnecessary
 2019-11-30 23:15:58 -05:00
Hypolite Petovan d3c45f9186 Update type hint of System::jsonExit parameter to mixed 
- Output isn't necessarily an array
 2019-11-30 23:15:28 -05:00
Hypolite Petovan 461f7f4bb0 Assume hidewall key may be missing in ACL::getFullSelectorHTML 
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-559974588
 2019-11-30 10:45:47 -05:00
Hypolite Petovan 3a7ef7893f Fix typo in ACL::getFullSelectorHTML 2019-11-29 15:55:52 -05:00
Hypolite Petovan 0ff4381305 Ensure the existence of expected default permission keys in ACL::getFullSelectorHTML 
- Addresses https://sozialwolke.net/display/703b8751-145d-e11f-a923-98e999239905
 2019-11-29 11:39:49 -05:00
Hypolite Petovan 25194b58b8 Initialize class members in App\Page 
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-559680658
 2019-11-29 11:33:48 -05:00
Tobias Diekershoff 0191f5242b
Merge pull request #7877 from annando/show-received 
Show the received date along with the creation date of posts
 2019-11-29 12:42:03 +01:00
Michael 02875df596 Show the received date along with the creation date of posts 2019-11-29 06:24:02 +00:00
Michael Vogel 2f2480d88d
Merge pull request #7876 from MrPetovan/task/7308-backport-compose-acl 
Generalize the Compose ACL to the whole site
 2019-11-28 21:24:20 +01:00
Hypolite Petovan 8f4f6899dd Update composer module to use the new ACL selector 
- Remove ACL-specific code from compose-footer
- Move compose-footer template remaining content to compose.js
 2019-11-28 12:54:56 -05:00
Hypolite Petovan ae3d4f63a3 Use visibility tags input for the default ACL selector 
- Move friendica-tagsinput to default view folder
- Update all references to ACL::getFullSelectorHTML
- Fix theme-specific issues with the new ACL
 2019-11-28 12:54:53 -05:00
Hypolite Petovan 11da7f4095 Add new ACL::getContactListByUserId and ACL::getGroupListByUserId methods 2019-11-28 12:33:00 -05:00
Hypolite Petovan 440d3eb9c4 Simplify Theme::getPathForfile to expand its uses 2019-11-28 12:27:16 -05:00
Michael e1f9dd5bb5 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-28 16:10:18 +00:00
Tobias Diekershoff dba41da7e4
Merge pull request #7874 from annando/mail-post 
Only transfer posts via mail
 2019-11-28 16:30:31 +01:00
Michael 0979daddac Modules separated 2019-11-28 07:07:34 +00:00
Michael 7ffd6d0bc7 Attached photos from pixelfed are now added to the body again 2019-11-28 06:34:35 +00:00
Michael 22b89df348 Removed test logging 2019-11-27 22:00:43 +00:00
Michael a6a79d9c7e Only transfer posts via mail 2019-11-27 21:59:11 +00:00
Michael 98d10b7253 Merge remote-tracking branch 'upstream/develop' into nodeinfo 2019-11-27 08:18:03 +00:00
Michael cb37588375 We can always send via SMTP, receiving mails is via IMAP 2019-11-27 07:44:59 +00:00
Michael ae306ea7de rss is inbound 2019-11-27 07:38:57 +00:00
Michael 054a111f3c Twitter is also inbound 2019-11-27 07:36:24 +00:00
Michael a26689f69c remove unused variable 2019-11-27 07:32:46 +00:00
Michael 890bbfa1a7 We now support nodeinfo version 2 / basic nodeinfo data is always enabled 2019-11-27 07:25:54 +00:00
Michael 1531cad596 Fix a notice in gcontact.php 2019-11-26 19:03:21 +00:00
Michael 06a6774a7b Notice/warning in event fixed 2019-11-25 11:16:55 +00:00
Michael 67a0e97f7c Avoid contact update for non federated networks 2019-11-25 08:49:14 +00:00
Michael fdaac8a681 Add "discourse" as protocol 2019-11-24 20:06:47 +00:00
Michael 99945f21cb Only read undeleted mails / improved structure 2019-11-23 20:02:21 +00:00
Michael 84244b1450 Now it works 2019-11-23 12:54:39 +00:00
Michael fda30bbb1f Removed test data 2019-11-23 11:44:25 +00:00
Michael e220698ea1 E-Mail import: The item is now provided to the hook 2019-11-23 11:42:03 +00:00
Hypolite Petovan 17c934aa07
Merge pull request #7859 from annando/mail-reply-to 
Use the "reply-to" header of the original post when answering via mail
 2019-11-22 23:33:10 -05:00
Michael 2dcf6d9e2b Now using the correct function call ... 2019-11-23 04:31:40 +00:00
Michael 37bdafcc96 Use the "reply-to" header of the original post when answering via mail 2019-11-22 22:15:04 +00:00
Hypolite Petovan 20dc285f9d
Merge pull request #7858 from annando/diaspora-date 
Don't use the creation date when transmitting to Diaspora
 2019-11-22 15:36:27 -05:00
Michael Vogel f0ffc6df38 Don't use the creation date when transmitting to Diaspora 2019-11-22 21:24:02 +01:00
Michael e539c74fa4 Removed the word "test" 2019-11-22 19:47:35 +00:00
Michael 5bf8c895a9 Improvement for PR 7854: Avoid leaking of BCC header data 2019-11-22 18:39:51 +00:00
Michael d8da580869 Fix mail delivery via AP when the contact is hidden 2019-11-22 08:01:23 +00:00
Michael d3e12c58e2 Fix some notices/warnings again 2019-11-21 22:40:54 +00:00
Michael ade926afc6 Storing the mail header in the item 2019-11-21 15:28:18 +00:00
Michael a6ae6a83b8 Added hooks for the email fetch process 2019-11-20 20:57:34 +00:00
Michael 7c1f8a0597 Renamed config name 2019-11-19 16:31:22 +00:00
Michael fa876d770e Make the automatic title appending optional 2019-11-19 12:59:21 +00:00
Michael Vogel 100dfea524 Fix further notes and warnings 2019-11-19 11:02:35 +01:00
Michael Vogel 287c55722e Show title for posts with attached pages 2019-11-18 19:52:00 +01:00
Michael Vogel 80917018e9 Fix warnings 2019-11-18 19:09:21 +01:00
Michael Vogel 0733ae6aae Improve the look of fetched feeds and the BBCode processing of attachments 2019-11-18 13:29:27 +01:00
Michael 8644d300d0 Readded empty line 2019-11-17 18:12:20 +00:00
Michael 28ca0d6fab AP: Remove the link description from the "rich html" and adds it to the attachment 2019-11-17 18:10:12 +00:00
Michael Vogel a3b7f08f78 Don't guess the site info / restrict the description length 2019-11-15 14:28:42 +01:00
Michael fa57fead2e AP: Read different content types for the source and the content 2019-11-13 16:22:20 +00:00
Michael 85b3c880ef Fix: Mentions in the HTML part of the "contentMap" now are links 2019-11-13 06:43:36 +00:00
Michael 1fb485af1c Use the contentMap to transmit additional content encodings 2019-11-12 20:22:35 +00:00
Michael 8997361609 Better function name 2019-11-11 23:13:36 +00:00
Michael 1b5fa55bdc Fix image links with descriptions in API and AP transmission 2019-11-11 22:37:50 +00:00
Hypolite Petovan babcd24412
[hotfix] Fix syntax error in Module\Register 
- Prevents registration
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-552070076
 2019-11-09 01:09:26 -05:00
Michael bdacda32ba Pinning: Missing file added 2019-11-09 03:17:18 +00:00
Michael fc94cad5f2 Pinned posts now work for visitors in the intended way 2019-11-08 06:52:44 +00:00
Hypolite Petovan 2200996d44
[hotfix] Prevent fatal error in profile with pinned posts 
- `$a->profile['profile_uid']` may not be set
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-551255174
 2019-11-07 15:51:05 -05:00
Hypolite Petovan b8f2252a7f
Merge pull request #7823 from annando/pin 
We can now pin posts
 2019-11-07 15:10:03 -05:00
Michael 806e6a230e Added description, removed sorting 2019-11-07 07:41:54 +00:00
Michael 91ad7936f3 Only sort the profile after pinned 2019-11-07 07:39:50 +00:00
Michael ed58af25a5 show pinned items 2019-11-07 06:53:18 +00:00
Michael cf56992444 We can now pin our own posts 2019-11-07 05:39:15 +00:00
Hypolite Petovan 134d6d18f9 Pass Router parameter to module content method 2019-11-06 22:35:28 -05:00
Michael 48ab31f451 Fix a notice 2019-11-06 19:17:40 +00:00
Michael 02c43f283e Changed exceptions 2019-11-05 22:28:12 +00:00
Michael 7adc3460b3 Exceptions 2019-11-05 22:13:33 +00:00
Michael a5b5f0e455 removed space 2019-11-05 22:03:02 +00:00
Michael aecac2cb54 Readded removed comments 2019-11-05 22:01:45 +00:00
Michael 8c03bdada9 parameters now are having a default value and are optional 2019-11-05 21:48:54 +00:00
Michael bc2694bf7f Redo some changes 2019-11-05 20:28:35 +00:00
Michael bd62d548db Added parameters 2019-11-05 20:22:54 +00:00
Michael abe6724629 Added parameter to rawContent 2019-11-05 19:16:26 +00:00
Michael 30e02beb46 New module to pin posts 2019-11-05 19:16:11 +00:00
Michael 8720094b52 Pass the parameters from the router to the modules 2019-11-05 05:03:05 +00:00
Philipp 4daa3d37c1
Merge pull request #7812 from tobiasd/20191103-tarpid 
a hidden field for the registration form
 2019-11-04 11:03:54 +01:00
Philipp d0068170db
Merge pull request #7806 from tobiasd/20191102-csvexport 
added export and import of followed contacts to and from  CSV files
 2019-11-03 20:28:08 +01:00
Tobias Diekershoff b7ecc62cc8 move link generation into the loop 2019-11-03 19:57:32 +01:00
Tobias Diekershoff 1377d13055 ypot 2019-11-03 17:37:53 +01:00
Tobias Diekershoff 7ca202baad add a tar pid to the registration form 2019-11-03 17:05:06 +01:00
Tobias Diekershoff f45d39c05b create URL for categories 2019-11-03 16:34:58 +01:00
Tobias Diekershoff d3122c396e really there is no App 2019-11-03 15:53:32 +01:00
Tobias Diekershoff 9b03e2a564 there was no App 2019-11-03 15:07:29 +01:00
Michael 17704d2458 Diaspora: Use the standard function for adding a relationship 2019-11-03 13:35:41 +00:00
Tobias Diekershoff 0c873a0548 mv q() to DBA::select() 2019-11-03 14:03:11 +01:00
Tobias Diekershoff e5e87d546d we only need one contact export, D* _only_ exports the entire profile 2019-11-03 12:59:14 +01:00
Tobias Diekershoff 955a84a266 added export and import of followed contacts to and from CSV files 2019-11-03 00:12:16 +01:00
Michael 6f9302f389 Another duplicated "use" removed 2019-11-02 21:29:16 +00:00
Michael 04c889270b Removed duplicated "use system" 2019-11-02 21:24:22 +00:00
Michael Vogel 6ba7b5961c
Merge pull request #7798 from MrPetovan/task/rework-photo-functions 
Rework photo functions
 2019-11-02 21:20:38 +01:00
Hypolite Petovan 50a2e7001e Replace last instance of local_user() used to guess authentication status in Module/Contact/Hovercard 2019-11-02 12:48:04 -04:00
Hypolite Petovan ff27f45cb9 Move mod/hovercard to src/Module/Contact/Hovercard 
- Rework hovercard.js to remove JS template interpolation
- Remove template/json output from Module/Contact/Hovercard
 2019-11-02 12:48:03 -04:00
Hypolite Petovan 5cd8cb7134 Add unfollow link to output of Contact::photoMenu 
- Add rel and pending keys to output of Contact::getDetailsByURL
- Add rel and pending keys to output of Contact::getDetailsByAddr
 2019-11-02 12:48:03 -04:00
Hypolite Petovan b8a22de2d2
Merge pull request #7800 from annando/manually-improve 
AP: Respect "manually approve" during contact request
 2019-11-02 12:45:43 -04:00
Michael 9461446374 Respect "manually-improve" during contact request 2019-11-02 16:24:54 +00:00
Michael e27ebaee48 Respect "manually improve" during contact request 2019-11-02 16:20:17 +00:00
Hypolite Petovan dca1b8b580 Add URL decoding to query string in App\Arguments 
- Slashes were stored url encoded
 2019-11-02 07:48:45 -04:00
Hypolite Petovan 26b5de9a76 Rename Photo::newResource() result variable from $hash to $resource_id 2019-11-02 07:48:45 -04:00
Hypolite Petovan 03bf1dcbd3 Move Object\Image static methods to Util\Images 
- Optimize imports in modified files
 2019-11-02 07:48:45 -04:00
Hypolite Petovan b543ee8ac7
Merge pull request #7726 from tobiasd/20191010-uexport 
move uexport module to src
 2019-11-02 07:46:57 -04:00
Tobias Diekershoff 8bea9e7523 mv URL path uexport -> userexport 2019-11-02 12:44:46 +01:00
Tobias Diekershoff 34932e12bf mv q() to DBA::p() 2019-11-02 12:12:29 +01:00
Tobias Diekershoff 15cdfdd414 mv Uexport to UserExport 2019-11-02 11:36:31 +01:00
Tobias Diekershoff 048b693fbf some more change requests 2019-11-02 11:24:46 +01:00
Steffen K9 7d51d45c17
Changing asort() to usort() 2019-11-02 03:44:54 +01:00
Steffen K9 fd5c122667
Added asort() to the saved folders widget 2019-11-01 22:22:52 +01:00
Hypolite Petovan 41261ba7e1
Merge pull request #7785 from nupplaphil/bug/7676-is_file_warning 
Fix wrong check for logfile in admin summary
 2019-11-01 11:06:52 -04:00
Philipp Holzer f8e43ddf8d
rename developer to debug :-) 2019-11-01 15:59:00 +01:00
Philipp Holzer f4ad82bcfb
make ACLFormatter::expand() nullable and return an empty array 
- optimize tests
 2019-11-01 15:43:16 +01:00
Philipp Holzer aa7be41728
Fix ACLFormatterTest 
- Add nullable to expand() function again
- Add angle bracket support to toString()
 2019-11-01 14:13:29 +01:00
Michael 44cc750f79 Some more warnings removed 2019-10-31 07:33:25 +00:00
Michael 422f0cbdbc Solve warning 2019-10-30 09:44:07 +00:00
Michael dc065eed42 Fix several warnings and errors 2019-10-30 06:50:20 +00:00
Hypolite Petovan d6ff89d7b4
Merge pull request #7769 from annando/issue-3229 
Changed OpenID registration
 2019-10-29 10:32:02 -04:00
Michael eb0d8c1ed0 Uswe default value 2019-10-29 13:26:54 +00:00
Tobias Diekershoff 5e55aa41cb
Merge pull request #7787 from annando/issue-7778 
Fix 7778: Don't return empty string in permissions
 2019-10-29 07:24:02 +01:00
Michael bef7eeed13 Fix 7778: Don't return empty string in permissions 2019-10-29 06:01:50 +00:00
Philipp Holzer dc4d3842e0
Fix wrong check for logfile in admin summary 2019-10-28 22:26:34 +01:00
Michael 8470fa70d3 Using "args" 2019-10-28 20:38:53 +00:00
Michael dd7070938b Use "http_build_query" 2019-10-28 19:34:09 +00:00
Philipp Holzer 3eda62bfa6
Check null for acl-fields 2019-10-28 18:16:10 +01:00
Michael bfbce16d0b Merge remote-tracking branch 'upstream/develop' into issue-3229 2019-10-28 13:50:06 +00:00
Philipp Holzer d9d71ea1e6
Wrong condition for home notifications 2019-10-28 00:01:35 +01:00
Michael 945e256b7b Possibly handle issue 7772 2019-10-27 18:36:04 +00:00
Michael 30a6231f11 Fix indentation 2019-10-27 17:45:43 +00:00
Michael 60eb6603bf (hopefully) fix preview issue with tags on Mastodon 2019-10-27 17:41:47 +00:00
Philipp Holzer 3465bd9f11
rename methods 2019-10-26 05:02:14 +02:00
Philipp Holzer fdc0236aa1
Fix arguments 2019-10-26 04:37:31 +02:00
Philipp Holzer a72e65a760
Adapt class structure 
- Introduce constants
- Add constructor parameters
- Add typehints
- Renamed fields more meaningful
- Renamed method names to match identifier
- Adjust PHP doc
- Add GetClass call at used places
 2019-10-26 04:03:27 +02:00
Philipp Holzer 1f368d469f
Move Friendica\Core\NotificationsManager to Friendica\Model\Notify 2019-10-26 02:01:46 +02:00
Hypolite Petovan b632114b12
Merge pull request #7774 from annando/img-title 
Images: Show the description as title
 2019-10-25 19:29:55 -04:00