Commit Graph

1414 Commits

Author SHA1 Message Date
Tobias Diekershoff 878bdeccfd Merge branch 'master' of git://github.com/friendika/friendika 2011-03-18 18:07:37 +01:00
Friendika 9838245c6c Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext 2011-03-18 05:07:42 -07:00
Friendika 43234a6678 rework post editing a bit 2011-03-18 05:06:16 -07:00
Fabio Comuni e307846c2d Updated utils/README 2011-03-18 12:36:34 +01:00
Fabio Comuni 7e4f22a0b6 Fix to po2php on multiline msgstr 2011-03-18 11:25:22 +01:00
Fabio Comuni 8ef6077d4d Update IT strings 2011-03-18 11:04:12 +01:00
Fabio Comuni fd4256a13f php2po script 2011-03-18 11:03:15 +01:00
Fabio Comuni 9bc85162a4 Update po2php script 2011-03-18 11:02:59 +01:00
Fabio Comuni 7df8e18dd1 Update more strings 2011-03-18 11:02:42 +01:00
Friendika ce754bc0e2 edit to display page 2011-03-18 01:24:34 -07:00
Friendika 9f5201dcaa edit posting after submission 2011-03-18 00:30:34 -07:00
Friendika ea03d9fa86 more thorough cleanup on account/contact removal 2011-03-17 21:15:27 -07:00
Friendika 6380d22229 better colour matching on toolbar, replace "share" with "recycle" 2011-03-17 17:31:39 -07:00
Friendika 5d9550e08f incorrect slinky param 2011-03-17 15:31:46 -07:00
Friendika a5d5ae5efa updated swedish templates 2011-03-17 15:26:45 -07:00
Friendika 0bce69fe9c swedush string update via erikl 2011-03-17 14:55:25 -07:00
Friendika 6b37e6d48d Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
Conflicts:
	view/sv/contact_edit.tpl
	view/sv/strings.php
2011-03-17 14:44:06 -07:00
Friendika 90178f86cb revup 2011-03-17 14:41:36 -07:00
Friendika 3d323fd260 condense birthday display 2011-03-17 00:32:24 -07:00
Tobias Diekershoff f4f5095e19 Merge branch 'master' of git://github.com/friendika/friendika 2011-03-17 07:08:48 +01:00
Friendika b3050d3bc8 no birthdays for nonexistent contacts 2011-03-16 22:27:34 -07:00
Friendika 47f0abf27e no sharing icon for private msgs 2011-03-16 22:04:00 -07:00
Friendika 9d9176f87e no sharing from thread display page 2011-03-16 21:49:28 -07:00
Friendika 334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika 9e1ca52e45 small position adjustment 2011-03-16 20:14:19 -07:00
Friendika 8fd989c568 protect tags from double expansion during RT 2011-03-16 19:57:13 -07:00
Friendika 3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Tobias Diekershoff 0c16d033ef Merge github.com:tobiasd/friendika 2011-03-16 07:30:08 +01:00
Tobias Diekershoff c43f647049 Merge branch 'master' of git://github.com/friendika/friendika 2011-03-16 06:52:33 +01:00
Friendika e2ea341094 facebook parses out punctuation on the left of links but not on right 2011-03-15 17:47:49 -07:00
Friendika f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika 73d3758e45 revup 2011-03-15 15:10:03 -07:00
Friendika 4cc20f1288 fix youtube videos that use https:// urls 2011-03-15 00:56:25 -07:00
Friendika 67b0b4600b Merge branch 'ffind' 2011-03-14 20:21:09 -07:00
Friendika 53dcede278 pub_keywords -> meta keywords 2011-03-14 20:19:45 -07:00
Friendika 852ea1aedd force last-child on foster children, disallow time travel 2011-03-14 18:34:58 -07:00
Friendika bae15f9aae revup 2011-03-14 16:18:32 -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 f2734681e5 friend finder support functions 2011-03-13 22:07:56 -07:00
Friendika 79a6b70a26 friend finder data structures 2011-03-13 21:53:39 -07:00
Friendika 0d161c6ef6 Merge branch 'omigeot-master' 2011-03-13 19:13:40 -07:00
Friendika aebf9bb4d6 non-code change 2011-03-13 19:12:46 -07:00
Friendika 0cf647bf6f don't let somebody install with a bogus db hostname as this seems to lead to spectacular failure modes 2011-03-13 16:47:41 -07:00
fabrixxm d6b4940ddd extract.php extract tt(). Updated strings.php 2011-03-13 13:51:59 +01:00
fabrixxm a7af6df962 Fix spaces around t() and tt() 2011-03-13 13:50:44 +01:00
Tobias Diekershoff a89bba724b resolved some local git quirks 2011-03-13 11:39:09 +01:00
Tobias Diekershoff a2ee5ebe42 Merge branch 'master' of git://github.com/friendika/friendika
Conflicts:
	addon/twitter/twitter.php
2011-03-13 11:37:24 +01:00
Friendika a912a0d3ca Swedish translation 2011-03-12 03:15:38 -08:00
Friendika ee210718cc photo album prev/next links 2011-03-11 20:06:13 -08:00
Friendika 5e2f0ff055 roll back "real people preferred" message - ineffectual 2011-03-11 14:48:58 -08:00