Thomas Mueller c8564c0795 Merge branch 'master' into move-maint-start ...

Conflicts:
	lib/util.php

2013-06-14 10:06:13 +02:00

..

ajax

Add undefined verision variables

2013-05-17 11:15:53 -04:00

css

Merge pull request #3679 from owncloud/multiselect-fixes

2013-06-12 09:52:15 -07:00

doc

rename to doc

2012-12-14 14:39:05 +01:00

img

Add shellscript for optimization.

2013-04-13 10:40:46 +02:00

js

multiselect: fixed 'add group' interface a bit

2013-06-11 18:21:13 +02:00

l10n

[tx-robot] updated from transifex

2013-06-14 02:52:34 +02:00

lostpassword

print a warning if a user wants to reset his password and encryption is enabled

2013-06-05 18:38:39 +02:00

templates

improved footer

2013-06-13 16:10:33 +02:00

minimizer.php

adding space between) and {

2012-09-07 15:22:01 +02:00

routes.php

implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout

2013-02-26 19:34:46 +01:00

setup.php

Suppress the notice from the nullbyte check

2013-04-09 21:11:44 +02:00

strings.php

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

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