Commit graph

20160 commits

Author SHA1 Message Date
Tobias Diekershoff
a47b58d596 Installation better start with master and eventially switch to develop 2018-06-24 11:48:32 +02:00
Hypolite Petovan
960834a1fe
Merge pull request #5282 from tobiasd/20180624-install
INSTALL.txt and doc/de/Install.md updates
2018-06-24 02:12:38 -04:00
Tobias Diekershoff
55eb0100e6 added missing parts in INSTALL.txt about smarty and addons 2018-06-24 07:55:37 +02:00
Tobias Diekershoff
40dc20481c 775 smarties, not 777 2018-06-24 07:54:19 +02:00
Tobias Diekershoff
62a61a95d3
Merge pull request #5280 from annando/issue-5276
Fixes Issue 5276 and an endless loop in item::update
2018-06-23 12:44:43 +02:00
Michael
a7d2f126eb Fixes Issue 5276 and an endless loop in item::update 2018-06-23 10:32:53 +00:00
Tobias Diekershoff
585ba4c09f
Merge pull request #5279 from annando/issue-5278
Issue 5278: Small corrections to the database definition
2018-06-23 08:28:43 +02:00
Michael
ca1add20a0 Small corrections to the database definition 2018-06-23 04:46:22 +00:00
Hypolite Petovan
78114c13d5
Merge pull request #4836 from Angristan/patch-1
chmod 777 is a bad practice
2018-06-22 16:09:01 -04:00
Hypolite Petovan
98a5749b45
Merge pull request #5277 from annando/native-pdo
We now are using the native pdo mode
2018-06-22 16:04:50 -04:00
Angristan
7326394f29
Fix indentation 2018-06-22 22:00:31 +02:00
Angristan
3ccd64ad9f
Fix chmod and chown, add note about webserver user 2018-06-22 21:56:56 +02:00
Michael
6e64091fc7 We now are using the native pdo mode 2018-06-22 19:35:42 +00:00
Hypolite Petovan
c16c235d50
Merge pull request #5270 from rabuzarus/201820_-_fix_mod_redir
fix redirection - works now with logged in users, remote users, guests and visitors
2018-06-22 11:11:52 -04:00
Hypolite Petovan
9b35c3bff2
Merge pull request #5272 from miqrogroove/patch-1
Ensure IN() Conditions Never Mix Data Types
2018-06-22 11:10:05 -04:00
miqrogroove
c37a8cc661
Update dba.php 2018-06-22 07:34:27 -04:00
Michael Vogel
423461f844
Merge pull request #5273 from tobiasd/20180622-pl
update PL translations THX waldis
2018-06-22 08:15:00 +02:00
Tobias Diekershoff
6800c89ea5 update PL translations THX waldis 2018-06-22 07:37:50 +02:00
miqrogroove
150989ba99
Ensure IN() Conditions Never Mix Data Types 2018-06-21 23:56:19 -04:00
Hypolite Petovan
47ab72352e
Merge pull request #5269 from annando/non-unique-values
This fixes the problem with mixed variables in queries
2018-06-21 22:12:07 -04:00
Hypolite Petovan
438dea8cc5
Merge pull request #5271 from miqrogroove/patch-1
Correct dba::close() To Match dba::p()
2018-06-21 22:11:13 -04:00
Michael
e1e28ba7c3 Better float detection 2018-06-21 21:55:43 +00:00
miqrogroove
c600ccad5c
Correct dba::close() To Match dba::p() 2018-06-21 17:27:12 -04:00
rabuzarus
92a84275d4 fix hovercard for not logged in users 2018-06-21 22:46:10 +02:00
Michael
1b85b75563 Currently removed, needs more testing 2018-06-21 20:42:58 +00:00
rabuzarus
22816c49a1 Merge develop into 201820_-_fix_mod_redir 2018-06-21 22:38:15 +02:00
rabuzarus
a119636cd5 fix redirection - works now with logged in users, remote users, guests and visitors 2018-06-21 22:37:05 +02:00
Michael
261d7435c0 Check for floats and enable native prepares 2018-06-21 20:33:27 +00:00
Michael
5656c0564a We don't need to look $is_int there 2018-06-21 19:52:28 +00:00
Michael
c1059875bc This fixes the problem with mixed variables in queries 2018-06-21 19:48:25 +00:00
Michael Vogel
4b0cf8d60f
Merge pull request #5267 from miqrogroove/patch-2
Allow for Integer Literals in PDO Database Driver
2018-06-21 18:51:01 +02:00
Hypolite Petovan
8a3cae686b
Merge pull request #5261 from annando/and-again-abstraction
And again the item abstraction - and a fix for issue 5252
2018-06-21 11:50:31 -04:00
miqrogroove
759dfe6bb1
Allow for Integer Literals in PDO Database Driver
This should fix things like "LIMIT ?"
2018-06-21 11:42:43 -04:00
Hypolite Petovan
88e532321f
Merge pull request #5265 from miqrogroove/patch-1
Workaround for Bugs in Class dba
2018-06-21 11:23:56 -04:00
miqrogroove
80e96bcf38
Workaround for Bugs in Class dba 2018-06-21 11:20:44 -04:00
Michael
d643e00d33 Standards and a new function to fetch content 2018-06-21 15:14:01 +00:00
Hypolite Petovan
019637123a
Merge pull request #5263 from miqrogroove/patch-1
Make Conversation Cleanup Configurable
2018-06-21 10:33:33 -04:00
miqrogroove
7f4bce67a8
Update DBClean.php 2018-06-21 08:27:36 -04:00
miqrogroove
d8646340c9
Update htconfig.md 2018-06-21 08:25:58 -04:00
miqrogroove
f2463e327a
Update DBClean.php 2018-06-21 07:52:56 -04:00
miqrogroove
cfe035f300
Update DBClean.php 2018-06-21 07:51:30 -04:00
miqrogroove
ab056f9ee5
Update htconfig.md 2018-06-21 07:49:59 -04:00
miqrogroove
62e61a75f7
Make Conversation Cleanup Configurable 2018-06-21 07:43:40 -04:00
Michael
5743bb0dae Fix Issue 5252 2018-06-21 08:23:35 +00:00
Michael
81ac7c33da Order search results by id 2018-06-21 07:46:06 +00:00
Michael
70af2cecf2 Some of the last direct SQL calls to the item table had been changed 2018-06-21 06:21:51 +00:00
Hypolite Petovan
e84c48b979
Merge pull request #5259 from rabuzarus/20180616_-_magic_auth_test_2
port hubzillas OpenWebAuth - don't initiate magic auth if the contact is allready authentificated
2018-06-20 20:15:14 -04:00
rabuzarus
02d96623f2 port hubzillas OpenWebAuth - don't initiate magic auth if the contact is allready authentificated 2018-06-21 02:08:54 +02:00
Hypolite Petovan
a5550b4702
Merge pull request #5253 from rabuzarus/20180616_-_magic_auth_test_2
Port hubzillas OpenWebAuth - remote authentification
2018-06-20 17:46:04 -04:00
rabuzarus
04fe3acb69 port hubzillas OpenWebAuth - fix method call 2018-06-20 23:29:36 +02:00