Commit Graph

28 Commits

Author SHA1 Message Date
fabrixxm f6cebf607f remove unneeded htconfig templates 2014-09-20 12:14:59 +02:00
fabrixxm f6cfdf4af1 remove uneeded email templates 2014-09-20 12:10:24 +02:00
fabrixxm d2afb263ae Set internal PuSH server as default 2014-09-20 12:08:10 +02:00
fabrixxm 21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00
fabrixxm a8c90155f8 db update mail via notification()
remove last template
2014-09-07 14:23:03 +02:00
fabrixxm 5861bdd6e9 registration request as system notification
kill the template
send email to all admins
2014-09-07 13:55:02 +02:00
fabrixxm a5df9b8b5d Somebody stop me! (not really..) 2014-09-07 12:35:08 +02:00
fabrixxm 5997fb19ee More template gore! 2014-09-07 12:29:13 +02:00
fabrixxm 9a0c37eb47 new password mail via notification()
new include/text.php::deindent() function
remove unused templates
2014-09-07 11:20:06 +02:00
fabrixxm d85bdd8fb0 lost password verification mail via notification() 2014-09-07 10:27:39 +02:00
fabrixxm 0e628f840f send ostatus follow/share notifications via notification()
remove unused templates
2014-09-06 18:15:18 +02:00
fabrixxm 1bdddebd44 connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
Tobias Diekershoff 4aa2ae488b Merge pull request #1102 from tobiasd/newstrings20140906a
updating message.po and string.php
2014-09-06 12:20:42 +02:00
Tobias Diekershoff e982697e17 CA: update to the strings 2014-09-06 12:05:44 +02:00
hauke 191595766d removed old comment that is no longer true 2014-09-06 00:14:25 +02:00
Tobias Diekershoff bb59c9c32a CA: update to the strings 2013-06-27 07:29:18 +02:00
Tobias Diekershoff 4d105f06e8 CA: update to the strings 2013-05-16 06:42:13 +02:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08:00
Tobias Diekershoff 3eeee2525c CA: update to the strings 2013-02-11 06:21:10 +01:00
Zach Prezkuta c43ff35fe7 newline at end of header 2013-01-11 10:00:10 -07:00
Zach Prezkuta 1656c63a55 add warning message about automatically generated templates 2013-01-11 09:57:11 -07:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Fabrixxm 7093c1b9f6 update all languages strings.php 2012-11-13 10:13:28 -05:00
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
Tobias Diekershoff 1880ad40d9 CA: update to the strings 2012-09-27 06:30:37 +02:00
Simon L'nu 311f39f12f fix silly abandonded typo. shouldn't affect translations
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:10:34 -04:00
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 af9f7da449 catalan translation 2012-03-08 16:29:22 -08:00