clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
friendica/mod
History
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete 
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02: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
issue 2247: Update more fields when relocation the server
2016-04-03 18:18:36 +02:00
allfriends.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01: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
cb.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
common.php
"get_baseurl" and "z_root" are disappearing ...
2016-02-17 23:47:32 +01:00
community.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
contactgroup.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
contacts.php
contactedit-actions-button: use internal links instead of full links
2016-02-23 19:26:03 +01:00
content.php
"get_baseurl" and "z_root" are disappearing ...
2016-02-17 23:47:32 +01:00
credits.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
crepair.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
delegate.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
dfrn_confirm.php
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
2016-03-21 06:47:47 +01:00
dfrn_notify.php
Merge pull request #2326 from fabrixxm/revert_db949bb8
2016-02-09 06:55:49 +01:00
dfrn_poll.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
dfrn_request.php
Central function for default group, special setting for OStatus
2016-03-06 13:15:27 +01:00
directory.php
"get_baseurl" and "z_root" are disappearing ...
2016-02-17 23:47:32 +01:00
dirfind.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
display.php
The display contained bad sql queries
2016-03-13 13:04:12 +01:00
editpost.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
events.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
fbrowser.php
fbrowser: Take the picture as that mostly fits
2016-04-10 13:36:26 +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
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
friendica.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
fsuggest.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01: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
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
ignored.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
install.php
make en the default language
2016-04-06 20:21:41 +02:00
invite.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
item.php
Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore
2016-04-13 07:00:36 +02: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
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
manage.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
match.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
message.php
"get_baseurl" and "z_root" are disappearing ...
2016-02-17 23:47:32 +01:00
modexp.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
mood.php
Add the guid to items that we create locally
2016-03-20 15:01:50 +01: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
Remove the baseurl where possible to avoid mixed content
2016-02-17 00:01:24 +01:00
newmember.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
nodeinfo.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
nogroup.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
noscrape.php
Bugfix: The nickname vanished/better way to fetch the alias
2016-04-02 15:41:55 +02:00
notes.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
notice.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
notifications.php
"get_baseurl" and "z_root" are disappearing ...
2016-02-17 23:47:32 +01: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
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +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
Removed just more old diaspora function calls.
2016-03-14 20:53:44 +01:00
parse_url.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
photo.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
photos.php
Add the guid to items that we create locally
2016-03-20 15:01:50 +01:00
ping.php
The name in the notifications has to be double encoded
2016-03-12 09:21:13 +01:00
poco.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
poke.php
Add the guid to items that we create locally
2016-03-20 15:01:50 +01: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_photo.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
profile.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
profiles.php
Add the guid to items that we create locally
2016-03-20 15:01:50 +01:00
profperm.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
proxy.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01: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
Fix for issue 2060: When password is provided during the register process now the user is redirected correctly.
2015-11-14 08:07:09 +01:00
regmod.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +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
New OStatus implementation
2016-03-30 12:43:15 +02:00
search.php
Post update ist now done.
2016-04-03 16:36:05 +02:00
session.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
settings.php
missing include file for the SocNet settings
2016-03-12 16:25:17 +01:00
share.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
smilies.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01: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
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
tagger.php
Add the guid to items that we create locally
2016-03-20 15:01:50 +01: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
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
update_display.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
update_network.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
update_notes.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
update_profile.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
videos.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
view.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
viewcontacts.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
viewsrc.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
wall_attach.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
wall_upload.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
wallmessage.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
webfinger.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00
xrd.php
Revert "Updated modules to allow for partial overrides without errors"
2016-02-07 15:11:34 +01:00