Thomas Müller f950ce82ae Merge branch 'master' into mobile-style ...

Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php

2014-01-23 00:39:11 +01:00

..

ajax

check if user is logged in

2013-11-26 12:47:59 +01:00

changepassword

fixing syntax error - it it that hard to test own code?

2013-09-18 23:46:58 +02:00

css

added website field

2014-01-17 16:35:48 +01:00

img

remove unused log icon

2014-01-15 15:48:42 +01:00

js

added website field

2014-01-17 16:35:48 +01:00

l10n

remove ru_RU - it has bee removed from transifex

2014-01-13 16:41:10 +01:00

templates

added website field

2014-01-17 16:35:48 +01:00

admin.php

lower required php version to 5.3.3

2013-12-04 10:25:22 +01:00

apps.php

finally fix the app sorting

2013-10-14 10:54:38 +02:00

help.php

fix difference between packaged version and master

2013-08-17 10:33:11 +02:00

languageCodes.php

remove ru_RU - fixes #3135

2013-08-17 11:43:37 +02:00

personal.php

Indicate password strength using strengthify

2014-01-15 11:10:12 +01:00

routes.php

Improve changepassword route naming

2013-09-13 17:07:23 +02:00

settings.php

Enhanced auth is totally unmaintained and broken

2013-01-14 21:39:49 +01:00

users.php

Pass view in \OC_Avatar to constructor and use $_ for enable_avatars

2013-09-09 16:57:46 +02:00