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

24415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael 0696026380 Improved logging when item had been deliberately deleted after creation 2019-07-31 14:09:27 +00:00
Hypolite Petovan b8a336cc0d
Merge pull request #7452 from annando/contact-id 
Reworked contact-id generation
 2019-07-31 08:12:00 -04:00
Hypolite Petovan 70b9359c38
Merge pull request #7450 from annando/api-alt-description 
We can now set image descriptions via API
 2019-07-30 18:45:06 -04:00
Michael b4c673a620 We now use a central function for fetching the postdata 2019-07-30 22:26:01 +00:00
Michael 8ddcd8417d Reworked contact-id generation 2019-07-30 22:02:32 +00:00
Michael f8b8a5a52b Merge remote-tracking branch 'upstream/develop' into api-alt-description 2019-07-30 13:40:12 +00:00
Hypolite Petovan 10395429a7
Merge pull request #7451 from annando/ap-contact-id 
Fix: The field "contact-id" now contains the correct contact id again
 2019-07-30 09:23:43 -04:00
Michael 7d79d48f6e Fix: The field "contact-id" now contains the correct contact id again 2019-07-30 13:08:14 +00:00
Michael 79bc773d02 Use tabs 2019-07-30 05:38:10 +00:00
Michael cf67b8aa37 Added documentation 2019-07-30 05:36:06 +00:00
Michael 223cb8f037 We can now set image descriptions via API 2019-07-30 05:02:26 +00:00
Hypolite Petovan 4b60e89c07
Merge pull request #7449 from annando/img-upload 
Use another "img" format to simplify adding of alternative texts
 2019-07-29 17:05:56 -04:00
Michael dfee2c467c Use another "img" format to simplify adding of alternative texts 2019-07-29 20:42:42 +00:00
Michael 1b0f260255 Convert filebrowser.js to unix format 2019-07-29 20:41:19 +00:00
Hypolite Petovan 7f08f5be71
Merge pull request #7448 from friendica/Photo-select-patch 
Replace remaining Photo::select by new Photo::selectToArray
 2019-07-29 13:43:29 -04:00
Hypolite Petovan e745506c04
Replace removed Photo::select by new Photo::selectToArray in /photos 2019-07-29 13:38:55 -04:00
Hypolite Petovan cfd2e7f686
Replace removed Photo::select by new Photo::selectToArray in /profile_photo 2019-07-29 13:37:54 -04:00
Philipp 70ba9e5e0c
Merge pull request #7174 from MrPetovan/task/dba-quote-identifiers 
DBA: Correctly escape identifier names
 2019-07-29 14:37:09 +02:00
Hypolite Petovan b876a339ff
Merge pull request #7447 from annando/ap-alt-outgoing 
ActivityPub: We now support transmitting alternative image descriptions
 2019-07-29 01:20:05 -04:00
Michael bcc8ed378c ActivityPub: We now do support transmitting alternative image descriptions 2019-07-29 05:09:11 +00:00
Hypolite Petovan 1ccc1efdcf
Merge pull request #7446 from annando/alt-text 
ActivityPub: Support for incoming picture descriptions
 2019-07-29 00:57:14 -04:00
Michael ab7db9944d ActivityPub: Support for incoming picture descriptions 2019-07-29 04:35:13 +00:00
Hypolite Petovan 0e0fff3324 Correctly escape identifier names 
- Add support for schema, multiple tables in $table parameters
- Remove Database->formatTableName method
 2019-07-29 00:23:40 -04:00
Michael Vogel ff54f4d3d7
Merge pull request #7445 from MrPetovan/bug/7442-event-title-unescape 
Unescape stream event title
 2019-07-29 06:06:14 +02:00
Hypolite Petovan 816eba5164 Unescape stream event title 2019-07-28 21:46:43 -04:00
Hypolite Petovan c290bcb975
Merge pull request #7443 from annando/no-diaspora 
Delivery comments to Diaspora only if it is useful
 2019-07-28 16:22:52 -04:00
Hypolite Petovan b1049d1d9f
Merge pull request #7441 from nupplaphil/task/remove_dbunit 
Remove Phpunit/Dbunit
 2019-07-28 16:21:22 -04:00
Michael e556dfd475 Don't deliver nested comments to Diaspora if the previous comment wasn't from Diaspora 2019-07-28 19:13:17 +00:00
Philipp Holzer df9ebf5e8e
Replace api.yml to api.fixture.php 
- Remove yaml dependency
- Add PHP array based fixture possibility
 2019-07-28 20:46:29 +02:00
Philipp Holzer b08ac3c0a7
Remove Phpunit/Dbunit 
- Introduce own Yaml-to-SQL class
- Introduce new way of MySQL-DB-tests (per rollback)
- Remove dependency phpunit/dbunit
- Introduce new dev-dependency for YAML-ready (Symfony YAML reader)
 2019-07-28 17:40:42 +02:00
Michael Vogel eddcb5ebe9
Merge pull request #7437 from MrPetovan/bug/fatal-errors 
Replace last instance of Contact::select
 2019-07-28 10:19:28 +02:00
Hypolite Petovan 50f3098495 Revert adding DBA::toArray to Item::selectToArray 2019-07-28 00:12:49 -04:00
Hypolite Petovan 3334a3d497 Fix indent in Model\Item 2019-07-28 00:06:05 -04:00
Hypolite Petovan a61ce4fed0 Ensure *toArray returns an array 2019-07-28 00:03:42 -04:00
Hypolite Petovan b684fffcb7 Replace last instance of Contact::select 2019-07-27 23:51:04 -04:00
Hypolite Petovan 9d45118356
Merge pull request #7417 from nupplaphil/task/app_dependencies 
Remove DependencyFactory
 2019-07-27 18:48:07 -04:00
Philipp Holzer 2f5928f43a
Refactoring Profile:: selectors 2019-07-28 00:19:38 +02:00
Philipp Holzer 930ce855f8
Use BaseObject in auth_ejabberd because of static dependencies inside ExAuth 2019-07-28 00:02:51 +02:00
Philipp Holzer 51d2db3998
merge DBA::selectToArray 2019-07-27 23:57:38 +02:00
Philipp Holzer 7613704d2f
improve Profile model 2019-07-27 23:56:54 +02:00
Philipp Holzer 46211de037
Fix DBA::fetch in API 2019-07-27 23:54:15 +02:00
Philipp Holzer aefbc703f2
Add some phpdoc 2019-07-27 23:54:14 +02:00
Philipp Holzer b7f1de1e64
Revert $term DB result check 2019-07-27 23:54:14 +02:00
Philipp Holzer 37d03bbeae
Introduce test optimization 
- Add static connection for whole tests
- Introduce ExtendedPDO class to enable nested transactions
- Add rollback logic for tests to ensure reliability and increase speed
 2019-07-27 23:54:13 +02:00
Philipp Holzer 07aaf292ec
Fix tests 2019-07-27 23:54:13 +02:00
Philipp Holzer 2a87464c97
Replace q() call with Profile::get() method 2019-07-27 23:54:12 +02:00