Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master ...

Conflicts:
	apps/files/index.php
	apps/files/templates/index.php

2013-10-04 12:30:49 +02:00

..

ajax

fix array_diff call

2013-10-04 12:23:40 +02:00

avatar

Base defaultavatar text on displayname

2013-09-28 16:46:53 +02:00

command

Add copyright, remove starting blank line

2013-09-19 19:12:16 +02:00

css

Merge branch 'master' into sharing_mail_notification_master

2013-10-04 12:30:49 +02:00

doc

fix difference between packaged version and master

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

img

increase height of controls bar and elements to more clickable 44px

2013-10-04 08:41:16 +03:00

js

Merge branch 'master' into sharing_mail_notification_master

2013-10-04 12:30:49 +02:00

l10n

[tx-robot] updated from transifex

2013-09-30 10:19:22 -04:00

lostpassword

Merge branch 'master' into rename-lostpassword-controller

2013-09-04 20:46:32 +02:00

skeleton

add a real examplefile instead of an .gitignore which is a bit stupid here

2013-10-04 10:21:33 +02:00

templates

Merge branch 'master' into sharing_mail_notification_master

2013-10-02 10:11:18 +02:00

minimizer.php

Clean up \OC\Util

2013-08-15 15:57:32 +02:00

register_command.php

Use appinfo/register_command.php to add commands to the console command

2013-09-13 18:10:04 +02:00

routes.php

Merge branch 'master' into oc_avatars

2013-09-12 07:41:44 +02:00

setup.php

Fix some naming and spacing in lib/util.php

2013-08-18 10:33:09 +02:00

strings.php

remove superfluous ?> at the end of .php files (left out apps/*/templates)

2012-07-09 16:51:16 +02:00