Commit graph

123 commits

Author SHA1 Message Date
Friendika
c26463b65b Merge branch 'omigeot-master'
Conflicts:
	view/fr/strings.php
2011-02-05 13:01:28 -08:00
olivierm
4e913d59ea Fixed some typo (prevented Friendika to load with french locale) 2011-02-05 15:19:28 +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
33b2490a91 Merge branch 'fabrixxm-master' 2011-02-02 23:24:04 -08: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
58309829a1 Merge branch 'omigeot-master' 2011-01-27 13:10:43 -08:00
olivierm
bfe6380d90 More translation 2011-01-27 16:50:39 +01:00
olivierm
8c6319394c Done head.tpl 2011-01-27 16:48:54 +01:00
olivierm
e93385a355 French translation : Done strings.php, started template files. 2011-01-27 16:44:55 +01: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
Fabio Comuni
4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Friendika
1100d7b958 sync template updates en => fr 2011-01-23 14:35:22 -08:00
olivierm
320059a506 Done timezones + marital statuses and a few time-related translations 2011-01-23 16:49:15 +01:00
olivierm
70db9369b4 A little more... 2011-01-21 21:41:15 +01: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
olivierm
6035f22caf More strings translated for french locale. 2011-01-21 11:08:12 +01:00
olivierm
e1c0b5c7c5 Started the french translation (up to the "TODO" comment in view/fr/strings.php) 2011-01-21 10:39:15 +01:00