..
ca
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
cs
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
de
small fixes for the German strings
2012-04-06 12:43:20 +02:00
en
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
es
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
fr
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
it
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
pt-br
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
ru
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
sv
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
theme
changelog 1.014 :
2012-04-07 16:39:43 +02:00
.htaccess
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
404.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
acl_selector.tpl
admin_aside.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin_logs.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin_plugins.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin_plugins_details.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin_remoteupdate.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin_site.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin_summary.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
admin_users.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
album_edit.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_config_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_friends_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_ratelimit_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_status_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_timeline_atom.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_timeline_rss.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_timeline_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
api_user_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
apps.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
atom_feed.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
atom_feed_dfrn.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
atom_mail.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
atom_suggest.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
auto_request.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
categories_widget.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
comment_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
common_friends.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
common_tabs.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
contact_block.tpl
contact_edit.tpl
[fix] contact_edit.tpl syntax; reduce cols to fit better
2012-03-26 03:39:06 -04:00
contact_head.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
contact_template.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
contacts-template.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
conversation.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
crepair.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
cropbody.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
crophead.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
custom_tinymce.css
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
default.php
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
delegate.tpl
dfrn_req_confirm.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
dfrn_request.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diasp_dec_hdr.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_comment.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_comment_relay.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_conversation.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_like.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_like_relay.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_message.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_photo.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_post.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_profile.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_retract.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_share.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_signed_retract.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
diaspora_vcard.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
directory_header.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
directory_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
email_notify_html.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
email_notify_text.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
event.tpl
event_form.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
event_head.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
events-js.tpl
events.tpl
fake_feed.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_checkbox.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_combobox.tpl
theme file_as combobox for 2.0
2012-03-29 04:07:16 -07:00
field_custom.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_input.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_intcheckbox.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_openid.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_password.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_radio.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_richtext.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_select.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_select_raw.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_textarea.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_themeselect.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
field_yesno.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
fileas_widget.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
filer_dialog.tpl
filer: replace "file as" prompt with combobox opened in fancybox
2012-03-28 10:49:34 +02:00
follow.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
follow_slap.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
group_drop.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
group_edit.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
group_side.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
groupeditor.tpl
head.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
hide_comments.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
install.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
install_checks.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
install_db.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
install_settings.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
intros.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
invite.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
jot-header.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
jot.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
jot_geotag.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
like_noshare.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
login.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
logout.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
lostpass.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
magicsig.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
mail_conv.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
mail_display.tpl
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
mail_head.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
mail_list.tpl
match.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
message_side.tpl
message: remove tabs, move new message link to aside, all message with gmail-style
2012-03-28 15:31:58 +02:00
minimal.php
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
msg-header.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
nav.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
netfriend.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
nets.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notifications.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notifications_comments_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notifications_dislikes_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notifications_friends_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notifications_likes_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notifications_network_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notifications_posts_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
notify.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
oauth_authorize.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
oauth_authorize_done.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
oembed_video.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
oexchange_xrd.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
opensearch.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
pagetypes.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
peoplefind.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photo_album.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photo_drop.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photo_edit.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photo_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photo_top.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photo_view.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photos_recent.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
photos_upload.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
poco_entry_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
poco_xml.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profed_head.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile-hide-friends.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile-hide-wall.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile-in-directory.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile-in-netdir.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_advanced.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_edit.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_edlink.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_entry.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_listing_header.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_photo.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_publish.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
profile_vcard.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
prv_message.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
pwdreset.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
register.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
removeme.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
saved_searches_aside.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
search_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
settings.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
settings_addons.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
settings_connectors.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
settings_display.tpl
settings: add "display settings" tab, with UI-related settings.
2012-03-30 15:45:02 +02:00
settings_nick_set.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
settings_nick_subdir.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
settings_oauth.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
settings_oauth_edit.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
suggest_friends.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
suggestions.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
tag_slap.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
viewcontact_template.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
wall_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
wallmessage.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
wallmsg-header.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
wallwall_item.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
xrd_diaspora.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
xrd_host.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00
xrd_person.tpl
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-05 13:39:15 +02:00