friendica/view
Michael Vogel de75d8ca7f Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
2014-08-13 00:18:05 +02:00
..
bg BG: update for the strings 2013-07-12 09:37:51 +02:00
ca CA: update to the strings 2013-06-27 07:29:18 +02:00
cs small update to the CS and DE strings 2014-05-17 14:49:05 +02:00
de Fixed two typos in strings.php and BBCode.md 2014-06-17 14:20:23 +02:00
en The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users. 2014-05-04 21:11:25 +02:00
eo merge 2013-03-02 15:46:54 -08:00
es ES: update to the strings 2014-04-06 08:01:23 +02:00
fr FR + CS: register_adminadd template from transifex 2014-05-17 08:50:39 +02:00
is IS: update to the update_fail_eml template 2014-01-16 10:55:31 +01:00
it update IT 2014-05-29 14:55:15 +02:00
nb-no NB NO: update to the strings 2014-05-29 07:03:42 +02:00
nl NL: update to the strings 2014-06-10 21:38:27 +02:00
pl PL: update to the strings 2013-12-21 16:32:06 +01:00
pt-br PT BR: update to the strings 2014-05-19 08:09:49 +02:00
ro RO: added smarty3 template translations 2014-05-29 07:12:10 +02:00
ru RU: update to the strings 2014-04-06 07:58:32 +02:00
smarty3 move register_adminadd_eml.tpl to view/en/ 2013-08-08 11:35:12 -04:00
sv newline at end of header 2013-01-11 10:00:10 -07:00
templates Merge remote-tracking branch 'upstream/master' 2014-08-13 00:18:05 +02:00
theme Merge pull request #1055 from annando/master 2014-07-24 08:40:29 +02:00
zh-cn ZH-CN: update to the strings 2014-04-30 17:02:06 +02:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
custom_tinymce.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
default.php Adding metadata in the schema.org format. 2014-01-26 09:58:41 +01:00
global.css The page info function can now be called with a picture link, support for big and preview images for attachments in global.css 2014-06-15 01:59:19 +02:00
minimal.php New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout. 2013-12-04 23:46:51 +01:00