Michael Vogel d653e27e2d Merge commit 'upstream/master' ... Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl		2012-03-11 20:22:28 +01:00
..
ca	catalan translation	2012-03-08 16:29:22 -08:00
cs
de	German translation	2012-03-10 10:36:20 +01:00
en
es
fr
it
pt-br
ru
sv
theme	Merge commit 'upstream/master'	2012-03-11 20:22:28 +01:00
.htaccess
404.tpl
acl_selector.tpl	these are more finessing on formatting again	2012-03-03 19:20:23 -05:00
admin_aside.tpl
admin_logs.tpl
admin_plugins.tpl
admin_plugins_details.tpl	some admin page fixes and cleanup	2012-03-05 18:51:21 -08:00
admin_remoteupdate.tpl
admin_site.tpl
admin_summary.tpl	some admin page fixes and cleanup	2012-03-05 18:51:21 -08:00
admin_users.tpl
album_edit.tpl
api_config_xml.tpl
api_friends_xml.tpl
api_ratelimit_xml.tpl
api_status_xml.tpl
api_timeline_atom.tpl
api_timeline_rss.tpl
api_timeline_xml.tpl
api_user_xml.tpl
apps.tpl
atom_feed.tpl
atom_feed_dfrn.tpl
atom_mail.tpl
atom_suggest.tpl
auto_request.tpl
comment_item.tpl
common_friends.tpl
common_tabs.tpl
contact_block.tpl	tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar	2012-03-05 13:16:28 -05:00
contact_edit.tpl
contact_head.tpl
contact_template.tpl
contacts-template.tpl
conversation.tpl
crepair.tpl
cropbody.tpl
crophead.tpl
custom_tinymce.css
default.php
delegate.tpl
dfrn_req_confirm.tpl
dfrn_request.tpl
diasp_dec_hdr.tpl
diaspora_comment.tpl
diaspora_comment_relay.tpl
diaspora_conversation.tpl
diaspora_like.tpl
diaspora_like_relay.tpl
diaspora_message.tpl
diaspora_photo.tpl
diaspora_post.tpl
diaspora_profile.tpl
diaspora_retract.tpl
diaspora_share.tpl
diaspora_signed_retract.tpl
diaspora_vcard.tpl
directory_header.tpl
directory_item.tpl
email_notify_html.tpl
email_notify_text.tpl
event.tpl
event_form.tpl
event_head.tpl
events-js.tpl
events.tpl
fake_feed.tpl
field.tpl
field_checkbox.tpl
field_custom.tpl
field_input.tpl
field_intcheckbox.tpl
field_openid.tpl
field_password.tpl
field_radio.tpl
field_richtext.tpl
field_select.tpl
field_select_raw.tpl
field_textarea.tpl
field_yesno.tpl
follow.tpl
follow_slap.tpl
group_drop.tpl
group_edit.tpl
group_side.tpl
groupeditor.tpl
head.tpl
hide_comments.tpl
install.tpl
install_checks.tpl
install_db.tpl
install_settings.tpl
intros.tpl
invite.tpl
jot-header.tpl
jot.tpl	minor formatting issues	2012-03-02 19:09:17 -05:00
jot_geotag.tpl
like_noshare.tpl
login.tpl
logout.tpl
lostpass.tpl
magicsig.tpl
mail_conv.tpl
mail_head.tpl
mail_list.tpl
match.tpl
minimal.php
msg-header.tpl	bug #324 - tinymce used for mail even if editplain being used.	2012-03-09 00:47:10 -08:00
nav.tpl
netfriend.tpl
nets.tpl	bugs #312, #313	2012-03-06 14:27:53 -08:00
notifications.tpl
notifications_comments_item.tpl
notifications_dislikes_item.tpl
notifications_friends_item.tpl
notifications_likes_item.tpl
notifications_network_item.tpl
notifications_posts_item.tpl
notify.tpl
oauth_authorize.tpl
oauth_authorize_done.tpl
oembed_video.tpl
oexchange_xrd.tpl
opensearch.tpl
pagetypes.tpl
peoplefind.tpl
photo_album.tpl
photo_drop.tpl
photo_edit.tpl
photo_item.tpl
photo_top.tpl
photo_view.tpl
photos_recent.tpl
photos_upload.tpl
poco_entry_xml.tpl
poco_xml.tpl
profed_head.tpl
profile-hide-friends.tpl
profile-hide-wall.tpl
profile-in-directory.tpl
profile-in-netdir.tpl
profile_advanced.tpl
profile_edit.tpl
profile_edlink.tpl
profile_entry.tpl
profile_listing_header.tpl
profile_photo.tpl
profile_publish.tpl
profile_vcard.tpl
prv_message.tpl	bug #327 - composed private message is lost if no recip specified.	2012-03-10 15:50:51 -08:00
pwdreset.tpl
register.tpl
removeme.tpl
saved_searches_aside.tpl
search_item.tpl
settings.tpl	allow user to set number of items to show on network page	2012-03-09 21:29:39 -05:00
settings_addons.tpl
settings_connectors.tpl
settings_nick_set.tpl
settings_nick_subdir.tpl
settings_oauth.tpl
settings_oauth_edit.tpl
suggest_friends.tpl
suggestions.tpl
tag_slap.tpl
viewcontact_template.tpl
wall_item.tpl
wallwall_item.tpl
xrd_diaspora.tpl
xrd_host.tpl
xrd_person.tpl