clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 7a79ac912c Merge pull request #5973 from friendica/bug/5946-remove-last-include-security Michael Vogel 2018-10-20 10:10:56 +02:00
  • fea48fa85e AP: Transmitting and receiving with non AP contacts Michael 2018-10-20 07:53:45 +00:00
  • 2f7f9ffdd8 Merge branch 'develop' of https://github.com/friendica/friendica into develop Ralf Thees 2018-10-20 04:40:48 +02:00
  • 0f44e03a9e Updated german addons doc with new location for logged_in hook Hypolite Petovan 2018-10-19 15:18:10 -04:00
  • 6b1f490a2a Updated documentation for logged_in hook location Hypolite Petovan 2018-10-19 15:15:24 -04:00
  • 97c181a391 Merge pull request #5972 from friendica/bug/5946-remove-last-include-security Michael Vogel 2018-10-19 21:14:10 +02:00
  • ed52b5d0a9 Remove reference to deleted include/security in mod/pubsub Hypolite Petovan 2018-10-19 15:12:53 -04:00
  • a2666b0d02 Remove reference to deleted include/security.php Hypolite Petovan 2018-10-19 15:11:51 -04:00
  • d6864311e3 Merge pull request #5971 from MrPetovan/bug/5970-use-temppath-passwordexposed Michael Vogel 2018-10-19 19:00:00 +02:00
  • bb3efd97ad Merge pull request #5969 from friendica/bug/5968-add-click-through-image-caption Michael Vogel 2018-10-19 18:58:57 +02:00
  • 7795643134 Add system.temppath description to config/settings.ini.php Benjamin Lorteau 2018-10-19 11:27:11 -04:00
  • d9209b9c7a Use local temporary directory for PasswordExposedChecker cache Benjamin Lorteau 2018-10-19 11:26:48 -04:00
  • afeb6df225 [frio] Enable click through image caption in file browser Hypolite Petovan 2018-10-19 10:46:09 -04:00
  • f104817967 Merge pull request #5967 from annando/ap-nick Hypolite Petovan 2018-10-19 10:38:51 -04:00
  • bedab33e0b Fix function naming Michael 2018-10-19 13:08:46 +00:00
  • ec0d3a6eac Merge pull request #5946 from JonnyTischbein/move_include_security Hypolite Petovan 2018-10-19 08:55:08 -04:00
  • 6e164ed09f Merge pull request #5965 from annando/ap-nick Hypolite Petovan 2018-10-19 08:51:38 -04:00
  • cafd5ca781 update function names in logger and comments Jonny Tischbein 2018-10-19 10:03:52 +02:00
  • bad7d1a9dc updated to match coding styles Jeroen De Meerleer 2018-10-19 09:45:00 +02:00
  • 65f2fc39e2 fixed view of active embedded videos Jeroen De Meerleer 2018-10-19 09:37:15 +02:00
  • cdeb4682ef Use nickname based mentions for AP Michael 2018-10-19 05:27:54 +00:00
  • ee5f86d836 Merge pull request #5964 from annando/item-thread Hypolite Petovan 2018-10-18 23:52:40 -04:00
  • 8cecc9fb97 Merge pull request #5962 from friendica/bug/5960-fix-register-email-translation-params Michael Vogel 2018-10-19 05:34:24 +02:00
  • 45156652cc Merge pull request #5963 from MrPetovan/bug/5956-catch-more-diaspora-magic-links Michael Vogel 2018-10-19 05:30:52 +02:00
  • 4ae37c6196 Merge remote-tracking branch 'upstream/develop' into item-thread Michael 2018-10-19 03:19:34 +00:00
  • d0681075bf Add itemsource module Hypolite Petovan 2018-10-18 22:49:25 -04:00
  • eb714f0487 Diaspora: Widen the magic link regular expression Hypolite Petovan 2018-10-18 22:39:06 -04:00
  • 8315940c39 Merge pull request #5961 from annando/simpler-item Hypolite Petovan 2018-10-18 18:24:09 -04:00
  • 18763e32af Remove superfluous L10n::t() parameter in Model\user Hypolite Petovan 2018-10-18 18:22:48 -04:00
  • 0628b44f8e The handling with item-content and item-activity had been simplified Michael 2018-10-18 21:35:48 +00:00
  • 50531d1c1d Merge pull request #5958 from vinzv/patch-1 Hypolite Petovan 2018-10-18 16:52:44 -04:00
  • 2b663ed2b6 Fix broken credits box vinzv 2018-10-18 22:49:03 +02:00
  • 9f0c039b6b Fix app/client links vinzv 2018-10-18 22:34:19 +02:00
  • fc4d01c088 Merge branch 'develop' of https://github.com/friendica/friendica into develop Ralf Thees 2018-10-18 21:22:13 +02:00
  • ca86a9e1d6 Merge pull request #5957 from friendica/bug/5955-restore-preshare Michael Vogel 2018-10-18 19:34:29 +02:00
  • ee32cf6b92 Restore preshare prepending in BBCode::convertShare Hypolite Petovan 2018-10-18 11:23:48 -04:00
  • a1919992b9 Merge pull request #5954 from annando/fix-null-receiver Hypolite Petovan 2018-10-18 10:05:05 -04:00
  • 2a3d5da8d6 Merge pull request #5953 from MrPetovan/task/5891-contacts-follow-up Michael Vogel 2018-10-18 16:02:02 +02:00
  • 688174e6c0 AP: Fix "null" receiver Michael 2018-10-18 12:25:57 +00:00
  • 6d5b2c484d Replace remaining instances of "contacts/" Hypolite Petovan 2018-10-18 07:48:34 -04:00
  • fdac992b6b Merge branch 'develop' of https://github.com/friendica/friendica into develop Ralf Thees 2018-10-18 10:42:10 +02:00
  • e2f005f68c Merge pull request #5952 from annando/ap-fixes Tobias Diekershoff 2018-10-18 08:02:27 +02:00
  • 8035bad8e2 AP: Fix a notice / avoid an error when fetched content hadn't been an array Michael 2018-10-18 05:54:44 +00:00
  • da2a17495d Merge pull request #5951 from annando/endless-contact Hypolite Petovan 2018-10-18 00:44:07 -04:00
  • 6d420dfe9e Merge pull request #5950 from annando/no-polling Hypolite Petovan 2018-10-18 00:43:35 -04:00
  • 92816dc725 Improved loop detection Michael 2018-10-18 03:33:08 +00:00
  • 35da40c2cb Avoid endless loop when trying to fetch contact id Michael 2018-10-18 03:01:34 +00:00
  • d307aa1484 For test purposes we can now deactivate polling Michael 2018-10-18 02:46:02 +00:00
  • 5201e9009d Inserted missing hidden input with form_security_token Ralf Thees 2018-10-17 22:53:24 +02:00
  • a937cf06a3 add remaning/moving to files not touch by refactoring because of typo Jonny Tischbein 2018-10-17 22:35:49 +02:00
  • a19f8d642d Merge pull request #5942 from MrPetovan/feature/3218-add-convert-share-callback Michael Vogel 2018-10-17 22:01:02 +02:00
  • 0c0e17b7a7 Remove unneeded Util/Security includings + Resolve including merge conflict with develop Jonny Tischbein 2018-10-17 21:52:08 +02:00
  • f3fc1f36ca Renaming functions + moving functions from security to Model/Item and BaseModule + fix multiline comments Jonny Tischbein 2018-10-17 21:30:41 +02:00
  • a298a1f8d5 Merge branch 'develop' of https://github.com/friendica/friendica into develop Ralf Thees 2018-10-17 21:19:52 +02:00
  • 3065d1c40a Add Link promt in comment + only add URL instead of attachement via parse_url Jonny Tischbein 2018-10-17 21:05:45 +02:00
  • 389685e099 Merge pull request #5920 from MrPetovan/bug/remove-password-from-register Michael Vogel 2018-10-17 21:04:11 +02:00
  • e254ace9d5 Merge pull request #5947 from annando/uri-id Hypolite Petovan 2018-10-17 14:45:40 -04:00
  • 62ad755980 Use "uri-id" for item relations Michael 2018-10-17 18:34:24 +00:00
  • ce2b1f5715 Rename function Authentication::authenticate_success to Authentication::success Jonny Tischbein 2018-10-17 18:45:32 +02:00
  • 45e5a7f59f remove unsed require_onces of security.php Jonny Tischbein 2018-10-17 18:39:27 +02:00
  • 057385a4ec Add $is_quote_share parameter to convert share callback Hypolite Petovan 2018-10-17 08:20:56 -04:00
  • 05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security Jonny Tischbein 2018-10-17 14:19:58 +02:00
  • 55e4b5943c Merge pull request #5945 from zeroadam/More-5493 Hypolite Petovan 2018-10-17 07:52:47 -04:00
  • 370ee08fcc Remaining contacts to contact Adam Magness 2018-10-17 07:49:27 -04:00
  • a21c1deb7e Merge pull request #5944 from zeroadam/5943 Hypolite Petovan 2018-10-17 07:40:49 -04:00
  • 2db8c7d64f Fix template urls from contacts/ to contact/ Adam Magness 2018-10-17 07:25:23 -04:00
  • ae85543aec Merge pull request #5941 from MrPetovan/bug/5932-fix-notices Tobias Diekershoff 2018-10-17 07:42:51 +02:00
  • 9239ecc5e0 Rework BBCode::convertShare to accept a callback function Hypolite Petovan 2018-10-17 01:13:18 -04:00
  • 45748da8a1 Remove network exception in handle_tag Hypolite Petovan 2018-10-17 01:11:50 -04:00
  • b5fb81f535 Add Mastodon/Pleroma protocol guessing Hypolite Petovan 2018-10-17 01:10:07 -04:00
  • c50be325bd Remove unused parameter $selected in Model\Item::fieldlist Hypolite Petovan 2018-10-16 18:30:24 -04:00
  • 341b83d1df Fix Undefined index: photo in ActivityPub/Receiver Hypolite Petovan 2018-10-16 18:29:28 -04:00
  • cb854b8b10 Fix Undefined index: timezone in Protocol\Diaspora Hypolite Petovan 2018-10-16 18:29:08 -04:00
  • 2b1d15de87 Fix undefined index: id in Protocol\Diaspora Hypolite Petovan 2018-10-16 18:28:27 -04:00
  • c4318fe05e Fix notices in Parse URL feature Hypolite Petovan 2018-10-16 18:27:13 -04:00
  • e9c9eb9c66 Fix notice in Worker\Delivery Hypolite Petovan 2018-10-16 18:26:43 -04:00
  • 2c0c92111f Merge branch 'develop' of https://github.com/friendica/friendica into develop Ralf Thees 2018-10-16 21:01:10 +02:00
  • ff643c4b6a Merge pull request #5940 from JonnyTischbein/issue_update_display_network Hypolite Petovan 2018-10-16 13:37:19 -04:00
  • be2e6c3929 Fix Issue #5896 by setting static return for edit_post to display item page (kind of revert parts of #5774) Jonny Tischbein 2018-10-16 19:14:55 +02:00
  • 93c6dddc0d Merge pull request #5939 from annando/onepoll Hypolite Petovan 2018-10-16 11:27:48 -04:00
  • 35a73b729f Onepoll hadn't polled anymore / small relocation in zrlinit for better logging Michael 2018-10-16 13:17:01 +00:00
  • dbd2aa1196 Merge pull request #5938 from annando/magic-loop Tobias Diekershoff 2018-10-16 09:17:17 +02:00
  • 24a4eb9699 Merge pull request #5936 from MrPetovan/bug/5932-fix-notices Michael Vogel 2018-10-16 08:42:25 +02:00
  • 012fe3c11e Avoid endless loop at magic auth Michael 2018-10-16 06:32:12 +00:00
  • 481b0ac138 Fix notices in include/enotify Hypolite Petovan 2018-10-15 23:13:00 -04:00
  • 0de1351a09 Fix notices in Network\Probe Hypolite Petovan 2018-10-15 23:12:29 -04:00
  • c4cb396730 Merge pull request #5935 from MrPetovan/bug/5934-class-group-not-found Hypolite Petovan 2018-10-15 18:36:32 -04:00
  • d71327e311 Fix namespace usage in mod/group Hypolite Petovan 2018-10-15 18:35:36 -04:00
  • cbd49b641a Merge pull request #5933 from annando/diaspora-signature Hypolite Petovan 2018-10-15 18:12:45 -04:00
  • 8d0f4710a4 Signed Diaspora posts should now be stored more reliable Michael 2018-10-15 21:42:55 +00:00
  • 9e1065ff87 Improve transition from previous behavior Benjamin Lorteau 2018-10-15 11:58:52 -04:00
  • f303f9edf2 Merge branch 'develop' of https://github.com/friendica/friendica into develop Ralf Thees 2018-10-15 15:16:21 +02:00
  • ab20a83c0a Merge pull request #5930 from tobiasd/20181015-installdocs Michael Vogel 2018-10-15 14:10:50 +02:00
  • 092125edb6 ypot Tobias Diekershoff 2018-10-15 13:45:21 +02:00
  • 4496fdba24 use the right bracket Tobias Diekershoff 2018-10-15 13:44:09 +02:00
  • c2c2f25d92 added links to alternative ways to install Friendica to the docs Tobias Diekershoff 2018-10-15 10:36:27 +02:00
  • 664afbcafb Merge pull request #5926 from annando/defer-worker Tobias Diekershoff 2018-10-15 08:02:51 +02:00
  • e2762e032c Poddibility to defer worker execution Michael 2018-10-15 05:19:35 +00:00
  • 0080d117ee Merge pull request #5923 from MrPetovan/task/improve-contact-module Michael Vogel 2018-10-15 06:02:55 +02:00
  • ea8b159df4 Fix wrong use statement in mod/update_contacts Hypolite Petovan 2018-10-14 23:09:11 -04:00