MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commit graph

  • 839fd9f17e update FI translations THX Kris Tobias Diekershoff 2018-04-30 08:34:47 +02:00
  • bbbebb2b9c Don't spool relay deliveries Michael 2018-04-30 05:56:40 +00:00
  • d0dd5c44d9 Update or create relay contact from discovery / process new protocol values Michael 2018-04-30 05:33:47 +00:00
  • aa4945f4a0 "x-social-relay" now exposes all supported protocols Michael 2018-04-30 04:01:04 +00:00
  • 493314a067
         Merge pull request #4920 from nupplaphil/install_mode Hypolite Petovan 2018-04-29 14:31:13 -04:00
  • b4f5311e7f Add Install Mode Philipp Holzer 2018-04-29 20:15:12 +02:00
  • bd0ba24518
         Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app Michael Vogel 2018-04-29 19:11:49 +02:00
  • 2c1b1841bb
         Merge pull request #4954 from annando/hide-contacts Tobias Diekershoff 2018-04-29 18:40:01 +02:00
  • 78f563407a Fix PR 4942: Fixed item query Michael 2018-04-29 16:32:46 +00:00
  • da9ac7b879 Add Install Mode Philipp Holzer 2018-04-29 18:13:24 +02:00
  • 6cb277b0bb Add Install Mode Philipp Holzer 2018-04-29 18:11:24 +02:00
  • cc2703ce8d
         Merge pull request #4953 from tobiasd/20180429-msg Hypolite Petovan 2018-04-29 07:05:02 -04:00
  • 52cc67e767 regenerated master messages.po file Tobias Diekershoff 2018-04-29 07:19:20 +02:00
  • cb364f440f
         Merge pull request #4952 from MrPetovan/bug/4947-fix-content-filter-self Tobias Diekershoff 2018-04-29 06:41:55 +02:00
  • baf235e200
         Merge pull request #4948 from annando/hash-ignored Hypolite Petovan 2018-04-28 20:37:47 -04:00
  • 20289393da Fix own post check for content filter Hypolite Petovan 2018-04-28 19:11:11 -04:00
  • 220242b55a Remove current_theme() and current_theme_url() functions Hypolite Petovan 2018-04-28 18:37:41 -04:00
  • fde3d6f870 Replace current_theme() and current_theme_url() calls Hypolite Petovan 2018-04-28 18:37:04 -04:00
  • 3213715b60 Fix formatting in frio_boot.php Hypolite Petovan 2018-04-28 18:33:52 -04:00
  • 964bf3f3cc Add new methods to src Hypolite Petovan 2018-04-28 18:30:13 -04:00
  • acbc733dce Fix formatting in Core\Theme Hypolite Petovan 2018-04-28 18:28:23 -04:00
  • 833fe0e0dc
         Merge pull request #4942 from MrPetovan/task/import-post-ignored-contact Michael Vogel 2018-04-28 18:16:30 +02:00
  • fd318a1193 Corrected query to don't show hash tag posts from blocked or ignored contacts Michael 2018-04-28 16:12:45 +00:00
  • 9edff6cc5c Add exception for self-contact in item_joins() Hypolite Petovan 2018-04-28 11:38:01 -04:00
  • 8815d07765 Add Install Mode Philipp Holzer 2018-04-28 17:06:08 +02:00
  • 41c6d63052 Add Install Mode Philipp Holzer 2018-04-28 15:15:54 +02:00
  • 1ab965c944 Add Install Mode Philipp Holzer 2018-04-28 15:11:01 +02:00
  • c417f779c4 Add missing readonly check for displaying items in item_joins Hypolite Petovan 2018-04-28 07:47:02 -04:00
  • a97ad9dc42 Add Install Mode (Part 2) Philipp Holzer 2018-04-28 12:36:40 +02:00
  • 5dc47e5815
         Merge pull request #4945 from tobiasd/20180428-pl Michael Vogel 2018-04-28 11:03:28 +02:00
  • 298aae5ddf Merge remote-tracking branch 'upstream/develop' into develop Michael 2018-04-28 08:57:52 +00:00
  • 24da379c06 update PL translations THX waldis Tobias Diekershoff 2018-04-28 10:08:52 +02:00
  • 2c2d4e5869
         Merge pull request #4941 from MrPetovan/task/4938-update-dir-url-protocol Tobias Diekershoff 2018-04-28 09:42:06 +02:00
  • 02c046e630
         Merge pull request #4944 from astifter/fix_better_curl_error_during_install Tobias Diekershoff 2018-04-28 08:58:45 +02:00
  • 91e0a9227e Fix #4943. Andreas Neustifter 2018-04-28 06:46:46 +00:00
  • bd21fc3751 Import posts from ignored contacts Hypolite Petovan 2018-04-27 21:08:19 -04:00
  • 5bb35756dc Update directory URL protocol Hypolite Petovan 2018-04-27 20:56:34 -04:00
  • 66e5586d21
         Merge pull request #4939 from astifter/better_curl_error_during_install Hypolite Petovan 2018-04-27 16:57:01 -04:00
  • e2612514e8
         Merge pull request #4940 from astifter/fix_login_when_openid_disabled Hypolite Petovan 2018-04-27 16:49:38 -04:00
  • 9bf58e46f6 Changes requested by @MrPetovan. Andreas Neustifter 2018-04-27 20:22:17 +00:00
  • babb45efd8 Fix login page layout without OpenId. Andreas Neustifter 2018-04-27 20:00:46 +00:00
  • 5b4dce5983 Exclude editor backups from Git. Andreas Neustifter 2018-04-27 21:28:22 +02:00
  • 70a781fa5a Proper error when rewrite fails during install. Andreas Neustifter 2018-04-27 21:27:55 +02:00
  • d5b68cd146 Add a App-Mode with defined constants Philipp Holzer 2018-04-27 21:07:04 +02:00
  • 8a7c9d6666
         Merge pull request #4937 from astifter/install_theme_when_set Hypolite Petovan 2018-04-27 14:59:52 -04:00
  • 846f8becae Install selected theme during settings persistence. Andreas Neustifter 2018-04-27 20:45:34 +02:00
  • a19784d209
         Merge pull request #4890 from astifter/reorganize_login rabuzarus 2018-04-27 19:56:25 +02:00
  • e2b4690d6f
         Merge pull request #4930 from MrPetovan/task/improve-frio-bg-image rabuzarus 2018-04-27 19:55:47 +02:00
  • 607f31f631 Merge remote-tracking branch 'upstream/develop' into develop Michael 2018-04-27 15:04:11 +00:00
  • 99f288446b
         Merge pull request #4936 from annando/fix-reshare Hypolite Petovan 2018-04-27 10:38:51 -04:00
  • 6879be5168 Possibly not so important change ;-) Michael 2018-04-27 14:21:12 +00:00
  • 98415e0e34 Diaspora reshares should now always reshare the correct content Michael 2018-04-27 14:03:10 +00:00
  • dae838842e
         Merge pull request #4935 from annando/reworked-delivery Hypolite Petovan 2018-04-27 09:00:58 -04:00
  • 84909d9711 Standard stuff Michael 2018-04-27 12:40:52 +00:00
  • 9f5a6c05fb Preparation for relay posts with DFRN Michael 2018-04-27 05:11:52 +00:00
  • 4904be0d6f Better fallback on values > 299 as well Michael 2018-04-27 04:55:46 +00:00
  • 1e2bc1e6cf Ensure local delivery of Diaspora comments Michael 2018-04-27 04:11:33 +00:00
  • e3c9d31088 Added header Michael 2018-04-27 03:08:13 +00:00
  • 488c6c9b68 Constants moved Michael 2018-04-27 02:52:12 +00:00
  • 66e34b9357 Improvements Michael 2018-04-26 22:30:43 +00:00
  • 8c23fea1df Added some explanation, beautified code Michael 2018-04-26 21:16:16 +00:00
  • a785d8c2f9 Merge remote-tracking branch 'upstream/develop' into reworked-delivery Michael 2018-04-26 20:42:57 +00:00
  • d071a5cdad Merge remote-tracking branch 'upstream/develop' into develop Michael 2018-04-26 20:42:30 +00:00
  • 4957ab8fbb Avoid PHP warning with a missing key Michael 2018-04-26 20:41:06 +00:00
  • 33a551235e
         Merge pull request #4934 from annando/distribute-precaution Hypolite Petovan 2018-04-26 16:26:23 -04:00
  • 4a792761d1 Item distribution: Better don't store these values Michael 2018-04-26 20:11:29 +00:00
  • 9e700ba6ea
         Merge pull request #4933 from annando/bugfix-distribute Hypolite Petovan 2018-04-26 16:02:56 -04:00
  • da3658c80d Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, Michael 2018-04-26 19:47:12 +00:00
  • eae86951f5
         Merge pull request #4932 from MrPetovan/bug/4928-fix-php-72-warning-profile Tobias Diekershoff 2018-04-26 16:36:19 +02:00
  • 2d6dafc057 [frio] Improve background styles' description Hypolite Petovan 2018-04-26 07:50:05 -04:00
  • 1ce999a4ab [frio] Fix quoting style in php/Image Hypolite Petovan 2018-04-26 07:46:59 -04:00
  • f7f640175a Fix PHP 7.2 warning in Model\Profile Hypolite Petovan 2018-04-26 04:56:42 -04:00
  • 7feeb0af78 Add backward-compatibility for config variables after schema rename Hypolite Petovan 2018-04-26 04:22:04 -04:00
  • a0c5a84ce8 Better way to fetch items Michael 2018-04-26 07:11:18 +00:00
  • b70b020490 Unneeded stuff removed, only fetch needed records Michael 2018-04-26 06:23:01 +00:00
  • 71d4c6e4a0 Cleaned up Michael 2018-04-26 05:45:05 +00:00
  • c437dac3a0 Delivery to non followers Michael 2018-04-25 21:55:24 +00:00
  • 3fb993f37b frio - fix help toc aside rabuzarus 2018-04-25 23:30:56 +02:00
  • 3abd0b54cc Reworked delivery Michael 2018-04-25 21:18:21 +00:00
  • a9f1f47be2
         Merge pull request #4931 from annando/no-ignored Hypolite Petovan 2018-04-25 12:07:00 -04:00
  • 66547e5107 Don't distribute for ignored contacts Michael 2018-04-25 16:00:21 +00:00
  • 801a13aa10
         Merge pull request #4915 from M-arcus/patch-4 Hypolite Petovan 2018-04-25 08:06:04 -04:00
  • ce52f40bdc [DOCS] Fix intendation Marcus Müller 2018-04-25 11:29:56 +02:00
  • 86e4690b5f [frio] Add background-repeat attribute to background image options Hypolite Petovan 2018-04-24 20:42:23 -04:00
  • 4307a87d6a [frio] Rename "Default" color scheme as "Custom" Hypolite Petovan 2018-04-24 20:40:29 -04:00
  • 0f82c3348d [frio] Rename bgcolor to background-color Hypolite Petovan 2018-04-24 20:37:04 -04:00
  • 3bfa6facfc [frio] Fix typo schema -> scheme Hypolite Petovan 2018-04-24 20:26:14 -04:00
  • eb9b832c3a [frio] Normalize quoting style in PHP files Hypolite Petovan 2018-04-24 20:12:43 -04:00
  • b65c8c55a4 [frio] Fix formatting in PHP files Hypolite Petovan 2018-04-24 20:05:20 -04:00
  • d06a174f0c Make register-link less obtrusive. Andreas Neustifter 2018-04-24 21:18:31 +00:00
  • 1a69265da4 Fix missing background tiles. Andreas Neustifter 2018-04-24 21:16:15 +00:00
  • d49df631fb
         Merge pull request #4929 from annando/diaspora-rework Hypolite Petovan 2018-04-24 14:56:35 -04:00
  • ad45a73bf3 Improvements for the Diaspora protocol Michael 2018-04-24 18:34:35 +00:00
  • c8cc8e57c2
         Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template Hypolite Petovan 2018-04-24 11:37:10 -04:00
  • ac753e3320 frio - provide a template for invite page rabuzarus 2018-04-24 17:33:48 +02:00
  • 8d8aef5624
         Merge pull request #4924 from annando/item-distribution Hypolite Petovan 2018-04-24 11:00:14 -04:00
  • 5019d46071 We only need the uid Michael 2018-04-24 14:58:39 +00:00
  • 5cf745af44 Item distribution is now done via the public post Michael 2018-04-24 13:21:25 +00:00
  • 008f2a2ec7 [DOCS] Hooks: Add hooks intendation to german docs Marcus Müller 2018-04-24 13:25:06 +02:00
  • 7ac4b17c80 [DOCS] Hooks: Add empty line Marcus Müller 2018-04-24 13:21:16 +02:00