]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge pull request #4729 from MrPetovan/task/4604-add-password-exposed-check
Michael Vogel [Tue, 3 Apr 2018 05:56:36 +0000 (07:56 +0200)]
Merge pull request #4729 from MrPetovan/task/4604-add-password-exposed-check

[Composer] Bump divineomega/password_exposed version to 2.5.1

6 years ago[Composer] Bump divineomega/password_exposed version to 2.5.1
Hypolite Petovan [Tue, 3 Apr 2018 05:04:46 +0000 (01:04 -0400)]
[Composer] Bump divineomega/password_exposed version to 2.5.1

6 years agoMerge pull request #4728 from annando/dfrn-send
Hypolite Petovan [Mon, 2 Apr 2018 22:08:42 +0000 (18:08 -0400)]
Merge pull request #4728 from annando/dfrn-send

The Diaspora transport layer is now the default for DFRN

6 years agoMisspelling
Michael [Mon, 2 Apr 2018 22:06:31 +0000 (22:06 +0000)]
Misspelling

6 years agoChanged logging text
Michael [Mon, 2 Apr 2018 22:02:43 +0000 (22:02 +0000)]
Changed logging text

6 years agoSending does now work
Michael [Mon, 2 Apr 2018 21:59:30 +0000 (21:59 +0000)]
Sending does now work

6 years agoThe Diaspora transport layer is now the default for DFRN
Michael [Mon, 2 Apr 2018 21:46:10 +0000 (21:46 +0000)]
The Diaspora transport layer is now the default for DFRN

6 years agoMerge pull request #4725 from annando/dfrn-2
Hypolite Petovan [Mon, 2 Apr 2018 13:47:31 +0000 (09:47 -0400)]
Merge pull request #4725 from annando/dfrn-2

 DFRN payload can now be transported via the Diaspora transport layer

6 years agoTreatment, Treating, whatever :-)
Michael [Mon, 2 Apr 2018 13:44:45 +0000 (13:44 +0000)]
Treatment, Treating, whatever :-)

6 years agoReceiving was tested, sending is implemented and tested as well, currently unused
Michael [Mon, 2 Apr 2018 12:53:48 +0000 (12:53 +0000)]
Receiving was tested, sending is implemented and tested as well, currently unused

6 years agoMerge pull request #4724 from tobiasd/20180401-lng
Hypolite Petovan [Sun, 1 Apr 2018 18:53:29 +0000 (14:53 -0400)]
Merge pull request #4724 from tobiasd/20180401-lng

update for PL translation THX waldis

6 years agoupdate for PL translation THX waldis
Tobias Diekershoff [Sun, 1 Apr 2018 18:15:50 +0000 (20:15 +0200)]
update for PL translation THX waldis

6 years agoMerge pull request #4723 from tobiasd/20180401-lng
Hypolite Petovan [Sun, 1 Apr 2018 14:44:20 +0000 (10:44 -0400)]
Merge pull request #4723 from tobiasd/20180401-lng

update for PL translation THX waldis

6 years agoupdate for PL translation THX waldis
Tobias Diekershoff [Sun, 1 Apr 2018 09:22:36 +0000 (11:22 +0200)]
update for PL translation THX waldis

6 years agoPublic contacts are not permitted for suggestions or mails
Michael [Sun, 1 Apr 2018 05:07:35 +0000 (05:07 +0000)]
Public contacts are not permitted for suggestions or mails

6 years agoMerge remote-tracking branch 'upstream/develop' into dfrn-2
Michael [Sun, 1 Apr 2018 04:49:28 +0000 (04:49 +0000)]
Merge remote-tracking branch 'upstream/develop' into dfrn-2

6 years agoMerge pull request #4719 from annando/fix-missing-arg
Tobias Diekershoff [Sat, 31 Mar 2018 12:36:32 +0000 (14:36 +0200)]
Merge pull request #4719 from annando/fix-missing-arg

Fixes missing command line argument

6 years agoMerge pull request #4720 from annando/fix-sorting
Tobias Diekershoff [Sat, 31 Mar 2018 12:35:34 +0000 (14:35 +0200)]
Merge pull request #4720 from annando/fix-sorting

Fix the version sorting in the federation statistics

6 years agoFix the version sorting in the federation statistics
Michael [Sat, 31 Mar 2018 09:34:36 +0000 (09:34 +0000)]
Fix the version sorting in the federation statistics

6 years agoFixes missing command line argument
Michael [Sat, 31 Mar 2018 08:19:19 +0000 (08:19 +0000)]
Fixes missing command line argument

6 years agoMerge pull request #4718 from MrPetovan/bug/fix-console-url-argument
Michael Vogel [Sat, 31 Mar 2018 04:02:23 +0000 (06:02 +0200)]
Merge pull request #4718 from MrPetovan/bug/fix-console-url-argument

Console: Use $argv instead of $_SERVER['argv']

6 years agoMerge pull request #4717 from annando/fix-profiles
Hypolite Petovan [Sat, 31 Mar 2018 03:52:03 +0000 (23:52 -0400)]
Merge pull request #4717 from annando/fix-profiles

Fix: Avoid a WSOD when saving the profile

6 years agoFix: Avoid a WSOD when saving the profile
Michael [Sat, 31 Mar 2018 03:33:19 +0000 (03:33 +0000)]
Fix: Avoid a WSOD when saving the profile

6 years agoUse $argv instead of $_SERVER['argv']
Hypolite Petovan [Sat, 31 Mar 2018 02:56:04 +0000 (22:56 -0400)]
Use $argv instead of $_SERVER['argv']

6 years agoMerge pull request #4716 from annando/password-console
Hypolite Petovan [Fri, 30 Mar 2018 20:00:07 +0000 (16:00 -0400)]
Merge pull request #4716 from annando/password-console

New functionality to set a password for a given user

6 years agoChanged comments
Michael [Fri, 30 Mar 2018 19:57:14 +0000 (19:57 +0000)]
Changed comments

6 years agoNew functionality to set a password for a given user
Michael [Fri, 30 Mar 2018 19:17:12 +0000 (19:17 +0000)]
New functionality to set a password for a given user

6 years agoEnsure that public contacts can't create toplevel posts
Michael [Fri, 30 Mar 2018 06:20:00 +0000 (06:20 +0000)]
Ensure that public contacts can't create toplevel posts

6 years agoMerge remote-tracking branch 'upstream/develop' into dfrn-2
Michael [Fri, 30 Mar 2018 05:45:29 +0000 (05:45 +0000)]
Merge remote-tracking branch 'upstream/develop' into dfrn-2

6 years agoMerge pull request #4713 from MrPetovan/bug/suppress-profile-message-follow
Michael Vogel [Fri, 30 Mar 2018 05:39:00 +0000 (07:39 +0200)]
Merge pull request #4713 from MrPetovan/bug/suppress-profile-message-follow

Suppress confusing error message in mod/follow

6 years agoMerge pull request #4712 from MrPetovan/task/improve-text-highlight
Michael Vogel [Fri, 30 Mar 2018 05:27:42 +0000 (07:27 +0200)]
Merge pull request #4712 from MrPetovan/task/improve-text-highlight

Improve text highlight

6 years agoSuppress error message for non-existing contacts in mod/follow
Hypolite Petovan [Fri, 30 Mar 2018 03:29:41 +0000 (23:29 -0400)]
Suppress error message for non-existing contacts in mod/follow

6 years agoFix formatting in mod/follow
Hypolite Petovan [Fri, 30 Mar 2018 03:28:48 +0000 (23:28 -0400)]
Fix formatting in mod/follow

6 years agoAdd fallback to regular code if language doesn't exist
Hypolite Petovan [Thu, 29 Mar 2018 23:29:36 +0000 (19:29 -0400)]
Add fallback to regular code if language doesn't exist

6 years agoAdd bash to text_highlight language list
Hypolite Petovan [Thu, 29 Mar 2018 23:29:09 +0000 (19:29 -0400)]
Add bash to text_highlight language list

6 years agoMerge pull request #4711 from rabuzarus/20180329_-_cropperjs
Hypolite Petovan [Thu, 29 Mar 2018 18:40:51 +0000 (14:40 -0400)]
Merge pull request #4711 from rabuzarus/20180329_-_cropperjs

update javascript cropper library

6 years agocropperjs: fix composer.lock
rabuzarus [Thu, 29 Mar 2018 18:30:26 +0000 (20:30 +0200)]
cropperjs: fix composer.lock

6 years agocropperjs: use npm-asset for composer
rabuzarus [Thu, 29 Mar 2018 16:39:26 +0000 (18:39 +0200)]
cropperjs: use npm-asset for composer

6 years agocropperjs: fix indention
rabuzarus [Thu, 29 Mar 2018 16:06:56 +0000 (18:06 +0200)]
cropperjs: fix indention

6 years agoupdate javascript cropper library
rabuzarus [Thu, 29 Mar 2018 15:57:06 +0000 (17:57 +0200)]
update javascript cropper library

6 years agoMerge pull request #4707 from tobiasd/20180329-vagrant
Hypolite Petovan [Thu, 29 Mar 2018 12:07:44 +0000 (08:07 -0400)]
Merge pull request #4707 from tobiasd/20180329-vagrant

make sure that the VM has php-zip installed that is needed by composer

6 years agoMerge pull request #4706 from tobiasd/20180329-installation
Hypolite Petovan [Thu, 29 Mar 2018 12:07:20 +0000 (08:07 -0400)]
Merge pull request #4706 from tobiasd/20180329-installation

added a hint to the htconfig file

6 years agomake sure that the VM has php-zip installed that is needed by composer
Tobias Diekershoff [Thu, 29 Mar 2018 10:06:16 +0000 (12:06 +0200)]
make sure that the VM has php-zip installed that is needed by composer

6 years agolittle wording change
Tobias Diekershoff [Thu, 29 Mar 2018 09:49:40 +0000 (11:49 +0200)]
little wording change

6 years agoprevent nun-configured node due copying htconfig.php files
Tobias Diekershoff [Thu, 29 Mar 2018 09:40:45 +0000 (11:40 +0200)]
prevent nun-configured node due copying htconfig.php files

6 years agoMerge pull request #4704 from MrPetovan/bug/4608-hashtag-autocomplete-ci
Tobias Diekershoff [Thu, 29 Mar 2018 07:41:30 +0000 (09:41 +0200)]
Merge pull request #4704 from MrPetovan/bug/4608-hashtag-autocomplete-ci

Make hashtag autocomplete case-insensitive

6 years agoMerge pull request #4705 from tobiasd/20180329-de
Hypolite Petovan [Thu, 29 Mar 2018 06:12:18 +0000 (02:12 -0400)]
Merge pull request #4705 from tobiasd/20180329-de

update to the DE and PL translation

6 years agoupdate for PL translation THX waldis
Tobias Diekershoff [Thu, 29 Mar 2018 05:24:45 +0000 (07:24 +0200)]
update for PL translation THX waldis

6 years agoupdate for DE translation
Tobias Diekershoff [Thu, 29 Mar 2018 05:23:56 +0000 (07:23 +0200)]
update for DE translation

6 years agotypo
Tobias Diekershoff [Thu, 29 Mar 2018 04:57:02 +0000 (06:57 +0200)]
typo

6 years agoMake Hashtag autocomplete case-insensitive
Hypolite Petovan [Thu, 29 Mar 2018 04:47:27 +0000 (00:47 -0400)]
Make Hashtag autocomplete case-insensitive

6 years agoStrip strtolower from Module\Hashtag
Hypolite Petovan [Thu, 29 Mar 2018 04:47:14 +0000 (00:47 -0400)]
Strip strtolower from Module\Hashtag

6 years agoMerge pull request #4702 from annando/sql-fix
rabuzarus [Wed, 28 Mar 2018 11:43:17 +0000 (13:43 +0200)]
Merge pull request #4702 from annando/sql-fix

Fixed SQL query

6 years agoMerge pull request #4703 from annando/fix-relocation
Tobias Diekershoff [Wed, 28 Mar 2018 08:42:33 +0000 (10:42 +0200)]
Merge pull request #4703 from annando/fix-relocation

A relocation hadn't changed the hostname

6 years agoA relocation hadn't changed the hostname
Michael [Wed, 28 Mar 2018 08:09:45 +0000 (08:09 +0000)]
A relocation hadn't changed the hostname

6 years agoFixed SQL query
Michael [Wed, 28 Mar 2018 08:04:20 +0000 (08:04 +0000)]
Fixed SQL query

6 years agoMerge pull request #4701 from tobiasd/20180328-msg
Michael Vogel [Wed, 28 Mar 2018 07:32:40 +0000 (09:32 +0200)]
Merge pull request #4701 from tobiasd/20180328-msg

regenerated the master messages.po file

6 years agoregenerated master messages.po file
Tobias Diekershoff [Wed, 28 Mar 2018 06:45:50 +0000 (08:45 +0200)]
regenerated master messages.po file

6 years agomessages.po output file needs to be in /util
Tobias Diekershoff [Wed, 28 Mar 2018 06:45:42 +0000 (08:45 +0200)]
messages.po output file needs to be in /util

6 years agoMerge pull request #4698 from annando/direct-relay
Tobias Diekershoff [Wed, 28 Mar 2018 06:36:44 +0000 (08:36 +0200)]
Merge pull request #4698 from annando/direct-relay

Direct transfer without a relay is now possible

6 years agoRelais settings are added to admin backend
Michael [Wed, 28 Mar 2018 06:16:46 +0000 (06:16 +0000)]
Relais settings are added to admin backend

6 years agoMerge pull request #4700 from tobiasd/20180328-translationdocs
Michael Vogel [Wed, 28 Mar 2018 05:42:12 +0000 (07:42 +0200)]
Merge pull request #4700 from tobiasd/20180328-translationdocs

translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation

6 years agoMerge pull request #4699 from tobiasd/20180328-pl
Michael Vogel [Wed, 28 Mar 2018 05:41:35 +0000 (07:41 +0200)]
Merge pull request #4699 from tobiasd/20180328-pl

update to the PL translation THX waldis

6 years agotranslation docs updated with a note, that the console tool has to be called from...
Tobias Diekershoff [Wed, 28 Mar 2018 05:20:46 +0000 (07:20 +0200)]
translation docs updated with a note, that the console tool has to be called from the base directory of the Friendica installation

6 years agoupdate to the PL translation THX waldis
Tobias Diekershoff [Wed, 28 Mar 2018 05:07:56 +0000 (07:07 +0200)]
update to the PL translation THX waldis

6 years agoDirect transfer without a relay is now possible
Michael [Wed, 28 Mar 2018 04:24:38 +0000 (04:24 +0000)]
Direct transfer without a relay is now possible

6 years agoMerge pull request #4693 from annando/doxygen-relay
Hypolite Petovan [Tue, 27 Mar 2018 15:24:38 +0000 (11:24 -0400)]
Merge pull request #4693 from annando/doxygen-relay

Forgotten doxygen header

6 years agoForgotten doxygen header
Michael [Tue, 27 Mar 2018 15:12:19 +0000 (15:12 +0000)]
Forgotten doxygen header

6 years agoMerge pull request #4692 from Rudloff/patch-1
Hypolite Petovan [Tue, 27 Mar 2018 15:01:22 +0000 (11:01 -0400)]
Merge pull request #4692 from Rudloff/patch-1

Update CHANGELOG

6 years agoUpdate CHANGELOG
Pierre Rudloff [Tue, 27 Mar 2018 14:58:24 +0000 (16:58 +0200)]
Update CHANGELOG

Small typo in my name ðŸ˜œ

6 years agoMerge pull request #4691 from annando/relais-discovery
Hypolite Petovan [Tue, 27 Mar 2018 12:50:27 +0000 (08:50 -0400)]
Merge pull request #4691 from annando/relais-discovery

 Added server discovery for their relais configuration

6 years agoMerge pull request #4690 from annando/no-async
Hypolite Petovan [Tue, 27 Mar 2018 12:48:11 +0000 (08:48 -0400)]
Merge pull request #4690 from annando/no-async

Asynchronous Javascript is deactivated

6 years agoAsynchronous Javascript is deactivated
Michael [Tue, 27 Mar 2018 05:45:56 +0000 (05:45 +0000)]
Asynchronous Javascript is deactivated

6 years agoMerge pull request #4686 from annando/no-warn-app
Hypolite Petovan [Tue, 27 Mar 2018 00:44:53 +0000 (20:44 -0400)]
Merge pull request #4686 from annando/no-warn-app

Avoid the warning of an unitialized variable in .htconfig.php

6 years agoMerge pull request #4687 from annando/fix-relay
Hypolite Petovan [Tue, 27 Mar 2018 00:40:44 +0000 (20:40 -0400)]
Merge pull request #4687 from annando/fix-relay

Fix sending messages to relay servers

6 years agoFix sending messages to relay servers
Michael [Mon, 26 Mar 2018 23:39:59 +0000 (23:39 +0000)]
Fix sending messages to relay servers

6 years agoAvoid the warning of an unitialized variable in .htconfig.php
Michael [Mon, 26 Mar 2018 20:58:34 +0000 (20:58 +0000)]
Avoid the warning of an unitialized variable in .htconfig.php

6 years agoOnly update when changed
Michael [Mon, 26 Mar 2018 06:17:50 +0000 (06:17 +0000)]
Only update when changed

6 years agoOnly add tags in the "tags" scope
Michael [Mon, 26 Mar 2018 06:11:55 +0000 (06:11 +0000)]
Only add tags in the "tags" scope

6 years agoAdded server discovery for their relais configuration
Michael [Mon, 26 Mar 2018 05:44:53 +0000 (05:44 +0000)]
Added server discovery for their relais configuration

6 years agoUpdate issue_template.md
Tobias Diekershoff [Mon, 26 Mar 2018 04:48:16 +0000 (06:48 +0200)]
Update issue_template.md

6 years agoMerge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding
Michael Vogel [Sun, 25 Mar 2018 20:26:17 +0000 (22:26 +0200)]
Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding

Move suppress_tags config usage to template

6 years agoMerge pull request #4685 from annando/fix-event
Hypolite Petovan [Sun, 25 Mar 2018 19:10:37 +0000 (15:10 -0400)]
Merge pull request #4685 from annando/fix-event

Bugfix: Prevent "Uncaught TypeError"

6 years agoBugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event:...
Michael [Sun, 25 Mar 2018 18:56:35 +0000 (18:56 +0000)]
Bugfix: Prevent "Uncaught TypeError: Argument 1 passed to Friendica\Model\Event::formatListForExport() must be of the type array, object given"

6 years agoMerge pull request #4684 from annando/missing-avatar
Tobias Diekershoff [Sun, 25 Mar 2018 17:54:32 +0000 (19:54 +0200)]
Merge pull request #4684 from annando/missing-avatar

Using the default avatar when no avatar was found for the self contact

6 years agoUsing the default avatar when no avatar was found for the self contact
Michael [Sun, 25 Mar 2018 17:26:40 +0000 (17:26 +0000)]
Using the default avatar when no avatar was found for the self contact

6 years agoUpdate issue_template.md
Tobias Diekershoff [Sun, 25 Mar 2018 16:32:56 +0000 (18:32 +0200)]
Update issue_template.md

6 years agoUpdate issue_template.md
Tobias Diekershoff [Sun, 25 Mar 2018 16:10:07 +0000 (18:10 +0200)]
Update issue_template.md

6 years agoadded template for issues at github
Tobias Diekershoff [Sun, 25 Mar 2018 15:42:26 +0000 (17:42 +0200)]
added template for issues at github

6 years agoMerge pull request #4683 from annando/update-self
Hypolite Petovan [Sun, 25 Mar 2018 13:25:10 +0000 (09:25 -0400)]
Merge pull request #4683 from annando/update-self

The "self" contact is now updated at a central place

6 years agoMerge pull request #4680 from MrPetovan/bug/4669-check-getInfoFromURL-parameter
Michael Vogel [Sun, 25 Mar 2018 08:39:17 +0000 (10:39 +0200)]
Merge pull request #4680 from MrPetovan/bug/4669-check-getInfoFromURL-parameter

Check Image::getInfoFromURL parameter

6 years agoUpdate the public contact
Michael [Sun, 25 Mar 2018 08:20:13 +0000 (08:20 +0000)]
Update the public contact

6 years agoUpdate the avatar
Michael [Sun, 25 Mar 2018 08:15:22 +0000 (08:15 +0000)]
Update the avatar

6 years agoMove suppress_tags config to template
Hypolite Petovan [Sun, 25 Mar 2018 04:38:23 +0000 (00:38 -0400)]
Move suppress_tags config to template

- Add new item.suppress_tags template variable
- Fix template formatting

6 years agoAdd Image::getInfoFromURL return check
Hypolite Petovan [Sun, 25 Mar 2018 00:03:55 +0000 (20:03 -0400)]
Add Image::getInfoFromURL return check

6 years agoAdd parameter check in Image::getInfoFromURL
Hypolite Petovan [Sun, 25 Mar 2018 00:03:28 +0000 (20:03 -0400)]
Add parameter check in Image::getInfoFromURL

6 years agoMerge pull request #4679 from annando/issue-4673
Hypolite Petovan [Sat, 24 Mar 2018 22:59:04 +0000 (18:59 -0400)]
Merge pull request #4679 from annando/issue-4673

Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'"

6 years agoMerge remote-tracking branch 'upstream/develop' into update-self
Michael [Sat, 24 Mar 2018 22:50:14 +0000 (22:50 +0000)]
Merge remote-tracking branch 'upstream/develop' into update-self

6 years agoIssue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'"
Michael [Sat, 24 Mar 2018 22:27:04 +0000 (22:27 +0000)]
Issue 4673: Avoid "Incorrect date value: '0000-00-00' for column 'bd'"

6 years agoMerge pull request #4678 from annando/issue-4666
Hypolite Petovan [Sat, 24 Mar 2018 22:09:21 +0000 (18:09 -0400)]
Merge pull request #4678 from annando/issue-4666

Fix: No "not null" when text is replaced by varchar