]> git.mxchange.org Git - friendica.git/log
friendica.git
6 years agoMerge pull request #5163 from annando/bugfix-user-item
Hypolite Petovan [Sat, 2 Jun 2018 17:49:58 +0000 (13:49 -0400)]
Merge pull request #5163 from annando/bugfix-user-item

Fix SQL error in tagcloud

6 years agoFix SQL error in tagcloud
Michael [Sat, 2 Jun 2018 17:07:28 +0000 (17:07 +0000)]
Fix SQL error in tagcloud

6 years agoMerge pull request #5162 from tobiasd/20180602-de
Hypolite Petovan [Sat, 2 Jun 2018 14:09:44 +0000 (10:09 -0400)]
Merge pull request #5162 from tobiasd/20180602-de

update DE translations

6 years agoupdate DE translations
Tobias Diekershoff [Sat, 2 Jun 2018 13:56:57 +0000 (15:56 +0200)]
update DE translations

6 years agoMerge pull request #5161 from annando/public-redir
Hypolite Petovan [Sat, 2 Jun 2018 13:18:10 +0000 (09:18 -0400)]
Merge pull request #5161 from annando/public-redir

"redir" is now centralized

6 years agoWeird stuff
Michael [Sat, 2 Jun 2018 13:00:47 +0000 (13:00 +0000)]
Weird stuff

6 years agoOnly redirections to the same host do make sense
Michael [Sat, 2 Jun 2018 08:42:46 +0000 (08:42 +0000)]
Only redirections to the same host do make sense

6 years agoUse MagicLinkbyId when possible
Michael [Sat, 2 Jun 2018 08:28:01 +0000 (08:28 +0000)]
Use MagicLinkbyId when possible

6 years agoMerge pull request #5160 from tobiasd/20180602-msg
Michael Vogel [Sat, 2 Jun 2018 08:27:37 +0000 (10:27 +0200)]
Merge pull request #5160 from tobiasd/20180602-msg

regen master messages.po

6 years agoUse magicLink whenever possible
Michael [Sat, 2 Jun 2018 08:05:06 +0000 (08:05 +0000)]
Use magicLink whenever possible

6 years agoregen master messages.po
Tobias Diekershoff [Sat, 2 Jun 2018 06:49:58 +0000 (08:49 +0200)]
regen master messages.po

6 years agoMerge remote-tracking branch 'upstream/develop' into public-redir
Michael [Sat, 2 Jun 2018 06:18:45 +0000 (06:18 +0000)]
Merge remote-tracking branch 'upstream/develop' into public-redir

6 years agoMerge pull request #5159 from AndyHee/patch1
Tobias Diekershoff [Sat, 2 Jun 2018 05:54:12 +0000 (07:54 +0200)]
Merge pull request #5159 from AndyHee/patch1

Rewording label

6 years agoImproved distinction between delete and remove
AndyHee [Sat, 2 Jun 2018 05:40:41 +0000 (12:40 +0700)]
Improved distinction between delete and remove

6 years agoRewording label
AndyHee [Sat, 2 Jun 2018 04:23:27 +0000 (11:23 +0700)]
Rewording label

6 years agoMerge pull request #5156 from annando/db-comment
Hypolite Petovan [Sat, 2 Jun 2018 02:44:46 +0000 (22:44 -0400)]
Merge pull request #5156 from annando/db-comment

Small corrections to the database descriptions

6 years agoSmall corrections to the database descriptions
Michael [Fri, 1 Jun 2018 22:12:35 +0000 (22:12 +0000)]
Small corrections to the database descriptions

6 years agoMerge remote-tracking branch 'upstream/develop' into public-redir
Michael [Fri, 1 Jun 2018 12:32:51 +0000 (12:32 +0000)]
Merge remote-tracking branch 'upstream/develop' into public-redir

6 years agoMerge pull request #5155 from MrPetovan/develop
Tobias Diekershoff [Fri, 1 Jun 2018 11:48:18 +0000 (13:48 +0200)]
Merge pull request #5155 from MrPetovan/develop

Update develop

6 years agoRestore gitignore
Hypolite Petovan [Fri, 1 Jun 2018 11:39:26 +0000 (07:39 -0400)]
Restore gitignore

6 years agoMerge branch 'master' into develop
Hypolite Petovan [Fri, 1 Jun 2018 11:30:04 +0000 (07:30 -0400)]
Merge branch 'master' into develop
- Updated new develop version label
- Incremented database build number

6 years agoFix version number in database.sql
Hypolite Petovan [Fri, 1 Jun 2018 11:25:48 +0000 (07:25 -0400)]
Fix version number in database.sql

6 years agoset the release date
Tobias Diekershoff [Fri, 1 Jun 2018 07:43:06 +0000 (09:43 +0200)]
set the release date

6 years agoFriendica 2018.05
Tobias Diekershoff [Fri, 1 Jun 2018 07:29:18 +0000 (09:29 +0200)]
Friendica 2018.05

6 years agoMerge pull request #5096 from tobiasd/3.6.1
Tobias Diekershoff [Fri, 1 Jun 2018 07:25:49 +0000 (09:25 +0200)]
Merge pull request #5096 from tobiasd/3.6.1

CHANGELOG

6 years ago"redir" is now centralized and works with the public contact
Michael [Fri, 1 Jun 2018 06:46:34 +0000 (06:46 +0000)]
"redir" is now centralized and works with the public contact

6 years agolast minute bug fixes
Tobias Diekershoff [Fri, 1 Jun 2018 04:42:46 +0000 (06:42 +0200)]
last minute bug fixes

6 years agoMerge pull request #5153 from tobiasd/20180531-nl
Hypolite Petovan [Thu, 31 May 2018 15:15:11 +0000 (11:15 -0400)]
Merge pull request #5153 from tobiasd/20180531-nl

update to the NL translation THX Pascal Deklerck

6 years agoupdate to the NL translation THX Pascal Deklerck
Tobias Diekershoff [Thu, 31 May 2018 14:38:31 +0000 (16:38 +0200)]
update to the NL translation THX Pascal Deklerck

6 years agoMerge pull request #5150 from abanink/5147
Hypolite Petovan [Thu, 31 May 2018 14:35:24 +0000 (10:35 -0400)]
Merge pull request #5150 from abanink/5147

5147 Typo 'bandwith' should be 'bandwidth'

6 years agoMerge pull request #5152 from tobiasd/20180531-regform
Michael Vogel [Thu, 31 May 2018 12:31:33 +0000 (14:31 +0200)]
Merge pull request #5152 from tobiasd/20180531-regform

the detected language was not stored during user creation

6 years agothe detected language was not stored during user creation
Tobias Diekershoff [Thu, 31 May 2018 06:27:27 +0000 (08:27 +0200)]
the detected language was not stored during user creation

6 years agoMerge pull request #5151 from tobiasd/20180531-de
Michael Vogel [Thu, 31 May 2018 06:26:19 +0000 (08:26 +0200)]
Merge pull request #5151 from tobiasd/20180531-de

update DE translations

6 years agoredo correct typo Bandwith to Bandwidth in mod/settings.php
Pascal Deklerck [Thu, 31 May 2018 04:39:30 +0000 (06:39 +0200)]
redo correct typo Bandwith to Bandwidth in mod/settings.php

6 years agoredo correct typo bandwith to bandwidth in mod/admin.php
Pascal Deklerck [Thu, 31 May 2018 04:38:14 +0000 (06:38 +0200)]
redo correct typo bandwith to bandwidth in mod/admin.php

6 years agoupdate DE translations
Tobias Diekershoff [Thu, 31 May 2018 04:37:54 +0000 (06:37 +0200)]
update DE translations

6 years agoundo change to mod/admin.php
Pascal Deklerck [Wed, 30 May 2018 18:28:38 +0000 (20:28 +0200)]
undo change to mod/admin.php

6 years agoundo changes to strings files
Pascal Deklerck [Wed, 30 May 2018 18:19:12 +0000 (20:19 +0200)]
undo changes to strings files

6 years agoMerge pull request #5149 from tobiasd/20180530-msg
Hypolite Petovan [Wed, 30 May 2018 17:15:46 +0000 (13:15 -0400)]
Merge pull request #5149 from tobiasd/20180530-msg

regen master messages.po

6 years ago5147 Typo 'bandwith' should be 'bandwidth'
Pascal Deklerck [Wed, 30 May 2018 06:50:29 +0000 (08:50 +0200)]
5147 Typo 'bandwith' should be 'bandwidth'

6 years agoregen master messages.po
Tobias Diekershoff [Wed, 30 May 2018 03:41:30 +0000 (05:41 +0200)]
regen master messages.po

6 years agoMerge pull request #5144 from annando/deleted-item
Hypolite Petovan [Tue, 29 May 2018 19:14:51 +0000 (15:14 -0400)]
Merge pull request #5144 from annando/deleted-item

Fix for not being able to delete items you don't own

6 years agoCoding standards
Michael [Tue, 29 May 2018 19:00:26 +0000 (19:00 +0000)]
Coding standards

6 years agoMerge pull request #1 from friendica/2018.05-rc
Pascal [Tue, 29 May 2018 18:57:43 +0000 (20:57 +0200)]
Merge pull request #1 from friendica/2018.05-rc

2018.05 rc

6 years agoUse local_user instead
Michael [Tue, 29 May 2018 18:57:32 +0000 (18:57 +0000)]
Use local_user instead

6 years agoMerge pull request #5143 from tobiasd/20180528-priv
Hypolite Petovan [Tue, 29 May 2018 15:03:43 +0000 (11:03 -0400)]
Merge pull request #5143 from tobiasd/20180528-priv

hide profile help text clarification

6 years agoMerge pull request #5145 from abanink/4419
Hypolite Petovan [Tue, 29 May 2018 15:03:01 +0000 (11:03 -0400)]
Merge pull request #5145 from abanink/4419

4419 Update the comments in src/Database/DBStructure.php from doc

6 years agorewording
Tobias Diekershoff [Tue, 29 May 2018 14:54:40 +0000 (16:54 +0200)]
rewording

6 years ago4419 update DB version & database.sql
Pascal Deklerck [Tue, 29 May 2018 14:11:25 +0000 (16:11 +0200)]
4419 update DB version & database.sql

6 years ago4419 Update the comments in src/Database/DBStructure.php from doc/database/*
Pascal Deklerck [Tue, 29 May 2018 08:24:36 +0000 (10:24 +0200)]
4419 Update the comments in src/Database/DBStructure.php from doc/database/*

6 years agoNew function to delete items for users
Michael [Tue, 29 May 2018 05:22:57 +0000 (05:22 +0000)]
New function to delete items for users

6 years agohide profile help text clarification
Tobias Diekershoff [Mon, 28 May 2018 14:16:23 +0000 (16:16 +0200)]
hide profile help text clarification

6 years agoMerge pull request #5142 from tobiasd/20180528-it
Michael Vogel [Mon, 28 May 2018 12:00:14 +0000 (14:00 +0200)]
Merge pull request #5142 from tobiasd/20180528-it

IT translations THX Fabio

6 years agoIT translations THX Fabio
Tobias Diekershoff [Mon, 28 May 2018 11:50:56 +0000 (13:50 +0200)]
IT translations THX Fabio

6 years agoMerge pull request #5140 from abanink/5066
Hypolite Petovan [Sun, 27 May 2018 13:10:46 +0000 (09:10 -0400)]
Merge pull request #5140 from abanink/5066

Fix autoname output length

6 years agoMerge pull request #5139 from rabuzarus/20180527_-_frio_tos_background
Hypolite Petovan [Sun, 27 May 2018 13:04:14 +0000 (09:04 -0400)]
Merge pull request #5139 from rabuzarus/20180527_-_frio_tos_background

 Frio: fix tos page background for frio and move tos link to a another place in the nave menu

6 years agoChanged documentation
Michael [Sun, 27 May 2018 10:42:47 +0000 (10:42 +0000)]
Changed documentation

6 years agoMerge remote-tracking branch 'upstream/2018.05-rc' into deleted-item
Michael [Sun, 27 May 2018 10:38:49 +0000 (10:38 +0000)]
Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item

6 years agoFix autoname output length
Pascal Deklerck [Sun, 27 May 2018 08:11:51 +0000 (10:11 +0200)]
Fix autoname output length

6 years agoMerge pull request #5138 from annando/optimize-workerqueue
rabuzarus [Sun, 27 May 2018 08:10:11 +0000 (10:10 +0200)]
Merge pull request #5138 from annando/optimize-workerqueue

Possibly fixes 5137: Only execute "optimize table" when allowed

6 years agoFrio: move tos link to a another place in the nave menu
rabuzarus [Sun, 27 May 2018 07:55:05 +0000 (09:55 +0200)]
Frio: move tos link to a another place in the nave menu

6 years agoFrio: tos page background for frio
rabuzarus [Sun, 27 May 2018 07:48:27 +0000 (09:48 +0200)]
Frio: tos page background for frio

6 years agoPossibly fixes 5137: Only execute "optimize table" when allowed
Michael [Sun, 27 May 2018 06:23:18 +0000 (06:23 +0000)]
Possibly fixes 5137: Only execute "optimize table" when allowed

6 years agoAdded the new parameter to the delete function.
Michael [Sat, 26 May 2018 21:38:45 +0000 (21:38 +0000)]
Added the new parameter to the delete function.

6 years agoPreparation for new deletion functionality
Michael [Sat, 26 May 2018 20:23:49 +0000 (20:23 +0000)]
Preparation for new deletion functionality

6 years agoRemoved useless line
Michael [Sat, 26 May 2018 20:08:42 +0000 (20:08 +0000)]
Removed useless line

6 years agoGrammar fix
Michael [Sat, 26 May 2018 20:07:30 +0000 (20:07 +0000)]
Grammar fix

6 years agoSome more places to add the user id
Michael [Sat, 26 May 2018 20:03:30 +0000 (20:03 +0000)]
Some more places to add the user id

6 years agoFix for not being able to delete items
Michael [Sat, 26 May 2018 18:07:27 +0000 (18:07 +0000)]
Fix for not being able to delete items

6 years agoMerge pull request #5131 from nupplaphil/htconfig_mariadb
Hypolite Petovan [Sat, 26 May 2018 12:58:55 +0000 (08:58 -0400)]
Merge pull request #5131 from nupplaphil/htconfig_mariadb

Make `htconfig.php` fit for MariaDB

6 years agoMerge pull request #5132 from tobiasd/20180526-zhcn
Hypolite Petovan [Sat, 26 May 2018 12:36:09 +0000 (08:36 -0400)]
Merge pull request #5132 from tobiasd/20180526-zhcn

update to the zh-cn translation THX 朱陈锬

6 years agoMerge pull request #5130 from tobiasd/20180526-frost
Hypolite Petovan [Sat, 26 May 2018 12:35:46 +0000 (08:35 -0400)]
Merge pull request #5130 from tobiasd/20180526-frost

removed deprecated themes frost(-mobile)

6 years agoMerge pull request #5129 from tobiasd/20180526-adminpanel
Hypolite Petovan [Sat, 26 May 2018 12:35:17 +0000 (08:35 -0400)]
Merge pull request #5129 from tobiasd/20180526-adminpanel

added a warning to an admin setting

6 years agoMerge pull request #5127 from tobiasd/20180525-register
Hypolite Petovan [Sat, 26 May 2018 12:34:42 +0000 (08:34 -0400)]
Merge pull request #5127 from tobiasd/20180525-register

Opt-In to listing in the directory

6 years agoupdate to the zh-cn translation THX 朱陈锬
Tobias Diekershoff [Sat, 26 May 2018 12:22:01 +0000 (14:22 +0200)]
update to the zh-cn translation THX 朱陈锬

6 years agoMake `htconfig.php` fit for MariaDB
Philipp Holzer [Sat, 26 May 2018 11:31:07 +0000 (13:31 +0200)]
Make `htconfig.php` fit for MariaDB

6 years agoremoved deprecated themes frost(-mobile)
Tobias Diekershoff [Sat, 26 May 2018 08:25:42 +0000 (10:25 +0200)]
removed deprecated themes frost(-mobile)

6 years agoadded a warning to an admin setting
Tobias Diekershoff [Sat, 26 May 2018 05:32:39 +0000 (07:32 +0200)]
added a warning to an admin setting

6 years agoremove false othion HTML ignored
Tobias Diekershoff [Sat, 26 May 2018 05:09:32 +0000 (07:09 +0200)]
remove false othion HTML ignored

6 years agoMerge pull request #5128 from tobiasd/20180525-5067
Hypolite Petovan [Fri, 25 May 2018 20:22:45 +0000 (16:22 -0400)]
Merge pull request #5128 from tobiasd/20180525-5067

exchange help text

6 years agoexchange help text
Tobias Diekershoff [Fri, 25 May 2018 18:32:48 +0000 (20:32 +0200)]
exchange help text

6 years agoOpt-In to listing in the directory
Tobias Diekershoff [Fri, 25 May 2018 17:53:03 +0000 (19:53 +0200)]
Opt-In to listing in the directory

6 years agofixed 4146
Tobias Diekershoff [Fri, 25 May 2018 16:06:16 +0000 (18:06 +0200)]
fixed 4146

6 years agoMerge pull request #5122 from tobiasd/20180525-4146
Hypolite Petovan [Fri, 25 May 2018 15:10:16 +0000 (11:10 -0400)]
Merge pull request #5122 from tobiasd/20180525-4146

applying changes to mods/sample-nginx.config from #5019

6 years agoMerge pull request #5123 from rabuzarus/20180526_-_load_correct_theme
Hypolite Petovan [Fri, 25 May 2018 12:14:03 +0000 (08:14 -0400)]
Merge pull request #5123 from rabuzarus/20180526_-_load_correct_theme

Bugfix: compute the current theme each time we want to know which theme is beeing used

6 years agohopefully fixing indentation...
Tobias Diekershoff [Fri, 25 May 2018 11:56:54 +0000 (13:56 +0200)]
hopefully fixing indentation...

6 years agoMerge pull request #5124 from tobiasd/20180525-lng
Hypolite Petovan [Fri, 25 May 2018 11:05:48 +0000 (07:05 -0400)]
Merge pull request #5124 from tobiasd/20180525-lng

IS and PL translation updates

6 years agotranslations
Tobias Diekershoff [Fri, 25 May 2018 09:26:36 +0000 (11:26 +0200)]
translations

6 years agoadd missing database use statements
rabuzarus [Fri, 25 May 2018 07:05:16 +0000 (09:05 +0200)]
add missing database use statements

6 years agoupdate IS translations THX Sveinn í Felli
Tobias Diekershoff [Fri, 25 May 2018 06:58:00 +0000 (08:58 +0200)]
update IS translations THX Sveinn í Felli

6 years agoupdate PL translations THX waldis
Tobias Diekershoff [Fri, 25 May 2018 06:56:34 +0000 (08:56 +0200)]
update PL translations THX waldis

6 years agofix typo in comment
rabuzarus [Fri, 25 May 2018 06:52:03 +0000 (08:52 +0200)]
fix typo in comment

6 years agoBugfix: compute the current theme each time we want to know which theme is beeing...
rabuzarus [Fri, 25 May 2018 06:44:01 +0000 (08:44 +0200)]
Bugfix: compute the current theme each time we want to know which theme is beeing used

6 years agoapplying changes to mods/sample-nginx.config from #5019
Tobias Diekershoff [Fri, 25 May 2018 06:22:49 +0000 (08:22 +0200)]
applying changes to mods/sample-nginx.config from #5019

6 years ago4655 hopefully fixed as well
Tobias Diekershoff [Thu, 24 May 2018 06:18:42 +0000 (08:18 +0200)]
4655 hopefully fixed as well

6 years ago2 issues fixed
Tobias Diekershoff [Thu, 24 May 2018 05:54:19 +0000 (07:54 +0200)]
2 issues fixed

6 years agoMerge pull request #5119 from MrPetovan/task/5116-remove-dns-get-record-from-dba
Tobias Diekershoff [Thu, 24 May 2018 05:53:25 +0000 (07:53 +0200)]
Merge pull request #5119 from MrPetovan/task/5116-remove-dns-get-record-from-dba

Remove obsolete DNS test from include/dba

6 years agoRemove obsolete DNS test from include/dba
Hypolite Petovan [Thu, 24 May 2018 05:31:03 +0000 (01:31 -0400)]
Remove obsolete DNS test from include/dba

6 years agoMerge pull request #5117 from annando/issue-5010
Hypolite Petovan [Thu, 24 May 2018 04:51:31 +0000 (00:51 -0400)]
Merge pull request #5117 from annando/issue-5010

Issue 5010: Don't show removed users

6 years agoIssue 5010: Don't show removed users
Michael [Thu, 24 May 2018 04:44:02 +0000 (04:44 +0000)]
Issue 5010: Don't show removed users