Commit graph

1542 commits

Author SHA1 Message Date
Tobias Diekershoff 767b4f30f7 Merge branch 'master' of git://github.com/friendika/friendika 2011-03-22 06:50:47 +01:00
Friendika ee11a74d0b profile match 2011-03-21 21:43:22 -07:00
Friendika c74367e4c2 pagination in keyword match 2011-03-21 21:26:11 -07:00
Friendika ee1dff9980 converted json to symbolic references 2011-03-21 19:44:00 -07:00
Friendika e16bca4f76 first prototype of profile match against global directory (hint: set some keywords) 2011-03-21 19:33:06 -07:00
Friendika f73e40c188 several install issues sorted out 2011-03-21 17:34:29 -07:00
Friendika d71db3e064 typo 2011-03-21 15:12:40 -07:00
Friendika 64e92f34d9 Merge branch 'omigeot-master' 2011-03-21 15:09:13 -07:00
Friendika c3ccd19274 revup 2011-03-21 15:08:04 -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 82bd1ce3cb installation issues 2011-03-21 03:33:58 -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 2b0af1456c editor consistency on profile edit page 2011-03-20 15:51:09 -07:00
Friendika 0609037b9e Merge branch 'fabrixxm-master' 2011-03-20 00:49:41 -07:00
fabrixxm c1144912e2 small fix 2011-03-20 08:38:42 +01:00
Friendika 6a56ac2add language file security 2011-03-19 15:12:04 -07:00
Friendika be67cf663b minor edits 2011-03-19 05:10:05 -07:00
Tobias Diekershoff 8fbde780b3 Merge branch 'master' of git://github.com/friendika/friendika 2011-03-19 09:58:07 +01:00
Friendika 7e33c1072a stuff to make connecting to diaspora profiles easier 2011-03-19 01:19:11 -07:00
Friendika 5034d7333e Merge branch 'fabrixxm-master' 2011-03-18 13:21:23 -07:00
Friendika 31eedce236 revup 2011-03-18 13:20:11 -07:00
Tobias Diekershoff 878bdeccfd Merge branch 'master' of git://github.com/friendika/friendika 2011-03-18 18:07:37 +01:00
Fabio Comuni 894e88d792 Updated IT language 2011-03-18 14:35:41 +01:00
Fabio Comuni 54e16d753d Fix to po2php with '$' in strings 2011-03-18 14:35:23 +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 40956faf6d swedish string update via erikl 2011-03-17 14:54:15 -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