Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 ...

Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php

2012-06-13 15:17:46 -04:00

..

ajax

Fix newline in code

2012-06-04 22:24:17 +02:00

css

applied patch provided by bug #966 to fix broken user specific quota settings

2012-06-12 11:18:34 +02:00

img

removing executable bit from various files

2012-04-30 12:05:57 +02:00

js

applied patch provided by bug #966 to fix broken user specific quota settings

2012-06-12 11:18:34 +02:00

l10n

update translations

2012-06-06 00:29:28 +02:00

templates

Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127

2012-06-13 15:17:46 -04:00

admin.php

Fixes a issue with the log

2012-06-11 19:33:16 +02:00

apps.php

Make some apps compatible

2012-06-11 19:07:51 +02:00

help.php

Revert

2012-06-11 13:27:32 +02:00

languageCodes.php

add more language names

2012-01-28 15:13:37 +01:00

log.php

Add support for logging to syslog

2012-03-30 23:41:53 +02:00

personal.php

Revert

2012-06-11 13:27:32 +02:00

settings.php

Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.

2011-10-02 15:51:24 +02:00

trans.png

improve the app installer.

2012-04-21 15:30:58 +02:00

users.php

Revert

2012-06-11 13:27:32 +02:00