Commit Graph

19636 Commits

Author SHA1 Message Date
Tobias Diekershoff b86326e04a regen master messages.po 2018-05-30 05:41:30 +02:00
Hypolite Petovan 2e97cbe728
Merge pull request #5144 from annando/deleted-item
Fix for not being able to delete items you don't own
2018-05-29 15:14:51 -04:00
Michael c86111d193 Coding standards 2018-05-29 19:00:26 +00:00
Pascal 26927accb1
Merge pull request #1 from friendica/2018.05-rc
2018.05 rc
2018-05-29 20:57:43 +02:00
Michael 5bcb9daa43 Use local_user instead 2018-05-29 18:57:32 +00:00
Hypolite Petovan ccbef51eff
Merge pull request #5143 from tobiasd/20180528-priv
hide profile help text clarification
2018-05-29 11:03:43 -04:00
Hypolite Petovan 3341deee6a
Merge pull request #5145 from abanink/4419
4419 Update the comments in src/Database/DBStructure.php from doc
2018-05-29 11:03:01 -04:00
Tobias Diekershoff 8eefe542df rewording 2018-05-29 16:54:40 +02:00
Pascal Deklerck 99a88b16ff 4419 update DB version & database.sql 2018-05-29 16:11:25 +02:00
Pascal Deklerck 1853c5623b 4419 Update the comments in src/Database/DBStructure.php from doc/database/* 2018-05-29 10:24:36 +02:00
Michael 8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Tobias Diekershoff 3f93b982b6 hide profile help text clarification 2018-05-28 16:16:23 +02:00
Michael Vogel 10ca9908a6
Merge pull request #5142 from tobiasd/20180528-it
IT translations THX Fabio
2018-05-28 14:00:14 +02:00
Tobias Diekershoff 703f886492 IT translations THX Fabio 2018-05-28 13:50:56 +02:00
Hypolite Petovan ddc37a004f
Merge pull request #5140 from abanink/5066
Fix autoname output length
2018-05-27 09:10:46 -04:00
Hypolite Petovan 549020300f
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
2018-05-27 09:04:14 -04:00
Michael deb015be12 Changed documentation 2018-05-27 10:42:47 +00:00
Michael c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
Pascal Deklerck 334aa40292 Fix autoname output length 2018-05-27 10:20:27 +02:00
rabuzarus 32c3762989
Merge pull request #5138 from annando/optimize-workerqueue
Possibly fixes 5137: Only execute "optimize table" when allowed
2018-05-27 10:10:11 +02:00
rabuzarus 9c9b82ba59 Frio: move tos link to a another place in the nave menu 2018-05-27 09:55:05 +02:00
rabuzarus 58f9498c7e Frio: tos page background for frio 2018-05-27 09:48:27 +02:00
Michael 04fd6eff01 Possibly fixes 5137: Only execute "optimize table" when allowed 2018-05-27 06:23:18 +00:00
Michael 54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
Michael 708ddf2b02 Preparation for new deletion functionality 2018-05-26 20:23:49 +00:00
Michael a6396dde55 Removed useless line 2018-05-26 20:08:42 +00:00
Michael a50805c371 Grammar fix 2018-05-26 20:07:30 +00:00
Michael 4c36109f02 Some more places to add the user id 2018-05-26 20:03:30 +00:00
Michael bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Hypolite Petovan 36591249b1
Merge pull request #5131 from nupplaphil/htconfig_mariadb
Make `htconfig.php` fit for MariaDB
2018-05-26 08:58:55 -04:00
Hypolite Petovan 7d565d8bff
Merge pull request #5132 from tobiasd/20180526-zhcn
update to the zh-cn translation THX 朱陈锬
2018-05-26 08:36:09 -04:00
Hypolite Petovan b3579ef910
Merge pull request #5130 from tobiasd/20180526-frost
removed deprecated themes frost(-mobile)
2018-05-26 08:35:46 -04:00
Hypolite Petovan 3965615fbc
Merge pull request #5129 from tobiasd/20180526-adminpanel
added a warning to an admin setting
2018-05-26 08:35:17 -04:00
Hypolite Petovan 5cc1405bae
Merge pull request #5127 from tobiasd/20180525-register
Opt-In to listing in the directory
2018-05-26 08:34:42 -04:00
Tobias Diekershoff a465f5c5f0 update to the zh-cn translation THX 朱陈锬 2018-05-26 14:22:01 +02:00
Philipp Holzer bc9140affd
Make `htconfig.php` fit for MariaDB 2018-05-26 13:31:07 +02:00
Tobias Diekershoff 571311a80b removed deprecated themes frost(-mobile) 2018-05-26 10:25:42 +02:00
Tobias Diekershoff c65c870032 added a warning to an admin setting 2018-05-26 07:32:39 +02:00
Tobias Diekershoff 112c7b0248 remove false othion HTML ignored 2018-05-26 07:09:32 +02:00
Hypolite Petovan f54c032e87
Merge pull request #5128 from tobiasd/20180525-5067
exchange help text
2018-05-25 16:22:45 -04:00
Tobias Diekershoff 9041bacebf exchange help text 2018-05-25 20:32:48 +02:00
Tobias Diekershoff e996354922 Opt-In to listing in the directory 2018-05-25 19:53:03 +02:00
Tobias Diekershoff b317db0c10 fixed 4146 2018-05-25 18:06:16 +02:00
Hypolite Petovan d51a98b3fe
Merge pull request #5122 from tobiasd/20180525-4146
applying changes to mods/sample-nginx.config from #5019
2018-05-25 11:10:16 -04:00
Hypolite Petovan 4aa46272a9
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
2018-05-25 08:14:03 -04:00
Tobias Diekershoff 6e02c0e908 hopefully fixing indentation... 2018-05-25 13:56:54 +02:00
Hypolite Petovan 3f133292eb
Merge pull request #5124 from tobiasd/20180525-lng
IS and PL translation updates
2018-05-25 07:05:48 -04:00
Tobias Diekershoff 9970618e85 translations 2018-05-25 11:26:36 +02:00
rabuzarus c66d1f01a3 add missing database use statements 2018-05-25 09:05:16 +02:00
Tobias Diekershoff 5c6b9cb64a update IS translations THX Sveinn í Felli 2018-05-25 08:58:00 +02:00