]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge pull request #4750 from friendica/revert-4746-img-alt-text
Hypolite Petovan [Thu, 5 Apr 2018 12:00:47 +0000 (08:00 -0400)]
Merge pull request #4750 from friendica/revert-4746-img-alt-text

Revert "Added support of alt texts in images"

6 years agoRevert "Added support of alt texts in images"
Hypolite Petovan [Thu, 5 Apr 2018 11:59:57 +0000 (07:59 -0400)]
Revert "Added support of alt texts in images"

6 years agoMerge pull request #4748 from tobiasd/220180405-de
Michael Vogel [Thu, 5 Apr 2018 07:07:32 +0000 (09:07 +0200)]
Merge pull request #4748 from tobiasd/220180405-de

update for DE translation THX Andreas

6 years agoupdate for DE translation THX Andreas
Tobias Diekershoff [Thu, 5 Apr 2018 06:36:16 +0000 (08:36 +0200)]
update for DE translation THX Andreas

6 years agoMerge pull request #4746 from annando/img-alt-text
Hypolite Petovan [Wed, 4 Apr 2018 23:20:42 +0000 (19:20 -0400)]
Merge pull request #4746 from annando/img-alt-text

Added support of alt texts in images

6 years agoAdded support of alt texts in images
Michael [Wed, 4 Apr 2018 22:23:17 +0000 (22:23 +0000)]
Added support of alt texts in images

6 years agoMerge pull request #4745 from annando/register-mess
Hypolite Petovan [Wed, 4 Apr 2018 20:07:23 +0000 (16:07 -0400)]
Merge pull request #4745 from annando/register-mess

Fix: The register mail contained variables in a wrong order

6 years agoFix: The register mail contained variables in a wrong order
Michael [Wed, 4 Apr 2018 19:56:34 +0000 (19:56 +0000)]
Fix: The register mail contained variables in a wrong order

6 years agoMerge pull request #4744 from annando/queue-improvements
Hypolite Petovan [Wed, 4 Apr 2018 19:13:57 +0000 (15:13 -0400)]
Merge pull request #4744 from annando/queue-improvements

Queue: Better handling of return values of transmissions

6 years agoMerge pull request #4742 from annando/negative-dates
Hypolite Petovan [Wed, 4 Apr 2018 19:08:01 +0000 (15:08 -0400)]
Merge pull request #4742 from annando/negative-dates

Avoid "Failed to parse time string (-001-11-30T00:00:00+00:00 + 32 days)"

6 years agoQueue: Better handling of return values of transmissions
Michael [Wed, 4 Apr 2018 19:03:05 +0000 (19:03 +0000)]
Queue: Better handling of return values of transmissions

6 years agoAvoid "Failed to parse time string (-001-11-30T00:00:00+00:00 + 32 days)"
Michael [Wed, 4 Apr 2018 18:58:25 +0000 (18:58 +0000)]
Avoid "Failed to parse time string (-001-11-30T00:00:00+00:00 + 32 days)"

6 years agoMerge pull request #4740 from ben-utzer/systemd-example
Tobias Diekershoff [Wed, 4 Apr 2018 10:07:23 +0000 (12:07 +0200)]
Merge pull request #4740 from ben-utzer/systemd-example

Systemd example unit files and readme

6 years agocomment about user
utzer [Wed, 4 Apr 2018 09:24:07 +0000 (14:54 +0530)]
comment about user

6 years agosystemd timer unit
utzer [Wed, 4 Apr 2018 09:21:51 +0000 (14:51 +0530)]
systemd timer unit

6 years agoMerge pull request #8 from ben-utzer/patch-1
utzer [Wed, 4 Apr 2018 09:18:03 +0000 (14:48 +0530)]
Merge pull request #8 from ben-utzer/patch-1

Patch 1

6 years agoMerge pull request #7 from ben-utzer/patch-3
utzer [Wed, 4 Apr 2018 09:16:45 +0000 (14:46 +0530)]
Merge pull request #7 from ben-utzer/patch-3

Patch 3

6 years agoMerge pull request #2 from friendica/master
utzer [Wed, 4 Apr 2018 09:06:32 +0000 (14:36 +0530)]
Merge pull request #2 from friendica/master

Master

6 years agoReadme extended for systemd unit files
ben-utzer [Wed, 4 Apr 2018 08:58:26 +0000 (14:28 +0530)]
Readme extended for systemd unit files

6 years ago.service file for systemd unit
ben-utzer [Wed, 4 Apr 2018 08:54:28 +0000 (14:24 +0530)]
.service file for systemd unit

6 years agoAddition of systemd timer/service
ben-utzer [Wed, 4 Apr 2018 08:46:05 +0000 (14:16 +0530)]
Addition of systemd timer/service

6 years agoMerge pull request #4737 from annando/fix-public-comment
Tobias Diekershoff [Wed, 4 Apr 2018 07:29:06 +0000 (09:29 +0200)]
Merge pull request #4737 from annando/fix-public-comment

Commenting on public posts from Friendica users is now possible again

6 years agoMerge pull request #4736 from tobiasd/20180404-service
Michael Vogel [Wed, 4 Apr 2018 06:11:48 +0000 (08:11 +0200)]
Merge pull request #4736 from tobiasd/20180404-service

consistent use of terms in heading in the admin panel

6 years agoFix: Commenting on public posts from Friendica users is now possible again
Michael [Wed, 4 Apr 2018 06:06:38 +0000 (06:06 +0000)]
Fix: Commenting on public posts from Friendica users is now possible again

6 years agoconsistent use of terms in heading in the admin panel
Tobias Diekershoff [Wed, 4 Apr 2018 05:22:05 +0000 (07:22 +0200)]
consistent use of terms in heading in the admin panel

6 years agoMerge pull request #4733 from tobiasd/20180403-pl
Hypolite Petovan [Tue, 3 Apr 2018 15:27:13 +0000 (11:27 -0400)]
Merge pull request #4733 from tobiasd/20180403-pl

update for PL translation THX waldis

6 years agoupdate for PL translation THX waldis
Tobias Diekershoff [Tue, 3 Apr 2018 15:19:18 +0000 (17:19 +0200)]
update for PL translation THX waldis

6 years agoMerge pull request #4727 from tobiasd/20180402-register
Hypolite Petovan [Tue, 3 Apr 2018 14:39:53 +0000 (10:39 -0400)]
Merge pull request #4727 from tobiasd/20180402-register

added TOS module

6 years agoadded hint about naming the class and filename
Tobias Diekershoff [Tue, 3 Apr 2018 14:33:39 +0000 (16:33 +0200)]
added hint about naming the class and filename

6 years agomove the tos module to src/Module
Tobias Diekershoff [Tue, 3 Apr 2018 14:33:10 +0000 (16:33 +0200)]
move the tos module to src/Module

6 years agoremoved leftover from the used template
Tobias Diekershoff [Tue, 3 Apr 2018 13:49:54 +0000 (15:49 +0200)]
removed leftover from the used template

6 years agoMerge pull request #4732 from annando/improve-delivery
Hypolite Petovan [Tue, 3 Apr 2018 12:39:59 +0000 (08:39 -0400)]
Merge pull request #4732 from annando/improve-delivery

DFRN: Improvements to delivery. Logging and marking as not reachable

6 years agoDon't always queue messages
Michael [Tue, 3 Apr 2018 12:27:22 +0000 (12:27 +0000)]
Don't always queue messages

6 years agoDFRN: Improvements to delivery. Logging and marking as not reachable
Michael [Tue, 3 Apr 2018 12:18:05 +0000 (12:18 +0000)]
DFRN: Improvements to delivery. Logging and marking as not reachable

6 years agoMerge pull request #4731 from tobiasd/20180403-lostpwd
Hypolite Petovan [Tue, 3 Apr 2018 11:14:01 +0000 (07:14 -0400)]
Merge pull request #4731 from tobiasd/20180403-lostpwd

pass uid to notification system so securemail addon can pick it up

6 years agoforgot the 2nd mail
Tobias Diekershoff [Tue, 3 Apr 2018 10:47:38 +0000 (12:47 +0200)]
forgot the 2nd mail

6 years agopass uid to notofication system so securemail addon can pick it up
Tobias Diekershoff [Tue, 3 Apr 2018 10:45:27 +0000 (12:45 +0200)]
pass uid to notofication system so securemail addon can pick it up

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 agoindentation
Tobias Diekershoff [Tue, 3 Apr 2018 04:58:21 +0000 (06:58 +0200)]
indentation

6 years agoindentation
Tobias Diekershoff [Tue, 3 Apr 2018 04:57:27 +0000 (06:57 +0200)]
indentation

6 years agoupdated the privacy statement text and added some headers to the functions
Tobias Diekershoff [Tue, 3 Apr 2018 04:55:25 +0000 (06:55 +0200)]
updated the privacy statement text and added some headers to the functions

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 agoregenerated master messages.po file
Tobias Diekershoff [Mon, 2 Apr 2018 16:50:27 +0000 (18:50 +0200)]
regenerated master messages.po file

6 years agoregister template may link to the TOS as well
Tobias Diekershoff [Mon, 2 Apr 2018 16:41:16 +0000 (18:41 +0200)]
register template may link to the TOS as well

6 years agoadded link to delete the account to the registration mail text
Tobias Diekershoff [Mon, 2 Apr 2018 16:40:52 +0000 (18:40 +0200)]
added link to delete the account to the registration mail text

6 years agoAdded /tos module
Tobias Diekershoff [Mon, 2 Apr 2018 16:40:30 +0000 (18:40 +0200)]
Added /tos module

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 agoBBCode support in register_text
Tobias Diekershoff [Mon, 2 Apr 2018 06:42:11 +0000 (08:42 +0200)]
BBCode support in register_text

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