Michael Gapczynski 6898f4256a 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

..

index.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

part.chooseaddressbook.php

Revert

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

part.chooseaddressbook.rowfields.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

part.contact.php

Contacts: implemented CSRF prevention.

2012-06-13 17:35:42 +02:00

part.contactphoto.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

part.contacts.php

Make some apps compatible

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

part.cropphoto.php

Contacts: implemented CSRF prevention.

2012-06-13 17:35:42 +02:00

part.edit_address_dialog.php

A bit of pixel-pushing.

2012-06-07 10:55:40 +02:00

part.edit_categories_dialog.php

Added missing template.

2012-03-09 12:11:52 +01:00

part.edit_name_dialog.php

removing executable bit - again

2012-05-15 00:52:00 +02:00

part.editaddressbook.php

More in-/output sanitation,

2012-02-02 17:54:30 +01:00

part.import.php

Calendar & Contacts: Store import progress in OC_Cache

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

part.importaddressbook.php

Remove check for encryption.

2012-06-13 19:03:34 +02:00

part.no_contacts.php

Contacts: Updated first run page.

2012-04-27 10:35:31 +02:00

settings.php

removing executable bit - again

2012-05-15 00:52:00 +02:00