GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
16,178 Commits 8 Branches 4 Tags 309 MiB
Commit Graph

359 Commits

Author SHA1 Message Date
Mikael Nordfeldth f79aec36fe Merge remote-tracking branch 'statusnet/master' 
This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.

Conflicts:
	doc-src/about
	doc-src/faq
	plugins/OpenID/doc-src/openid
 2013-08-12 12:23:17 +02:00
Siebrand Mazeland 51b28eda19 Localisation updates from http://translatewiki.net. 2012-06-30 11:10:38 +00:00
Siebrand Mazeland f2d66082b4 Localisation updates from http://translatewiki.net. 2012-06-24 18:26:18 +00:00
Siebrand Mazeland 707076fca9 Localisation updates from http://translatewiki.net. 2012-06-17 23:26:20 +00:00
Siebrand Mazeland c658ede37c Localisation updates from http://translatewiki.net. 2012-06-10 23:42:52 +00:00
Siebrand Mazeland bc733a200f Localisation updates from http://translatewiki.net. 2012-06-04 15:02:34 +00:00
Siebrand Mazeland f059977c57 Localisation updates from http://translatewiki.net. 2012-05-26 21:15:30 +00:00
Siebrand Mazeland cd77348852 Localisation updates from http://translatewiki.net. 2012-05-20 11:10:38 +00:00
Siebrand Mazeland 2e4e2f693d Localisation updates from http://translatewiki.net. 2012-05-12 18:47:41 +00:00
Siebrand Mazeland 6f557d3654 Localisation updates from http://translatewiki.net. 2012-05-06 17:08:47 +00:00
Siebrand Mazeland eafe507068 Localisation updates from http://translatewiki.net. 2012-05-03 22:13:22 +00:00
Siebrand Mazeland c7013ceb1a Localisation updates from http://translatewiki.net. 2012-04-29 23:12:10 +00:00
Siebrand Mazeland 3898500ff9 Localisation updates from http://translatewiki.net. 2012-04-21 10:21:38 +00:00
Siebrand Mazeland b2c5b9de52 Localisation updates from http://translatewiki.net. 2012-04-15 12:11:05 +00:00
Siebrand Mazeland 71a9644b35 Localisation updates from http://translatewiki.net. 2012-04-09 01:38:31 +02:00
Siebrand Mazeland c385eff75e Localisation updates from http://translatewiki.net. 2012-03-11 22:11:12 +01:00
Evan Prodromou a4bf33d6b5 mismatched \n 2012-03-08 06:15:27 -06:00
Evan Prodromou dd862de6fb mismatched \n in locale/es 2012-03-08 06:14:03 -06:00
Siebrand Mazeland f34a196e83 Localisation updates from http://translatewiki.net. 2012-03-01 17:22:45 +01:00
Siebrand Mazeland cebb565f18 Localisation updates from http://translatewiki.net. 2012-01-20 20:07:45 +01:00
Siebrand Mazeland 31305cb743 Localisation updates from http://translatewiki.net. 2011-12-28 14:00:49 +01:00
Siebrand Mazeland 7f257ddb95 Localisation updates from http://translatewiki.net. 2011-12-19 02:02:49 +01:00
Siebrand Mazeland 03657a90e1 Localisation updates from http://translatewiki.net. 2011-12-03 13:09:10 +01:00
Siebrand Mazeland b4ecb24907 Localisation updates from http://translatewiki.net. 2011-11-12 23:35:01 +01:00
Evan Prodromou 0b69efe6f8 mismatched \n in ja translation file 2011-11-07 12:39:42 -05:00
Siebrand Mazeland 151ff6beb7 Localisation updates from http://translatewiki.net. 2011-10-29 14:30:42 +02:00
Evan Prodromou 5b2a85303a add a \n for japanese email 2011-10-12 16:15:55 -04:00
Siebrand Mazeland 6120af3901 Localisation updates from http://translatewiki.net. 2011-10-10 15:58:00 +02:00
Evan Prodromou e1ac3ad868 missing \n in ja translation 2011-09-26 15:04:49 -04:00
Siebrand Mazeland e7dac240ef Localisation updates from http://translatewiki.net. 2011-09-26 00:01:00 +02:00
Siebrand Mazeland 83dc51ee79 Localisation updates from http://translatewiki.net. 2011-09-11 16:54:08 +02:00
Siebrand Mazeland 7cfbe7c2d4 Localisation updates from http://translatewiki.net. 2011-08-30 11:50:01 +02:00
Siebrand Mazeland ed13c9a098 Localisation updates from http://translatewiki.net. 2011-08-20 21:30:04 +02:00
Siebrand Mazeland 31556e3c00 Localisation updates from http://translatewiki.net. 2011-08-15 16:32:26 +02:00
Siebrand Mazeland 7fcdc1a9ed Localisation updates from http://translatewiki.net. 2011-07-21 14:49:16 +02:00
Siebrand Mazeland eb90389a22 Localisation updates from http://translatewiki.net. 2011-07-01 13:02:21 +02:00
Siebrand Mazeland 42b28547d5 Localisation updates from http://translatewiki.net. 2011-06-19 13:20:34 +02:00
Siebrand Mazeland 89aebb4ef0 Localisation updates from http://translatewiki.net. 2011-06-18 18:14:28 +02:00
Evan Prodromou a10edb3183 Merge branch 'testing' into 1.0.x 
Conflicts:
	plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
	plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
 2011-06-07 16:04:49 -04:00
Siebrand Mazeland c3f081c583 Localisation updates from http://translatewiki.net. 2011-06-05 21:15:31 +02:00
Siebrand Mazeland 7c5fb37e59 Localisation updates from http://translatewiki.net. 2011-06-05 11:50:05 +02:00
Ian Denhardt 31b29fde50 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 
Conflicts:
	plugins/OStatus/actions/ostatusinit.php
 2011-05-23 21:50:48 -04:00
Evan Prodromou 9c4c2c710f remove stray newlines that were causing problems with the build 2011-05-20 06:08:42 -07:00
Siebrand Mazeland d4aef7a007 Localisation updates from http://translatewiki.net. 2011-05-05 23:24:49 +02:00
Evan Prodromou 480fdea5ca error in uk translation file 2011-04-29 11:08:31 -07:00
Evan Prodromou 5df38bba17 fix fatal error in eo translation file 2011-04-29 11:07:30 -07:00
Evan Prodromou 5702b646fb fixup bug in sv translation 2011-04-29 11:02:03 -07:00
Evan Prodromou 142b2ca5f4 fixup bug in tl translation 2011-04-29 11:01:02 -07:00
Evan Prodromou e1b7db655c fixup bug in sv translation 2011-04-29 11:00:24 -07:00
Evan Prodromou 3399be00e9 fixup bug in nl translation 2011-04-29 10:58:55 -07:00