Commit graph

285 commits

Author SHA1 Message Date
Friendika
d124c67322 remove note about accounts being hidden in register email 2011-02-21 18:32:26 -08:00
Friendika
079e63bba9 Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests 2011-02-21 13:27:03 -08:00
Friendika
0bf8e418a8 Merge branch 'chriscase-master'
Conflicts:
	mod/dfrn_notify.php
2011-02-17 14:05:51 -08:00
Chris Case
9e654f7e57 removed localized multipart email templates, now the multipart settings are configured directly in the code 2011-02-17 13:41:56 -08:00
Fabio Comuni
f5557763d2 Updates to theme dupuntozero 2011-02-17 17:29:29 +01:00
Friendika
67bb737aa1 broken image + linkify site link in body 2011-02-16 17:49:52 -08:00
Friendika
9f1f9da89b Merge branch 'chriscase-master' 2011-02-16 14:41:12 -08:00
Chris Case
5aa6bbbbc5 fixed encoding, i had been experimenting with different ones and forgot to change it back, now UTF-8 2011-02-16 08:05:54 -08:00
Chris Case
e56895123a changed message sending to use base64 encoding 2011-02-16 05:17:40 -08:00
Friendika
9f02057374 provide permalink for posts, include permalinks in feeds and imported from feeds 2011-02-16 02:07:11 -08:00
Tobias Diekershoff
7a6174298b deleted the translated file of comment_item.tpl 2011-02-15 10:56:07 +01:00
Tobias Diekershoff
afdfc725b8 some translations into German 2011-02-15 09:49:38 +01:00
Friendika
0e7b09b41c bug #0000002, strip HTML from pasted text in prv messages 2011-02-14 21:33:17 -08:00
Chris Case
94e0c3c970 fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag 2011-02-14 04:54:44 -08:00
Chris Case
5eebb373e5 revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template. 2011-02-14 03:59:54 -08:00
Friendika
5e02519a13 disable network toggles when ACL's are entered 2011-02-11 04:32:38 -08:00
Friendika
c16e86add8 toggles "post to facebook, post to twitter", etc. 2011-02-11 02:35:19 -08:00
Friendika
e06cd399b7 close tag on favicon link missing 2011-02-07 23:28:41 -08:00
Friendika
147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme.
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
2011-02-06 15:50:50 -08:00
Tobias Diekershoff
09af200bcc german choose existing pic for the avatar 2011-02-06 08:51:10 +01:00
Tobias Diekershoff
dd3f21b98a Merge branch 'master' of git://github.com/friendika/friendika 2011-02-06 08:48:07 +01:00
Tobias Diekershoff
acd5f49d43 wording 2011-02-04 21:56:43 +01:00
Fabio Comuni
fb7959cfc0 Add a link to user photos in Upload Profile Photo page 2011-02-04 10:30:56 +01:00
Friendika
e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
Friendika
a4cbdc2414 remove self 2011-02-03 03:58:47 -08:00
Friendika
01c83f0e93 Merge branch 'tobiasd-master' 2011-02-02 23:55:16 -08:00
Tobias Diekershoff
5e73f9da86 double $ in de/strings.php corrected 2011-02-03 08:35:23 +01:00
Friendika
1558cd8085 Merge branch 'tobiasd-master' 2011-02-02 23:27:12 -08:00
Friendika
33b2490a91 Merge branch 'fabrixxm-master' 2011-02-02 23:24:04 -08:00
Tobias Diekershoff
73c2ccbc78 updates to the German strings.php file 2011-02-03 08:17:07 +01:00
Friendika
2a4d1fa858 append jotplugin tools to current toolbar row 2011-02-02 23:07:01 -08:00
fabrixxm
670dba6666 update jot-headers 2011-02-01 18:52:16 +01:00
Friendika
837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Friendika
3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors 2011-01-30 19:38:03 -08:00
Friendika
d2dddd995a set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. 2011-01-26 20:29:32 -08:00
Friendika
b4642ca650 search icons (?) 2011-01-26 14:25:36 -08:00
Tobias Diekershoff
529b036dbe some more strings translated into German 2011-01-25 12:44:14 +01:00
Tobias Diekershoff
43dc0b4280 updated profile_advanced.php from changes in view/en 2011-01-23 08:45:30 +01:00
Tobias Diekershoff
96620520a8 wording in email template adjusted 2011-01-22 09:20:52 +01:00
Tobias Diekershoff
3f847d5b0f variable name spelling mistake in template corrected 2011-01-21 14:55:03 +01:00
Tobias Diekershoff
61f0a0d903 more strings 2011-01-21 13:18:51 +01:00
Tobias Diekershoff
258c79ccd9 spelling ;-) 2011-01-21 13:01:19 +01:00
Tobias Diekershoff
ac845a1d95 minor wordening 2011-01-21 12:59:51 +01:00
Tobias Diekershoff
991185404c minor wording correction 2011-01-21 12:54:07 +01:00
Tobias Diekershoff
734476c5e2 minor correction to profile_edit.tpl more strings 2011-01-21 12:46:33 +01:00
Tobias Diekershoff
b23c941991 made this notification header consisten with the other 2011-01-21 12:34:25 +01:00
Tobias Diekershoff
a2723f8206 minor thing with the strings 2011-01-21 12:19:57 +01:00
Tobias Diekershoff
6a87fe4a0f german translation of registrations-top.tpl 2011-01-21 12:15:43 +01:00
Tobias Diekershoff
55fb33d85d some more strings 2011-01-21 12:05:26 +01:00
Tobias Diekershoff
c61defb2b0 german translation of install_db.tpl 2011-01-21 11:54:04 +01:00
Tobias Diekershoff
ffdcbd798f german translation of jot.tpl 2011-01-21 11:48:42 +01:00
Tobias Diekershoff
a3ef818d1d german translation of lostpass.tpl and lostpass_eml.tpl 2011-01-21 11:36:30 +01:00
Tobias Diekershoff
c199309e7d german translation of netfriend.tpl 2011-01-21 11:12:50 +01:00
Tobias Diekershoff
31ccd924f4 german translation of passchanged_eml.tpl pagetypes.tpl 2011-01-21 11:10:20 +01:00
Tobias Diekershoff
5863199b8d german translation of the profile* files 2011-01-21 10:58:32 +01:00
Tobias Diekershoff
57a1731678 german translation of pwdreset.tpl 2011-01-21 10:27:23 +01:00
Tobias Diekershoff
38ede4f3be german translation of register-link.tpl 2011-01-21 10:24:18 +01:00
Tobias Diekershoff
41bba5534e german translation of register_open_eml.tpl 2011-01-21 10:23:10 +01:00
Tobias Diekershoff
10be4f6d29 german translation of register_verify_eml.tpl 2011-01-21 10:14:29 +01:00
Tobias Diekershoff
d4496c5118 german translation of request_notify_eml.tpl 2011-01-21 10:03:51 +01:00
Tobias Diekershoff
5b0db3d228 german translation of wallwall_item.tpl 2011-01-21 09:59:13 +01:00
Tobias Diekershoff
ed37b1d166 german translation of settings_nick_set.tpl 2011-01-20 18:45:48 +01:00
Tobias Diekershoff
b4049f67ea german translation of settings_nick_subdir.tpl 2011-01-20 18:21:32 +01:00
Tobias Diekershoff
723aca6109 german translation of settings_nick_unset.tpl 2011-01-20 18:15:12 +01:00
Tobias Diekershoff
76ed216aaa german translation of wall_item_drop.tpl 2011-01-20 18:01:04 +01:00
Tobias Diekershoff
787496b7c2 german translation of settings.tpl 2011-01-20 16:43:59 +01:00
Tobias Diekershoff
07db945921 german translation of wall_received_eml.tpl 2011-01-20 15:43:51 +01:00
Tobias Diekershoff
b43ec25955 german translation mail_received_eml.tpl 2011-01-19 16:37:59 +01:00
Tobias Diekershoff
ea010de863 german translation of like.tpl 2011-01-19 16:33:42 +01:00
Tobias Diekershoff
ba9e85261b german translation of jot-header.tpl 2011-01-19 16:27:28 +01:00
Tobias Diekershoff
387e1aefbc german translations of insecure_net.tpl intro_complete_eml.tpl and
intros-top.tpl
2011-01-19 16:21:41 +01:00
Tobias Diekershoff
5702782caa german translation of friend_complete_eml.tpl 2011-01-19 15:45:55 +01:00
Tobias Diekershoff
fcf1f573e8 german translation of group_new.tpl 2011-01-19 15:33:23 +01:00
Tobias Diekershoff
990aafbfcf german translation of view/dev/group_edit.tpl 2011-01-19 15:32:19 +01:00
Tobias Diekershoff
8a17ce6da1 added 2011-01-19 15:31:50 +01:00
Tobias Diekershoff
468c182405 german translation view/de/follow_notify_eml.tpl 2011-01-18 13:44:46 +01:00
Tobias Diekershoff
6c42edf351 german translation view/de/directory_header.tpl 2011-01-18 12:47:03 +01:00
Tobias Diekershoff
11d95896f2 german translation of view/de/dfrn_req_confirm.tpl 2011-01-18 12:46:13 +01:00
Tobias Diekershoff
f7b0a4569d german translation of view/de/cropbody.tpl 2011-01-18 12:44:28 +01:00
Tobias Diekershoff
fe00d451a7 german translation of view/de/contact_edit.tpl 2011-01-18 11:40:27 +01:00
Tobias Diekershoff
80e77516c8 german translation of cmnt_received_eml.tpl 2011-01-18 11:24:52 +01:00
Tobias Diekershoff
0c77263a85 update to view/en placed into de 2011-01-18 11:18:23 +01:00
Tobias Diekershoff
b5c9f80919 some more German translation 2011-01-15 21:13:42 +01:00
Tobias Diekershoff
31d7973e7f some more German strings 2011-01-15 14:39:16 +01:00
Tobias Diekershoff
a118f83ee2 initial stuff for the german translation 2011-01-14 10:28:19 +01:00