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

5562 commits

Author SHA1 Message Date
Hypolite Petovan
4e579e77f5 Only output ActivityPub contacts in /followers and /following 
- Join contact table with apcontact to weed out non-AP contacts
 2020-05-06 15:29:35 -04:00
Michael
806f4a0142 Added logging 2020-05-06 19:00:56 +00:00
Michael
7dea1ff6bd Issue 8586 again: Don't transmit participations 2020-05-06 17:30:21 +00:00
Michael
b9ee46824f Added missing field 2020-05-06 15:37:04 +00:00
Michael
62a4638ea8 Don#t group 2020-05-06 15:27:13 +00:00
Michael
22be2cce8a Issue 8586: Reduce the amount of item receivers 2020-05-06 15:20:49 +00:00
Hypolite Petovan
36a7eceb89 Remove preemptive autolinker from Text\Markdown::toBBCode 
- Autolinker is done centrally in Text\BBCode::convert
 2020-05-05 23:41:35 -04:00
Hypolite Petovan
ccb69414d2 Combine getFollowers and getFollowing into getContacts in ActivityPub\Transmitter 2020-05-05 22:32:45 -04:00
Hypolite Petovan
f4083f6031
Merge pull request #8585 from annando/legacy-tag 
Removed legacy usage of the "tag" field
 2020-05-05 18:10:22 -04:00
Michael
d33f6fc167 Renamed function 2020-05-05 21:58:25 +00:00
Michael
0f042b064a Fix warning, notice and DB Error 2020-05-05 21:49:48 +00:00
Michael
980de37047 Removed legacy usage of the "tag" field 2020-05-05 19:54:25 +00:00
Hypolite Petovan
f7a45e4153
Merge pull request #8577 from annando/no-term2 
File and category aren't using "term" anymore
 2020-05-05 13:45:48 -04:00
Michael
3d4ace7a9d Merge branch 'no-term3' into no-term2 2020-05-05 16:09:50 +00:00
Michael
d67b9cb693 Formula according to documentation 2020-05-05 16:01:20 +00:00
Michael
7de6e60328 Merge remote-tracking branch 'upstream/develop' into issue-8550 2020-05-05 15:56:24 +00:00
Michael
5725784055 Update database definition, cleaned code 2020-05-05 15:47:35 +00:00
Michael
59675c4f0b Merge remote-tracking branch 'upstream/develop' into no-term2 2020-05-05 15:44:24 +00:00
Michael
d838dcbd8c Removed unused fields 2020-05-05 14:10:39 +00:00
Michael
2ee14bf5fe Merge remote-tracking branch 'upstream/develop' into post-delivery-data 2020-05-05 14:08:29 +00:00
Michael
84e3892955 Merge remote-tracking branch 'upstream/develop' into post-delivery-data 2020-05-05 13:16:01 +00:00
Michael
2f42e68dc8 Merge remote-tracking branch 'upstream/develop' into new-participation 2020-05-05 12:48:33 +00:00
Michael
b7e25d16e7 Removed usage of "tag" field 2020-05-05 05:11:59 +00:00
Hypolite Petovan
340bc57952 Ensure Tag::getByURIId parameter value in OStatus;;entryFooter 
- Address https://github.com/friendica/friendica/issues/8473#issuecomment-623701081
- $item['uri-id'] isn't present for follow entry pseudo-items
 2020-05-04 18:51:03 -04:00
Michael
1362748f59 Merge remote-tracking branch 'upstream/develop' into no-term2 2020-05-04 15:20:30 +00:00
Michael
4c86f2a3ec Merge remote-tracking branch 'upstream/develop' into new-participation 2020-05-04 15:01:42 +00:00
Michael
16d486dd24 Merge remote-tracking branch 'upstream/develop' into post-delivery-data 2020-05-04 14:40:52 +00:00
Hypolite Petovan
05cac4c186
Merge pull request #8570 from annando/tag-notice 
Fix for "Undefined index: uri-id""
 2020-05-04 09:30:14 -04:00
Michael
4fa26c81e8 Fix for wrong table and wrong field name 2020-05-03 15:44:39 +00:00
Michael
875d6b36e9 File and category aren't using "term" anymore 2020-05-03 15:13:40 +00:00
Michael
c141a3eb79 Corrected variable name 2020-05-02 22:02:29 +00:00
Michael
1a4beaf061 post update function added 2020-05-02 21:27:37 +00:00
Michael
098ba4a667 "item-delivery-data" is now "post-delivery-data" 2020-05-02 19:34:02 +00:00
Michael
2a1cdfa36b Diaspora participations are now atored as activities 2020-05-02 08:52:11 +00:00
Michael
233d6eea2b Tags are now added to the body again 2020-05-02 05:43:00 +00:00
Michael
11406fd3b6 Fix for "Undefined index: uri-id"" 2020-05-02 05:14:30 +00:00
Michael
b0cb6536dd The old tag handling is removed 2020-05-02 05:08:05 +00:00
Michael
776a1dd7c3 Renamed function 2020-05-01 15:43:50 +00:00
Michael
c3ecc19b41 Last "term" element renamed 2020-05-01 15:27:56 +00:00
Michael
729c6b67aa the "term" field now is called "name", workaround removed 2020-05-01 15:18:48 +00:00
Michael
74081a71ff Removed unused "use" 2020-05-01 13:26:13 +00:00
Michael
ede69a8673 Function renamed 2020-05-01 13:13:58 +00:00
Michael
70022393b7 Fix notice for missing "uri-id" 2020-05-01 12:42:22 +00:00
Michael
2b1fef469a Notification moved to usage of the "tag" table 2020-05-01 12:41:17 +00:00
Michael
029a379060 Move "isType" to Tag.php 2020-05-01 12:39:41 +00:00
Michael
ac2957c4dd Some more "term" to "tag" conversion 2020-05-01 10:57:32 +00:00
Michael
8602bbb3b9 "term" replaced with "tag" 2020-05-01 08:02:21 +00:00
Michael
3b2ae5c4a9 function names changed 2020-05-01 06:01:22 +00:00
Michael
6d4962a571 1,000 is better than 100 2020-04-30 12:13:13 +00:00
Michael
bb0d6ce6f6 Better check for finished conversion 2020-04-30 09:03:05 +00:00
Michael
88931e5053 Post update functionality for tags 2020-04-30 06:09:57 +00:00
Michael Vogel
e1d21e736a
Update src/Database/Database.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-29 19:13:23 +02:00
Michael
136c6b644e Fix: Mentions had been stored as tags 2020-04-29 10:49:13 +00:00
Michael
6487daa4a9 Issue 8550: Check for a good table_definition cache value 2020-04-29 06:28:06 +00:00
Michael
8c44f535b7 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-29 02:38:33 +00:00
Michael
00ef29fb97 It has to be "selectFirst" 2020-04-29 01:40:59 +00:00
Michael
1f9f321d54 Issue 8557: We have to fetch only a single row 2020-04-28 21:13:37 +00:00
Michael
10ffd3a374 Iissue 8560: Wrong value for parent in mail notification 2020-04-28 20:32:39 +00:00
Michael
6f3b46217e Fix for "Undefined index: profile_url" 2020-04-28 19:36:10 +00:00
Michael
70e5639e29 Merge 2020-04-28 13:33:03 +00:00
Hypolite Petovan
a61f61a051
Merge pull request #8556 from annando/close-db-connection 
Added forgotten DBA::close
 2020-04-28 09:27:27 -04:00
Michael
c2a9b3b9e9 Usage of the new tag tables 2020-04-28 11:52:51 +00:00
Michael
5367620467 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-28 08:03:26 +00:00
Michael
238c079d11 Merge remote-tracking branch 'upstream/develop' into issue-8546 2020-04-28 08:01:33 +00:00
Michael
e52e505a48 Merge 2020-04-28 08:00:38 +00:00
Michael
f75009c20c Some more forgotten DBA::close 2020-04-28 07:10:18 +00:00
Tobias Diekershoff
c853ea6aae
Merge pull request #8554 from annando/fix-8551 
Fix issue 8551: Last item is now displayed again
 2020-04-28 07:55:24 +02:00
Michael
9ccdbd9349 Added forgotten DBA::close 2020-04-28 05:55:17 +00:00
Michael
fd752be114 Issue 8546: Added option to not use prepared statements 2020-04-28 05:40:23 +00:00
Michael
0c4dde8e68 Fix issue 8551: Last item is now displayed again 2020-04-28 05:22:29 +00:00
Michael
ce20081d28 Fix wrong field name 2020-04-28 03:52:07 +00:00
Michael
f521689ced Suppress XML logging of errors 2020-04-27 14:35:50 +00:00
Michael
9fb035ee79 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-26 18:47:24 +00:00
Hypolite Petovan
1b0a8ec5c0
Merge pull request #8545 from nupplaphil/bug/subdir 
Template Engine with Subdirectory
 2020-04-26 14:31:30 -04:00
Michael
6c59e03805 Renamed comment 2020-04-26 16:20:17 +00:00
Michael
7f5f68a904 More preparations for term to tag transition 2020-04-26 16:15:39 +00:00
Michael
5df5e9521b The tag table is now really used 2020-04-26 15:24:58 +00:00
Philipp
f5f62d3f42
Template Engine with Subdirectory 
- Use explicit root path for template engine
- Replace "__DIR__" calls in addons with subdirectories
- Fixes local tests, where call is made out of '/' and not '/vagrant/'
 2020-04-26 15:45:25 +02:00
Michael
d74067b461 Queries had been simplified 2020-04-26 06:58:30 +00:00
Michael
832ac65248 Merge branch 'views' of github.com:annando/friendica into views 2020-04-26 06:31:31 +00:00
Michael Vogel
7e8bcc9034
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:34 +02:00
Michael Vogel
3107680e51
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:17 +02:00
Michael Vogel
3f9c78a20b
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-26 08:04:03 +02:00
Michael Vogel
37b9031a27
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-25 23:33:11 +02:00
Michael Vogel
7f17c1484a
Update src/Model/Profile.php 
Co-Authored-By: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-04-25 23:33:01 +02:00
Michael
51bc5279a0 Documentation and unneeded stuff removed 2020-04-25 18:36:58 +00:00
Michael
e012730e52 Added check and repair for missing self contact 2020-04-25 07:29:38 +00:00
Michael
7d111e2a6f Duplicated fields renamed 2020-04-25 07:29:02 +00:00
Michael
ee3a724b41 Three more joins replaced with views 2020-04-24 20:39:14 +00:00
Michael
1c980c5b29 The workerqueue is now using a view as well 2020-04-24 18:50:36 +00:00
Michael
89dcab774d Prticipation is now a view as well 2020-04-24 17:55:49 +00:00
Michael
57009d30c4 There is now a pending view 2020-04-24 15:42:43 +00:00
Michael
cf0d36737f Removed query for "updated" in gcontact 2020-04-24 15:18:34 +00:00
Michael
a5aa43469b Some more places with owner-view 2020-04-24 13:41:11 +00:00
Michael
c4f7f3e26e And some more view calls added 2020-04-24 12:59:19 +00:00
Michael
3e5c3dce01 Next join replaced by view 2020-04-24 12:24:10 +00:00
Michael
4181eb37f5 More joins replaced by view calls 2020-04-24 11:55:46 +00:00
Michael
02aed490e2 Owner-view added 2020-04-24 11:04:50 +00:00
Michael
afa712b811 DBView is View 2020-04-24 08:48:34 +00:00
Michael
304ba0e7c4 Merge remote-tracking branch 'upstream/develop' into views 2020-04-24 05:35:00 +00:00
Michael
778ff0689f AP: Interpret "update" as "create" when item isn't found 2020-04-23 19:57:20 +00:00
Michael
c3aa2730de Improved definition style 2020-04-23 07:02:18 +00:00
Michael
63ebbb8a16 We now can define views 2020-04-23 06:19:44 +00:00
Hypolite Petovan
43b8bdea07
Merge pull request #8520 from annando/term2tag 
We now store tags in "tag"
 2020-04-22 22:56:07 -04:00
Michael
1f7993acad Code standards 2020-04-22 15:22:39 +00:00
Hypolite Petovan
36717a9953
Merge pull request #8532 from annando/fix-image-description 
Fix: Image descriptions now work again
 2020-04-21 09:45:01 -04:00
Michael
33eda87bc4 Fix: Image descriptions now work again 2020-04-21 04:01:13 +00:00
Michael Vogel
ee098277b9
Merge pull request #8530 from MrPetovan/task/8498-move-poke-to-src 
Move poke module to src/
 2020-04-21 05:56:59 +02:00
Hypolite Petovan
8cc11d6033 Update log string in Module\Contact\Poke 2020-04-20 18:02:23 -04:00
Hypolite Petovan
7f04aea8b1 Move poke module to src/ 
- Add new route contact/<cid>/poke and update all references
- Rework template with form field includes
- [frio] Enable modal behavior
 2020-04-20 11:47:08 -04:00
Michael
e19b1800a4 Added documentation 2020-04-20 12:19:26 +00:00
Michael
27ea747e99 Switchable contact probing 2020-04-20 09:47:26 +00:00
Michael
21103a5735 Store implicit mentions 2020-04-20 05:43:13 +00:00
Michael
f4543b2cf7 Fix: Wrong variable 2020-04-20 05:42:46 +00:00
Michael
2bb76d96d6 Improved logging 2020-04-19 16:48:03 +00:00
Michael
538e212a84 Hashtag handling with Diaspora improved 2020-04-19 16:33:06 +00:00
Michael
98b3058601 Update item-uri with guid if given 2020-04-19 08:34:20 +00:00
Michael
66f5e7c0f8 Don't store URL with hashtags / OStatus-Diaspora-Improvements 2020-04-19 07:24:36 +00:00
Michael
ea60660c6d Central function to fetch the type for a given hash 2020-04-18 21:01:43 +00:00
Michael
9e9a104320 Tags can now be added and removed from photos 2020-04-18 20:46:41 +00:00
Michael
c2d1d11123 Use constants 2020-04-18 16:14:38 +00:00
Michael
0f2215bc17 Hybrid mode for non resolvable contacts 2020-04-18 16:00:06 +00:00
Michael
5d34a90d67 Store mentioned contacts in another way 2020-04-18 14:41:26 +00:00
Michael
539a5c5da1 Fixes RegExp 2020-04-18 10:38:08 +00:00
Michael
3ce9386cb1 Improved body scanning, increased length 2020-04-18 10:05:30 +00:00
Michael
d9352f5a63 Use the new function when adding additional tags 2020-04-17 13:34:29 +00:00
Michael
c446712d08 Added documentation 2020-04-17 07:58:54 +00:00
Michael
6afcf5c8c7 Use "store" when possible 2020-04-17 07:55:23 +00:00
Michael
db657b0149 We now store the tags in two separate tables 2020-04-17 06:35:20 +00:00
Michael
d3f4e4d629 Don't insert empty terms 2020-04-16 08:21:02 +00:00
Michael
5ef05b3703 Added uri-id to the constant 2020-04-16 04:20:59 +00:00
Michael
a0d4e330b9 Spaces 2020-04-16 04:20:06 +00:00
Michael
126b95d873 Added documentation header 2020-04-15 20:59:45 +00:00
Michael
f871105ef9 Use name or nick 2020-04-15 20:52:30 +00:00
Michael
472518f0b5 Use the name as name 2020-04-15 20:45:04 +00:00
Michael
a4fd5033dd Function had been moved 2020-04-15 19:42:02 +00:00
Michael
4808aa431a Use the own constants 2020-04-15 16:38:52 +00:00
Michael
2e0501e7c5 New model class for tag 2020-04-15 16:37:09 +00:00
Michael
cb593226bf Spaces and newlines 2020-04-15 11:39:00 +00:00
Michael
f52614e249 Merge remote-tracking branch 'upstream/develop' into term2tag 2020-04-15 11:31:52 +00:00
Michael
a5f84c8991 The old fields are not existing anymore 2020-04-15 05:57:07 +00:00
Michael
fe48b078e4 The old fields don't exist anymore 2020-04-15 05:51:06 +00:00
Michael
54a4b4df3b Whitespace removed 2020-04-15 05:33:11 +00:00
Michael
2b41229a6a Merge branch 'item-select' of github.com:annando/friendica into item-select 2020-04-15 05:31:26 +00:00
Michael
8e3eceaeb0 Merge remote-tracking branch 'upstream/develop' into item-select 2020-04-15 05:30:04 +00:00
Michael
496d882d06 Fix: some selected item fields hadn't been selected 2020-04-15 05:28:54 +00:00
Michael
0d5d0bb65a Fix: some selected item fields hadn't been selected 2020-04-15 05:24:36 +00:00
Michael
e5a0ff9572 Fix for missing fields 2020-04-15 05:11:45 +00:00
Michael
9a0d2c9e0c The new tag table should work for feeds no as well 2020-04-15 05:10:40 +00:00
Michael
010491e0b0 Don't use "sensitive" 2020-04-14 17:18:48 +00:00
Michael
1e702d4145 Corrections for DFRN, added support for OStatus 2020-04-14 17:00:56 +00:00
Michael
3f4c85dead Store the tags with DFRN as well 2020-04-14 16:52:53 +00:00
Michael
df898bd3d3 Improved logging 2020-04-14 09:19:45 +00:00
Michael
6fa43ffa71 Store tags for Diaspora - shorten tags when needed 2020-04-14 07:56:53 +00:00
Michael
67a67200a7 Storing mentions in Diaspora and AP 2020-04-13 23:54:28 +00:00
Michael
661dd43b0d Term constants updated 2020-04-13 19:24:22 +00:00
Michael
552fd98657 The "sign" table had been removed 2020-04-13 16:27:40 +00:00
Hypolite Petovan
af817b2ad5 Add cache and CORS headers to ActivityPub endpoints 2020-04-05 18:02:38 -04:00
Hypolite Petovan
1e32f74b0b Rework Module/Objects 
- Merge two item queries into one
- Add ETag check
- Use Router parameter
 2020-04-05 18:00:46 -04:00
Hypolite Petovan
f96d1fbd0b Add Network::checkEtagModified method 2020-04-05 17:58:09 -04:00
Hypolite Petovan
0eab66253e
Merge pull request #8494 from annando/ap-fix-comments 
AP: Limited comment distribution
 2020-04-05 08:19:44 -04:00
Michael
860d4654c1 Issue 8495: Only use "noreply" when no sender mail is defined 2020-04-04 20:26:09 +00:00
Michael
bdd6e1913a AP: Limited comment distribution 2020-04-04 17:59:08 +00:00
Hypolite Petovan
6bb210ff7a Refactor features pages 
- Create frio template for admin features page
- Fix header hierarchy
 2020-04-01 19:06:10 -04:00
Hypolite Petovan
fd89572606 Refactor admin site settings templates 
- Fix header hierarchy in admin/site.tpl
- Fix panel display in frio/templates/admin/site.tpl
 2020-04-01 19:06:10 -04:00
Michael
01c6179feb Check for Antelope and convert to Barracuda 2020-04-01 18:11:06 +00:00
Hypolite Petovan
0584667d13
Merge pull request #8481 from annando/mimetype 
Improved Mime Type detection
 2020-04-01 07:27:42 -04:00
Michael
d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
Hypolite Petovan
dcf59e34c1 Add new Strings::substringReplace method 
- Add tests for the method
 2020-03-30 10:49:53 -04:00
Tobias Diekershoff
352383f7b2
Merge pull request #8472 from annando/prevent-loop 
Discover contacts: Prevent putting much stress on remote systems
 2020-03-30 09:10:20 +02:00
Michael
4aa89368ad Prevent putting much stress on remote systems 2020-03-30 06:22:32 +00:00
Hypolite Petovan
f69c591166 Add object key existence check in ActivityPub/Transmitter 
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-605614192
 2020-03-29 12:52:05 -04:00
Tobias Diekershoff
8eaab2cecb
Merge pull request #8465 from AlfredSK/AlfredSK-dont_mention_multiprofiles 
Remove multi profile mention in settings
 2020-03-29 14:35:50 +02:00
Michael
e17e385c41 Fix: Queries with empty selections hadn't worked anymore 2020-03-29 12:29:57 +00:00
Michael
979199c442 Should fix the unknown "internal-psid" field 2020-03-29 11:16:40 +00:00
Steffen K9
154109f9ee
remove default from welcome.php 2020-03-29 11:36:04 +02:00
Tobias Diekershoff
cb1696bfaf
Merge pull request #8464 from annando/notice 
Fixes two notices
 2020-03-29 08:37:57 +02:00
Hypolite Petovan
1d8bb726d6
Merge pull request #8462 from annando/issue-8254-3 
Issue 8254: Some more fixes for too long data for columns
 2020-03-29 00:32:03 -04:00
Hypolite Petovan
9fd23c407b
Merge pull request #8463 from annando/issue-8299 
Issue 8299: Don't manipulate DFRN content upon receiving
 2020-03-28 23:18:44 -04:00
Michael Vogel
1194f9a58c (hopefully) Fixes "Undefined index: internal-psid" 2020-03-28 23:11:57 +01:00
Michael Vogel
3ca88f53ec Fixes "Undefined index: object" 2020-03-28 22:37:03 +01:00
Michael Vogel
01d6bfd2dd Issue 8299: Don't manipulate DFRN content upon receiving 2020-03-28 20:41:25 +01:00
Michael
2ba4333f70 Exchange "part" with "fragment" 2020-03-28 15:18:12 +00:00
Michael
3761e9ee51 Issue 8254: Some more fixes for too long data for columns 2020-03-28 15:14:40 +00:00
Michael
b5cdd78523 Issue 8341: Make events sharable 2020-03-28 14:02:49 +00:00
Michael
cc913bcf7c Prevent another endless loop while fetching AP items 2020-03-28 10:34:23 +00:00
Hypolite Petovan
8a4a65f418
Merge pull request #8456 from annando/fix-ap 
Fix: Fetching content via the "objects" endpoint behaved wrong
 2020-03-26 08:45:10 -04:00
Michael Vogel
fcb0fa4cfa Fix: Fetching content via the "objects" endpoint behaved wrong 2020-03-26 07:52:48 +01:00
Michael
6f22e3909b Issue 8254 More length shortenings 2020-03-25 23:18:07 +00:00
Michael
52e6f97b61 Removed wrong comment 2020-03-25 18:27:35 +00:00
Michael
1e9d793d74 Socialhome added 2020-03-25 17:25:23 +00:00
Michael
6249b674dc Issue 7892: Improve "plink" generation for Diaspora posts 2020-03-25 16:42:53 +00:00
Tobias Diekershoff
e4dbc09601
Merge pull request #8452 from annando/issue-8254 
Issue 8254: Length restriction for "title" and "uri"
 2020-03-25 12:07:26 +01:00
Michael
b36e0e58b7 OStatus: Avoid a notice 2020-03-25 07:29:47 +00:00
Michael
0486050d96 Issue 8254: Length restriction for "title" and "uri" 2020-03-25 07:07:34 +00:00
Michael
1fef1ef6e9 Issue 7771: Funkwhale support 2020-03-24 23:12:53 +00:00
Tobias Diekershoff
103769f4c2
Merge pull request #8447 from annando/issue-7771-funkwhale 
Funkwhale support added, Peertube support improved
 2020-03-23 06:44:18 +01:00
Michael
50e0ea5b3e Funkwhale support added, Peertube support improved 2020-03-23 04:43:06 +00:00
Hypolite Petovan
1187742c14 Skip Contact::getDetailsByURL when url is empty in GContact::searchByName 
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-602169147
 2020-03-22 22:46:22 -04:00
Michael
b68a16e07a "repair diaspora" fixed some problem long time ago. It is not needed anymore 2020-03-22 13:12:48 +00:00