This repository has been archived on 2024-08-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Friendika 0bf8e418a8 Merge branch 'chriscase-master' ...

Conflicts:
	mod/dfrn_notify.php

2011-02-17 14:05:51 -08:00

..

cmnt_received_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

contact_edit.tpl

more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors

2011-01-30 19:38:03 -08:00

cropbody.tpl

finish moving english files

2010-11-16 20:13:18 -08:00

dfrn_req_confirm.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

directory_header.tpl

finish moving english files

2010-11-16 20:13:18 -08:00

follow_notify_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

friend_complete_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

group_edit.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

group_new.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

head.tpl

close tag on favicon link missing

2011-02-07 23:28:41 -08:00

htconfig.tpl

theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme.

2011-02-06 15:50:50 -08:00

insecure_net.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

install_db.tpl

fix installation into subdir of domain

2010-12-02 17:31:48 -08:00

intro_complete_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

intros-top.tpl

finish moving english files

2010-11-16 20:13:18 -08:00

jot-header.tpl

disable network toggles when ACL's are entered

2011-02-11 04:32:38 -08:00

jot.tpl

toggles "post to facebook, post to twitter", etc.

2011-02-11 02:35:19 -08:00

like.tpl

finish moving english files

2010-11-16 20:13:18 -08:00

logout.tpl

finish moving english files

2010-11-16 20:13:18 -08:00

lostpass_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

lostpass.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

mail_received_html_body_eml.tpl

broken image + linkify site link in body

2011-02-16 17:49:52 -08:00

mail_received_text_body_eml.tpl

changed message sending to use base64 encoding

2011-02-16 05:17:40 -08:00

msg-header.tpl

bug #0000002, strip HTML from pasted text in prv messages

2011-02-14 21:33:17 -08:00

netfriend.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

pagetypes.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

passchanged_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

profile_advanced.php

birthday timezone is absolute

2011-01-22 03:21:15 -08:00

profile_edit.tpl

personal title

2011-01-18 19:25:28 -08:00

profile_entry_default.tpl

make profile name clickable

2010-11-25 19:35:17 -08:00

profile_listing_header.tpl

finish moving english files

2010-11-16 20:13:18 -08:00

profile_photo.tpl

Add a link to user photos in Upload Profile Photo page

2011-02-04 10:30:56 +01:00

profile_tabs.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

profile-hide-friends.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

profile-in-directory.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

profile-in-netdir.tpl

more i18n reorg

2010-11-16 01:14:04 -08:00

profile.php

db prepare for enhanced magic profiles and remote privacy indicators, fixed $lang setting to use system config var, some other syntax issues

2010-12-07 18:13:51 -08:00

pwdreset.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

register_open_eml.tpl

thought we got rid of the "introduction" word

2010-12-02 22:48:46 -08:00

register_verify_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

register-link.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

registrations-top.tpl

Manage user registrations in REGISTER_APPROVE mode.

2011-01-04 14:46:08 +01:00

registrations.tpl

Manage user registrations in REGISTER_APPROVE mode.

2011-01-04 14:46:08 +01:00

request_notify_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

settings_nick_set.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

settings_nick_subdir.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

settings_nick_unset.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

settings.tpl

remove self

2011-02-03 03:58:47 -08:00

wall_item_drop.tpl

finish moving english files

2010-11-16 20:13:18 -08:00

wall_received_eml.tpl

i18n re-arrange

2010-11-15 23:27:12 -08:00

wallwall_item.tpl

provide permalink for posts, include permalinks in feeds and imported from feeds

2011-02-16 02:07:11 -08:00