utzer [Wed, 4 Apr 2018 09:16:45 +0000 (14:46 +0530)]
Merge pull request #7 from ben-utzer/patch-3
Patch 3
utzer [Wed, 4 Apr 2018 09:06:32 +0000 (14:36 +0530)]
Merge pull request #2 from friendica/master
Master
ben-utzer [Wed, 4 Apr 2018 08:54:28 +0000 (14:24 +0530)]
.service file for systemd unit
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
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
Michael [Wed, 4 Apr 2018 06:06:38 +0000 (06:06 +0000)]
Fix: Commenting on public posts from Friendica users is now possible again
Tobias Diekershoff [Wed, 4 Apr 2018 05:22:05 +0000 (07:22 +0200)]
consistent use of terms in heading in the admin panel
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
Tobias Diekershoff [Tue, 3 Apr 2018 15:19:18 +0000 (17:19 +0200)]
update for PL translation THX waldis
Hypolite Petovan [Tue, 3 Apr 2018 14:39:53 +0000 (10:39 -0400)]
Merge pull request #4727 from tobiasd/
20180402-register
added TOS module
Tobias Diekershoff [Tue, 3 Apr 2018 14:33:39 +0000 (16:33 +0200)]
added hint about naming the class and filename
Tobias Diekershoff [Tue, 3 Apr 2018 14:33:10 +0000 (16:33 +0200)]
move the tos module to src/Module
Tobias Diekershoff [Tue, 3 Apr 2018 13:49:54 +0000 (15:49 +0200)]
removed leftover from the used template
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
Michael [Tue, 3 Apr 2018 12:27:22 +0000 (12:27 +0000)]
Don't always queue messages
Michael [Tue, 3 Apr 2018 12:18:05 +0000 (12:18 +0000)]
DFRN: Improvements to delivery. Logging and marking as not reachable
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
Tobias Diekershoff [Tue, 3 Apr 2018 10:47:38 +0000 (12:47 +0200)]
forgot the 2nd mail
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
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
Hypolite Petovan [Tue, 3 Apr 2018 05:04:46 +0000 (01:04 -0400)]
[Composer] Bump divineomega/password_exposed version to 2.5.1
Tobias Diekershoff [Tue, 3 Apr 2018 04:58:21 +0000 (06:58 +0200)]
indentation
Tobias Diekershoff [Tue, 3 Apr 2018 04:57:27 +0000 (06:57 +0200)]
indentation
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
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
Michael [Mon, 2 Apr 2018 22:06:31 +0000 (22:06 +0000)]
Misspelling
Michael [Mon, 2 Apr 2018 22:02:43 +0000 (22:02 +0000)]
Changed logging text
Michael [Mon, 2 Apr 2018 21:59:30 +0000 (21:59 +0000)]
Sending does now work
Michael [Mon, 2 Apr 2018 21:46:10 +0000 (21:46 +0000)]
The Diaspora transport layer is now the default for DFRN
Tobias Diekershoff [Mon, 2 Apr 2018 16:50:27 +0000 (18:50 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Mon, 2 Apr 2018 16:41:16 +0000 (18:41 +0200)]
register template may link to the TOS as well
Tobias Diekershoff [Mon, 2 Apr 2018 16:40:52 +0000 (18:40 +0200)]
added link to delete the account to the registration mail text
Tobias Diekershoff [Mon, 2 Apr 2018 16:40:30 +0000 (18:40 +0200)]
Added /tos module
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
Michael [Mon, 2 Apr 2018 13:44:45 +0000 (13:44 +0000)]
Treatment, Treating, whatever :-)
Michael [Mon, 2 Apr 2018 12:53:48 +0000 (12:53 +0000)]
Receiving was tested, sending is implemented and tested as well, currently unused
Tobias Diekershoff [Mon, 2 Apr 2018 06:42:11 +0000 (08:42 +0200)]
BBCode support in register_text
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
Tobias Diekershoff [Sun, 1 Apr 2018 18:15:50 +0000 (20:15 +0200)]
update for PL translation THX waldis
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
Tobias Diekershoff [Sun, 1 Apr 2018 09:22:36 +0000 (11:22 +0200)]
update for PL translation THX waldis
Michael [Sun, 1 Apr 2018 05:07:35 +0000 (05:07 +0000)]
Public contacts are not permitted for suggestions or mails
Michael [Sun, 1 Apr 2018 04:49:28 +0000 (04:49 +0000)]
Merge remote-tracking branch 'upstream/develop' into dfrn-2
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
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
Michael [Sat, 31 Mar 2018 09:34:36 +0000 (09:34 +0000)]
Fix the version sorting in the federation statistics
Michael [Sat, 31 Mar 2018 08:19:19 +0000 (08:19 +0000)]
Fixes missing command line 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']
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
Michael [Sat, 31 Mar 2018 03:33:19 +0000 (03:33 +0000)]
Fix: Avoid a WSOD when saving the profile
Hypolite Petovan [Sat, 31 Mar 2018 02:56:04 +0000 (22:56 -0400)]
Use $argv instead of $_SERVER['argv']
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
Michael [Fri, 30 Mar 2018 19:57:14 +0000 (19:57 +0000)]
Changed comments
Michael [Fri, 30 Mar 2018 19:17:12 +0000 (19:17 +0000)]
New functionality to set a password for a given user
Michael [Fri, 30 Mar 2018 06:20:00 +0000 (06:20 +0000)]
Ensure that public contacts can't create toplevel posts
Michael [Fri, 30 Mar 2018 05:45:29 +0000 (05:45 +0000)]
Merge remote-tracking branch 'upstream/develop' into dfrn-2
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
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
Hypolite Petovan [Fri, 30 Mar 2018 03:29:41 +0000 (23:29 -0400)]
Suppress error message for non-existing contacts in mod/follow
Hypolite Petovan [Fri, 30 Mar 2018 03:28:48 +0000 (23:28 -0400)]
Fix formatting in mod/follow
Hypolite Petovan [Thu, 29 Mar 2018 23:29:36 +0000 (19:29 -0400)]
Add fallback to regular code if language doesn't exist
Hypolite Petovan [Thu, 29 Mar 2018 23:29:09 +0000 (19:29 -0400)]
Add bash to text_highlight language list
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
rabuzarus [Thu, 29 Mar 2018 18:30:26 +0000 (20:30 +0200)]
cropperjs: fix composer.lock
rabuzarus [Thu, 29 Mar 2018 16:39:26 +0000 (18:39 +0200)]
cropperjs: use npm-asset for composer
rabuzarus [Thu, 29 Mar 2018 16:06:56 +0000 (18:06 +0200)]
cropperjs: fix indention
rabuzarus [Thu, 29 Mar 2018 15:57:06 +0000 (17:57 +0200)]
update javascript cropper library
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
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
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
Tobias Diekershoff [Thu, 29 Mar 2018 09:49:40 +0000 (11:49 +0200)]
little wording change
Tobias Diekershoff [Thu, 29 Mar 2018 09:40:45 +0000 (11:40 +0200)]
prevent nun-configured node due copying htconfig.php files
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
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
Tobias Diekershoff [Thu, 29 Mar 2018 05:24:45 +0000 (07:24 +0200)]
update for PL translation THX waldis
Tobias Diekershoff [Thu, 29 Mar 2018 05:23:56 +0000 (07:23 +0200)]
update for DE translation
Tobias Diekershoff [Thu, 29 Mar 2018 04:57:02 +0000 (06:57 +0200)]
typo
Hypolite Petovan [Thu, 29 Mar 2018 04:47:27 +0000 (00:47 -0400)]
Make Hashtag autocomplete case-insensitive
Hypolite Petovan [Thu, 29 Mar 2018 04:47:14 +0000 (00:47 -0400)]
Strip strtolower from Module\Hashtag
rabuzarus [Wed, 28 Mar 2018 11:43:17 +0000 (13:43 +0200)]
Merge pull request #4702 from annando/sql-fix
Fixed SQL query
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
Michael [Wed, 28 Mar 2018 08:09:45 +0000 (08:09 +0000)]
A relocation hadn't changed the hostname
Michael [Wed, 28 Mar 2018 08:04:20 +0000 (08:04 +0000)]
Fixed SQL query
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
Tobias Diekershoff [Wed, 28 Mar 2018 06:45:50 +0000 (08:45 +0200)]
regenerated master messages.po file
Tobias Diekershoff [Wed, 28 Mar 2018 06:45:42 +0000 (08:45 +0200)]
messages.po output file needs to be in /util
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
Michael [Wed, 28 Mar 2018 06:16:46 +0000 (06:16 +0000)]
Relais settings are added to admin backend
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
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
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
Tobias Diekershoff [Wed, 28 Mar 2018 05:07:56 +0000 (07:07 +0200)]
update to the PL translation THX waldis
Michael [Wed, 28 Mar 2018 04:24:38 +0000 (04:24 +0000)]
Direct transfer without a relay is now possible
Hypolite Petovan [Tue, 27 Mar 2018 15:24:38 +0000 (11:24 -0400)]
Merge pull request #4693 from annando/doxygen-relay
Forgotten doxygen header
Michael [Tue, 27 Mar 2018 15:12:19 +0000 (15:12 +0000)]
Forgotten doxygen header
Hypolite Petovan [Tue, 27 Mar 2018 15:01:22 +0000 (11:01 -0400)]
Merge pull request #4692 from Rudloff/patch-1
Update CHANGELOG
Pierre Rudloff [Tue, 27 Mar 2018 14:58:24 +0000 (16:58 +0200)]
Update CHANGELOG
Small typo in my name 😜
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
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
Michael [Tue, 27 Mar 2018 05:45:56 +0000 (05:45 +0000)]
Asynchronous Javascript is deactivated
https://reisub.nsupdate.info/git / friendica.git / .git / log