Tobias Diekershoff [Wed, 30 May 2018 03:41:30 +0000 (05:41 +0200)]
regen master messages.po
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
Michael [Tue, 29 May 2018 19:00:26 +0000 (19:00 +0000)]
Coding standards
Michael [Tue, 29 May 2018 18:57:32 +0000 (18:57 +0000)]
Use local_user instead
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
Tobias Diekershoff [Tue, 29 May 2018 14:54:40 +0000 (16:54 +0200)]
rewording
Michael [Tue, 29 May 2018 05:22:57 +0000 (05:22 +0000)]
New function to delete items for users
Tobias Diekershoff [Mon, 28 May 2018 14:16:23 +0000 (16:16 +0200)]
hide profile help text clarification
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
Tobias Diekershoff [Mon, 28 May 2018 11:50:56 +0000 (13:50 +0200)]
IT translations THX Fabio
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
Michael [Sun, 27 May 2018 10:42:47 +0000 (10:42 +0000)]
Changed documentation
Michael [Sun, 27 May 2018 10:38:49 +0000 (10:38 +0000)]
Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item
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
rabuzarus [Sun, 27 May 2018 07:55:05 +0000 (09:55 +0200)]
Frio: move tos link to a another place in the nave menu
rabuzarus [Sun, 27 May 2018 07:48:27 +0000 (09:48 +0200)]
Frio: tos page background for frio
Michael [Sun, 27 May 2018 06:23:18 +0000 (06:23 +0000)]
Possibly fixes 5137: Only execute "optimize table" when allowed
Michael [Sat, 26 May 2018 21:38:45 +0000 (21:38 +0000)]
Added the new parameter to the delete function.
Michael [Sat, 26 May 2018 20:23:49 +0000 (20:23 +0000)]
Preparation for new deletion functionality
Michael [Sat, 26 May 2018 20:08:42 +0000 (20:08 +0000)]
Removed useless line
Michael [Sat, 26 May 2018 20:07:30 +0000 (20:07 +0000)]
Grammar fix
Michael [Sat, 26 May 2018 20:03:30 +0000 (20:03 +0000)]
Some more places to add the user id
Michael [Sat, 26 May 2018 18:07:27 +0000 (18:07 +0000)]
Fix for not being able to delete items
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
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 朱陈锬
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)
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
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
Tobias Diekershoff [Sat, 26 May 2018 12:22:01 +0000 (14:22 +0200)]
update to the zh-cn translation THX 朱陈锬
Philipp Holzer [Sat, 26 May 2018 11:31:07 +0000 (13:31 +0200)]
Make `htconfig.php` fit for MariaDB
Tobias Diekershoff [Sat, 26 May 2018 08:25:42 +0000 (10:25 +0200)]
removed deprecated themes frost(-mobile)
Tobias Diekershoff [Sat, 26 May 2018 05:32:39 +0000 (07:32 +0200)]
added a warning to an admin setting
Tobias Diekershoff [Sat, 26 May 2018 05:09:32 +0000 (07:09 +0200)]
remove false othion HTML ignored
Hypolite Petovan [Fri, 25 May 2018 20:22:45 +0000 (16:22 -0400)]
Merge pull request #5128 from tobiasd/
20180525-5067
exchange help text
Tobias Diekershoff [Fri, 25 May 2018 18:32:48 +0000 (20:32 +0200)]
exchange help text
Tobias Diekershoff [Fri, 25 May 2018 17:53:03 +0000 (19:53 +0200)]
Opt-In to listing in the directory
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
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
Tobias Diekershoff [Fri, 25 May 2018 11:56:54 +0000 (13:56 +0200)]
hopefully fixing indentation...
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
rabuzarus [Fri, 25 May 2018 07:05:16 +0000 (09:05 +0200)]
add missing database use statements
Tobias Diekershoff [Fri, 25 May 2018 06:58:00 +0000 (08:58 +0200)]
update IS translations THX Sveinn í Felli
Tobias Diekershoff [Fri, 25 May 2018 06:56:34 +0000 (08:56 +0200)]
update PL translations THX waldis
rabuzarus [Fri, 25 May 2018 06:52:03 +0000 (08:52 +0200)]
fix typo in comment
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
Tobias Diekershoff [Fri, 25 May 2018 06:22:49 +0000 (08:22 +0200)]
applying changes to mods/sample-nginx.config from #5019
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
Hypolite Petovan [Thu, 24 May 2018 05:31:03 +0000 (01:31 -0400)]
Remove obsolete DNS test from include/dba
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
Michael [Thu, 24 May 2018 04:44:02 +0000 (04:44 +0000)]
Issue 5010: Don't show removed users
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
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"
Michael [Tue, 22 May 2018 20:17:32 +0000 (20:17 +0000)]
Issue 5111: missing "use DBM" in "removeme"
Michael [Tue, 22 May 2018 20:10:18 +0000 (20:10 +0000)]
Nodeinfo: The number of comments is now calculated more reliable
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
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
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
Tobias Diekershoff [Tue, 22 May 2018 05:12:43 +0000 (07:12 +0200)]
update DE translations THX hauke
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
Tobias Diekershoff [Mon, 21 May 2018 14:08:07 +0000 (16:08 +0200)]
EN US and GB translation updates THX AndyH3
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
Michael [Mon, 21 May 2018 10:15:50 +0000 (10:15 +0000)]
Don't proxy pictures when they are sent to other networks
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
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
Tobias Diekershoff [Mon, 21 May 2018 05:31:35 +0000 (07:31 +0200)]
RU translations THX pztrn
Tobias Diekershoff [Mon, 21 May 2018 04:02:49 +0000 (06:02 +0200)]
forgot to rename vars in TOS template
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
Tobias Diekershoff [Sun, 20 May 2018 16:11:42 +0000 (18:11 +0200)]
update PL translations THX waldis
Tobias Diekershoff [Sun, 20 May 2018 16:09:09 +0000 (18:09 +0200)]
update FI translations THX kris
Tobias Diekershoff [Sun, 20 May 2018 16:08:07 +0000 (18:08 +0200)]
update FR translations THX vindarel
Tobias Diekershoff [Sun, 20 May 2018 16:05:50 +0000 (18:05 +0200)]
update DE translations
Hypolite Petovan [Sun, 20 May 2018 13:16:27 +0000 (09:16 -0400)]
Merge pull request #5097 from tobiasd/
20180520-credits
regen credits
Tobias Diekershoff [Sun, 20 May 2018 13:02:44 +0000 (15:02 +0200)]
cleanup
Tobias Diekershoff [Sun, 20 May 2018 12:56:33 +0000 (14:56 +0200)]
fixing the base path detection
Tobias Diekershoff [Sun, 20 May 2018 12:56:03 +0000 (14:56 +0200)]
regen credits
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
Tobias Diekershoff [Sun, 20 May 2018 12:25:07 +0000 (14:25 +0200)]
regen master messages.po
Hypolite Petovan [Sun, 20 May 2018 12:20:16 +0000 (08:20 -0400)]
Merge pull request #5089 from tobiasd/
20180519-tos
privacy statement
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
Tobias Diekershoff [Sun, 20 May 2018 06:43:43 +0000 (08:43 +0200)]
cite: just some small styling thing
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
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
Michael [Sat, 19 May 2018 19:34:51 +0000 (19:34 +0000)]
Issue-3412 related: Don't send connection posts anymore
Tobias Diekershoff [Sat, 19 May 2018 17:08:50 +0000 (19:08 +0200)]
missing sign
Tobias Diekershoff [Sat, 19 May 2018 17:07:13 +0000 (19:07 +0200)]
removed one line too much
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
Tobias Diekershoff [Sat, 19 May 2018 16:53:54 +0000 (18:53 +0200)]
registration: added display of privacy statement if enabled
Tobias Diekershoff [Sat, 19 May 2018 16:52:23 +0000 (18:52 +0200)]
admin panel: added privacy statement preview
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.
Michael [Sat, 19 May 2018 16:04:57 +0000 (16:04 +0000)]
Follow up: Display update should really be fixed now.
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
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
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.
Michael [Sat, 19 May 2018 14:55:27 +0000 (14:55 +0000)]
Issue 2880: Editing post doesn't destroy mentions or hashtags anymore
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
Michael [Sat, 19 May 2018 06:12:55 +0000 (06:12 +0000)]
Fix constant display updates
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
Michael [Sat, 19 May 2018 05:59:43 +0000 (05:59 +0000)]
Fix missing $
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
Michael [Sat, 19 May 2018 03:56:29 +0000 (03:56 +0000)]
End subscription for unreachable subscribers
https://reisub.nsupdate.info/git / friendica.git / .git / log