Friendika 0bf8e418a8 Merge branch 'chriscase-master' ... Conflicts: mod/dfrn_notify.php		2011-02-17 14:05:51 -08:00
..
cmnt_received_eml.tpl
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
dfrn_req_confirm.tpl
directory_header.tpl
follow_notify_eml.tpl
friend_complete_eml.tpl
group_edit.tpl
group_new.tpl
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
install_db.tpl
intro_complete_eml.tpl
intros-top.tpl
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
logout.tpl
lostpass.tpl
lostpass_eml.tpl
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
pagetypes.tpl
passchanged_eml.tpl
profile-hide-friends.tpl
profile-in-directory.tpl
profile-in-netdir.tpl
profile.php
profile_advanced.php	sync template updates en => fr	2011-01-23 14:35:22 -08:00
profile_edit.tpl
profile_entry_default.tpl
profile_listing_header.tpl	French translation : Done strings.php, started template files.	2011-01-27 16:44:55 +01: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
pwdreset.tpl
register-link.tpl
register_open_eml.tpl
register_verify_eml.tpl
registrations-top.tpl
registrations.tpl	More translation	2011-01-27 16:50:39 +01:00
request_notify_eml.tpl
settings.tpl	remove self	2011-02-03 03:58:47 -08:00
settings_nick_set.tpl
settings_nick_subdir.tpl
settings_nick_unset.tpl
strings.php	Fixed some typo (prevented Friendika to load with french locale)	2011-02-05 15:19:28 +01:00
wall_item_drop.tpl
wall_received_eml.tpl
wallwall_item.tpl	provide permalink for posts, include permalinks in feeds and imported from feeds	2011-02-16 02:07:11 -08:00