Commit graph

Select branches

Hide pull requests

2018.05-rc

develop

master

2.1

2.2

2.21

2.3

2.32

2.33

2.34

2.35

2.36

2.37

2.38

2.39

2.3beta1

2.3beta2

2018.05

3.0

3.01

3.1

3.2

3.3

3.3-RC

3.3.1

3.3.2

3.3.3

3.4

3.4.1

3.4.2

3.4.3

3.4.3-2

3.5

3.5.1

3.5.2

3.5.3

3.5.4

3.6

Mono Color

• 3ec4e28af6 updated the privacy statement text and added some headers to the functions Tobias Diekershoff 2018-04-03 06:55:25 +02:00
• 933042f26d
  Merge pull request #4728 from annando/dfrn-send Hypolite Petovan 2018-04-02 18:08:42 -04:00
• d668b967c9 Misspelling Michael 2018-04-02 22:06:31 +00:00
• becc86a960 Changed logging text Michael 2018-04-02 22:02:43 +00:00
• 8ff6a31512 Sending does now work Michael 2018-04-02 21:59:30 +00:00
• eeadd2f9d6 The Diaspora transport layer is now the default for DFRN Michael 2018-04-02 21:46:10 +00:00
• 01a1e1b451 regenerated master messages.po file Tobias Diekershoff 2018-04-02 18:50:27 +02:00
• 6f5b6a073a register template may link to the TOS as well Tobias Diekershoff 2018-04-02 18:41:16 +02:00
• 6cef0fbaeb added link to delete the account to the registration mail text Tobias Diekershoff 2018-04-02 18:40:52 +02:00
• 6c20b4507d Added /tos module Tobias Diekershoff 2018-04-02 18:40:30 +02:00
• 4972b82807
  Merge pull request #4725 from annando/dfrn-2 Hypolite Petovan 2018-04-02 09:47:31 -04:00
• f89904ed77 Treatment, Treating, whatever :-) Michael 2018-04-02 13:44:45 +00:00
• 0594f13c35 Receiving was tested, sending is implemented and tested as well, currently unused Michael 2018-04-02 12:53:48 +00:00
• 348ee3625d BBCode support in register_text Tobias Diekershoff 2018-04-02 08:42:11 +02:00
• fc8e095154
  Merge pull request #4724 from tobiasd/20180401-lng Hypolite Petovan 2018-04-01 14:53:29 -04:00
• bd1a48b61b update for PL translation THX waldis Tobias Diekershoff 2018-04-01 20:15:50 +02:00
• 0bb277d62a
  Merge pull request #4723 from tobiasd/20180401-lng Hypolite Petovan 2018-04-01 10:44:20 -04:00
• 91e9b464e5 update for PL translation THX waldis Tobias Diekershoff 2018-04-01 11:22:36 +02:00
• f51a254ed0 Public contacts are not permitted for suggestions or mails Michael 2018-04-01 05:07:35 +00:00
• 7dd64dd465 Merge remote-tracking branch 'upstream/develop' into dfrn-2 Michael 2018-04-01 04:49:28 +00:00
• 15adc5a7fd
  Merge pull request #4719 from annando/fix-missing-arg Tobias Diekershoff 2018-03-31 14:36:32 +02:00
• 08fd6734ae
  Merge pull request #4720 from annando/fix-sorting Tobias Diekershoff 2018-03-31 14:35:34 +02:00
• 3eb7ab2d9e Fix the version sorting in the federation statistics Michael 2018-03-31 09:34:36 +00:00
• 3d487c263e Fixes missing command line argument Michael 2018-03-31 08:19:19 +00:00
• 8ea37a9d0b 5th draft Tobias Diekershoff 2018-03-31 08:44:25 +02:00
• 4724c7de72
  Merge pull request #4718 from MrPetovan/bug/fix-console-url-argument Michael Vogel 2018-03-31 06:02:23 +02:00
• bdacaa424e
  Merge pull request #4717 from annando/fix-profiles Hypolite Petovan 2018-03-30 23:52:03 -04:00
• 80cca09a53 Fix: Avoid a WSOD when saving the profile Michael 2018-03-31 03:33:19 +00:00
• 3b81c66150 Use $argv instead of $_SERVER['argv'] Hypolite Petovan 2018-03-30 22:56:04 -04:00
• bcf974a995
  Merge pull request #4716 from annando/password-console Hypolite Petovan 2018-03-30 16:00:07 -04:00
• 491db963db Changed comments Michael 2018-03-30 19:57:14 +00:00
• 2eb4912dbf New functionality to set a password for a given user Michael 2018-03-30 19:17:12 +00:00
• 7a46bbbd3a 4th draft Tobias Diekershoff 2018-03-30 08:22:08 +02:00
• 1613f2a1c4 Ensure that public contacts can't create toplevel posts Michael 2018-03-30 06:20:00 +00:00
• c9f02d534e Merge remote-tracking branch 'upstream/develop' into dfrn-2 Michael 2018-03-30 05:45:29 +00:00
• ca37b34333
  Merge pull request #4713 from MrPetovan/bug/suppress-profile-message-follow Michael Vogel 2018-03-30 07:39:00 +02:00
• a2b6ff7b25
  Merge pull request #4712 from MrPetovan/task/improve-text-highlight Michael Vogel 2018-03-30 07:27:42 +02:00
• d13f36938c Suppress error message for non-existing contacts in mod/follow Hypolite Petovan 2018-03-29 23:29:41 -04:00
• 3a58fe48bd Fix formatting in mod/follow Hypolite Petovan 2018-03-29 23:28:48 -04:00
• 80b6dc5787 Add fallback to regular code if language doesn't exist Hypolite Petovan 2018-03-29 19:29:36 -04:00
• 586b0b6e57 Add bash to text_highlight language list Hypolite Petovan 2018-03-29 19:29:09 -04:00
• 8a2d41e53f
  Merge pull request #4711 from rabuzarus/20180329_-_cropperjs Hypolite Petovan 2018-03-29 14:40:51 -04:00
• 515ef66c52 cropperjs: fix composer.lock rabuzarus 2018-03-29 20:30:26 +02:00
• 4efa2109ee cropperjs: use npm-asset for composer rabuzarus 2018-03-29 18:39:26 +02:00
• 51841ab148 cropperjs: fix indention rabuzarus 2018-03-29 18:06:56 +02:00
• 34204ca580 update javascript cropper library rabuzarus 2018-03-29 17:57:06 +02:00
• 5f40b306b8
  Merge pull request #4707 from tobiasd/20180329-vagrant Hypolite Petovan 2018-03-29 08:07:44 -04:00
• 1db6c42aa8
  Merge pull request #4706 from tobiasd/20180329-installation Hypolite Petovan 2018-03-29 08:07:20 -04:00
• 535a9838fc 3rd draft Tobias Diekershoff 2018-03-29 12:42:55 +02:00
• 399344a1f8 make sure that the VM has php-zip installed that is needed by composer Tobias Diekershoff 2018-03-29 12:06:16 +02:00
• 2cc2b886b2 little wording change Tobias Diekershoff 2018-03-29 11:49:40 +02:00
• 1cd18b6bf9 prevent nun-configured node due copying htconfig.php files Tobias Diekershoff 2018-03-29 11:40:45 +02:00
• 4326fa4e19
  Merge pull request #4704 from MrPetovan/bug/4608-hashtag-autocomplete-ci Tobias Diekershoff 2018-03-29 09:41:30 +02:00
• f84c8d665a
  Merge pull request #4705 from tobiasd/20180329-de Hypolite Petovan 2018-03-29 02:12:18 -04:00
• 5eedaabdde update for PL translation THX waldis Tobias Diekershoff 2018-03-29 07:24:45 +02:00
• 99244f383e update for DE translation Tobias Diekershoff 2018-03-29 07:23:56 +02:00
• 07954f7bcf typo Tobias Diekershoff 2018-03-29 06:57:02 +02:00
• 84b4ff58b6 Make Hashtag autocomplete case-insensitive Hypolite Petovan 2018-03-29 00:47:27 -04:00
• a5bb8f4e7d Strip strtolower from Module\Hashtag Hypolite Petovan 2018-03-29 00:47:14 -04:00
• 27c09b445e typo Tobias Diekershoff 2018-03-29 06:23:28 +02:00
• 2b93819ae3 3.6.1 changelog (1st draft) Tobias Diekershoff 2018-03-28 20:17:10 +02:00
• 6dc6581aca
  Merge pull request #4702 from annando/sql-fix rabuzarus 2018-03-28 13:43:17 +02:00
• 752a9f4b08
  Merge pull request #4703 from annando/fix-relocation Tobias Diekershoff 2018-03-28 10:42:33 +02:00
• 9bfc7bf584 A relocation hadn't changed the hostname Michael 2018-03-28 08:09:45 +00:00
• 2465bbaac8 Fixed SQL query Michael 2018-03-28 08:04:20 +00:00
• 707588ee0e
  Merge pull request #4701 from tobiasd/20180328-msg Michael Vogel 2018-03-28 09:32:40 +02:00
• e4ff071e8b regenerated master messages.po file Tobias Diekershoff 2018-03-28 08:45:50 +02:00
• acb1a082b9 messages.po output file needs to be in /util Tobias Diekershoff 2018-03-28 08:45:42 +02:00
• 26be334dc1
  Merge pull request #4698 from annando/direct-relay Tobias Diekershoff 2018-03-28 08:36:44 +02:00
• 17a6cb18b8 Relais settings are added to admin backend Michael 2018-03-28 06:16:46 +00:00
• b969df89b2
  Merge pull request #4700 from tobiasd/20180328-translationdocs Michael Vogel 2018-03-28 07:42:12 +02:00
• 9cf73e2a5c
  Merge pull request #4699 from tobiasd/20180328-pl Michael Vogel 2018-03-28 07:41:35 +02:00
• 8d53fed096 translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation Tobias Diekershoff 2018-03-28 07:20:46 +02:00
• 34318666cd update to the PL translation THX waldis Tobias Diekershoff 2018-03-28 07:07:56 +02:00
• bfd057f148 Direct transfer without a relay is now possible Michael 2018-03-28 04:24:38 +00:00
• 6102a16613
  Merge pull request #4693 from annando/doxygen-relay Hypolite Petovan 2018-03-27 11:24:38 -04:00
• 7868de529e Forgotten doxygen header Michael 2018-03-27 15:12:19 +00:00
• 5e5fde0a63
  Merge pull request #4692 from Rudloff/patch-1 Hypolite Petovan 2018-03-27 11:01:22 -04:00
• b73178115e
  Update CHANGELOG Pierre Rudloff 2018-03-27 16:58:24 +02:00
• 27155fead7
  Merge pull request #4691 from annando/relais-discovery Hypolite Petovan 2018-03-27 08:50:27 -04:00
• 7c63563e1c
  Merge pull request #4690 from annando/no-async Hypolite Petovan 2018-03-27 08:48:11 -04:00
• 8bdd417b04 Asynchronous Javascript is deactivated Michael 2018-03-27 05:45:56 +00:00
• 35e18e9e1e
  Merge pull request #4686 from annando/no-warn-app Hypolite Petovan 2018-03-26 20:44:53 -04:00
• 5a6b846445
  Merge pull request #4687 from annando/fix-relay Hypolite Petovan 2018-03-26 20:40:44 -04:00
• bc03c8846c Fix sending messages to relay servers Michael 2018-03-26 23:39:59 +00:00
• b48df6a828 Avoid the warning of an unitialized variable in .htconfig.php Michael 2018-03-26 20:58:34 +00:00
• 00c444a699 Only update when changed Michael 2018-03-26 06:17:50 +00:00
• 6b84cb9715 Only add tags in the "tags" scope Michael 2018-03-26 06:11:55 +00:00
• e65bd0325e Added server discovery for their relais configuration Michael 2018-03-26 05:44:53 +00:00
• 25981e8a22
  Update issue_template.md Tobias Diekershoff 2018-03-26 06:48:16 +02:00
• bfc2bda9b6
  Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding Michael Vogel 2018-03-25 22:26:17 +02:00
• 2fa5e7be0a
  Merge pull request #4685 from annando/fix-event Hypolite Petovan 2018-03-25 15:10:37 -04:00
• dece06c571 Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event::formatListForExport() must be of the type array, object given" Michael 2018-03-25 18:56:35 +00:00
• 8329c48511
  Merge pull request #4684 from annando/missing-avatar Tobias Diekershoff 2018-03-25 19:54:32 +02:00
• 402c0fc770 Using the default avatar when no avatar was found for the self contact Michael 2018-03-25 17:26:40 +00:00
• cec0fc189f
  Update issue_template.md Tobias Diekershoff 2018-03-25 18:32:56 +02:00
• 1a186d88b9
  Update issue_template.md Tobias Diekershoff 2018-03-25 18:10:07 +02:00
• 4fb258a97e
  added template for issues at github Tobias Diekershoff 2018-03-25 17:42:26 +02:00
• 30113dd6ef
  Merge pull request #4683 from annando/update-self Hypolite Petovan 2018-03-25 09:25:10 -04:00
• 2c00e3ad36
  Merge pull request #4680 from MrPetovan/bug/4669-check-getInfoFromURL-parameter Michael Vogel 2018-03-25 10:39:17 +02:00