diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
| commit | 43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (patch) | |
| tree | 2f9d83d87682b16ac6ac949382ab566fdca48076 /view/cs | |
| parent | b361bcea83140c28b5a5677905405de0ac102791 (diff) | |
| parent | afd2bf031eff688ae53e51f9199d025ca1935abe (diff) | |
| download | volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.gz volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.bz2 volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
update to the German strings
add network_tabs hook
pass autoname(0) test
rev update
added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.
* master:
Diffstat (limited to 'view/cs')
19 files changed, 0 insertions, 0 deletions
diff --git a/view/cs/cmnt_received_eml.tpl b/view/cs/cmnt_received_eml.tpl index ff4492322..ff4492322 100755..100644 --- a/view/cs/cmnt_received_eml.tpl +++ b/view/cs/cmnt_received_eml.tpl diff --git a/view/cs/cmnt_received_html_body_eml.tpl b/view/cs/cmnt_received_html_body_eml.tpl index 6b6318743..6b6318743 100755..100644 --- a/view/cs/cmnt_received_html_body_eml.tpl +++ b/view/cs/cmnt_received_html_body_eml.tpl diff --git a/view/cs/cmnt_received_text_body_eml.tpl b/view/cs/cmnt_received_text_body_eml.tpl index ff4492322..ff4492322 100755..100644 --- a/view/cs/cmnt_received_text_body_eml.tpl +++ b/view/cs/cmnt_received_text_body_eml.tpl diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl index 440ba9ca4..440ba9ca4 100755..100644 --- a/view/cs/follow_notify_eml.tpl +++ b/view/cs/follow_notify_eml.tpl diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl index 50bb7e105..50bb7e105 100755..100644 --- a/view/cs/friend_complete_eml.tpl +++ b/view/cs/friend_complete_eml.tpl diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl index 5d116dd99..5d116dd99 100755..100644 --- a/view/cs/htconfig.tpl +++ b/view/cs/htconfig.tpl diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl index 91753f35d..91753f35d 100755..100644 --- a/view/cs/intro_complete_eml.tpl +++ b/view/cs/intro_complete_eml.tpl diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl index 05042ddce..05042ddce 100755..100644 --- a/view/cs/lostpass_eml.tpl +++ b/view/cs/lostpass_eml.tpl diff --git a/view/cs/mail_received_html_body_eml.tpl b/view/cs/mail_received_html_body_eml.tpl index 427c6c98d..427c6c98d 100755..100644 --- a/view/cs/mail_received_html_body_eml.tpl +++ b/view/cs/mail_received_html_body_eml.tpl diff --git a/view/cs/mail_received_text_body_eml.tpl b/view/cs/mail_received_text_body_eml.tpl index c69872377..c69872377 100755..100644 --- a/view/cs/mail_received_text_body_eml.tpl +++ b/view/cs/mail_received_text_body_eml.tpl diff --git a/view/cs/messages.po b/view/cs/messages.po index 529504c5c..529504c5c 100755..100644 --- a/view/cs/messages.po +++ b/view/cs/messages.po diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl index 5447d2e80..5447d2e80 100755..100644 --- a/view/cs/passchanged_eml.tpl +++ b/view/cs/passchanged_eml.tpl diff --git a/view/cs/register_open_eml.tpl b/view/cs/register_open_eml.tpl index f8e42678b..f8e42678b 100755..100644 --- a/view/cs/register_open_eml.tpl +++ b/view/cs/register_open_eml.tpl diff --git a/view/cs/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl index 4b34c6b6d..4b34c6b6d 100755..100644 --- a/view/cs/register_verify_eml.tpl +++ b/view/cs/register_verify_eml.tpl diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl index 74010c79c..74010c79c 100755..100644 --- a/view/cs/request_notify_eml.tpl +++ b/view/cs/request_notify_eml.tpl diff --git a/view/cs/strings.php b/view/cs/strings.php index 0c7d0d7bd..0c7d0d7bd 100755..100644 --- a/view/cs/strings.php +++ b/view/cs/strings.php diff --git a/view/cs/wall_received_eml.tpl b/view/cs/wall_received_eml.tpl index 9fb27ddd8..9fb27ddd8 100755..100644 --- a/view/cs/wall_received_eml.tpl +++ b/view/cs/wall_received_eml.tpl diff --git a/view/cs/wall_received_html_body_eml.tpl b/view/cs/wall_received_html_body_eml.tpl index 893eec20c..893eec20c 100755..100644 --- a/view/cs/wall_received_html_body_eml.tpl +++ b/view/cs/wall_received_html_body_eml.tpl diff --git a/view/cs/wall_received_text_body_eml.tpl b/view/cs/wall_received_text_body_eml.tpl index 088f7f9db..088f7f9db 100755..100644 --- a/view/cs/wall_received_text_body_eml.tpl +++ b/view/cs/wall_received_text_body_eml.tpl |