Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 10:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
friendica-github/mod
History
Roland Häder d489ba1510 Merge remote-tracking branch 'upstream/develop' into develop 
Also removed <<<<< as this interfers (a bit) with searching for merge conflicts
with a more simplier editor.

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/ping.php
	view/lang/fr/messages.po
	view/lang/fr/strings.php
2016-12-13 09:59:43 +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 add frontend worker to the admin panel and regen master messages.po file 2016-12-06 08:44:59 +01:00
allfriends.php The account type is now read and displayed 2016-10-01 20:03:27 +00:00
amcd.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
api.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
apps.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
attach.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +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 update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
cb.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
common.php The account type is now read and displayed 2016-10-01 20:03:27 +00:00
community.php Improved queries, more uncommitted queries 2016-10-17 18:38:51 +00:00
contactgroup.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
contacts.php Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-11-16 06:27:21 +00:00
content.php New indexes for the API 2016-07-19 08:43:57 +02:00
credits.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
crepair.php frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
delegate.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
dfrn_confirm.php upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
dfrn_notify.php upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
dfrn_poll.php Better implementation of "hidewall" 2016-05-06 11:04:21 +02:00
dfrn_request.php dfrn_request: include the graphic of the connection process into the doxygen header 2016-11-29 19:57:30 +01:00
directory.php The account type is now read and displayed 2016-10-01 20:03:27 +00:00
dirfind.php The account type is now read and displayed 2016-10-01 20:03:27 +00:00
display.php And again ... 2016-10-22 10:33:18 +00:00
editpost.php add missing strings for frio 2016-06-25 12:21:13 +02:00
events.php update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
fbrowser.php fbrowser: Take the picture as that mostly fits 2016-04-10 13:36:26 +02:00
fetch.php Avoid redirection loops at /fetch/ and /p/ 2016-06-30 12:02:35 +02: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 Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
fsuggest.php "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
group.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +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 Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
install.php Fix typo in get_available_languages function name 2016-10-24 22:17:02 -04:00
invite.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
item.php The gcontact-id and the object field can now be stored with item_post 2016-12-09 09:57:02 +00: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 Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
login.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
lostpass.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
maintenance.php dbstructure now switches in the maintenance mode when updating 2016-10-02 13:52:52 +00:00
manage.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
match.php The account type is now read and displayed 2016-10-01 20:03:27 +00:00
message.php Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
modexp.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
mood.php "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
msearch.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
navigation.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
network.php Avoid SQL errors 2016-12-11 07:09:48 +00: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 Unified contact data handling 2016-06-05 13:57:11 +02:00
noscrape.php The global contact for server users is now stored directly 2016-05-05 12:02:51 +02:00
notes.php Optimised the amount of function for the item query 2016-06-19 08:32:38 +02:00
notice.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
notifications.php HTML entities in Notifications aren't a problem anymore 2016-08-11 19:59:07 +02:00
notify.php Merge branch 'develop' into api_ping 2016-02-09 14:06:57 +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 Simplify openid query, and (needlessly) quote all fields 2016-05-25 16:06:16 +02: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 Avoid redirection loops at /fetch/ and /p/ 2016-06-30 12:02:35 +02:00
parse_url.php legacy support for function parseurl_getsiteinfo_cached() 2016-11-28 15:26:51 +01:00
photo.php Improved queries, more uncommitted queries 2016-10-17 18:38:51 +00:00
photos.php fix photos page permissions 2016-11-14 18:49:51 +01:00
ping.php Merge remote-tracking branch 'upstream/develop' into develop 2016-12-13 09:59:43 +01:00
poco.php Contact Type is now transmitted via poco 2016-10-04 03:48:01 +00:00
poke.php "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
post.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +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.php We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
profile_photo.php "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
profiles.php The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
profperm.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
proxy.php Avoid UTF8 warning in mod/proxy.php 2016-11-20 08:30:30 +00:00
pubsub.php Bugfix: The "keywords" field in the gcontact table wasn't set correctly 2016-02-10 23:39:18 +01:00
pubsubhubbub.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
qsearch.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
randprof.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
receive.php Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
redir.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
register.php Additional info in registration request 2016-11-19 18:22:49 +01:00
regmod.php "proc_run" is now called with priority. 2016-08-01 07:48:43 +02: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 New OStatus implementation 2016-03-30 12:43:15 +02:00
search.php Search query optimized 2016-06-20 22:03:40 +02:00
session.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
settings.php The warning if a group contains members of several network types can now be supressed. 2016-11-20 12:09:18 +00:00
share.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
smilies.php rework autocomplete: some polishing 2016-04-14 17:05:19 +02:00
starred.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +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 Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
suggest.php The account type is now read and displayed 2016-10-01 20:03:27 +00:00
tagger.php "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
tagrm.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +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 "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +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 fix photos page permissions 2016-11-14 18:49:51 +01:00
view.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
viewcontacts.php Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
viewsrc.php Revert "Updated modules to allow for partial overrides without errors" 2016-02-07 15:11:34 +01:00
wall_attach.php fix photos page permissions 2016-11-14 18:49:51 +01:00
wall_upload.php fix photos page permissions 2016-11-14 18:49:51 +01:00
wallmessage.php Issue 1769: Some enhancements for sending wall mails 2016-05-29 19:35:23 +02: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 Diaspora: Comments and Likes are now signed at any time 2016-04-20 23:27:33 +02:00