]> git.mxchange.org Git - friendica.git/log
friendica.git
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 #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

6 years agoFix: No "not null" when text is replaced by varchar
Michael [Sat, 24 Mar 2018 21:57:50 +0000 (21:57 +0000)]
Fix: No "not null" when text is replaced by varchar

6 years agoMerge pull request #4677 from MrPetovan/bug/4670-fix-po2php-command
Michael Vogel [Sat, 24 Mar 2018 21:43:55 +0000 (22:43 +0100)]
Merge pull request #4677 from MrPetovan/bug/4670-fix-po2php-command

Revert po2php command "fix"

6 years agoFix number constant used in Console\PoToPhp
Hypolite Petovan [Sat, 24 Mar 2018 20:09:19 +0000 (16:09 -0400)]
Fix number constant used in Console\PoToPhp

6 years agoFix formatting in Console\PoToPhp
Hypolite Petovan [Sat, 24 Mar 2018 20:08:56 +0000 (16:08 -0400)]
Fix formatting in Console\PoToPhp

6 years agoMerge pull request #4674 from annando/acl-fix
Hypolite Petovan [Sat, 24 Mar 2018 19:48:02 +0000 (15:48 -0400)]
Merge pull request #4674 from annando/acl-fix

Fix the ACL problem issue 4616

6 years agostandards
Michael [Sat, 24 Mar 2018 19:40:35 +0000 (19:40 +0000)]
standards

6 years agoMerge pull request #4676 from annando/clean-url
Hypolite Petovan [Sat, 24 Mar 2018 19:31:07 +0000 (15:31 -0400)]
Merge pull request #4676 from annando/clean-url

Handle URL with unicode characters

6 years agoMerge pull request #4675 from annando/group-delete
Hypolite Petovan [Sat, 24 Mar 2018 19:25:26 +0000 (15:25 -0400)]
Merge pull request #4675 from annando/group-delete

Fix: Groups can now be deleted again

6 years agoRemoved test code
Michael [Sat, 24 Mar 2018 18:48:40 +0000 (18:48 +0000)]
Removed test code

6 years agoLine feeds fixed, not change in functionality
Michael [Sat, 24 Mar 2018 18:39:13 +0000 (18:39 +0000)]
Line feeds fixed, not change in functionality

6 years agoFix ACL data
Michael [Sat, 24 Mar 2018 18:38:05 +0000 (18:38 +0000)]
Fix ACL data

6 years agoMerge pull request #4671 from tobiasd/20180324-trans
Hypolite Petovan [Sat, 24 Mar 2018 15:40:35 +0000 (11:40 -0400)]
Merge pull request #4671 from tobiasd/20180324-trans

translation update DE and ZN CH

6 years agoupdate to the zh-cn translation THX 朱陈锬
Tobias Diekershoff [Sat, 24 Mar 2018 15:09:45 +0000 (16:09 +0100)]
update to the zh-cn translation THX æœ±é™ˆé”¬

6 years agoupdate for DE translation
Tobias Diekershoff [Sat, 24 Mar 2018 15:07:33 +0000 (16:07 +0100)]
update for DE translation

6 years agoMerge pull request #4668 from MrPetovan/bug/4665-fix-console-hashbang
Tobias Diekershoff [Sat, 24 Mar 2018 13:21:26 +0000 (14:21 +0100)]
Merge pull request #4668 from MrPetovan/bug/4665-fix-console-hashbang

Use correct /bin/bash hashbang in bin/console

6 years agoUse correct /bin/bash hashbang in bin/console
Hypolite Petovan [Sat, 24 Mar 2018 12:40:43 +0000 (08:40 -0400)]
Use correct /bin/bash hashbang in bin/console

6 years agoMerge pull request #4667 from Alkarex/fix-bin-console
Hypolite Petovan [Sat, 24 Mar 2018 12:38:29 +0000 (08:38 -0400)]
Merge pull request #4667 from Alkarex/fix-bin-console

Fix PHP cannot take a shell script

6 years agoFix PHP cannot take a shell script
Alexandre Alapetite [Sat, 24 Mar 2018 11:47:40 +0000 (12:47 +0100)]
Fix PHP cannot take a shell script

Fix part of https://github.com/friendica/friendica/issues/4665
`php [shell file]` does not work, so use `php [php file]` instead.
`php bin/console.php` is more robust than e.g. `bin/console` which does
not work on Windows, or *nix systems without Bash

6 years agoFix: Groups can now be deleted again
Michael [Sat, 24 Mar 2018 07:26:57 +0000 (07:26 +0000)]
Fix: Groups can now be deleted again

6 years agoNew function to keep the self contact updated
Michael [Sat, 24 Mar 2018 06:15:18 +0000 (06:15 +0000)]
New function to keep the self contact updated

6 years agoMerge pull request #4662 from MrPetovan/bug/4660-restore-composer-5.6-compatibility
Hypolite Petovan [Sat, 24 Mar 2018 00:53:52 +0000 (20:53 -0400)]
Merge pull request #4662 from MrPetovan/bug/4660-restore-composer-5.6-compatibility

Hotfix: Restore composer 5 6 compatibility

6 years agoMerge pull request #4661 from MrPetovan/develop
Hypolite Petovan [Sat, 24 Mar 2018 00:53:07 +0000 (20:53 -0400)]
Merge pull request #4661 from MrPetovan/develop

Hotfix: Bump database version number after RC merge

6 years agoRestore executable permissions in bin/
Hypolite Petovan [Sat, 24 Mar 2018 00:47:58 +0000 (20:47 -0400)]
Restore executable permissions in bin/

6 years ago[Composer] Downgrade paragonie/constant_time_encoding to PHP 5.6 compatible version
Hypolite Petovan [Sat, 24 Mar 2018 00:41:55 +0000 (20:41 -0400)]
[Composer] Downgrade paragonie/constant_time_encoding to PHP 5.6 compatible version

6 years agoBump database version number after RC merge
Hypolite Petovan [Sat, 24 Mar 2018 00:01:53 +0000 (20:01 -0400)]
Bump database version number after RC merge

6 years agoMerge pull request #4657 from MrPetovan/task/3878-move-event-to-src
Michael Vogel [Fri, 23 Mar 2018 20:24:20 +0000 (21:24 +0100)]
Merge pull request #4657 from MrPetovan/task/3878-move-event-to-src

Move include/event.php to src/

6 years agoMerge pull request #4658 from fabrixxm/dev/update-vagrant
Hypolite Petovan [Fri, 23 Mar 2018 19:40:20 +0000 (15:40 -0400)]
Merge pull request #4658 from fabrixxm/dev/update-vagrant

Edits to Vagrant dev env part 3

6 years agoHandle URL with unicode characters
Michael [Fri, 23 Mar 2018 18:41:59 +0000 (18:41 +0000)]
Handle URL with unicode characters

6 years agoDev env: fix cache test data
fabrixxm [Fri, 23 Mar 2018 17:19:29 +0000 (18:19 +0100)]
Dev env: fix cache test data

6 years agoMerge pull request #4651 from MrPetovan/develop
fabrixxm [Fri, 23 Mar 2018 16:21:35 +0000 (17:21 +0100)]
Merge pull request #4651 from MrPetovan/develop

Update Develop with 3.6-rc changes

6 years agoDev env: fix admin email
fabrixxm [Fri, 23 Mar 2018 16:16:22 +0000 (17:16 +0100)]
Dev env: fix admin email

6 years agoMerge pull request #4654 from fabrixxm/dev/update-vagrant
Hypolite Petovan [Fri, 23 Mar 2018 15:49:14 +0000 (11:49 -0400)]
Merge pull request #4654 from fabrixxm/dev/update-vagrant

Edits to Vagrant dev env - the missing part

6 years agoupdate test data for dev env
fabrixxm [Fri, 23 Mar 2018 15:38:26 +0000 (16:38 +0100)]
update test data for dev env

6 years agoMerge pull request #4653 from fabrixxm/dev/update-vagrant
Hypolite Petovan [Fri, 23 Mar 2018 15:23:00 +0000 (11:23 -0400)]
Merge pull request #4653 from fabrixxm/dev/update-vagrant

Edits to Vagrant dev env

6 years agoFix Vagrant dev env
fabrixxm [Fri, 23 Mar 2018 15:12:11 +0000 (16:12 +0100)]
Fix Vagrant dev env

- more consistent use of hostname
- use .local hostname instead of .dev . Looks like Firefox is more
  happy with a self-signed certificate on .local than .dev
- add friendica.local to altname in certificate
- run composer install while provisioning

6 years agoUpdated version number
Hypolite Petovan [Fri, 23 Mar 2018 10:39:51 +0000 (06:39 -0400)]
Updated version number

6 years agoEnable CalendarExport widget on /events
Hypolite Petovan [Mon, 19 Mar 2018 13:09:07 +0000 (09:09 -0400)]
Enable CalendarExport widget on /events

6 years agoRestore previous permission comment in Widget\CalendarExport
Hypolite Petovan [Sun, 18 Mar 2018 05:32:43 +0000 (01:32 -0400)]
Restore previous permission comment in Widget\CalendarExport

6 years agoFinally fix the permissions for Widget\CalendarExport
Hypolite Petovan [Sun, 18 Mar 2018 05:23:38 +0000 (01:23 -0400)]
Finally fix the permissions for Widget\CalendarExport

6 years agoFix typo in mod/events
Hypolite Petovan [Sat, 17 Mar 2018 20:43:15 +0000 (16:43 -0400)]
Fix typo in mod/events

- Add todo in Model\Event

6 years agoRestore missing permission check in Widget\CalendarExport
Hypolite Petovan [Sat, 17 Mar 2018 20:42:28 +0000 (16:42 -0400)]
Restore missing permission check in Widget\CalendarExport

6 years agoFix wrong contact retrieval condition in Event::store
Hypolite Petovan [Sat, 17 Mar 2018 14:05:17 +0000 (10:05 -0400)]
Fix wrong contact retrieval condition in Event::store

6 years agoFix wrong parameter check in Event::store
Hypolite Petovan [Sat, 17 Mar 2018 14:05:02 +0000 (10:05 -0400)]
Fix wrong parameter check in Event::store