Commit Graph

68 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
friendica 1e2e6f5ba9 more wordsmithing of the Friendica invitation email 2012-03-25 20:52:34 -07:00
friendica 6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07: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
Friendika 1fa2231c20 invite system 2011-07-17 21:12:31 -07:00
Friendika 43110db749 begin invites, fb setup changes 2011-07-17 16:08:47 -07:00
Friendika 040fc247a0 bug #85 2011-05-23 20:30:37 -07:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Friendika de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
fabrixxm a7af6df962 Fix spaces around t() and tt() 2011-03-13 13:50:44 +01:00
fabrixxm 9f7878057f update source strings 2011-03-11 00:22:21 +01:00
Friendika 163e614a3b don't translate CR-LF 2011-01-24 03:08:20 -08:00
Friendika d5355da368 never enough comments 2010-12-10 04:04:35 -08:00
Friendika 0851669b39 clean up some regex's for i18n, and eliminate old ereg patterns. 2010-11-14 00:32:31 -08:00
Mike Macgirvin d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00
Mike Macgirvin 7feed93a56 added invitation module 2010-07-28 16:28:39 -07:00