friendica.git/.git
5 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

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

5 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

5 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

5 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

5 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

5 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

5 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

5 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 朱陈锬

5 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)

5 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

5 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

5 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 朱陈锬

5 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

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

5 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

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

5 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

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

5 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

5 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

5 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

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

5 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

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

5 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

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

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

5 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

5 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

5 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

5 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

5 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

5 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

5 years agoMerge pull request #5110 from annando/nodeinfo
Hypolite Petovan [Tue, 22 May 2018 21:20:06 +0000 (17:20 -0400)]
Merge pull request #5110 from annando/nodeinfo

Nodeinfo: The number of comments is now calculated more reliable

5 years agoMerge pull request #5112 from annando/issue-5111
Hypolite Petovan [Tue, 22 May 2018 21:16:03 +0000 (17:16 -0400)]
Merge pull request #5112 from annando/issue-5111

Issue 5111: missing "use DBM" in "removeme"

5 years agoIssue 5111: missing "use DBM" in "removeme"
Michael [Tue, 22 May 2018 20:17:32 +0000 (20:17 +0000)]
Issue 5111: missing "use DBM" in "removeme"

5 years agoNodeinfo: The number of comments is now calculated more reliable
Michael [Tue, 22 May 2018 20:10:18 +0000 (20:10 +0000)]
Nodeinfo: The number of comments is now calculated more reliable

5 years agoMerge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance
Tobias Diekershoff [Tue, 22 May 2018 13:10:44 +0000 (15:10 +0200)]
Merge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance

frio - add "info about the instance" link into the navbar for non-authed users

5 years agoMerge pull request #5108 from tobiasd/20180522-lng
Michael Vogel [Tue, 22 May 2018 11:04:27 +0000 (13:04 +0200)]
Merge pull request #5108 from tobiasd/20180522-lng

update DE translations THX hauke

5 years agofrio - add "info about the instance" link into the navbar for non-authed users
rabuzarus [Tue, 22 May 2018 10:44:35 +0000 (12:44 +0200)]
frio - add "info about the instance" link into the navbar for non-authed users

5 years agoupdate DE translations THX hauke
Tobias Diekershoff [Tue, 22 May 2018 05:12:43 +0000 (07:12 +0200)]
update DE translations THX hauke

6 years agoMerge pull request #5106 from tobiasd/20180521-en
Hypolite Petovan [Mon, 21 May 2018 14:55:36 +0000 (10:55 -0400)]
Merge pull request #5106 from tobiasd/20180521-en

EN US and GB translation updates THX AndyH3

6 years agoEN US and GB translation updates THX AndyH3
Tobias Diekershoff [Mon, 21 May 2018 14:08:07 +0000 (16:08 +0200)]
EN US and GB translation updates THX AndyH3

6 years agoMerge pull request #5105 from annando/dont-proxy
Tobias Diekershoff [Mon, 21 May 2018 11:00:49 +0000 (13:00 +0200)]
Merge pull request #5105 from annando/dont-proxy

Don't proxy pictures when they are sent to other networks

6 years agoDon't proxy pictures when they are sent to other networks
Michael [Mon, 21 May 2018 10:15:50 +0000 (10:15 +0000)]
Don't proxy pictures when they are sent to other networks

6 years agoMerge pull request #5103 from tobiasd/20180521-ru
Michael Vogel [Mon, 21 May 2018 06:47:42 +0000 (08:47 +0200)]
Merge pull request #5103 from tobiasd/20180521-ru

RU translations THX pztrn

6 years agoMerge pull request #5102 from tobiasd/20180521-tos
Michael Vogel [Mon, 21 May 2018 06:46:47 +0000 (08:46 +0200)]
Merge pull request #5102 from tobiasd/20180521-tos

forgot to rename vars in TOS template

6 years agoRU translations THX pztrn
Tobias Diekershoff [Mon, 21 May 2018 05:31:35 +0000 (07:31 +0200)]
RU translations THX pztrn

6 years agoforgot to rename vars in TOS template
Tobias Diekershoff [Mon, 21 May 2018 04:02:49 +0000 (06:02 +0200)]
forgot to rename vars in TOS template

6 years agoMerge pull request #5098 from tobiasd/20180520-msg
Hypolite Petovan [Sun, 20 May 2018 16:34:48 +0000 (12:34 -0400)]
Merge pull request #5098 from tobiasd/20180520-msg

translation update DE, FR, FI, PL

6 years agoupdate PL translations THX waldis
Tobias Diekershoff [Sun, 20 May 2018 16:11:42 +0000 (18:11 +0200)]
update PL translations THX waldis

6 years agoupdate FI translations THX kris
Tobias Diekershoff [Sun, 20 May 2018 16:09:09 +0000 (18:09 +0200)]
update FI translations THX kris

6 years agoupdate FR translations THX vindarel
Tobias Diekershoff [Sun, 20 May 2018 16:08:07 +0000 (18:08 +0200)]
update FR translations THX vindarel

6 years agoupdate DE translations
Tobias Diekershoff [Sun, 20 May 2018 16:05:50 +0000 (18:05 +0200)]
update DE translations

6 years agoMerge pull request #5097 from tobiasd/20180520-credits
Hypolite Petovan [Sun, 20 May 2018 13:16:27 +0000 (09:16 -0400)]
Merge pull request #5097 from tobiasd/20180520-credits

regen credits

6 years agocleanup
Tobias Diekershoff [Sun, 20 May 2018 13:02:44 +0000 (15:02 +0200)]
cleanup

6 years agofixing the base path detection
Tobias Diekershoff [Sun, 20 May 2018 12:56:33 +0000 (14:56 +0200)]
fixing the base path detection

6 years agoregen credits
Tobias Diekershoff [Sun, 20 May 2018 12:56:03 +0000 (14:56 +0200)]
regen credits

6 years agoMerge pull request #5094 from tobiasd/2018.05-rc
Hypolite Petovan [Sun, 20 May 2018 12:27:49 +0000 (08:27 -0400)]
Merge pull request #5094 from tobiasd/2018.05-rc

regen master messages.po

6 years agoregen master messages.po
Tobias Diekershoff [Sun, 20 May 2018 12:25:07 +0000 (14:25 +0200)]
regen master messages.po

6 years agoMerge pull request #5089 from tobiasd/20180519-tos
Hypolite Petovan [Sun, 20 May 2018 12:20:16 +0000 (08:20 -0400)]
Merge pull request #5089 from tobiasd/20180519-tos

privacy statement

6 years agoMerge pull request #5091 from annando/issue-4956
Tobias Diekershoff [Sun, 20 May 2018 06:50:28 +0000 (08:50 +0200)]
Merge pull request #5091 from annando/issue-4956

Don't fail during installation because of a missing theme configuration

6 years agocite: just some small styling thing
Tobias Diekershoff [Sun, 20 May 2018 06:43:43 +0000 (08:43 +0200)]
cite: just some small styling thing

6 years agoIssue 4956: Don't fail during installation because of a missing theme configuration
Michael [Sun, 20 May 2018 05:44:20 +0000 (05:44 +0000)]
Issue 4956: Don't fail during installation because of a missing theme configuration

6 years agoMerge pull request #5090 from annando/issue-3412
Hypolite Petovan [Sat, 19 May 2018 20:12:52 +0000 (16:12 -0400)]
Merge pull request #5090 from annando/issue-3412

Issue-3412 related: Don't send connection posts anymore

6 years agoIssue-3412 related: Don't send connection posts anymore
Michael [Sat, 19 May 2018 19:34:51 +0000 (19:34 +0000)]
Issue-3412 related: Don't send connection posts anymore

6 years agomissing sign
Tobias Diekershoff [Sat, 19 May 2018 17:08:50 +0000 (19:08 +0200)]
missing sign

6 years agoremoved one line too much
Tobias Diekershoff [Sat, 19 May 2018 17:07:13 +0000 (19:07 +0200)]
removed one line too much

6 years agotext of the priv. statement can now be shown outside of the module
Tobias Diekershoff [Sat, 19 May 2018 16:55:29 +0000 (18:55 +0200)]
text of the priv. statement can now be shown outside of the module

6 years agoregistration: added display of privacy statement if enabled
Tobias Diekershoff [Sat, 19 May 2018 16:53:54 +0000 (18:53 +0200)]
registration: added display of privacy statement if enabled

6 years agoadmin panel: added privacy statement preview
Tobias Diekershoff [Sat, 19 May 2018 16:52:23 +0000 (18:52 +0200)]
admin panel: added privacy statement preview

6 years agoMerge pull request #5088 from annando/display-update
Tobias Diekershoff [Sat, 19 May 2018 16:19:52 +0000 (18:19 +0200)]
Merge pull request #5088 from annando/display-update

Follow up: Display update should really be fixed now.

6 years agoFollow up: Display update should really be fixed now.
Michael [Sat, 19 May 2018 16:04:57 +0000 (16:04 +0000)]
Follow up: Display update should really be fixed now.

6 years agoMerge pull request #5086 from annando/issue-2880
Hypolite Petovan [Sat, 19 May 2018 16:01:05 +0000 (12:01 -0400)]
Merge pull request #5086 from annando/issue-2880

Issue 2880: Editing post doesn't destroy mentions or hashtags anymore

6 years agoMerge pull request #5087 from annando/issue-4819
Tobias Diekershoff [Sat, 19 May 2018 15:44:42 +0000 (17:44 +0200)]
Merge pull request #5087 from annando/issue-4819

Issue 4819: The introduction note is now stored

6 years agoIssue 4819: The introduction note is now stored displayed on the contact page.
Michael [Sat, 19 May 2018 15:29:34 +0000 (15:29 +0000)]
Issue 4819: The introduction note is now stored displayed on the contact page.

6 years agoIssue 2880: Editing post doesn't destroy mentions or hashtags anymore
Michael [Sat, 19 May 2018 14:55:27 +0000 (14:55 +0000)]
Issue 2880: Editing post doesn't destroy mentions or hashtags anymore

6 years agoMerge pull request #5085 from annando/display-update
Hypolite Petovan [Sat, 19 May 2018 12:15:59 +0000 (08:15 -0400)]
Merge pull request #5085 from annando/display-update

Fix constant display updates

6 years agoFix constant display updates
Michael [Sat, 19 May 2018 06:12:55 +0000 (06:12 +0000)]
Fix constant display updates

6 years agoMerge pull request #5083 from annando/fix-spamming
Tobias Diekershoff [Sat, 19 May 2018 06:06:33 +0000 (08:06 +0200)]
Merge pull request #5083 from annando/fix-spamming

Fix: Avoid getting spammed when an admin has got several accounts

6 years agoFix missing $
Michael [Sat, 19 May 2018 05:59:43 +0000 (05:59 +0000)]
Fix missing $

6 years agoMerge pull request #5084 from annando/dead-subscriber
Tobias Diekershoff [Sat, 19 May 2018 05:07:00 +0000 (07:07 +0200)]
Merge pull request #5084 from annando/dead-subscriber

End subscription for unreachable subscribers

6 years agoEnd subscription for unreachable subscribers
Michael [Sat, 19 May 2018 03:56:29 +0000 (03:56 +0000)]
End subscription for unreachable subscribers

6 years agoFix: Avoid getting spammed when an admin has got several accounts
Michael [Sat, 19 May 2018 03:38:43 +0000 (03:38 +0000)]
Fix: Avoid getting spammed when an admin has got several accounts

6 years agoMerge pull request #5082 from annando/federation-warning
Hypolite Petovan [Fri, 18 May 2018 16:26:08 +0000 (12:26 -0400)]
Merge pull request #5082 from annando/federation-warning

Avoid warning when no valid data could be read

6 years agoAvaoid warning when no valid data could be read
Michael [Fri, 18 May 2018 16:07:55 +0000 (16:07 +0000)]
Avaoid warning when no valid data could be read

6 years agoMerge pull request #5081 from annando/ostatus-subscription-fix
Hypolite Petovan [Fri, 18 May 2018 13:31:07 +0000 (09:31 -0400)]
Merge pull request #5081 from annando/ostatus-subscription-fix

Fix for subscribing to the wrong feed from OStatus

6 years agoFix for subscribing to the wrong feed from OStatus
Michael [Fri, 18 May 2018 13:23:27 +0000 (13:23 +0000)]
Fix for subscribing to the wrong feed from OStatus

6 years agoMerge pull request #5079 from annando/fix-self
Hypolite Petovan [Fri, 18 May 2018 12:54:00 +0000 (08:54 -0400)]
Merge pull request #5079 from annando/fix-self

Fix: Sometimes the contact endpoints seem to be wrong

6 years agoMerge pull request #5080 from annando/changed-structure
Hypolite Petovan [Fri, 18 May 2018 12:53:37 +0000 (08:53 -0400)]
Merge pull request #5080 from annando/changed-structure

Changed database structure

6 years agoChanged database structure
Michael [Fri, 18 May 2018 12:50:57 +0000 (12:50 +0000)]
Changed database structure

6 years agoMerge pull request #5078 from annando/fix-ostatus-subscription
Hypolite Petovan [Fri, 18 May 2018 12:27:31 +0000 (08:27 -0400)]
Merge pull request #5078 from annando/fix-ostatus-subscription

Fix: Subscriptions from GNU Social partially don't work

6 years agoFix: Sometimes the contact endpoints seem to be wrong
Michael [Fri, 18 May 2018 12:26:10 +0000 (12:26 +0000)]
Fix: Sometimes the contact endpoints seem to be wrong

6 years agoFix: Subscriptions from GNU Social partially don't work
Michael [Fri, 18 May 2018 12:18:12 +0000 (12:18 +0000)]
Fix: Subscriptions from GNU Social partially don't work

6 years agoMerge pull request #5076 from tobiasd/20180517-extract
Hypolite Petovan [Thu, 17 May 2018 23:59:57 +0000 (19:59 -0400)]
Merge pull request #5076 from tobiasd/20180517-extract

dont parse the addons directory for translateable strings

6 years agoMerge pull request #5077 from annando/fix-blocking-ostatus
Hypolite Petovan [Thu, 17 May 2018 23:59:08 +0000 (19:59 -0400)]
Merge pull request #5077 from annando/fix-blocking-ostatus

Fix to OStatus delivery to be not so blocking to other tasks

6 years agoNow it should work ...
Michael [Thu, 17 May 2018 23:47:15 +0000 (23:47 +0000)]
Now it should work ...

6 years agoDynamic priority handling
Michael [Thu, 17 May 2018 23:43:44 +0000 (23:43 +0000)]
Dynamic priority handling

6 years agoChanged database structure
Michael [Thu, 17 May 2018 23:35:24 +0000 (23:35 +0000)]
Changed database structure