jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
friendica/view
History
Simon L'nu 34eb843fb4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  the heart should really be red.
  fix location change notification
  enhanced profile reporting for single values
  add db field for removed account, which will also be the first test of update error checking
  toggle to archive unfriends, though render them useless
  indicate successful updates
  diabook-themes: small fix
  diabook-themes: bug/css-fixes
  some constants for the db update failure possibilities
  bring back the email and logging of update failures, but without the transactions

* master:
2012-04-29 22:06:16 -04:00
..
ca fix silly abandonded typo. shouldn't affect translations 2012-04-18 06:10:34 -04:00
cs Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
de DE strings, correction of a typo 2012-04-23 20:55:48 +02:00
en bring back the email and logging of update failures, but without the transactions 2012-04-28 17:50:28 -07:00
eo Esperanto at 100% again 2012-04-25 08:50:02 +02:00
es fix silly abandonded typo. shouldn't affect translations 2012-04-18 06:10:34 -04:00
fr fix silly abandonded typo. shouldn't affect translations 2012-04-18 06:10:34 -04:00
it fix silly abandonded typo. shouldn't affect translations 2012-04-18 06:10:34 -04: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 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 2012-04-29 22:06:16 -04: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 these are more finessing on formatting again 2012-03-03 19:20:23 -05:00
admin_aside.tpl Added "important changes" to admin menu for admins who don't follow 2012-04-28 01:25:55 +01:00
admin_logs.tpl XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:24:47 +00:00
admin_plugins.tpl XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:36:48 +00:00
admin_plugins_details.tpl XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:36:48 +00:00
admin_remoteupdate.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
admin_site.tpl break up poller into separate processes 2012-04-27 23:17:40 -07:00
admin_summary.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
admin_users.tpl XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:24:47 +00: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_test_xml.tpl API: template for test function added 2012-04-02 22:36:05 +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 API: Improved the timeline. Several (disabled) tests with caching of photos. 2012-04-11 19:31:01 +02:00
api_user_xml.tpl API: Tweetdeck is now working 2012-04-09 11:49:33 +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 bogus empty list element in dfrn_request page when emailnet not enabled 2012-04-14 05:32:31 -07:00
birthdays_reminder.tpl put fakelink back in birthday notice 2012-04-26 20:08:57 -07: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 add tooltip title to common_tabs 2012-04-27 19:47:52 -07:00
contact_block.tpl fix view contacts 2012-04-27 01:10:09 -07:00
contact_edit.tpl implement contact archival 2012-04-27 17:17:58 -07:00
contact_head.tpl make editplain work everywhere 2012-04-10 18:08:06 -07: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 fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
dfrn_req_confirm.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
dfrn_request.tpl bogus empty list element in dfrn_request page when emailnet not enabled 2012-04-14 05:32:31 -07: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 events: first test for full-javascript events calendar 2012-02-14 16:19:48 +01:00
event_form.tpl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
event_head.tpl events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) 2012-04-24 08:12:30 +02:00
events-js.tpl enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
events.tpl enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
events_reminder.tpl remove html from get_birthdays() and get_events() 2012-04-24 09:50:10 +02:00
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 well that was a silly mistake... 2012-04-13 16:12:06 -07: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 display settings: show theme screenshot on page load 2012-04-13 11:55:36 +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
filebrowser.tpl filebrowser: fix style, show 10 recent photos if not in an album 2012-04-18 15:15:52 +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
generic_links_widget.tpl settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +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 bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
groupeditor.tpl fix visualization in groupeditor 2012-02-23 16:21:28 +01:00
head.tpl reset qcomment selector after insert. 2012-04-26 21:53:40 -07: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 tinymce: add inlinepopups plugin 2012-04-18 14:55:21 +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
lang_selector.tpl move html out of lang_selector() and new template lang_selector.tpl 2012-04-13 11:56:21 +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 missing close double quote in mail_list.tpl 2012-03-16 01:57:27 -04:00
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
nogroup-template.tpl bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07: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 visit "random profile" feature 2012-04-10 20:50:31 -07: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 make editplain work everywhere 2012-04-10 18:08:06 -07: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 make editplain work everywhere 2012-04-10 18:08:06 -07: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 profile change activities 2012-04-12 21:10:32 -07:00
settings_addons.tpl settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +02:00
settings_connectors.tpl settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +02:00
settings_display.tpl settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +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 settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +02:00
settings_oauth_edit.tpl settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +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