streams/view
friendica c57b6745e8 Merge https://github.com/friendica/red into zpull
Conflicts:
	view/theme/redbasic/css/style.css
2013-12-11 15:32:25 -08: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 Merge https://github.com/friendica/red into zpull 2013-12-11 15:32:25 -08:00
de DE: update to the strings 2013-12-06 09:08:10 +01:00
en INSTALL for dummies - step 1: ensure that we throw an ugly error message in their face 2013-11-05 19:45:02 -08: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 italian translation 2013-12-11 09:18:56 +01:00
js typo in mod_poke.js 2013-12-07 22:46:52 -08:00
nb-no reset email templates to English 2013-06-16 16:49:46 -07:00
pdl comanchify all the simple cases - those that only load a profile. Rework permission checks for the profile sidebar so that it is all done internally. Remove crepair which we aren't using. 2013-12-11 14:54:36 -08:00
php split out widgets.css 2013-12-11 21:28:42 +01:00
pt-br reset email templates to English 2013-06-16 16:49:46 -07:00
ru update ru strings 2013-09-22 21:18:15 -07:00
sv reset email templates to English 2013-06-16 16:49:46 -07:00
theme/redbasic Merge https://github.com/friendica/red into zpull 2013-12-11 15:32:25 -08:00
tpl this is not needed anymore 2013-12-11 23:52:34 +01:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00