1
0
Fork 0
friendica_2020-09-1_sharedH.../include
Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
2016-12-13 11:00:44 +01:00
..
autoloader set include/ folder base for 'Friendica' PSR4 namespace 2016-06-10 11:50:52 +02:00
Core More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
acl_selectors.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
api.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
attach.php add support for more file attachment types 2013-02-04 22:15:16 -07:00
auth.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
auth_ejabberd.php Some rewrites: 2016-12-13 10:16:36 +01:00
autoloader.php add some doxygen comments 2016-02-09 11:10:00 +01:00
bb2diaspora.php Formatting 2016-12-05 22:48:02 -05:00
bbcode.php Adding default protocols on missing config value for backward compatibility 2016-12-07 23:18:10 -05:00
cache.php cache: use unserialize(false) 2016-11-20 17:32:37 +01:00
cli_startup.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
config.php Add $default_value parameter to Config::get() and PConfig::get() 2016-06-10 12:00:34 +02:00
Contact.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
contact_selectors.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
contact_widgets.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
conversation.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
create_shadowentry.php Removed "&" 2016-11-12 17:20:26 +00:00
cron.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
cronhooks.php Some rewrites: 2016-12-13 10:16:36 +01:00
cronjobs.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
crypto.php RINO 2 based on php-encryption 2015-06-23 16:13:09 +02:00
datetime.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
dba.php Some rewrites: 2016-12-13 10:16:36 +01:00
dba_pdo.php Some rewrites: 2016-12-13 10:16:36 +01:00
dbclean.php run dbclean as long as there is some data to be purged 2016-11-01 21:36:15 +00:00
dbm.php CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
dbstructure.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
dbupdate.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
delivery.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
dfrn.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
diaspora.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
directory.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
DirSearch.php Speeding up the gcontact search 2016-05-01 13:48:52 +02:00
discover_poco.php Some rewrites: 2016-12-13 10:16:36 +01:00
email.php reformat todo according to doxygen style 2015-12-25 23:17:34 +01:00
Emailer.php adjust the rand bounderies to be within the allowed max value 2016-07-05 15:45:39 +02:00
enotify.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
event.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
expire.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
fcontact.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
features.php Disable richtext editor for frio - followup for #2938 2016-11-29 20:04:31 +00:00
feed.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
files.php Some rewrites: 2016-12-13 10:16:36 +01:00
follow.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
ForumManager.php Merge remote-tracking branch 'upstream/develop' into 1607-is-result2 2016-07-02 14:01:52 +02:00
friendica_smarty.php Pass App class instace to all templates via "$APP" variable 2016-02-03 14:01:37 +01:00
gprobe.php some more coding style correction 2016-11-04 19:26:28 +01:00
group.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
html2bbcode.php move function deletenode() to the xml class 2016-11-27 20:19:43 +01:00
html2plain.php Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
HTTPExceptions.php Changes in api 2015-12-28 10:23:06 +01:00
identity.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
items.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
like.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
lock.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
map.php map bbcode tag from Red 2015-05-15 20:41:10 +02:00
message.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
msgclean.php reformat todo according to doxygen style 2015-12-25 23:17:34 +01:00
nav.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
network.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
NotificationsManager.php Bugfix: avatar images for activty like was not shown notifications page 2016-11-16 13:21:13 +01:00
notifier.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
oauth.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
oembed.php Some rewrites: 2016-12-13 10:16:36 +01:00
onepoll.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
ostatus.php Fixed code structure 2016-10-23 22:12:45 +00:00
ParseUrl.php ParseUrl: some docu work 2016-11-27 23:41:55 +01:00
pgettext.php Some rewrites: 2016-12-13 10:16:36 +01:00
Photo.php Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
photos.php cache: serialize the cache content directly in the cache class 2016-11-04 16:44:49 +01:00
pidfile.php Mute warnings in pidfile/Quit poller after an hour. 2015-09-25 17:38:56 +02:00
plaintext.php parse_url: recognize image/video/audio files + move functions into own class 2016-11-24 01:11:22 +01:00
plugin.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
poller.php Some rewrites: 2016-12-13 10:16:36 +01:00
post_update.php CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
Probe.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
profile_selectors.php add plugin hooks to gender, sexpref, and marital selectors 2012-05-27 22:35:01 -07:00
profile_update.php Profile update is now working with the new function as well 2016-05-01 13:46:08 +02:00
pubsubpublish.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
queue.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
queue_fn.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
quoteconvert.php
redir.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
remove_contact.php Some brackets added 2016-11-28 22:18:37 +00:00
salmon.php Mastodon is now detected as OStatus network 2016-10-05 20:54:26 +00:00
Scrape.php Removed the legacy function calls, removed unused functions 2016-07-04 08:05:30 +02:00
security.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
session.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
shadowupdate.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
Smilies.php rework autocomplete: some polishing 2016-05-01 13:47:24 +02:00
socgraph.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
spool_post.php File was missing 2016-12-01 21:11:52 +00:00
system_unavailable.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tags.php Some rewrites: 2016-12-13 10:16:36 +01:00
tagupdate.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
template_processor.php better logger format, some comments 2014-04-27 15:18:43 +02:00
text.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
threads.php Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result 2016-12-13 11:00:44 +01:00
threadupdate.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
uimport.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
update_gcontact.php Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
user.php More usage of dbm::is_result($r) instead of count($r): 2016-12-13 10:44:13 +01:00
xml.php xml:php - some code standard work 2016-11-27 20:42:40 +01:00