Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ...

Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php

2012-08-19 22:29:01 -04:00

..

ajax

Added CSRF checks to files_versions. Expect some error messages - and report them ;)

2012-07-17 11:57:38 +02:00

appinfo

Merge branch 'master' into share_api

2012-07-25 17:08:18 -04:00

css

added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts

2012-04-27 13:19:16 +01:00

js

Make file actions permissions aware

2012-07-25 16:33:08 -04:00

l10n

[tx-robot] updated from transifex

2012-08-20 02:01:32 +02:00

lib

fix ununsed variables

2012-07-21 00:20:27 +02:00

templates

Change image links to use imagePath function

2012-08-12 22:30:13 +02:00

history.php

This is unnessecary because we already run htmlentities() over the template engine

2012-08-11 20:53:56 +02:00

settings-personal.php

added new user settings interface for deleting old file versions

2012-06-20 18:25:12 +01:00

settings.php

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

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