Roland Häder
f66cb9b0a3
added more curly braces + a bit more usage of dbm::is_result()
...
Signed-off-by: Roland Häder <roland@mxchange.org>
2018-05-10 13:07:21 +02:00
Hypolite Petovan
7997df877d
Merge pull request #4996 from fabrixxm/docs-theme-dev
...
Docs: add a note on adding `use` on theme.php
2018-05-08 04:02:37 -04:00
fabrixxm
5ebe10d7fc
Docs: add a note on adding use on theme.php
2018-05-08 09:53:58 +02:00
Tobias Diekershoff
b1cb955110
Merge pull request #4991 from annando/dbclean
...
dbclean settings are now available from the frontend
2018-05-07 14:28:59 +02:00
Michael
bd432c89d9
Text for translations
2018-05-07 08:46:32 +00:00
Michael
eb4650ff23
dbclean settings are now available from the frontend
2018-05-07 05:37:20 +00:00
Hypolite Petovan
850e296020
Merge pull request #4989 from annando/video-bbcode
...
Fix video display problems with videos with parameters
2018-05-06 17:59:05 -04:00
Michael
c33df7a05e
Fix video display problems with videos with parameters
2018-05-06 16:57:46 +00:00
Michael Vogel
5ab675891d
Merge pull request #4987 from tobiasd/20180506-lng
...
translation updates for FI, PL and ZH CN
2018-05-06 13:57:41 +02:00
Michael Vogel
b7f3607790
Merge pull request #4988 from tobiasd/20180506-4689
...
API docs, the count parameter
2018-05-06 13:56:21 +02:00
Tobias Diekershoff
0c6333599d
API docs, the count parameter
2018-05-06 12:25:23 +02:00
Tobias Diekershoff
cf13511066
update PL translations THX waldis
2018-05-06 11:18:56 +02:00
Tobias Diekershoff
bfca51c450
update FI translations THX Samuli Valavuo
2018-05-06 11:18:08 +02:00
Tobias Diekershoff
d98d9a5e60
update to the zh-cn translation THX 朱陈锬
2018-05-06 11:17:15 +02:00
Hypolite Petovan
3a3a4807a8
Merge pull request #4978 from annando/dba-2
...
Diaspora: Fix person/contact retraction
2018-05-04 18:04:38 -04:00
Hypolite Petovan
4e1441bb3e
Merge pull request #4981 from annando/remote-self
...
"remote-self" is now working for Diaspora and Twitter as well
2018-05-04 17:50:17 -04:00
Hypolite Petovan
7de52788b3
Merge pull request #4982 from annando/no-blocked-contact
...
Suppress blocked contacts from being displayed
2018-05-04 17:49:21 -04:00
Michael
7cd7b1a9bf
Some more replaced queries
2018-05-04 21:43:29 +00:00
Michael
dfa0dbf33f
Ups
2018-05-04 21:33:15 +00:00
Michael
125afb4ae5
Suppress blocked contacts from being displayed
2018-05-04 21:27:20 +00:00
Michael
1230ff146a
"remote-self" is now working for Diaspora and Twitter as well
2018-05-04 21:12:13 +00:00
Hypolite Petovan
244c9d7a5b
Merge pull request #4980 from nupplaphil/install-pdo-bugfix
...
using \PDO instead of PDO (bugfix)
2018-05-04 14:23:36 -04:00
Philipp Holzer
7e28e3e5f4
using \PDO instead PDO (bugfix)
2018-05-04 19:48:01 +02:00
Michael
6dbf0de9f2
Removed activities that aren't in the Diaspora protocol
2018-05-04 06:34:02 +00:00
Michael
a83970bc0e
Some more dba stuff
2018-05-04 06:33:36 +00:00
Hypolite Petovan
e5a6e7b449
Merge pull request #4977 from annando/dba-error
...
Avoid SQL error with wrong formatted datetime value
2018-05-03 17:03:30 -04:00
Michael
d52b226a6e
Reformat wrong expansion
2018-05-03 20:49:32 +00:00
Michael
321a36d4db
Avoid SQL error with wrong formatted datetime value
2018-05-03 20:48:35 +00:00
Hypolite Petovan
89cf2ea186
Merge pull request #4975 from annando/fix-blocked-contacts
...
"pending" shouldn't be set as well by default ...
2018-05-03 14:22:50 -04:00
Michael
08bfced11b
"pending" shouldn't be set as well by default ...
2018-05-03 18:19:40 +00:00
Hypolite Petovan
4158dcccaf
Merge pull request #4974 from annando/fix-blocked-contacts
...
Ugly bugfix: Public contacts had been blocked automatically when created
2018-05-03 14:06:01 -04:00
Michael
bce3b6f896
Urgent bugfix: Public contacts had been blocked automatically when created
2018-05-03 17:43:10 +00:00
Hypolite Petovan
fbe1206f35
Merge pull request #4973 from annando/diaspora-link
...
Bugfix: Twitter "Reshares" are now appearing again on Diaspora
2018-05-03 10:20:18 -04:00
Michael
53b7028d35
Reshares had been detected falsely so that were rejected by Diaspora
2018-05-03 13:03:41 +00:00
Michael
aba93df94f
Ensure that the link will be displayed correctly on Diaspora
2018-05-03 04:43:50 +00:00
Hypolite Petovan
b6cb7c034f
Merge pull request #4972 from annando/dba-stuff
...
Replace old database queries with the new ones
2018-05-02 20:55:58 -04:00
Michael
eecd1e47e4
Some corrections
2018-05-02 21:12:48 +00:00
Michael
4ad655ab80
Replace old database queries with the new ones
2018-05-02 19:26:15 +00:00
Hypolite Petovan
8f9757aba5
Merge pull request #4962 from astifter/fix_cropped_find_button
...
vier: Fix layout issue introduced with PR #4873 .
2018-05-01 08:43:45 -04:00
Hypolite Petovan
538143f628
Merge pull request #4967 from nupplaphil/4899-autoinstall-with-file
...
AutomaticInstallation - use config file
2018-05-01 08:19:02 -04:00
Philipp Holzer
559250b8b3
Updated help-text
...
accidentaly changed `htconfig.php` (reverted)
2018-05-01 13:21:42 +02:00
Philipp Holzer
95ef07d67b
Updated help-text
2018-05-01 13:14:41 +02:00
Philipp Holzer
fa78f148c8
AutomaticInstallation - use config file
...
- added new parameter "-f config file" to `AutomaticInstallation.php`
2018-05-01 13:11:25 +02:00
Tobias Diekershoff
1935a8150d
Merge pull request #4964 from annando/delivery-foo
...
Fixed private messaging/relaying is controlled by the parent
2018-05-01 11:30:31 +02:00
Michael
1e0200884f
Fixed private messaging/relaying is controlled by the parent
2018-05-01 06:37:12 +00:00
Andreas Neustifter
59b57459c6
Fix layout issue introduced with PR #4873 .
...
The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.
2018-04-30 21:22:59 +00:00
Hypolite Petovan
352e136132
Merge pull request #4961 from annando/direct-dfrn
...
Direct Relay is now working with DFRN as well
2018-04-30 14:06:35 -04:00
Michael
b72bc0735f
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
2018-04-30 16:52:44 +00:00
Michael
a182dd3400
Improved logging, avoiding PHP warning
2018-04-30 16:46:49 +00:00
Michael
1a8d0a573e
Bugfix: Contact wasn't added on probing
2018-04-30 16:45:00 +00:00
