1
1
Fork 0
Commit graph

107 commits

Author SHA1 Message Date
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
Abinoam P. Marques Jr
d89a0449d0 htconfig.tpl - Friendika -> Friendica 2012-02-20 19:47:44 -03:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
01cae9a50a remove all plugins from default config 2011-12-12 16:28:33 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica
deb182b92e string update es,fr 2011-11-22 16:13:23 -08:00
Olivier Migeot
c0cda02963 Updated french locale. 2011-10-04 12:06:01 +02:00
Olivier Migeot
273594af62 Merge remote branch 'upstream/master' 2011-10-04 11:45:57 +02:00
Friendika
c63adcfae0 bug #159 multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Olivier Migeot
1548449586 Small fix 2011-08-24 18:04:16 +02:00
Olivier Migeot
1f5a67c81f French translation up to date. 2011-08-24 17:47:21 +02:00
Friendika
2d2b500639 input the admin email address during install/setup. 2011-07-07 19:12:35 -07:00
Chris Case
4cff911939 merged multipart email changes 2011-05-21 21:40:16 -07:00
Chris Case
11dd0c8571 html email updates 2011-05-21 19:23:56 -07:00
Friendika
59fd70e568 issues with private photos - hitting internal size limits 2011-05-04 02:20:44 -07:00
Olivier Migeot
0c9c4c1714 Fixed plurals def 2011-04-13 14:49:44 +02:00
Olivier Migeot
aa358b707c More french. 2011-04-13 10:04:34 +02:00
Olivier Migeot
cd491fc9a3 French translation updated to reflect the last templates conversion. 2011-04-12 13:55:48 +02:00
Olivier Migeot
85f709320b Merge remote branch 'mike/master' 2011-04-12 13:55:43 +02:00
Friendika
e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika
338ba48554 more templates 2011-04-07 18:00:35 -07:00
Olivier Migeot
294577a48b Quick fix. 2011-04-07 15:13:31 +02:00
Friendika
4043ede080 more templates 2011-04-06 23:03:54 -07:00
Friendika
c32ed16303 more templates converted to string files 2011-04-06 22:42:08 -07:00
Friendika
6728a11ee3 support feed attachments/enclosures, and fix for bug #30 2011-04-06 19:42:35 -07:00
Olivier Migeot
ddf13d8c97 Some corrections to PO workflow, and integrated latest templates "stringization" for french. 2011-03-30 16:46:22 +02:00
Friendika
8357c064ae remove obsolete template 2011-03-29 19:23:02 -07:00
Friendika
f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00
Friendika
e1fd2ecb16 another template 2011-03-29 15:27:14 -07:00
Olivier Migeot
3b709a074a French translation considered done, yet not fully tested. 2011-03-28 19:59:16 +02:00
Olivier Migeot
581349de59 Some more templates for french translation 2011-03-28 14:31:57 +02:00
Olivier Migeot
10d44f2bb9 More french templates (except emails, everything should be ok now) 2011-03-28 13:59:05 +02:00
Olivier Migeot
c8fb1008f5 Some more templates translated to french. 2011-03-28 13:50:56 +02:00
Olivier Migeot
da546588db Merge remote branch 'mike/master' 2011-03-28 12:11:10 +02:00
Friendika
c4b292a4f1 account/profile/contacts export 2011-03-22 03:07:46 -07:00
Olivier Migeot
19d7e7fefe Defined plurals (as explained by Fabio) 2011-03-22 10:28:22 +01:00
Friendika
64e92f34d9 Merge branch 'omigeot-master' 2011-03-21 15:09:13 -07:00
Olivier Migeot
b8b77adad5 More templates frenchized 2011-03-21 14:02:01 +01:00
Olivier Migeot
0926532323 Started to convert french translation to the new format. 2011-03-21 13:45:41 +01:00
Friendika
94cbf3bb80 another template down 2011-03-21 04:10:08 -07:00
Friendika
798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika
5f9f03daf7 simplify insecure network warning 2011-03-20 19:29:01 -07:00
Friendika
b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
Friendika
334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika
3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika
f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika
7b92b42603 keywords split into public and private. Public will be used by the friend finder. 2011-03-14 00:28:49 -07:00
Friendika
0d161c6ef6 Merge branch 'omigeot-master' 2011-03-13 19:13:40 -07:00
Friendika
0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
olivierm
25c674b73a Merge remote branch 'mike/master' 2011-03-08 14:39:26 +01:00