streams/view
friendica 6679734135 Merge branch 'master' into tres
Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css
2015-04-23 19:49:41 -07:00
..
ca remove unused email template files 2014-10-10 11:42:46 +02:00
cs raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
css Merge branch 'master' into tres 2015-04-23 19:49:41 -07:00
de update to German strings 2015-02-27 11:02:07 +01:00
en automated warning after a few days if poller is dead 2015-03-02 18:02:06 -08:00
en-au remove unused email template files 2014-10-10 11:42:46 +02:00
en-gb remove unused email template files 2014-10-10 11:42:46 +02:00
eo raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
es raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
fr raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
img get sliders working again 2013-01-06 15:11:31 -08:00
it Added string for item ID in view source 2015-04-15 12:59:22 +02:00
js bring lockview to menu items, slightly change the way /lockview is called 2015-04-21 22:45:54 +02:00
nb-no Updated Norwegian bokmål translation 2015-03-26 20:36:28 +01:00
nl Update/fix Dutch and removing an ugly space 2015-04-02 02:23:26 +02:00
pdl webpages appearence 2015-04-13 23:38:36 +02:00
php Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it there). Comment out some most probably deprecated js includes. Some css cleanup. 2015-03-27 11:52:59 +01:00
pt-br raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
ru raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
sv raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
theme/redbasic webpages blocks fixes 2015-04-23 21:04:01 +02:00
tpl webpages blocks fixes 2015-04-23 21:04:01 +02:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00