Thomas Willingham a0dfd44f91 Merge remote-tracking branch 'upstream/master'		2013-08-14 20:44:17 +01:00
..
ca	global rename viewcontacts to viewconnections	2013-02-19 03:00:29 -08:00
cs	reset email templates to English	2013-06-16 16:49:46 -07:00
css	Add public visibility setting to privacy groups (collections). This doesn't yet make them visible, but allows them to be visible (like a Cc: instead of a Bcc:)	2013-08-07 17:51:10 -07:00
de	reset email templates to English	2013-06-16 16:49:46 -07:00
en	Add a site access policy (to determine if this is really a public site or just an open site) and add an orphan flag to xchans in case all their hublocs go away. Get rid of a couple of DO NOT EDIT template messages which were still lurking in the tree.	2013-08-06 17:15:41 -07:00
eo	reset email templates to English	2013-06-16 16:49:46 -07:00
es	reset email templates to English	2013-06-16 16:49:46 -07:00
fr	reset email templates to English	2013-06-16 16:49:46 -07:00
img	get sliders working again	2013-01-06 15:11:31 -08:00
it	reset email templates to English	2013-06-16 16:49:46 -07:00
js	usability improvements on abook permissions settings - keep advanced dialogue open, make quick links clear relevant settings before setting each, and don't auto submit. This shows you exactly what happens with the quick settings and allows you to change/correct it if it isn't what you want.	2013-07-17 18:12:50 -07:00
nb-no	reset email templates to English	2013-06-16 16:49:46 -07:00
php	get rid of ugly article wrapper	2013-07-21 20:19:05 -07:00
pt-br	reset email templates to English	2013-06-16 16:49:46 -07:00
ru	ru strings updated	2013-08-14 05:03:18 -07:00
sv	reset email templates to English	2013-06-16 16:49:46 -07:00
theme/redbasic	debugging issue #58 - seems to work but needs (more) theming	2013-08-13 02:29:10 -07:00
tpl	Merge remote-tracking branch 'upstream/master'	2013-08-14 20:44:17 +01:00
.htaccess	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00