Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-27 08:02:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
26183 commits 3 branches 64 tags 241 MiB
Commit graph

4941 commits

Author SHA1 Message Date
Michael
4e77321be8 Replaced all preg calls in the calls with the new function 2019-12-05 06:42:10 +00:00
Michael
e435102089 Added logging, fixed indentation, call it from DFRN as well 2019-12-05 05:28:28 +00:00
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
Michael
9f86465fb9 Images: Show the description as title 2019-10-25 23:23:38 +00:00
Philipp
b34afa990b
Merge pull request #7767 from MrPetovan/bug/fatal-errors 
Expect outbox->first to be a Link structure in Model\GContact
 2019-10-25 08:46:42 +02:00
Philipp Holzer
7343ee5108
Move Namespace of ActivityNamespace 2019-10-25 00:41:48 +02:00
Philipp Holzer
dc2858938d
Renamed to ActivityNamespace 2019-10-25 00:32:35 +02:00
Philipp Holzer
3897c74deb
Add docs 2019-10-25 00:10:20 +02:00
Michael
aca701bef8 Changed OpenID registration 2019-10-24 20:23:26 +00:00
Philipp Holzer
a83dfc11a0
Fixing https://github.com/friendica/friendica/pull/7759#discussion_r337102107 2019-10-24 21:43:20 +02:00
Philipp Holzer
2fba7ed477
Rename namespace 2019-10-24 21:40:13 +02:00
Philipp Holzer
07cea24430
Move Activity/Namespaces defines to constants 2019-10-24 21:40:12 +02:00
Hypolite Petovan
ee1954f294
Merge pull request #7762 from nupplaphil/task/mod_ignored 
move mod/ignored to src/Module/Item/Ignored
 2019-10-24 12:04:50 -04:00
Philipp Holzer
062e472314
Rename route '/ignored/{iid}' to '/item/ignore/{iid}' 2019-10-24 17:18:29 +02:00
Hypolite Petovan
b0987f637c Expect outbox->first to be a Link structure in Model\GContact 
- See https://www.w3.org/TR/activitystreams-vocabulary/#dfn-first
- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-545300597
 2019-10-24 08:47:00 -04:00
Philipp Holzer
5aa73afa7e
Rename module class name 2019-10-24 09:09:47 +02:00
Hypolite Petovan
9f460c6797
Merge pull request #7765 from nupplaphil/task/move_text 
Move include/text.php to class structure
 2019-10-23 15:57:01 -04:00
Philipp Holzer
c9e1098dd2
Adapt naming convention 2019-10-23 21:39:00 +02:00
Philipp Holzer
dba2d574b1
Adapt because of feedback 2019-10-23 21:29:17 +02:00
Philipp Holzer
db25f5b6ca
Add jsonExit() and fix UID issue 2019-10-23 16:24:19 +02:00
Philipp Holzer
edf006905b
Move (last) get_cats_and_terms to Content\Item::determineCategoriesTerms() 
- Added incomplete test
 2019-10-23 02:48:46 +02:00
Philipp Holzer
ad67fd3aa8
Move is_a_date_arg to DateTimeFormat::isYearMonth 
- Improved functionality
- Added tests
 2019-10-23 02:39:28 +02:00
Philipp Holzer
52c42491c4
Move activity_match() to Protocol\Activity::match() 
- With tests
 2019-10-23 02:05:11 +02:00
Philipp Holzer
9e94e8b48c
Remove function prepare_text and use BBCode::convert() instead 2019-10-23 00:58:13 +02:00
Philipp Holzer
5843a80b6c
Move perms2str to ACLFormatter::aclToString() 
- including new tests
 2019-10-23 00:54:34 +02:00
Philipp Holzer
f65f7f11c3
Move expand_acl to ACLFormatter::expand() 
- including tests
 2019-10-23 00:40:14 +02:00
Philipp Holzer
a3e350313d
Move redir_private_images to Item::addRedirLinkToImageLinks() 2019-10-23 00:20:44 +02:00
Philipp Holzer
2870f42ca2
Move bb_translate_video 
- To new Class BBCode\Video
- Adding tests
- Make BaseObject::getClass() public
 2019-10-23 00:14:47 +02:00
Philipp Holzer
04a86dad75
remove superfluous line 2019-10-22 22:52:40 +02:00
Philipp Holzer
1fe9b789f3
Add some PHP doc 2019-10-22 22:51:52 +02:00
Philipp Holzer
4e32d46f97
switch case 2019-10-22 22:48:54 +02:00
Philipp Holzer
6b2c28e2d7
Add checks & realpath() usage 
- New util class "FileSystem"
- Add check in admin summary too
 2019-10-22 22:47:37 +02:00
Philipp Holzer
0e84a843a4
Add Fallback in case the logfile isn't accessible. 
- Fixes https://github.com/friendica/friendica/issues/7756#issuecomment-544227862
 2019-10-21 21:53:55 +02:00
Philipp Holzer
17aca9bee8
move mod/ignored to src/Module/Item/Ignored 2019-10-21 21:19:28 +02:00
Hypolite Petovan
2edccf9341
Merge pull request #7759 from nupplaphil/task/mod_receive 
Move mod/receive to src/Module/Diaspora/receive
 2019-10-21 11:59:13 -04:00
Philipp Holzer
a25d841b85
some improvements 2019-10-21 17:29:53 +02:00
Philipp Holzer
2a41f0b104
wrong field 2019-10-21 11:34:47 +02:00
Michael
17bb1eaf12 Fix fatal error 2019-10-21 05:52:45 +00:00
Philipp Holzer
7716374593
Move mod/receive to src/Module/Diaspora/receive 
- Added routes
- Make Diaspora::decode(Raw) more explicit
- Add new User::getByGuid() method
 2019-10-20 13:07:16 +02:00
Michael
df1db84846 Fix: Friendica contacts had falsely been detected as ActivityPub 2019-10-20 06:04:47 +00:00
Michael
1f98067189 Cleaned up code / removed legacy stuff 2019-10-19 16:41:07 +00:00
Michael
98c12006d5 Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact 2019-10-18 18:48:32 +00:00
Hypolite Petovan
1a8bc6e73f
Merge pull request #7753 from annando/http-417 
Handling for HTTP Error code 417
 2019-10-18 12:53:33 -04:00
Hypolite Petovan
f8c0f24e34
Merge pull request #7752 from kPherox/develop 
Change Model type to `OrderedCollectionPage`
 2019-10-18 06:54:42 -04:00
kPherox
0da36b839c
Change Model type to OrderedCollectionPage 
Use type `OrderedCollectionPage` instead of `OrderedCollection` in pages or distinct subsets
FYI: https://www.w3.org/TR/activitystreams-core/#h-paging
 2019-10-18 12:58:47 +09:00
Michael
4664249fec Improved comment 2019-10-17 21:49:29 +00:00
Michael
36ba7fa79c Merge remote-tracking branch 'upstream/develop' into http-417 2019-10-17 21:37:24 +00:00
Tobias Diekershoff
2ed61194d5 adopted some change requests 2019-10-17 07:45:48 +02:00
Hypolite Petovan
1997938ae7 Remove remaining Logger log level in explicit Logger::debug call 2019-10-16 22:39:31 -04:00
Michael
4c5b97834b Replaced quotes 2019-10-16 17:13:56 +00:00
Hypolite Petovan
5dcf6bfc58 Remove extra spaces before closing parentheses in src/ 2019-10-16 08:58:09 -04:00
Hypolite Petovan
146646c4d4 Replace deprecated calls to defaults() by ?? and ?: in src/ 2019-10-16 08:38:52 -04:00
Philipp
c0b78a9720
Merge pull request #7743 from MrPetovan/task/7190-remove-defaults-modules 
Replace deprecated defaults() calls by ?? and ?: operators in src/Module/
 2019-10-15 18:17:45 +02:00
Hypolite Petovan
f59ea2af55 Replace deprecated defaults() calls by ?? and ?: operators in src/Module/ 2019-10-15 09:20:32 -04:00
Michael
f1e7d97b8c Merge remote-tracking branch 'upstream/develop' into sanitize-gcontact 2019-10-15 10:10:12 +00:00
Michael
3e93c62a9c Changed quotation (" to ') 2019-10-15 07:55:20 +00:00
Philipp
fed486bfc5
Merge pull request #7727 from MrPetovan/task/4090-move-manage-to-src 
Move mod/manage to src/Module/Delegation
 2019-10-13 18:20:47 +02:00
Philipp
05c4fd9daa
Merge pull request #7737 from MrPetovan/task/4090-move-search-to-src 
Saved Search fixes
 2019-10-13 15:40:42 +02:00
Hypolite Petovan
230a97ccdd Correctly URL encode return URLS for saved search 2019-10-13 08:39:55 -04:00
Hypolite Petovan
74bf3a4dc8 Replace path parameter with query string parameter in Module\Search\Saved 2019-10-13 08:39:41 -04:00
Hypolite Petovan
c5f4f730e1 Use init() rather than rawContent() in Module\Search\Saved since there's no output 2019-10-13 08:37:25 -04:00
Hypolite Petovan
db0630b0f9 Catch missing Certainty bundle exception when checking for exposed password in Model\User 2019-10-12 21:10:03 -04:00
Hypolite Petovan
1cdbf32aa2 Remove duplicate array entry in Core\Logger 2019-10-12 21:10:03 -04:00
Michael
440da8a9f4 eol 2019-10-12 14:07:22 +00:00
Michael
c1ab93a5d8 Strings.php: Spaces are transformed to Tabs. 2019-10-12 10:28:18 +00:00
Hypolite Petovan
2c2beb5c0a
Revert Util\Strings::escapeHtml changes from #7725 
- Breaks display of inserted mentions
 2019-10-11 22:19:20 -04:00
Hypolite Petovan
02f02d44dc Move mod/manage to src/Module/Delegation 
- Move templates/manage to templates/delegation
- Update navigation links
- Update CSS classes
 2019-10-11 19:59:06 -04:00
Hypolite Petovan
4ee9e21a4f Make Router::getModuleClass throw exceptions 
- Add new MethodNotAllowedModule
- Add new Module->determineClass catch blocks
- Update Module and Router tests
 2019-10-11 19:59:05 -04:00
Hypolite Petovan
001c9ed259 Fix typo in Core\Authentication 2019-10-11 19:57:04 -04:00
Hypolite Petovan
27eaffd7fb
Merge pull request #7725 from dew-git/develop 
Fix security vulnerabilities.
 2019-10-11 14:48:07 -04:00
Tobias Diekershoff
10a66f368c self should be lower case 2019-10-11 17:44:50 +02:00
Tobias Diekershoff
9f3e68c2c5 correct the file name in the header 2019-10-11 11:55:57 +02:00
Tobias Diekershoff
5ac5a67b6b enhance description 2019-10-11 11:49:28 +02:00
Tobias Diekershoff
e3a947fb3d keep the ToDo hint from delegations 2019-10-11 11:48:05 +02:00
Tobias Diekershoff
882449266c removed debugging leftover 2019-10-11 11:45:28 +02:00
Tobias Diekershoff
06a964c32f only take action, when there is something to do 2019-10-11 11:42:07 +02:00
dew-git
e1e1d26b5b Revert random_int changes. 2019-10-11 00:00:15 -08:00
Tobias Diekershoff
46172b641d moved UExport to src/Module/Settings/Uexport 2019-10-11 07:38:42 +02:00
dew-git
b5dac16def Comply with coding style. 2019-10-10 20:50:51 -08:00
dew-git
3940e804e3 Remove uneeded variable. 2019-10-10 20:48:13 -08:00
dew-git
dc01bdbc80 Use the utility instead. 2019-10-10 20:43:32 -08:00
dew-git
811cdcdfcb Fix security vulnerbilities. 
Fix possible length extension attack, predicable generators, timing attacks on hash comparision and improved formatting.
 2019-10-10 15:21:41 -08:00
Hypolite Petovan
4b71fd2442 Replace deprecated calls to App->getBaseURL in Module\Register 2019-10-10 13:13:23 -04:00
Hypolite Petovan
67d374a14f Complete L10n::detectLanguage call parameters in Module\Register 2019-10-10 13:12:55 -04:00
Tobias Diekershoff
50fa119f79
Merge pull request #7722 from nupplaphil/bug/7718-lang 
Fix browser language detection
 2019-10-10 16:54:32 +02:00
Philipp Holzer
a522cf609b
Fix browser language detection (& tests) 2019-10-10 16:39:04 +02:00
Philipp
cf4bae26c7
Merge pull request #7720 from MrPetovan/task/4090-move-delegate-to-src 
Move mod/delegate to src/Module/Settings/Delegation
 2019-10-10 10:24:15 +02:00
Hypolite Petovan
43567bcf0e Add documentation comments to Module\Settings\Delegation 2019-10-10 04:17:37 -04:00
Hypolite Petovan
3cd916d7aa Use Model\User::getById when possible in Module\Settings\Delegation 2019-10-10 04:10:57 -04:00
Hypolite Petovan
cc0cf2b8ce Improve parent user password check in Module/Settings/Delegation 2019-10-10 04:10:29 -04:00
Hypolite Petovan
616edd0600 Move mod/delegate to src/Module/Settings/Delegation 
- Move templates/delegate to templates/settings/delegation
 2019-10-09 22:17:09 -04:00
Philipp
e72402389d
Merge pull request #7715 from annando/fix-getguid 
The getGUID function hadn't fetched the GUID from pictures with scale "0"
 2019-10-08 07:01:17 +02:00
Michael
11194d6679 Fix: The getGUID function hadn't fetched the GUID from pictures with scale "0" 2019-10-08 04:42:51 +00:00
Hypolite Petovan
e3e3ee72a0 Improve logging in Module\Search\Index 2019-10-07 16:18:19 -04:00
Hypolite Petovan
c8316bfe57 Use Dice instantiation to access App\Arguments 
- Remove App->args accessors
 2019-10-07 16:16:42 -04:00
Hypolite Petovan
1e737ae888 Move mod/search to src/Module/Search/Index 
- Update BaseSeachModule not to depend on a single query string parameter
 2019-10-07 14:27:46 -04:00
Hypolite Petovan
22598fc7e8 Improve search box 
- Use new saved search module
- Use dynamic search option loop
- Use "q" instead of "search" for search query string parameter
 2019-10-07 14:27:46 -04:00
Hypolite Petovan
cdefa7f32a Add new module and widget for managing saved searches 2019-10-07 14:27:46 -04:00
Hypolite Petovan
11ad0acd28 Add accessor for App->args in App and BaseModule 2019-10-07 14:27:46 -04:00
Philipp
5f80180b47
Merge pull request #7710 from MrPetovan/task/rework-theme-session-vars 
Rework theme session variables
 2019-10-07 18:17:29 +02:00
Michael
83f670e9e5 Test against the thread parent as well 2019-10-07 04:19:12 +00:00
Michael
9c6fd5fc35 Fix communication issues when a contact is able to speak AP, but uses Diaspora 2019-10-06 21:59:23 +00:00
Michael
1c8dd457cc Just some added logging to the proxy functionality to better analyze problems 2019-10-06 18:48:33 +00:00
Michael
4e7d94053e Fix for multiline host-meta, reducement of requests, fix for wordpress 2019-10-06 16:33:39 +00:00
Hypolite Petovan
f4d06ebd47 Remove useless theme session variable deletions in modules 2019-10-06 12:08:15 -04:00
Hypolite Petovan
ead0defb48 Rework theme override in Profile::load and App 
- Separate desktop theme from mobile theme in App
 2019-10-06 12:07:06 -04:00
Hypolite Petovan
e5fbaf6a00 Add Session::clear method 
- Replace manual session clear by method in mod/manage
 2019-10-06 11:21:54 -04:00
Hypolite Petovan
4a5dfefacc Move theme determination after full module run 2019-10-06 11:18:51 -04:00
Hypolite Petovan
cb4950a3be Replace duplicated authentication code in FKOAuth1 with Session::setAuthenticatedForUser 2019-10-06 11:17:30 -04:00
Hypolite Petovan
7959b9bbed
Merge pull request #7706 from tobiasd/20191006-checknote 
add server side check about note to admin
 2019-10-06 07:53:09 -04:00
Tobias Diekershoff
cbaa4d13d1 add server side check about note to admin 2019-10-06 11:57:43 +02:00
Michael
e3431f2d26 Empty line added 2019-10-06 06:08:07 +00:00
Michael
8238081d87 Replace obsolete functionality in "PortableContact" 2019-10-05 23:30:47 +00:00
Philipp
c32fb1547f
Merge pull request #7699 from MrPetovan/task/4090-move-acl-to-src 
Move mod/acl to src/Module/Search/Acl
 2019-10-05 15:14:49 +02:00
Hypolite Petovan
b62e20c7bf Code beautification 2019-10-05 08:34:07 -04:00
Michael
af5527f896 Unified return value types 2019-10-05 04:50:29 +00:00
Michael
aa75e749be Enhanced documentation 2019-10-05 04:22:16 +00:00
Hypolite Petovan
908197cc70 Use switches instead of if/else in Module\Search\Acl 2019-10-04 22:27:13 -04:00
Hypolite Petovan
9e29321aaf Use constants for search type in Module\Search\Acl 2019-10-04 22:20:40 -04:00
Hypolite Petovan
445133cb21 Move Module\Search\Acl::contactAutocomplete to Core\Search::searchGlobalContact 
- Replace broken reference to directory /lsearch module with /search module
 2019-10-04 22:19:54 -04:00
Michael
4d1cc44151 Added documentation 2019-10-04 17:29:21 +00:00
Michael
cd3dada39c Detect network type via the contacts 2019-10-04 06:33:16 +00:00
Michael
a7e518acbd Readded the network parameter 2019-10-04 05:42:54 +00:00
Hypolite Petovan
8f20e2054b Move /acl module to src/ 
- Move Core\ACL::contactAutocomplete to Module\Search\Acl
- Rename module path to /search/acl
 2019-10-03 22:40:42 -04:00
Michael
d9a74bd5dd Code transitioning from PortableContacts.php to GServer.php 2019-10-03 23:33:41 +00:00
Michael
2009080327 Remove more test data 2019-10-03 21:39:48 +00:00
Michael
832c765ad5 Hostmeta check, Pleroma version number cleaning 2019-10-03 20:52:04 +00:00
Michael
59b464ade3 PoCo endpoint added 2019-10-03 15:30:07 +00:00
Michael
3eb24d1b5c Nost test code is removed 2019-10-03 14:48:46 +00:00
Michael
ae55029028 Additional endpoints added 2019-10-03 13:02:48 +00:00
Michael
25f93cb03a Count known users, check for empty attribute values 2019-10-03 10:44:29 +00:00
Michael
9cbe5c5e0e New class for handling gserver entries 2019-10-03 09:20:36 +00:00
Michael
21e9e9f3c2 Remove obsolete function to guess the base url of a contact 2019-10-02 15:10:42 +00:00
Philipp
a855c6888b
Merge pull request #7687 from annando/get-header-field 
Enable the possibility to fetch a specific header variable
 2019-10-02 13:22:30 +02:00
Michael
7991b77343 Return value added 2019-10-02 09:37:05 +00:00
Tobias Diekershoff
92ee309591 quotes 2019-10-02 08:28:12 +02:00
Michael
6a6a48c58d Renamed function 2019-10-02 06:24:29 +00:00
Tobias Diekershoff
9a0201e674 require a note to the admin when register policy is set to needs approval 2019-10-02 07:39:42 +02:00
Michael
b051804dc3 Empty the header array 2019-10-02 04:10:36 +00:00
Michael
489510e7a9 Cache the header fields 2019-10-02 03:45:32 +00:00
Michael
5cdeb8615f Use $this 2019-10-02 03:31:58 +00:00
Michael
516fd02812 New function to check for key existance 2019-10-01 21:46:18 +00:00
Michael
c494b158c8 Fix notice "Undefined index: openRegistrations" 2019-10-01 19:27:33 +00:00
Michael
c37663f1c1 Changed return value 2019-10-01 19:02:26 +00:00
Michael
2c730a5c45 New function for fetching associated header array 2019-10-01 18:22:33 +00:00
Michael
18198b4aaa Enable the possibility to fetch a specific header variable 2019-10-01 16:33:11 +00:00
Michael
18807ae21d Don't send blank pictures on error, fail instead. 2019-10-01 12:41:49 +00:00
Hypolite Petovan
c0cb1a194e
Merge pull request #7670 from nupplaphil/task/add_router_config 
Add router config
 2019-09-30 11:13:36 -04:00
Hypolite Petovan
185f1fc687
Merge pull request #7636 from annando/manage 
Restructured "manage" functionality, added count parameters
 2019-09-30 11:12:46 -04:00
Hypolite Petovan
2333526b8a
Merge pull request #7678 from annando/remote-rework 
Reworked the remote authentication
 2019-09-30 09:18:43 -04:00
Philipp Holzer
dc73117a62
code optimization 2019-09-30 14:03:15 +02:00
Philipp Holzer
49e812f3d3
Bugfix GetAllKeys() of Memcache 
- Abstract Memcache and Memcached implementation
 2019-09-30 14:03:15 +02:00
Philipp Holzer
d5dd12b8f8
Add Drone CI 
- Add drone test environment
- Add drone config
- apt phpunit
- Fix api.php
- Fix item.php
- Fix DBStructure
- Check if caching is possible during tests
 2019-09-30 14:03:12 +02:00
Michael
d41399496e Merge remote-tracking branch 'upstream/develop' into manage 2019-09-30 06:30:13 +00:00
Michael
520c250a41 Some small code adjustments 2019-09-29 19:21:05 +00:00
Michael
5eeca432fe removed unused "f" parameter 2019-09-29 18:59:03 +00:00
Michael
51e55bca18 Added some logging 2019-09-29 10:58:07 +00:00
Michael
32ea610559 Avoid a contact lookup for empty URL 2019-09-29 10:23:36 +00:00
Michael
c2c1b317e0 Transferring the "addr" value on magic auth 2019-09-29 10:20:53 +00:00
Philipp Holzer
0e5cb88888
Add router config 
- Introduce route.config.php structure
- Adding config loader for routes
- Adapt Module class (separation of duties)
- Add tests
 2019-09-29 11:57:27 +02:00
Michael
0185c91246 Merge remote-tracking branch 'upstream/2019.09-rc' into remote-rework 2019-09-29 06:32:35 +00:00
Michael
58fb0beaa3 Delete the cache entry allowing direct login again 2019-09-29 06:26:02 +00:00
Michael Vogel
4e9a810206 Fix magic auth for redirects with non profile paths 2019-09-29 02:16:09 +02:00
Michael
7704758f9c Fix permissionset query 2019-09-28 20:42:33 +00:00
Michael
83b00ef308 New function "isAuthenticated" 2019-09-28 18:09:11 +00:00
Michael
1c26baec46 remote_user is replaced 2019-09-28 09:59:08 +00:00
Michael
6e9026e033 Renamed function, beginning to replace the "remote_user" function 2019-09-28 09:36:41 +00:00
Michael
1ddd2df4b8 Removed obsolete code 2019-09-28 05:37:24 +00:00
Michael
3dd94355b7 Fix permissions when viewing photos, applying same fix to items as well 2019-09-27 05:49:23 +00:00
Michael
abecf62f2d Merge remote-tracking branch 'upstream/2019.09-rc' into remote-rework 2019-09-26 20:50:29 +00:00
Michael
704cdf1b5a New function to store the "remote" session value / making the changes work 2019-09-26 04:47:42 +00:00
Hypolite Petovan
1f20a9330c Add new ignoreChildren behavior to HTML::tagToBBCode 
- Allow discarding HTML tag children for single-value BBCode
- Add test for it
 2019-09-25 20:44:09 -04:00
Hypolite Petovan
d8484e65bd Move autolinker execution earlier in BBCode::convert 
- Prevents already replaced HTML links (like in [audio] tag) to be doubled
- Add test for it
 2019-09-25 20:39:04 -04:00
Michael
ec66553032 Reworked "remote" cookie handling 2019-09-25 22:24:17 +00:00
Michael
d5c37001cd Empty the "remote" variable, avoid being remote to yourself 2019-09-25 07:02:07 +00:00
Michael
6a376c29d8 Fix session size problems 2019-09-25 05:57:32 +00:00
Michael
87462ec67f Don't use the "url" parameter on redir if it points to the same contact 2019-09-24 21:44:37 +00:00
Hypolite Petovan
8a5eb689f7
Merge pull request #7656 from annando/redir-loop 
Fix "redir" loop
 2019-09-23 18:56:50 -04:00
Michael
5254147ccc Fix "redir" loop 2019-09-23 22:13:20 +00:00
Philipp Holzer
ca36ea17f9
Fix Auto-Installer 2019-09-23 12:51:07 +02:00
Michael
aba23daeca Get rid of zombie introductions that reappear automatically 2019-09-22 10:51:34 +00:00
Philipp
482cf1bbfe
Merge pull request #7646 from MrPetovan/bug/warnings 
Remove setting obsolete App->data['user'] in Module\Profile\Contacts
 2019-09-21 18:20:57 +02:00
Hypolite Petovan
f51b275b17 Add parameter type hints in Temporal::getDateofBirthField 2019-09-21 10:52:55 -04:00
Michael
a2105c5dfe Changed documentation 2019-09-21 13:19:00 +00:00
Michael
b24ef7247d Don't update the basepath on local check 2019-09-21 13:17:33 +00:00
Michael
cf569425c6 Avoid a notice 2019-09-21 13:00:53 +00:00
Michael
c364a77d63 Always use direct DFRN transport on local contacts 2019-09-21 12:39:07 +00:00
Hypolite Petovan
118e737a49 Remove dependency to App object in Temporal::getDateofBirthField 2019-09-21 05:15:52 -04:00
Hypolite Petovan
f19136905f Remove setting obsolete App->data['user'] in Module\Profile\Contacts 2019-09-21 05:14:49 -04:00
Michael
64f30d3627 Fix: updateFromProbe failed when updating non-federated networks 2019-09-20 21:01:52 +00:00
Michael
3b6f16347a Fetch avatar and name on Twitter discovery 2019-09-19 05:28:46 +00:00
Michael
358cbe812a Correction: Must be inverted 2019-09-18 16:37:13 +00:00
Michael
1144863090 Changed "hidewall" behaviour 2019-09-18 05:20:33 +00:00
Philipp Holzer
b13dbb3dcb
Remove $_SERVER['PHP_SELF'] usage 2019-09-17 16:47:00 +02:00
Michael
8237d35a87 Restructured "manage" functionality, added count parameters 2019-09-17 04:05:26 +00:00
Hypolite Petovan
888f7ffd1c Use correct data key to compare authors before appending mention in Protocol\Diaspora 2019-09-15 07:05:47 -04:00
Hypolite Petovan
69752fd945 Prevent prepending implicit mention if replied to item is ours in Protocol\Diaspora 2019-09-14 17:42:02 -04:00
Hypolite Petovan
6576f15164 Check the root directory is writable before copying .htaccess in Worker\Cron 
- Addresses https://github.com/friendica/friendica/issues/7298#issuecomment-531454632
 2019-09-14 06:30:41 -04:00
Michael
a037427a54 Added comment 2019-09-14 07:17:06 +00:00
Michael
9d87bc94a6 Issue 6553: Restructured code for treating removed accounts 2019-09-14 07:12:25 +00:00
Hypolite Petovan
32707022bf Remove GET page parameter access from Core\ACL 2019-09-13 20:06:57 -04:00
Hypolite Petovan
1a81ed8616 Fix notice message when $return is undefined in Core\ACL 2019-09-13 20:06:22 -04:00
Michael
39133a1e0e Fix a notice because of invalid return data 2019-09-13 18:59:33 +00:00
Hypolite Petovan
f5eb8e88f1 Remove obsolete blockquote replacement in Item::prepareBody 2019-09-12 22:18:46 -04:00
Hypolite Petovan
c034fa7baa Use <details> tag for spoilers BCode 2019-09-12 22:17:55 -04:00
Philipp
50cce950f6
Merge pull request #7614 from annando/issue-5721 
Issue 5721: Set permissions of photos in PM
 2019-09-11 22:22:06 +02:00
Michael
4223011a7d Fix a notice about a missing "pending" 2019-09-11 20:03:29 +00:00
Michael
3c1380fdcc Fix enduring follow requests to Pleroma 2019-09-11 16:54:13 +00:00
Michael
a34995a3e5 Issue 5721: Set permissions of photos in PM 2019-09-11 04:08:41 +00:00
Michael
a733a00ea9 Detect the hide status when it hadn't been detected before 2019-09-10 20:20:34 +00:00
Michael
3c7fe5fc1b Issue 7610-2: Read the "hide" status for non DFRN profiles 2019-09-10 20:06:07 +00:00
Michael
57e4b9f806 Issue 7610: Set the appropriate meta header to not being crawled 2019-09-10 17:15:29 +00:00
Philipp
64e74b4e03
Merge pull request #7607 from annando/issue-7603 
Issue 7603: Display forums too when they are AP
 2019-09-10 13:01:41 +02:00
Michael
b2d6854829 Issue 7285: Perform duplicate check for item URI also with AP 2019-09-10 04:59:12 +00:00
Tobias Diekershoff
5f2028b657
Merge pull request #7605 from annando/pending-2 
Pending contacts: Fix contact deletion / added cron job for repairs
 2019-09-10 06:32:18 +02:00
Tobias Diekershoff
3d5d50a25b
Merge pull request #7606 from annando/fix-invalid-url 
Replace not working "redir" link with a working one
 2019-09-10 06:29:55 +02:00
Michael
e588c350ef Issue 7603: Display forums too when they are AP 2019-09-10 04:29:49 +00:00
Michael
0a0a961c52 The value is used twice, so use a variable 2019-09-10 04:04:07 +00:00
Michael
8fc8e26e23 Replace not working "redir" link with a working one 2019-09-09 21:37:26 +00:00
Michael
323285216b We have to check for "0" in "rel" as well 2019-09-09 20:39:19 +00:00
Michael
f185f6fd3d Pending contacts part 2: Fix contact deletion / added cron job for repairs 2019-09-09 20:03:11 +00:00
Hypolite Petovan
91b0f0465f
Merge pull request #7604 from annando/pending-contacts 
Display pending contacts in the contact list
 2019-09-09 13:49:51 -04:00
Michael
a70a0306d7 Only show incoming pending contact requests with intro 2019-09-09 08:58:56 +00:00
Michael
2dbd843ed2 Don't display ignored pending contacts, link to contact request page 2019-09-09 05:29:33 +00:00
Michael
591ba9c68e Display pending contacts in the contact list 2019-09-08 19:18:56 +00:00
Hypolite Petovan
69105928f5 Use destination URL when provided in Contact::magicLink 2019-09-06 08:33:19 -04:00
Hypolite Petovan
2dcb9926bc
Merge pull request #7601 from annando/issue-2199 
Issue 2199: Diaspora doesn't interpret size elements
 2019-09-05 17:15:01 -04:00
Michael
aa6497c281 Issue 2199: Diaspora doesn't interpret size elements 2019-09-05 05:14:43 +00:00
Michael
f0b40853d0 Merge remote-tracking branch 'upstream/2019.09-rc' into delivery-counter 2019-09-05 03:10:34 +00:00
Michael
16a0afbbae Fixes the delivery counter for edits 2019-09-04 21:06:25 +00:00
Michael
5e60d0c94f Fix cache key problem / avoid need for fetching own pictures 2019-09-04 20:54:23 +00:00
Michael
33006d8455 Merge remote-tracking branch 'upstream/2019.09-rc' into performance 2019-09-03 15:02:16 +00:00
Philipp Holzer
8273b88a3e
Add missing getPokeVerbs() method 2019-09-03 16:07:05 +02:00
Philipp
08b6f55a89
Merge pull request #7589 from annando/delivery-counter 
Fix delivery counter / archive relay contacts
 2019-09-03 15:59:49 +02:00
Michael
52d8b618f0 Type hints 2019-09-03 03:59:46 +00:00
Michael
5ea8116cfd Workaround for HTTP error 417 2019-09-02 20:39:51 +00:00
Michael Vogel
046b5a1eac Fix performance issues due to relay contact requests 2019-09-02 15:11:07 +02:00
Michael
8947473c71 Contact details are now available when searching for a single contact 2019-09-02 05:33:13 +00:00
Michael
db16f1a106 Increment the "failed" value on failed relay delivery 2019-09-02 03:37:45 +00:00
Michael
6af4c90dff Fix delivery counter / archive relay contacts 2019-09-02 03:25:05 +00:00
Michael
74f12baac2 Follow up to #7582: Only update the contact when needed 2019-08-31 09:27:19 +00:00
Hypolite Petovan
0c876db30f
Merge pull request #7582 from annando/contact-dba 
Avoid and remove duplicated contact entries
 2019-08-30 03:36:40 -04:00
Michael Vogel
f293e352ec Renamed function parameter 2019-08-30 07:59:18 +02:00
Michael Vogel
3b92f7357c Renamed function 2019-08-30 07:52:21 +02:00
Michael Vogel
438394bc1d Type hints, corrected wrong documentation 2019-08-30 07:38:42 +02:00
Hypolite Petovan
ce7ec11d1d
Merge pull request #7570 from nupplaphil/bug/friendica-7298 
Some code hardenings for semaphore locking
 2019-08-29 15:02:07 -04:00
Michael Vogel
481376dd6f Avoid not performing unarchiving 2019-08-29 08:41:55 +02:00
Michael Vogel
66eab2b44f Don't handle deleted contacts / removed unneeded parameter 2019-08-29 07:22:29 +02:00
Michael Vogel
503a5be06c Fixed query (not all duplicates had been found) 2019-08-29 06:55:36 +02:00
Michael Vogel
ef02a1cb7b Check fpr duplicated contacts upon inserting them 2019-08-29 06:07:07 +02:00
Michael Vogel
141bcf149d Added post update to remove duplicated contacts 2019-08-29 06:06:41 +02:00
Michael Vogel
40a7d6eb42 Merge remote-tracking branch 'upstream/2019.09-rc' into contact-dba 2019-08-29 04:14:01 +02:00
Michael Vogel
90b9ad8bed New contact table functions with check for duplicates 2019-08-28 22:27:48 +02:00
Hypolite Petovan
e6f00455f3
Merge pull request #7578 from annando/archive 
Don't transmit content to already archived contacts
 2019-08-28 11:12:00 -04:00
Michael Vogel
96b895bc3a Changed array name, fixed bug that prevented testing most Diaspora endpoints 2019-08-28 16:54:49 +02:00
Hypolite Petovan
7340f366d7
Merge pull request #7580 from annando/issue-7563 
Issue 7563: Use icons instead of names on posts
 2019-08-28 10:16:33 -04:00
Michael
1c4b96ae26 Moved array to the top 2019-08-28 14:07:21 +00:00
Michael Vogel
3c9834922c Check if the Diaspora endpoint is archived 2019-08-28 16:02:19 +02:00
Hypolite Petovan
58949bf1a7
Merge pull request #7577 from nupplaphil/bug/friendica-7297 
Fixing PHP Fatal Error
 2019-08-28 09:42:49 -04:00
Hypolite Petovan
cc1160a243
Merge pull request #7575 from nupplaphil/bug/friendica-7299 
PHP Notice fixings
 2019-08-28 09:41:51 -04:00
Michael
8b6697b044 Updated lists of software, removed comment 2019-08-28 11:27:38 +00:00
Michael
ed4d08c7f4 Changed detection for specific software 2019-08-28 09:10:25 +00:00
Michael
9cbf320c86 Issue 7563: Use icons instead of names on posts 2019-08-28 06:38:35 +00:00
Michael Vogel
cf170c9c02 Fixed count, added to-do 2019-08-28 06:44:37 +02:00
Philipp Holzer
4b4dbd38d9
Fixing PHP Fatal Error for Database-Reconnects with PDO 2019-08-28 01:40:34 +02:00
Philipp Holzer
4733b1e5e0
Fixing PHP Fatal Error for Model\Contact (usage of non available contact) 2019-08-28 01:40:28 +02:00
Philipp Holzer
8688053a08
remove superfluous comment 2019-08-28 01:02:23 +02:00
Michael Vogel
9b7432781b Don't transmit content to already archived contacts 2019-08-27 21:01:11 +02:00
Philipp Holzer
df7ec0cdf7
php notice fixings 
addons:
- bufferapp (missing errorcode)
- twitter (wrong field name 'nickname')
core:
- bbcode (incomplete attachementdata)
- crypto (uninitialized key)
 2019-08-27 08:27:07 +02:00
Tobias Diekershoff
1c3a5e1e6f added USE statement and changed statement as requested in #7305#discussion_r296461181 2019-08-27 07:10:51 +02:00
Philipp Holzer
62f7510aa7
Fixed wrong app reference 2019-08-27 00:03:05 +02:00
Philipp Holzer
de7c026590
Some code hardenings for semaphore locking 2019-08-26 23:55:54 +02:00
Michael
7d50a086e0 Issue 7559: Merge contact duplicates 2019-08-26 15:51:56 +00:00
Philipp
b914900ff5
Merge pull request #7553 from annando/fatal 
Prevent a fatal error for an empty parameter in "unparseURL"
 2019-08-23 08:44:51 +02:00
Michael Vogel
a892156052 Output better comparable log entries for the worker 2019-08-23 07:23:32 +02:00
Michael Vogel
74d93269da Prevent a fatal error for an empty parameter in "unparseURL" 2019-08-23 07:19:08 +02:00
Hypolite Petovan
20a6b368fb Replace mb_convert_encoding with html_entity_decode for feed item title conversion 
- Prevents already UTF-8 strings to be corrupted
 2019-08-22 06:00:21 -04:00
Jeroen De Meerleer
cf95e0f856 Translating the vcard 2019-08-20 16:38:46 +02:00
Michael
5a1a5a54dc Delivery count now counts the failed delivery attempts as well 2019-08-20 07:39:13 +00:00
Hypolite Petovan
2736aac678 Add missing use statement in Search\Directory 
- Fixes https://github.com/friendica/friendica/issues/7297#issuecomment-522346804
 2019-08-18 15:21:36 -04:00
Hypolite Petovan
9de59d5c4d Add entry title HTML entities conversion in Protocol\Feed 
- Prevents literal entities display in generated post title
 2019-08-18 09:37:36 -04:00
Philipp
0f32ab10d8
Merge pull request #7524 from MrPetovan/bug/7337-check-dead-enumeratePermissions 
Prune unavailable contacts from AP envelope
 2019-08-18 15:17:11 +02:00
Hypolite Petovan
77b754862b
Merge pull request #7533 from nupplaphil/bug/friendica-7299 
Fixing wrong defaults() usage
 2019-08-18 09:16:25 -04:00
Philipp Holzer
bff427174b
Fix parameters for Source 2019-08-18 15:14:03 +02:00
Philipp Holzer
b5cb3bc783
Fixing https://github.com/friendica/friendica/issues/7299#issuecomment-521745931 2019-08-18 15:12:10 +02:00
Philipp Holzer
b63b1570d6
removed superfluous comment 2019-08-18 15:04:36 +02:00
Philipp Holzer
9d3ad8f435
Fix https://github.com/friendica/friendica/issues/7298#issuecomment-522215746 2019-08-18 14:55:24 +02:00
Hypolite Petovan
1a2628f210
Merge pull request #7528 from nupplaphil/bug/fix_locks 
Fix Locks
 2019-08-17 14:41:32 -04:00
Philipp Holzer
d39a6ba444
Auto-remove duplicated, allowed themes during reload 2019-08-17 20:00:11 +02:00
Philipp Holzer
7e82f8dc2e
fix Admin Theme reload 2019-08-17 19:55:14 +02:00
Philipp Holzer
46655eac70
Remove unnecessary parameter 2019-08-17 19:41:59 +02:00
Philipp Holzer
c803dcb6c5
Fix Locks 
- Wrong return of lock releasing with DBA provider
- It's not possible to maintain Semaphore locks, since they aren't accessible by other processes
Should solve https://github.com/friendica/friendica/issues/7298#issuecomment-521996540
 2019-08-17 19:33:36 +02:00
Philipp Holzer
566889fbc0
fix alignment 2019-08-17 11:08:57 +02:00
Philipp Holzer
2c73377b39
Create Core\Process as a base for followup work 2019-08-17 09:09:13 +02:00
Philipp Holzer
90b438e082
Move mode settings to App\Mode 
- Move isAjax() to App\Mode
- Move isTablet() to App\Mode
- Move isMobile() to App\Mode
- Refactor last usage of App->isBackend()
 2019-08-17 09:09:13 +02:00
Hypolite Petovan
cf8177461e Prune unavailable contacts from AP envelope 2019-08-17 00:00:49 -04:00
Hypolite Petovan
828368267c Add check_dead parameter to Item::enumeratePermissions 2019-08-16 23:59:48 -04:00
Michael Vogel
aba23abfaa
Merge pull request #7520 from MrPetovan/bug/7468-contact-search-fan 
Suppress relationship string in template vars for public contact
 2019-08-17 04:42:59 +02:00
Hypolite Petovan
7a73445503
Merge pull request #7519 from nupplaphil/task/add_page 
Add Page class (Frontend code)
 2019-08-16 07:30:06 -04:00
Hypolite Petovan
e463df6418 Add existence check for contact.uid and contact.rel fields in Contact::getContactTemplateVars 2019-08-16 07:29:34 -04:00
Philipp Holzer
eaed327c07
fix indentation 2019-08-16 09:10:05 +02:00
Hypolite Petovan
98b0f97639 Suppress relationship string in template vars for public contact 2019-08-15 21:24:33 -04:00
Michael Vogel
6f944f1e53
Merge pull request #7514 from MrPetovan/bug/7507-allow-protocolless 
Allow protocol-less links
 2019-08-15 22:07:09 +02:00
Philipp Holzer
30b69f1fc4
some fixings 2019-08-15 20:58:57 +02:00
Philipp Holzer
9f68e6b589
Add Page class for Frontend 
- Move frontend logic (stylesheet, footerscript, content) to Page class
 2019-08-15 20:52:42 +02:00
Hypolite Petovan
feb720a3ee
Merge pull request #7518 from nupplaphil/bug/lock_unlink 
Fix Lock-Unlink
 2019-08-15 12:11:01 -04:00
Philipp Holzer
2369ea1d50
Fix Lock-Unlink 
- Check if .sem file exists before unlinking it
- Fixing https://github.com/friendica/friendica/issues/7298#issuecomment-521670482
 2019-08-15 17:55:17 +02:00
Philipp Holzer
822ba67105
Fixing https://github.com/friendica/friendica/pull/7508#issuecomment-521679624 2019-08-15 17:47:08 +02:00
Philipp Holzer
290dd2ab39
moved rest of BaseURL 2019-08-15 17:36:07 +02:00
Philipp Holzer
ccbb0241bf
Removed unnecessary auto-initializing 2019-08-15 17:27:05 +02:00
Philipp Holzer
956439a9f2
reverted wrong indentation 2019-08-15 17:25:03 +02:00
Philipp Holzer
734b63adba
Fixed wrong "BaseUrl" class (=> "BaseURL") 2019-08-15 17:23:35 +02:00
Philipp Holzer
08be92a862
Moved BaseURL to App namespace (because similar type as Arguments/Modules/Modes) 2019-08-15 17:23:00 +02:00
Philipp Holzer
fa1b783052
removed static Logger usage 2019-08-15 17:10:14 +02:00
Philipp Holzer
4f0ee4df27
Move $page initialization into constructor 2019-08-15 17:04:36 +02:00
Philipp Holzer
55f9dba230
Prepare App for further usage 2019-08-15 17:00:07 +02:00
Hypolite Petovan
48caf55cff
Merge pull request #7515 from nupplaphil/task/console_lock 
New Console Command: Lock
 2019-08-15 10:31:34 -04:00
Philipp Holzer
9abfd55d37
modified hint 2019-08-15 16:25:34 +02:00
Philipp Holzer
689a2145f6
Add @see for SO link 2019-08-15 16:24:11 +02:00
Philipp Holzer
f3269bf826
Add hint for getClass 2019-08-15 16:19:23 +02:00
Philipp Holzer
cba9fa2467
Move isBackend logic to App\Mode 2019-08-15 15:51:15 +02:00
Philipp Holzer
d95457cf61
Add Lock test 2019-08-15 14:26:05 +02:00
Philipp Holzer
e2e109b8c1
Fix getAllKeys() method for memcache instances 2019-08-15 14:26:05 +02:00
Philipp Holzer
41e2031e6b
Console Lock 
WIP
 2019-08-15 14:26:04 +02:00
Hypolite Petovan
0f9520f520 Increase specificity of default allowed protocols 2019-08-14 21:42:00 -04:00
Hypolite Petovan
f88435fa4c Add support for protocol-less URLs in BBCode::convert 2019-08-14 21:40:51 -04:00
Hypolite Petovan
425876316f
Merge pull request #7508 from nupplaphil/task/arguments_module_class_2 
Add Arguments & Module class (again)
 2019-08-14 07:52:55 -04:00
Philipp Holzer
6546bf5ad6
fix isBackend() 2019-08-13 19:05:32 +02:00
Philipp
23da053cf8
Merge pull request #7512 from annando/cid-forum 
Use the contact id whenever we are following the contact
 2019-08-13 18:50:10 +02:00
Michael
aab6b739d8 Use the contact id whenever we are following the contact 2019-08-13 15:54:47 +00:00
Philipp Holzer
b1ae58cdc5
fix tests & remove superfluous parameter 2019-08-13 16:29:16 +02:00
Philipp Holzer
4089e17f85
re-add App::isBackend() 2019-08-13 16:29:12 +02:00
Philipp Holzer
0af9747c6c
Add Arguments & Modules class 2019-08-13 16:29:11 +02:00
Hypolite Petovan
f068d00645
Merge pull request #7510 from nupplaphil/bug/Fix_Redis_test 
Fix Redis test
 2019-08-13 06:41:07 -04:00
Hypolite Petovan
8b00f48c47
Merge pull request #7509 from annando/admin-queue 
Improved calculation of deferred tasks
 2019-08-13 06:40:21 -04:00
Philipp Holzer
b28e11fee8
- Remove deprecated Redis::delete() function 2019-08-13 08:54:26 +02:00
Philipp Holzer
31cfac1cfa
Fix Redis test 
- Check if $redis_port is null
 2019-08-13 08:32:08 +02:00
Michael Vogel
afac4b7698 Improved calculation of deferred tasks 2019-08-13 06:43:08 +02:00
Hypolite Petovan
2f752b18e1
Merge pull request #7505 from annando/admin-queue 
Queue numbers corrected, only display 999 queue items
 2019-08-12 19:30:57 -04:00
Michael Vogel
3b0767764b Queue numbers corrected, only display 999 queue items 2019-08-12 07:30:33 +02:00
Hypolite Petovan
fcb1a78352
Revert "Introduce Arguments / Module class" 2019-08-11 18:01:11 -04:00
Philipp
e9fc2af1c3
Merge pull request #7499 from annando/new_defer 
Worker: The retrial value can now skip retrial levels
 2019-08-11 23:27:54 +02:00
Philipp
541cdcd515
Merge pull request #7503 from MrPetovan/bug/fix-private-permissions 
Use contact.network field instead of contact.protocol in Group::expand
 2019-08-11 23:26:34 +02:00
Michael Vogel
e07a17daf6 Added config value 2019-08-11 23:07:06 +02:00
Hypolite Petovan
feb2d94972
Merge pull request #7500 from nupplaphil/task/arguments_module_class 
Introduce Arguments / Module class
 2019-08-11 16:45:31 -04:00
Hypolite Petovan
5feeffbe79 Use network field instead of protocol in Group::expand 
- contact.protocol field isn't systematically populated
 2019-08-11 16:41:00 -04:00
Philipp Holzer
11752d7059
move backend constant 2019-08-11 14:33:25 +02:00
Philipp Holzer
2c5ba7fc15
Introduce Arguments / Module class 
- move from App
- add tests for Arguments/Module class
 2019-08-11 14:24:05 +02:00
Michael Vogel
5c72aeb8d7 Worker: The retrial value can now skip retrial levels 2019-08-11 10:28:52 +02:00
Michael Vogel
35a487ae30 Don't fork worker on frontend by default 2019-08-08 22:42:12 +02:00
Tobias Diekershoff
48b1e172b9
Merge pull request #7487 from MrPetovan/task/7473-trending-tags 
Fix trending tags variable name mistakes in Model\Term
 2019-08-07 06:44:37 +02:00
Hypolite Petovan
66d4e5ce5f Remove wrap length in Babel HTML::toPlaintext display 2019-08-06 21:23:09 -04:00
Hypolite Petovan
246894f233 Ensure trimmed HTML nodes are text nodes in HTML::toBBCode 2019-08-06 21:22:19 -04:00
Hypolite Petovan
19adb9a1a0 Fix trending tags variable name mistakes in Model\Term 2019-08-06 20:52:54 -04:00
Tobias Diekershoff
dc85451b78
Merge pull request #7483 from MrPetovan/task/7474-html-to-bbcode 
Fix bug removing spaces between hashtag links in HTML::toPlaintext
 2019-08-06 16:50:00 +02:00
Hypolite Petovan
79374dbf7a Fix DOMNodeList length compatibility with PHP <7.2 in Content\Text\HTML 2019-08-06 09:00:32 -04:00
Hypolite Petovan
5dbf319e06 Fix bug removing spaces between hashtag links in HTML::toPlaintext 2019-08-06 08:20:48 -04:00
Hypolite Petovan
3e2f0e9ffa Feedback changes 
- Import namespaces in mod/community
- Fix alignment in Content\Feature
- Add phpDoc to Widget\TrendingTags
 2019-08-06 07:37:48 -04:00
Hypolite Petovan
9e8ae520b8 Move trending tags queries to Model\Term 2019-08-06 07:36:51 -04:00
Hypolite Petovan
4c45cb864a Update master translation strings file 
- Fix gettext warning for empty string in Module\Item\Compose
 2019-08-06 07:09:05 -04:00
Hypolite Petovan
c399e40618 Add trending_tags additional feature + usage in mod/community 2019-08-06 07:09:04 -04:00
Hypolite Petovan
a947bd0889 Add Trending Tags widget + template 2019-08-06 07:09:04 -04:00
Hypolite Petovan
6b7dfd0c71
Merge pull request #7465 from nupplaphil/task/dice_cache_lock 
Refactor Cache/Lock to DICE
 2019-08-06 07:05:07 -04:00
Tobias Diekershoff
951444e715
Merge pull request #7482 from annando/image-description 
Support for multiple picture posts in API and connectors
 2019-08-06 08:21:54 +02:00
Michael
27006f577c Support for multiple picture posts 2019-08-06 05:35:21 +00:00
Hypolite Petovan
2ab43f94d8 Revert using LIBXML_NOBLANKS 
- This removed all self-closing tags (img, br, etc...) from HTML sources
 2019-08-05 20:57:03 -04:00
Michael
cbee91a61b Avoid a notice 2019-08-05 16:48:58 +00:00
Michael
bdc07b4213 Added support for image descriptions and multiple image posts to external services 2019-08-05 16:27:45 +00:00
Michael Vogel
a507963c7f
Merge pull request #7474 from MrPetovan/bug/7457-html-bbcode-plaintext 
Fix HTML/BBCode::toPlaintext
 2019-08-04 22:08:53 +02:00
Philipp Holzer
a66580444f
Fixing sort of BaseURL usage for App & Cache usage 2019-08-04 20:01:15 +02:00
Hypolite Petovan
4a85de4c19 Add HTML output panel to babel module 2019-08-04 10:22:49 -04:00
Hypolite Petovan
c3e3e83a52 Improve BBCode:toPlaintext 
- Fix issue where matching literal square brackets were removed with their content
- Fix issue where content without line feeds between BBCode tags would end up compacted in plain text
- Update extr calls to BBCode::toPlaintext in api
 2019-08-04 10:22:23 -04:00
Philipp Holzer
3834d5e129
Renamed __toString() to getName() 2019-08-04 16:14:19 +02:00
Hypolite Petovan
a0f77e1800 Improve HTML::toPlaintext 
- Ignore empty trimmed text nodes
- Ignore anchor links
- Ignore blank tags and avoids adding a doctype to transitional DOM objects
 2019-08-04 10:11:59 -04:00
Philipp Holzer
d2211bd6dd
Removed some leftovers 2019-08-04 15:58:53 +02:00
Philipp Holzer
7cdcad9f6c
Remove unused class variable 2019-08-04 15:54:37 +02:00
Philipp Holzer
19777baa79
- Move constants to the "Cache" class (more transparent than inside the interface) 2019-08-04 15:53:28 +02:00
Philipp Holzer
34e4968c06
Adding possibility to use a different cache-backend for locking and caching 
- Renaming *LockDriver to *Lock since it isn't a "driver" anymore
 2019-08-04 15:42:39 +02:00
Michael
d2b551a616 Merge remote-tracking branch 'upstream/develop' into alt-description 2019-08-04 12:07:21 +00:00
Philipp Holzer
86bf2ee45a
Rename *CacheDriver to *Cache because they don't act as driver anymore 2019-08-04 10:26:53 +02:00
Michael
1b7f96dac8 Partly reverted, real problem fixed 2019-08-04 04:29:52 +00:00
Michael
cb77b1af8c API: We now transmit the text description there as well 2019-08-04 03:45:23 +00:00
Philipp Holzer
d56bd28a07
Refactor Cache/Lock to DICE 
- Refactor Cache classes
- Refactor Lock classes
- Improved test speed (removed some seperate class annotations)
 2019-08-03 20:51:58 +02:00
Michael
6e8057a1c3 Respecting the "alt" description of images during import from HTML 2019-08-03 11:48:47 +00:00
Michael
764c70720c Moved several database stuff out of the transaction to avoid error 1205 2019-08-03 10:36:21 +00:00
Hypolite Petovan
e5321ecc7f
Merge pull request #7458 from annando/fix-7449 
Fix issue 7449: Image permissions are now set like before
 2019-08-02 13:26:57 -04:00
Michael
bcadf19289 "contact-id" has to be set, after "author-id" had been set 2019-08-02 17:17:51 +00:00
Michael
7c10807d1d Clarified description 2019-08-02 16:59:26 +00:00
Michael
9819d31591 Merge remote-tracking branch 'upstream/develop' into contact-id-new 2019-08-02 16:52:34 +00:00
Michael
418009ffea Improved PR 7452: We now respect the "self" contact 2019-08-02 16:46:26 +00:00
Michael
01ef630322 Fixed description 2019-08-02 16:42:24 +00:00
Michael
d95ef96cca Fix issue 7449: Image permissions are now set like before 2019-08-02 16:38:50 +00:00
Hypolite Petovan
2e6b72ba62
Revert "Reworked contact-id generation" 2019-08-01 20:39:42 -04:00
Michael Vogel
e8459cce34
Merge pull request #7381 from MrPetovan/task/7309-frio-compose 
[frio] New Compose page
 2019-08-01 08:15:02 +02:00
Hypolite Petovan
e9f0c4dbfb
Merge pull request #7444 from nupplaphil/task/dice_console 
Use DICE for Console
 2019-07-31 14:07:45 -04:00
Philipp Holzer
5935e69d33
Adding Configuration dependency 2019-07-31 19:43:00 +02:00
Philipp Holzer
a60eb9e33d
Use DICE for Console 
- Use Friendica\Core\Console as Controller for DI-library
- Refactor every console command to use DICE (when possible)
- Adjusting tests
 2019-07-31 19:37:42 +02:00
Michael
88aa777410 Moved user block 2019-07-31 16:09:03 +00:00
Michael
c936232575 Added header 2019-07-31 16:07:50 +00:00
Michael
cdc44e26de Log level changed 2019-07-31 16:05:28 +00:00
Michael
b377906b77 Merge remote-tracking branch 'upstream/develop' into tag-deliver-delete 2019-07-31 14:11:06 +00:00