friendica/view
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
2013-02-17 12:35:40 +01:00
..
ca CA: update to the strings 2013-02-11 06:21:10 +01:00
cs newline at end of header 2013-01-11 10:00:10 -07:00
de DE; update to the strings, fixing #476 2013-02-17 11:19:12 +01:00
en newline at end of header 2013-01-11 10:00:10 -07:00
eo newline at end of header 2013-01-11 10:00:10 -07:00
es newline at end of header 2013-01-11 10:00:10 -07:00
fr newline at end of header 2013-01-11 10:00:10 -07:00
is newline at end of header 2013-01-11 10:00:10 -07:00
it update it strings 2013-02-15 11:23:49 -05:00
nb-no newline at end of header 2013-01-11 10:00:10 -07:00
pl PL: update to the strings 2013-01-22 08:01:25 +01:00
pt-br newline at end of header 2013-01-11 10:00:10 -07:00
ru RU: update to the strings 2012-12-04 11:06:02 +01:00
smarty3 starting switching to colorbox 2013-02-04 18:09:56 -07:00
sv newline at end of header 2013-01-11 10:00:10 -07:00
theme Merge remote-tracking branch 'upstream/master' 2013-02-17 12:35:40 +01:00
zh-cn ZH-CN: update to the strings to 100% thx Matthew 2013-02-11 06:23:55 +01:00
.htaccess
404.tpl
acl_selector.tpl Keep html in template, use data attribute for img 2012-12-29 23:44:26 +01:00
admin_aside.tpl
admin_logs.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
admin_plugins.tpl
admin_plugins_details.tpl
admin_remoteupdate.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
admin_site.tpl starting switching to colorbox 2013-02-04 18:09:56 -07:00
admin_summary.tpl
admin_users.tpl remove more dashes in templates 2012-12-27 09:38:42 -07:00
album_edit.tpl
api_config_xml.tpl
api_friends_xml.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
api_ratelimit_xml.tpl
api_status_xml.tpl
api_test_xml.tpl
api_timeline_atom.tpl get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
api_timeline_rss.tpl get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
api_timeline_xml.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
api_user_xml.tpl
apps.tpl
atom_feed.tpl
atom_feed_dfrn.tpl
atom_mail.tpl
atom_relocate.tpl moveme: fix contact photos 2012-11-05 09:18:55 +01:00
atom_suggest.tpl
auto_request.tpl
birthdays_reminder.tpl
categories_widget.tpl
comment_item.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
common_friends.tpl
common_tabs.tpl
confirm.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
contact_block.tpl
contact_edit.tpl Reset network when showing a contact's posts 2013-02-01 09:12:37 +01:00
contact_end.tpl
contact_head.tpl try to improve TinyMCE block handling 2013-01-27 14:41:48 -07:00
contact_template.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
contacts-end.tpl
contacts-head.tpl
contacts-template.tpl fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
contacts-widget-sidebar.tpl
content.tpl
conversation.tpl allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
crepair.tpl
cropbody.tpl
cropend.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_relay_retraction.tpl
diaspora_relayable_retraction.tpl
diaspora_retract.tpl
diaspora_share.tpl
diaspora_signed_retract.tpl
diaspora_vcard.tpl
directory_header.tpl
directory_item.tpl Implement Smarty3 2012-12-22 12:57:29 -07:00
display-head.tpl
email_notify_html.tpl
email_notify_text.tpl
end.tpl
event.tpl remove more dashes in templates 2012-12-27 09:38:42 -07:00
event_end.tpl
event_form.tpl
event_head.tpl starting switching to colorbox 2013-02-04 18:09:56 -07:00
events-js.tpl
events.tpl remove more dashes in templates 2012-12-27 09:38:42 -07:00
events_reminder.tpl
failed_updates.tpl
fake_feed.tpl
field.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
field_checkbox.tpl fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
field_combobox.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_themeselect.tpl
field_yesno.tpl
fileas_widget.tpl
filebrowser.tpl fix a few more templates for correction conversion to Smarty3 templates 2012-12-24 08:44:26 -07:00
filer_dialog.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
follow.tpl bad html in view/follow.tpl 2012-09-19 03:17:41 -07:00
follow_slap.tpl
generic_links_widget.tpl
group_drop.tpl
group_edit.tpl fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
group_selection.tpl
group_side.tpl
groupeditor.tpl
head.tpl starting switching to colorbox 2013-02-04 18:09:56 -07:00
hide_comments.tpl
install.tpl
install_checks.tpl Implement Smarty3 2012-12-22 12:57:29 -07:00
install_db.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
install_settings.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
intros.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
invite.tpl add form security to invite page and set maximum per user invites 2013-01-25 13:48:57 -08:00
jot-end.tpl
jot-header.tpl starting switching to colorbox 2013-02-04 18:09:56 -07:00
jot.tpl implement features 2012-11-22 09:14:22 -07:00
jot_geotag.tpl
lang_selector.tpl
like_noshare.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
login.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
login_head.tpl
logout.tpl
lostpass.tpl
magicsig.tpl
mail_conv.tpl
mail_display.tpl fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
mail_head.tpl
mail_list.tpl
maintenance.tpl module to show system down message 2013-01-14 16:48:01 -07:00
manage.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
match.tpl
message-end.tpl
message-head.tpl
message_side.tpl
minimal.php
moderated_comment.tpl
mood_content.tpl
msg-end.tpl
msg-header.tpl try to improve TinyMCE block handling 2013-01-27 14:41:48 -07:00
nav.tpl Fix browser prefetch in notifications menu 2012-12-30 00:28:48 +01:00
navigation.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
netfriend.tpl
nets.tpl remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters 2012-09-29 17:56:50 -06:00
nogroup-template.tpl fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
notifications.tpl revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
notifications_comments_item.tpl
notifications_dislikes_item.tpl
notifications_friends_item.tpl
notifications_likes_item.tpl
notifications_network_item.tpl fix a few more templates for correction conversion to Smarty3 templates 2012-12-24 08:44:26 -07:00
notifications_posts_item.tpl
notify.tpl
oauth_authorize.tpl
oauth_authorize_done.tpl
oembed_video.tpl
oexchange_xrd.tpl get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
opensearch.tpl Make 'Friendika' 'Friendica' in open search. 2012-09-16 16:16:22 +01:00
pagetypes.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
peoplefind.tpl
photo_album.tpl
photo_drop.tpl
photo_edit.tpl
photo_edit_head.tpl
photo_item.tpl
photo_top.tpl
photo_view.tpl
photos_default_uploader_box.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
photos_default_uploader_submit.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
photos_head.tpl
photos_recent.tpl fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
photos_upload.tpl Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
poco_entry_xml.tpl
poco_xml.tpl fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
poke_content.tpl
posted_date_widget.tpl
profed_end.tpl
profed_head.tpl try to improve TinyMCE block handling 2013-01-27 14:41:48 -07:00
profile-hide-friends.tpl
profile-hide-wall.tpl
profile-in-directory.tpl
profile-in-netdir.tpl
profile_advanced.tpl
profile_edit.tpl change profile photo link on profile edit page 2012-12-07 16:02:40 -08:00
profile_edlink.tpl
profile_entry.tpl
profile_listing_header.tpl
profile_photo.tpl
profile_publish.tpl
profile_vcard.tpl remove dashes from variable names in profile_vcard.tpl 2012-12-26 13:20:18 -08:00
prv_message.tpl revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
pwdreset.tpl
register.tpl Move HTML part of oid to template + replace outside the tpl 2013-01-01 22:40:05 +01:00
remote_friends_common.tpl
removeme.tpl
saved_searches_aside.tpl
search_item.tpl anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported. 2012-12-13 14:15:18 -08:00
settings-end.tpl
settings-head.tpl
settings.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
settings_addons.tpl
settings_connectors.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
settings_display.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
settings_display_end.tpl
settings_features.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
settings_nick_set.tpl
settings_nick_subdir.tpl
settings_oauth.tpl
settings_oauth_edit.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
suggest_friends.tpl
suggestions.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
tag_slap.tpl
threaded_conversation.tpl Implement Smarty3 2012-12-22 12:57:29 -07:00
toggle_mobile_footer.tpl add new template file 2012-09-29 17:51:39 -06:00
uexport.tpl move account. first step. 2012-10-17 11:13:01 -04:00
uimport.tpl simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
vcard-widget.tpl
viewcontact_template.tpl fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
voting_fakelink.tpl * Add MIME types for file attachments 2013-01-12 06:31:32 -07:00
wall_thread.tpl revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
wallmessage.tpl
wallmsg-end.tpl
wallmsg-header.tpl try to improve TinyMCE block handling 2013-01-27 14:41:48 -07:00
xrd_diaspora.tpl
xrd_host.tpl
xrd_person.tpl