clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
63610c7b73fcaf862adbf880d4968dd2b1678d9b
friendica/mod
History
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
..
_well_known.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
acctlink.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
acl.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
admin.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
allfriends.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
amcd.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
api.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
apps.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
attach.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
babel.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
bookmarklet.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
cal.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
cb.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
common.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
community.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
contactgroup.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
contacts.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
content.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
credits.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
crepair.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
delegate.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
dfrn_confirm.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
dfrn_notify.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
dfrn_poll.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
dfrn_request.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
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
dirfind.php
The account type is now read and displayed
2016-10-01 20:03:27 +00:00
display.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
editpost.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
events.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
fbrowser.php
Some rewrites:
2016-12-13 10:16:36 +01:00
fetch.php
Some rewrites:
2016-12-13 10:16:36 +01:00
filer.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
filerm.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
follow.php
Unused indexes removed, queries changed
2016-07-26 22:10:13 +02:00
friendica.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
fsuggest.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
group.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
hcard.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
help.php
docs: small fixes to help sidebar
2016-02-12 09:26:42 +01:00
home.php
Make the network page the new default page after login.
2014-08-25 23:34:29 +02:00
hostxrd.php
Only close the session if it had been opened.
2016-08-16 21:35:12 +02:00
hovercard.php
The account type is now read and displayed
2016-10-01 20:03:27 +00:00
ignored.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
install.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
invite.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
item.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
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
localtime.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
lockview.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
login.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
lostpass.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
maintenance.php
dbstructure now switches in the maintenance mode when updating
2016-10-02 13:52:52 +00:00
manage.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
match.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
message.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
modexp.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
mood.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
msearch.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
navigation.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +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
newmember.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
nodeinfo.php
Code bautification
2016-12-10 12:28:49 +00:00
nogroup.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
noscrape.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
notes.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
notice.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
notifications.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
notify.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
oembed.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
oexchange.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
openid.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
opensearch.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
ostatus_subscribe.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
p.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
parse_url.php
legacy support for function parseurl_getsiteinfo_cached()
2016-11-28 15:26:51 +01:00
photo.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
photos.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
ping.php
Opps, no need for this.
2016-12-13 10:01:56 +01:00
poco.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
poke.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
post.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
pretheme.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
probe.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
profile_photo.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
profile.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
profiles.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
profperm.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
proxy.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
pubsub.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
pubsubhubbub.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
qsearch.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
randprof.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
receive.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
redir.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
register.php
Additional info in registration request
2016-11-19 18:22:49 +01:00
regmod.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
removeme.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
repair_ostatus.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
rsd_xml.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
salmon.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
search.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
session.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
settings.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
share.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
smilies.php
rework autocomplete: some polishing
2016-05-01 13:47:24 +02:00
starred.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
statistics_json.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
subthread.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
suggest.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
tagger.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
tagrm.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
toggle_mobile.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
uexport.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
uimport.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
update_community.php
Reverting too extensive formatting changes
2016-10-22 21:33:54 -04:00
update_display.php
Reverting too extensive formatting changes
2016-10-22 21:33:54 -04:00
update_network.php
Reverting too extensive formatting changes
2016-10-22 21:33:54 -04:00
update_notes.php
Reverting too extensive formatting changes
2016-10-22 21:33:54 -04:00
update_profile.php
Reverting too extensive formatting changes
2016-10-22 21:33:54 -04:00
videos.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
view.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
viewcontacts.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
viewsrc.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
wall_attach.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
wall_upload.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
wallmessage.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00
webfinger.php
Remove obsolote functions
2016-07-09 20:09:09 +02:00
worker.php
Store spooled data
2016-12-01 20:53:18 +00:00
xrd.php
More usage of dbm::is_result($r) instead of count($r):
2016-12-13 10:44:13 +01:00