Commit Graph

  • *
  • |\
  • * \
  • |\ \
  • | * |
  • | | | *
  • | |_|/
  • |/| |
  • | * |
  • |/ /
  • * |
  • |\ \
  • * \ \
  • |\ \ \
  • | | | *
  • | |_|/
  • |/| |
  • | * |
  • | * |
  • |/ /
  • | *
  • | *
  • | *
  • | *
  • |/
  • | *
  • | |\
  • |/ /
  • | *
  • |/
  • *
  • *
  • |\
  • | *
  • | *
  • | |\
  • | | *
  • | | *
  • | | *
  • | | |\
  • | | | | *
  • | | * | |
  • | | |\ \ \
  • | | | * | |
  • | | | * | |
  • | | |/ / /
  • | | * | |
  • | | |\ \ \
  • | | | | * |
  • | | | | * |
  • | | * | | |
  • | | |\ \ \ \
  • | | | |_|_|/
  • | | |/| | |
  • | | | * | |
  • | | | | * |
  • | | | |/ /
  • | | |/| |
  • | | | | | *
  • | | | | | *
  • | | | |_|/
  • | | |/| |
  • | | * | |
  • | | |\ \ \
  • | | | |/ /
  • | | |/| |
  • | | | * |
  • | | |/ /
  • | | | *
  • | | | *
  • | | |/
  • | | *
  • | | |\
  • | | * \
  • | | |\ \
  • | | | * |
  • | | | | *
  • | | * | |
  • | | |\ \ \
  • | | * \ \ \
  • | | |\ \ \ \
  • | | | * | | |
  • | | | * | | |
  • | | | * | | |
  • | | | * | | |
  • | | | * | | |
  • | | | * | | |
  • | | |/ / / /
  • | | | * | |
  • | | * | | |
  • | | |\ \ \ \
  • | | | |/ / /
  • | | | * | |
  • | | | | | *
  • | | | | |/
  • | | * | |
  • | | |\ \ \
  • | | | |/ /
  • | | |/| |
  • | | | * |
  • | | |/ /
  • | | * |
  • | | |\ \
  • | | * \ \
  • | | |\ \ \
  • | | | |_|/
  • | | |/| |
  • | | | | *
  • | | | |/
  • | | |/|
  • | | | *
  • | | |/
  • | | *
  • | | |\
  • | | | *
  • | | * |
  • | | |\ \
  • | | * \ \
  • | | |\ \ \
  • | | | | |/
  • | | | |/|
  • | | | * |
  • | | |/ /
  • | | | *
  • | | | *
  • | | | |\
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\ \
  • | | | * |
  • | | | | *
  • | | | |/
  • | | | *
  • | | | *
  • | | |/
  • | | *
  • | | |\
  • | | | *
  • | | * |
  • | | |\ \
  • | | | * |
  • | | |/ /
  • | | * |
  • | | |\ \
  • | | | |/
  • | | |/|
  • | | | *
  • | | | *
  • | | | *
  • | | |/
  • | | *
  • | | |\
  • | | | *
  • | | | *
  • | | | *
  • | | |/
  • | | *
  • | | |\
  • | | * \
  • | | |\ \
  • | | | * |
  • | | | * |
  • | | |/ /
  • | | | *
  • | | * |
  • | | |\ \
  • | | * \ \
  • | | |\ \ \
  • | | | | * |
  • | | | * | |
  • | | * | | |
  • | | |\ \ \ \
  • | | | | | | *
  • | | | |_|_|/
  • | | |/| | |
  • | | | * | |
  • | | |/ / /
  • | | | | *
  • | | | | *
  • | | | |/
  • | | |/|
  • | | * |
  • | | |\ \
  • 3b08ce953 (refs/pull/7313/merge) Merge 921d1c21a4 into 8a1f31b322 by Philipp 2019-06-25 06:01:35 +0000
  • 8a1f31b32 (HEAD -> develop) Merge pull request #7318 from deantownsley/lessbubbles by Hypolite Petovan 2019-06-24 23:09:41 -0400
  • fdbd16014 (refs/pull/7318/head) Add spaces for standards compliance by Dean Townsley 2019-06-24 21:37:44 -0500
  • 60cc05f19 (refs/pull/7319/head) Restore Preload config adapter features by Hypolite Petovan 2019-06-24 21:33:47 -0400
  • 59553ab97 Don't try to auth for public images by Dean Townsley 2019-06-24 19:45:50 -0500
  • 26accbe3e Merge pull request #7296 from MrPetovan/task/smilies-replace by Michael Vogel 2019-06-24 22:05:37 +0200
  • 8214aa287 Merge pull request #7312 from nupplaphil/task/DBA_Wrapper by Hypolite Petovan 2019-06-24 07:05:23 -0400
  • 921d1c21a (refs/pull/7313/head) Dynamic config loading - Move settings, defaults and dbstructure to directory 'static' - Dynamic loading of config files (after the static loading) - Filter out '-sample.config.php' and '-sample.ini.php' files - Remove unnecessary ConfigFileManager - Move ConfigFileLoader to Utils - Add tests for multi-loading for INI, config and sample-filtering by Philipp Holzer 2019-06-23 19:56:21 +0200
  • 91c295b55 (refs/pull/7312/head) Rebase type-hint based on af9ce6b92a by Philipp Holzer 2019-06-15 13:11:12 +0200
  • 082634adb Moving from DBA to Database by Philipp Holzer 2019-06-07 00:10:45 +0200
  • 2fb70bd5f (refs/pull/7296/head) Use Unicode to convert multiple hearts in Content\Smilies by Hypolite Petovan 2019-06-20 20:25:14 -0400
  • b51fb8c99 Fix typo in docblock in include/text by Hypolite Petovan 2019-06-20 19:31:47 -0400
  • 19b7398c6 Update BBCode::convert test mock-ups by Hypolite Petovan 2019-06-20 16:14:05 -0400
  • 9545ff614 Limit smilies replacement to BBCode::convert by Hypolite Petovan 2019-06-20 15:00:33 -0400
  • 16aa8e8c0 (refs/pull/7174/merge) Merge 95811d88a2 into 5e4ace271b by Hypolite Petovan 2019-06-23 21:53:19 +0000
  • 95811d88a (refs/pull/7174/head) Correctly escape identifiers in DBA by Hypolite Petovan 2019-05-21 17:05:03 -0400
  • 5e4ace271 Welcome 2019.09-dev! by Hypolite Petovan 2019-06-23 17:52:05 -0400
  • b9ab61377 Merge branch 'master' into develop by Hypolite Petovan 2019-06-23 17:40:52 -0400
  • f0c854324 (master) Update Composer archive settings by Hypolite Petovan 2019-06-23 17:38:12 -0400
  • c1f99c70b (tag: 2019.06) Merge branch '2019.06-rc' by Hypolite Petovan 2019-06-23 15:30:44 -0400
  • a25ed827c Updated version constants for 2019.06 release by Hypolite Petovan 2019-06-23 15:28:38 -0400
  • e4714cc50 Updated CHANGELOG for 2019.06 release by Hypolite Petovan 2019-06-23 15:26:48 -0400
  • fa191bd82 Merge pull request #7305 from deantownsley/imageauthfix by Hypolite Petovan 2019-06-23 15:18:15 -0400
  • ac371f4f2 (refs/pull/7310/head) Dynamic config loading - Move settings, defaults and dbstructure to directory 'static' - Dynamic loading of config files (after the static loading) - Filter out '-sample.config.php' and '-sample.ini.php' files - Remove unnecessary ConfigFileManager - Move ConfigFileLoader to Utils - Add tests for multi-loading for INI, config and sample-filtering by Philipp Holzer 2019-06-23 19:56:21 +0200
  • 2f42cb08f Merge pull request #7307 from annando/delete-events by Hypolite Petovan 2019-06-23 09:53:35 -0400
  • 955926607 (refs/pull/7307/head) todo added by Michael Vogel 2019-06-23 12:01:14 +0200
  • f84e2e9d9 Fix for distribution of event deletions by Michael Vogel 2019-06-23 08:41:49 +0200
  • 530662222 Merge pull request #7304 from MrPetovan/bug/smilies-escape-code-blocks by Philipp 2019-06-23 03:00:22 +0200
  • 0c6a0942c (refs/pull/7305/head) Clarify comment and log message by Dean Townsley 2019-06-22 19:08:34 -0500
  • 9dff3d2b6 Use User:: API insteadd of direct database read by Dean Townsley 2019-06-22 18:56:33 -0500
  • dc2535541 Merge pull request #7306 from annando/perform-activity by Hypolite Petovan 2019-06-22 19:23:09 -0400
  • 449305e52 (refs/pull/7306/head) Fix the processing of event activities by Michael Vogel 2019-06-23 00:38:52 +0200
  • cf11f57a5 (refs/pull/7304/head) Escape HTML pre-formatted blocks before converting smilies by Hypolite Petovan 2019-06-22 18:20:43 -0400
  • 7e29b336d (refs/pull/7232/head) Rebase type-hint based on af9ce6b92a by Philipp Holzer 2019-06-15 13:11:12 +0200
  • 46e268cce Moving from DBA to Database by Philipp Holzer 2019-06-07 00:10:45 +0200
  • daaf30e50 Merge pull request #7302 from friendica/revert-7286-bug/invading-smilies by Michael Vogel 2019-06-22 22:09:09 +0200
  • 1883cfba2 (refs/pull/7302/head) Revert "Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray" by Michael Vogel 2019-06-22 22:06:43 +0200
  • 042fcfeb5 Enable multi-auth in dfrn autoRedir by Dean Townsley 2019-06-22 12:34:54 -0500
  • b5e195b41 Add auth to load sequence for photos by Dean Townsley 2019-06-22 12:24:30 -0500
  • cd2f390df Merge pull request #7291 from MrPetovan/bug/2209-update-default-log-location by Michael Vogel 2019-06-22 12:56:25 +0200
  • 85772f02c Merge pull request #7286 from MrPetovan/bug/invading-smilies by Michael Vogel 2019-06-22 12:51:49 +0200
  • cdd23e5b6 (refs/pull/7286/head) Escape all the HTML pre-formatted blocks in Smilies::replaceFromArray by Hypolite Petovan 2019-06-20 20:22:26 -0400
  • 3cc9920af (refs/pull/7291/head) Add log folder to project gitignore by Hypolite Petovan 2019-06-22 03:49:58 -0400
  • c86c43db3 Merge pull request #7294 from annando/public-dfrn by Hypolite Petovan 2019-06-22 03:28:51 -0400
  • a90644698 Merge pull request #7295 from tobiasd/20190622-lang by Michael Vogel 2019-06-22 08:56:36 +0200
  • 72fdbbe79 (refs/pull/7295/head) EN US translation update THX AndyH3 by Tobias Diekershoff 2019-06-22 08:04:46 +0200
  • 4b4f121b7 EN GB translation update THX AndyH3 by Tobias Diekershoff 2019-06-22 07:43:24 +0200
  • ed1f96bf7 update FR translations THX Valvin A. by Tobias Diekershoff 2019-06-22 07:40:10 +0200
  • 680e2eb9e DE translation update THX Copis by Tobias Diekershoff 2019-06-22 07:29:52 +0200
  • b2f5ccc68 PL translation update THX waldis by Tobias Diekershoff 2019-06-22 07:29:03 +0200
  • acee9c1c9 CS translation update THX Aditoo by Tobias Diekershoff 2019-06-22 07:23:39 +0200
  • 289bcfa12 (refs/pull/7294/head) Fix receiving of DFRN posts with public envelope by Michael 2019-06-22 04:17:38 +0000
  • 9ed262ced Merge pull request #7292 from annando/notice by Hypolite Petovan 2019-06-21 15:42:27 -0400
  • b5de71c39 (refs/pull/7292/head) Fix a notice when the author is missing by Michael 2019-06-21 17:57:26 +0000
  • 470dd6079 Update default log location by Hypolite Petovan 2019-06-21 08:52:22 -0400
  • cb5a30218 Merge pull request #7289 from tobiasd/20190621-credits by Philipp 2019-06-21 08:56:03 +0200
  • 2deda829c (refs/pull/7289/head) updated the credits for 2019.06 by Tobias Diekershoff 2019-06-21 06:45:20 +0200
  • b07490266 Merge pull request #7288 from annando/fix-search by Hypolite Petovan 2019-06-20 19:33:00 -0400
  • 164464844 Merge pull request #7287 from annando/issue-6477 by Hypolite Petovan 2019-06-20 19:32:02 -0400
  • 7c87e83dc (refs/pull/7288/head) Fix searching for contacts by Michael 2019-06-20 21:56:18 +0000
  • 14c28868e (refs/pull/7287/head) Issue 6477: Use the correct content-type to resize the images by Michael 2019-06-20 20:09:33 +0000
  • f0849b0a9 Merge pull request #7284 from annando/fix-fatal by Hypolite Petovan 2019-06-19 23:42:21 -0400
  • 2e4e8bdf0 (refs/pull/7284/head) Don't send activities to "null" endpoints by Michael 2019-06-20 03:06:34 +0000
  • 2ba411611 Merge pull request #7282 from annando/issue-6477 by Hypolite Petovan 2019-06-19 16:12:56 -0400
  • e0b936e33 Merge pull request #7283 from annando/7280-fix by Michael Vogel 2019-06-19 20:40:19 +0200
  • f878cc262 (refs/pull/7283/head) Fix for PR 7280 by Michael 2019-06-19 18:38:22 +0000
  • d8ed2ed76 (refs/pull/7282/head) it is poll, not notify by Michael 2019-06-19 18:32:38 +0000
  • b55546b72 Merge remote-tracking branch 'upstream/2019.06-rc' into issue-6477 by Michael 2019-06-19 18:26:59 +0000
  • 105c12675 Merge pull request #7280 from annando/contact-baseurl by Hypolite Petovan 2019-06-19 14:12:47 -0400
  • 6bd5be281 (refs/pull/7280/head) Normalise it by Michael 2019-06-19 17:21:35 +0000
  • 4ab772ed6 Issue 6477: Automatically repair self contact avatar by Michael 2019-06-19 17:05:29 +0000
  • b48a49b0f Added timeout by Michael 2019-06-18 08:05:45 +0000
  • ea90554e7 Fix the base url detection of AP profiles by Michael 2019-06-18 07:47:21 +0000
  • 2c19b8c8e Merge pull request #7277 from annando/ignore-resharer by Hypolite Petovan 2019-06-17 09:01:31 -0400
  • 496910e75 (refs/pull/7277/head) Issue #5983: Ignore reshares from blocked and ignored contacts by Michael 2019-06-17 11:55:19 +0000
  • 80dce42aa Merge pull request #7276 from MrPetovan/bug/7275-share-new-lines by Michael Vogel 2019-06-17 08:13:59 +0200
  • d54e778f3 (refs/pull/7276/head) Move share conversion at the end of Text\BBCode::convert by Hypolite Petovan 2019-06-16 23:13:26 -0400
  • 43ba24fb2 Merge pull request #7274 from MrPetovan/bug/7271-allow-brackets-in-urls by Philipp 2019-06-16 15:27:17 +0200
  • da56e0a54 (refs/pull/7274/head) Add tests folder to typo console coverage by Hypolite Petovan 2019-06-15 22:27:20 -0400
  • 84ccaf50f Allow brackets in URLs by Hypolite Petovan 2019-06-15 22:26:29 -0400
  • 38311a4a0 Move link conversion to the end of BBCode::convert by Hypolite Petovan 2019-06-15 22:24:51 -0400
  • dc95d7c4f Merge pull request #7273 from MrPetovan/bug/notices by Philipp 2019-06-16 00:58:22 +0200
  • 14725bbd6 (refs/pull/7273/head) Fix undefined index addr notices in Model\Contact::getIdForURL by Hypolite Petovan 2019-06-15 17:16:10 -0400
  • aa5a61bae Fix variable by reference notice in Module\Admin\Federation by Hypolite Petovan 2019-06-15 17:12:36 -0400
  • 75894fa27 Use item created date if edited doesn't exist in Protocol\Diaspora::buildStatus by Hypolite Petovan 2019-06-15 17:11:01 -0400
  • da114445c Merge pull request #7268 from annando/issue-5983 by Hypolite Petovan 2019-06-15 16:53:41 -0400
  • 808cb3912 Merge pull request #7272 from MrPetovan/bug/directory-links by Philipp 2019-06-15 15:17:20 +0200
  • 394159d41 (refs/pull/7272/head) Use correct entry list in Module\Directory by Hypolite Petovan 2019-06-15 08:44:55 -0400
  • 68c65af04 Remove unused Module\Directory::init method by Hypolite Petovan 2019-06-15 08:44:36 -0400
  • f6f22378f (refs/pull/7268/head) Ignored stuff must be stored. by Michael 2019-06-14 18:34:17 +0000
  • 097ecdd10 Merge pull request #7266 from MrPetovan/bug/notices by Michael Vogel 2019-06-14 15:03:30 +0200
  • dc3bbb749 Merge pull request #7270 from MrPetovan/bug/7269-fetch-routes by Michael Vogel 2019-06-14 13:24:43 +0200
  • 95094aa53 (refs/pull/7266/head) Check for existing protocols.inbound value in Protocol\PortableContact by Hypolite Petovan 2019-06-14 06:25:44 -0400
  • 9f2529df3 (refs/pull/7270/head) Define expected /fetch module routes by Hypolite Petovan 2019-06-14 06:22:01 -0400
  • fa3b5f2bb Merge pull request #7267 from annando/notice by Hypolite Petovan 2019-06-14 06:01:52 -0400
  • 248207245 Issue 5983: Central check for blocked and ignored contacts added by Michael 2019-06-14 05:25:10 +0000
  • e4efddbab (refs/pull/7267/head) Avoid a notice in AP Receiver by Michael 2019-06-14 02:58:40 +0000
  • 66d4f1d40 Add type-hint in ActivityPub\Receiver::fetchObject to catch wrong type coercion by Hypolite Petovan 2019-06-13 19:07:39 -0400
  • af9ce6b92 Add type-hint for dynamic variables in DBA by Hypolite Petovan 2019-06-13 19:07:04 -0400
  • 9054e0087 Merge pull request #7265 from annando/issue-7264 by Hypolite Petovan 2019-06-13 16:51:03 -0400