Commit graph

969 commits

Author SHA1 Message Date
root
80a7e68528 Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-24 07:44:08 +01:00
4198efe035 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-24 07:33:56 +01:00
Friendika
205a2b8930 owner's sparkle link, sometimes not author's - on display page 2011-01-23 21:26:09 -08:00
Friendika
5be98e3ec8 following random feeds 2011-01-23 20:09:34 -08:00
Friendika
00d2b58358 fix a few issues with code blocks, ignore tags within blocks, fold multi-line blocks to one, also turn html br into two LFs. 2011-01-23 16:29:30 -08:00
Friendika
1460fc0d71 add cc-license text to all content pages 2011-01-23 14:56:14 -08:00
Friendika
1100d7b958 sync template updates en => fr 2011-01-23 14:35:22 -08:00
Friendika
f649692c25 Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master 2011-01-23 14:19:42 -08:00
Friendika
950e5f6693 given a tag @foo, don't also link/replace words like food in msg body 2011-01-23 13:49:21 -08:00
2319bc43bf Merge branch 'master' of git://github.com/friendika/friendika 2011-01-23 21:33:08 +01:00
olivierm
320059a506 Done timezones + marital statuses and a few time-related translations 2011-01-23 16:49:15 +01:00
Friendika
ab62b8f712 fix quotes (again) 2011-01-23 03:25:03 -08:00
Friendika
461625e378 new network types 2011-01-23 02:45:37 -08:00
root
71294faf2c Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-23 08:46:57 +01:00
43dc0b4280 updated profile_advanced.php from changes in view/en 2011-01-23 08:45:30 +01:00
60c5e76b2d Merge branch 'master' of git://github.com/friendika/friendika 2011-01-23 08:43:30 +01:00
Friendika
6c0218563f linkify naked urls when they are at the beginning of the text 2011-01-22 05:19:53 -08:00
Friendika
f278d17910 wrong verb in dislike activity body 2011-01-22 03:59:13 -08:00
Friendika
844b177791 birthday timezone is absolute 2011-01-22 03:21:15 -08:00
Friendika
a80ab19483 typo 2011-01-22 02:51:31 -08:00
root
0dc7e0975a Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-22 09:22:16 +01:00
96620520a8 wording in email template adjusted 2011-01-22 09:20:52 +01:00
c000510c27 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-22 09:18:05 +01:00
olivierm
70db9369b4 A little more... 2011-01-21 21:41:15 +01:00
Friendika
c0a0710f97 incorrect item owner on like/dislike activity body when remote-auth profile 2011-01-21 12:20:05 -08:00
olivierm
555a4e2fd8 More translation, added FIXME where not completely satisfying. 2011-01-21 18:39:51 +01:00
olivierm
0bb7777bfe Translated more french 2011-01-21 18:24:14 +01:00
root
f54f8ca63a Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 14:56:09 +01:00
3f847d5b0f variable name spelling mistake in template corrected 2011-01-21 14:55:03 +01:00
root
e8897d4079 Merge branch 'master' of git://github.com/friendika/friendika 2011-01-21 14:38:29 +01:00
9a30055aae Merge branch 'master' of git://github.com/friendika/friendika 2011-01-21 14:38:03 +01:00
Friendika
d347026094 don't urlencode $_GET vars 2011-01-21 05:21:13 -08:00
root
130cc252a7 Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 13:19:24 +01:00
61f0a0d903 more strings 2011-01-21 13:18:51 +01:00
258c79ccd9 spelling ;-) 2011-01-21 13:01:19 +01:00
root
8d1fb88498 Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 13:00:23 +01:00
ac845a1d95 minor wordening 2011-01-21 12:59:51 +01:00
991185404c minor wording correction 2011-01-21 12:54:07 +01:00
root
ecc7fff4e2 Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 12:47:31 +01:00
734476c5e2 minor correction to profile_edit.tpl more strings 2011-01-21 12:46:33 +01:00
b23c941991 made this notification header consisten with the other 2011-01-21 12:34:25 +01:00
root
fdddf93ccc Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 12:20:22 +01:00
a2723f8206 minor thing with the strings 2011-01-21 12:19:57 +01:00
root
251727021b Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 12:16:35 +01:00
6a87fe4a0f german translation of registrations-top.tpl 2011-01-21 12:15:43 +01:00
root
a180b29c7d Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 12:06:01 +01:00
55fb33d85d some more strings 2011-01-21 12:05:26 +01:00
root
e0d6d68f60 Merge branch 'master' of git://github.com/tobiasd/friendika 2011-01-21 11:56:47 +01:00
c61defb2b0 german translation of install_db.tpl 2011-01-21 11:54:04 +01:00
ffdcbd798f german translation of jot.tpl 2011-01-21 11:48:42 +01:00