db18218a1b
Space before tab fixes
2012-08-29 20:34:44 +02:00
0365f8fd01
Remove php close at end of file
2012-08-29 20:29:43 +02:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
cbaf858dea
Merge remote-tracking branch 'gitorious/master' into routing
...
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
224e55e590
LDAP: fix debug message with undefined variable
2012-08-29 19:37:18 +02:00
741a21292e
LDAP: fix potential infinite loop introduced with 4c4aa92eef, as side effect optimize groupExists-method.
2012-08-29 19:37:18 +02:00
8be8f6fff2
LDAP: Remove unnecessary debug output, fixes a Notice
2012-08-29 19:37:18 +02:00
e5cbc532c3
Fix password authentication for links and fix template problems for links by creating a new base layout
2012-08-29 11:54:49 -04:00
9338d093f9
[tx-robot] updated from transifex
2012-08-29 02:06:48 +02:00
b64229a89e
apply coding style
2012-08-29 01:39:42 +02:00
4c4aa92eef
LDAP: check for existing username from other backends when creating one for an LDAP user or group. Led also to some code cleanup. Fixes oc-1551 in master.
2012-08-29 01:23:51 +02:00
fe49cbafc7
apply coding style
2012-08-29 00:50:12 +02:00
f301bfd8c9
apply coding style
2012-08-29 00:36:27 +02:00
da44e5405a
Fix typo
2012-08-28 11:12:18 -04:00
c53310e49b
Remove unnecessary ajax file from files_sharing
2012-08-28 09:57:09 -04:00
1e2ba8398d
Remove old database xml file for files_sharing, bump version number
2012-08-28 09:55:24 -04:00
0a1f24142a
Change public file from get.php to public.php
2012-08-28 09:53:31 -04:00
42a9969304
LDAP: implement getHome() function, use either username (default) or specify an LDAP attribute value to use
2012-08-28 14:24:50 +02:00
549f69cbc1
marked as shipped app
2012-08-28 07:35:31 +02:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
6b5f1ffdb4
upload button improvement, better separation, fix wrap issue
2012-08-27 14:05:18 -07:00
c2290a542e
add deprecated warning
2012-08-27 22:58:50 +02:00
5985d00c6f
LDAP: transliterate other latin characters to ASCII when creating owncloud names. Already created usernames are not being affected.
2012-08-27 21:32:56 +02:00
ead7de6bff
only mount every single homefolder when using sharing app
2012-08-27 16:10:37 +02:00
c33a2ca01d
[tx-robot] updated from transifex
2012-08-27 02:02:37 +02:00
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
184438224c
restore the webdavauth app
2012-08-26 17:51:01 +02:00
72e9a2ce57
moved to apps repository
2012-08-26 17:30:07 +02:00
32bad688bd
Wrong function
...
https://github.com/owncloud/core/commit/2028c8116122f56d8087716e42162fdc
651819d3#commitcomment-1766755
2012-08-26 17:22:41 +02:00
2028c81161
OC_Util is better thank OCP\JSON because it'll redirect the user to the index.php instead of displaying an error
2012-08-26 16:08:58 +02:00
4885a52ba4
Check if app is enabled
2012-08-26 16:05:40 +02:00
bcd86bfd02
Remove some empty lines
2012-08-26 15:43:34 +02:00
726be04e5f
Use sanitizeHTML instead of strip_tags
2012-08-26 15:41:41 +02:00
922982f070
[tx-robot] updated from transifex
2012-08-26 02:22:02 +02:00
ad66d6d5e9
translation support for pdfviewer
2012-08-26 02:17:28 +02:00
8e090d8f67
added translation for odfviewer
2012-08-26 02:17:28 +02:00
a1a3862274
[tx-robot] updated from transifex
2012-08-26 02:02:48 +02:00
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
814cb6bbfa
translation support for text editor and impress added
2012-08-26 00:39:23 +02:00
c82518cb0e
[tx-robot] updated from transifex
2012-08-26 00:12:05 +02:00
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
dc3bec6211
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
2012-08-25 03:13:59 +02:00
e8ffd5c042
use limit parameter instead of LIMIT SQL for vcard
2012-08-25 02:27:43 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
0c4575db7a
Temporary fix to prevent rename action in root of Shared directory
2012-08-24 15:12:16 -04:00
ee04b626b4
Correct variable name.
2012-08-24 17:23:01 +02:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
3148edbdef
Fix shared storage rename. Note: You can only rename shared files/folders that are inside a shared folder, not individual shared files/folders.
2012-08-24 10:01:46 -04:00
63d6884e23
Sanitizing the user input to prevent a reflected XSS. Thanks to Nico Golde (ngolde.de)
2012-08-24 15:00:53 +02:00
eadb894eff
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534
2012-08-24 15:00:53 +02:00
9188d2a844
Add a missing exit();
2012-08-24 15:00:53 +02:00
4e5291c77a
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
2012-08-24 15:00:53 +02:00
1d530192b9
Disable user enumeration
2012-08-24 15:00:53 +02:00
9917c611d3
Disable listing of all users
2012-08-24 15:00:52 +02:00
78e8cbd52c
Check if webfinger is enabled
2012-08-24 14:58:48 +02:00
ffb55d5a17
Don't return file handle if the mode supports writing and the file is not writable
...
Conflicts:
apps/files_sharing/sharedstorage.php
2012-08-24 14:58:48 +02:00
3644517b01
Missed an "echo"
2012-08-24 14:58:47 +02:00
4f7e4c20d2
Sanitize user input
2012-08-24 14:58:47 +02:00
2832311640
fix label for versioning in admin settings
2012-08-24 14:54:17 +02:00
5e9f92e5dd
Calendar: remove double html encoding
2012-08-24 14:54:17 +02:00
646bc1fc24
Contacts: Fix no active Addressbooks
2012-08-24 14:54:16 +02:00
2af7473651
LDAP: sanitize base, user and group trees. fixes oc-1302
2012-08-24 14:54:16 +02:00
46d6fd15e4
Implemented sharing api for CalDAV.
2012-08-24 14:26:06 +02:00
d1421ca5ab
White-space.
2012-08-24 13:49:56 +02:00
b716296203
Forgot to reenable the export plugin.
2012-08-24 05:04:45 +02:00
953f9d95f8
Implemented sharing api for CardDAV. Next step CalDAV.
2012-08-24 04:56:21 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
2cffcfbc03
Permission checking for shared addressbooks/contacts.
2012-08-23 22:03:36 +02:00
f568ba9c8c
Removed redundant __CLASS__ in logging.
2012-08-23 22:03:36 +02:00
fdb4c820d3
Fix for deleting queued contacts.
2012-08-23 22:03:35 +02:00
394617e0b6
Missing IM variable assignments.
2012-08-23 22:03:35 +02:00
069d16fdd4
Use correct js class in first-run template.
2012-08-23 22:03:35 +02:00
a3af9f4773
Used non-existing variable.
2012-08-23 22:03:35 +02:00
d5127b14be
Return newly created addressbook.
2012-08-23 22:03:35 +02:00
e3ac15bad3
development snapshot
2012-08-23 19:19:39 +01:00
d5c111a984
LDAP: identify (map) users with their directory UUID. Fixes the issue, that usernames for owncloud will change, when the DN changes (which happens rarely, but it happens).
2012-08-23 18:29:43 +02:00
32ee3de918
Extensive work on crypto stream wrapper implementation
2012-08-23 16:43:10 +01:00
2d97164f80
Limit styles so they don't interfere with sharing dropdown.
2012-08-23 05:02:30 +02:00
6941266e7b
Remove obsolete closure.
2012-08-23 05:02:30 +02:00
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
99d17c5190
Don't add empty property parameters.
2012-08-23 01:18:59 +02:00
1df596e758
CSS fix for Windows.
2012-08-23 00:40:10 +02:00
0944b4455b
Moves the lastAction=null outside the if so it can include the undo requests from replace
2012-08-22 17:08:10 -04:00
24a207a8fa
Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented.
...
Essentially, just set FileLists.lastAction = null when one clicks undo.
2012-08-22 16:56:00 -04:00
61c7700ce6
Add support for IMPP properties.
2012-08-22 18:51:17 +02:00
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
25d474579a
Removing most of files_sharing, the Share API implemented the majority of it
2012-08-22 11:57:58 -04:00
536fbb9189
LDAP: fix potentially unavailable LDAP resource, which can prevent successful login
2012-08-22 15:22:52 +02:00
63c454c7b2
LDAP: make refreshInterval for background jobs configurable in the DB
2012-08-22 12:44:46 +02:00
056d9adb23
LDAP: bg jobs: sane default refresh interval
2012-08-22 12:44:46 +02:00
c48732987e
LDAP: permanantly watch group members. Emit post_addToGroup resp. post_removeFromGroup on membership changes, so that Sharing App can take care of files shared within the groups. Requires and relies on background jobs.
2012-08-22 12:44:46 +02:00
2b8a2e16ed
LDAP: don't pass -1 as length to array slice, when no limit is given. It cuts off the last item.
2012-08-22 12:44:46 +02:00
ac9fd79329
Email type list wasn't initialized.
2012-08-22 12:40:35 +02:00
78b7e28ce0
Removed unused variable.
2012-08-22 12:40:35 +02:00
5c1dd82998
Minor layout change.
2012-08-22 12:40:35 +02:00
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
53350b2f19
Remove unnecessary file
2012-08-21 10:33:20 -04:00
1cfa831239
A first basic presentation app based on the amazing impress.js.
...
You have to put a presentation file that contains the presentation defined in html into your ownCloud with the file extension .impress
Then you can use this app to play it. It also contains a demo presentation that you can use to learn.
Help is welcome to improve this app. :-)
2012-08-21 14:44:23 +02:00
25dd0e940f
Preliminary support for Apple X-ABLabel. Also for oc-1508.
2012-08-21 03:57:48 +02:00
8d38dc04a0
Remove class contactsection
2012-08-21 03:57:48 +02:00
68f5dc2a44
Remove unnecessary files
2012-08-20 21:22:23 -04:00
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
1e42cd162e
Added types to emails. Support for custom types. Partial fix for oc-1508.
2012-08-21 00:20:18 +02:00
719ae155db
Try to align and float contact parts better.
2012-08-21 00:20:18 +02:00
ef3eebfd3e
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.
2012-08-20 17:24:10 +02:00
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
f893d21660
[tx-robot] updated from transifex
2012-08-20 02:03:51 +02:00
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
2d3ec5cb4b
Removed stray img element.
2012-08-19 17:05:45 +02:00
4946e23bdc
Strip slashes from commas and semi-colons.
2012-08-19 16:32:32 +02:00
a4e840f4f1
improve hasUpdated for archive storage backend
2012-08-19 06:29:57 +02:00
758ebe0446
don't report ctime in the archive storage backend since it isn't reliable
2012-08-19 06:18:40 +02:00
7f6a037b8c
small fix for normalizing paths in archives
2012-08-19 06:15:33 +02:00
808d6c58fe
ensure proper result format when using opendir on the archive storage backend
2012-08-19 05:45:55 +02:00
2ea46ee1ca
better file_get_contents, file_put_contents and toTmpFile for archive storage backend
2012-08-19 05:05:55 +02:00
d54390b1a0
Optimized image size
2012-08-18 13:56:04 +02:00
6ef5edf5ea
Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.
2012-08-18 09:30:01 +02:00
f1cabdd8e0
[tx-robot] updated from transifex
2012-08-18 02:04:07 +02:00
41639f0517
fix fail in sql query of isDuplicate method of OC_Calendar_Import
2012-08-17 21:29:26 +02:00
44272b9889
increase margin top of calendar import's color picker
2012-08-17 20:48:47 +02:00
53a888cc81
more path normalization
2012-08-17 01:22:54 +02:00
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
293a0f4d32
Started rewrite of cryptstream class (renamed to stream)
...
Added unit tests
Fixed decryption of user private key at login
Added functionality to keymanager
2012-08-16 19:18:18 +01:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
4c638f101e
Merge addressbooks.
2012-08-16 00:25:32 +02:00
3b9fac8f81
Fix gallery image view
2012-08-15 19:55:26 +02:00
f11f524dfa
working on streaming decrypted content
...
applied some dependency injection to keymanager.php
2012-08-15 18:49:53 +01:00
ddfb9de147
Fix linkTo calls for new routing
2012-08-15 18:16:06 +02:00
b883bb6b42
Converted test to PHPUnit format
2012-08-15 14:52:03 +01:00
d725d07219
added two (currently passing) unit tests
2012-08-15 14:13:03 +01:00
ea236e83d7
added first version of keymanager PHPUnit test files
2012-08-15 14:01:43 +01:00
dd3208fe6f
Fix webfinger documentation
2012-08-15 14:50:25 +02:00
d039f11905
provide ocs calls and keymanager functions to get/set both keys (private, public) of a user together
2012-08-15 13:18:11 +02:00
92ec88c7bc
move chane password code from keymanager.php to crypt.php
2012-08-15 09:54:21 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
6ce315fe58
added wrapper method in crypt class for encrypting asymmetric and symmetric simultaneously
...
fixed bugs with keymanager integration
added unit tests
2012-08-14 19:06:56 +01:00
a75870489c
Use correct class.
2012-08-14 20:06:45 +02:00
db5b995a6b
Disable user enumeration
2012-08-14 17:23:26 +02:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
62e4f55f72
LDAP: adjust usersInGroup to updated interface
2012-08-14 14:30:03 +02:00
3c1380b093
LDAP: adjust getGroups to updated interface
2012-08-14 14:22:05 +02:00
452f55e163
adjust LDAP to updated interface
2012-08-14 14:14:20 +02:00
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
830676b475
Improve usability for configuring Dropbox and Google Drive external storage
2012-08-13 17:10:58 -04:00
d3bdab286b
Suggest mount point name, don't reload custom javascript file
2012-08-13 17:10:58 -04:00
98c7d40fcd
Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct
2012-08-13 17:10:58 -04:00
7f12a65c24
Show access granted label immediately after granting access
2012-08-13 17:10:58 -04:00
0e6d22e25f
Prevent editing Dropbox configuration input after access granted
2012-08-13 17:10:58 -04:00
b6b2f8826b
Show access granted label next to Google Drive and Dropbox storage in configuration
2012-08-13 17:10:58 -04:00
be32625fcc
Fix remove button display for external storage
2012-08-13 17:10:58 -04:00
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
d303763d1f
Automatically check radio when new addressbook fields get focus.
2012-08-13 15:07:15 +02:00
b1f6bb36b0
write error to OC_Log
2012-08-13 13:29:22 +02:00
34f93ac765
check if user has write access to a given file before updating the filekey
2012-08-13 11:31:15 +02:00
758f476fe3
Calendar: remove not used style rules
2012-08-12 22:40:36 +02:00
73b1b68fff
Rewrite remoteStorage settings, remove block echo
2012-08-12 22:30:13 +02:00
ab8e7f1da3
Remove unused gallery template
2012-08-12 22:30:13 +02:00
cb71996008
Change image links to use imagePath function
2012-08-12 22:30:13 +02:00
329bc28d06
Commented out unused(?) class that interfered with appsettings.
2012-08-12 18:44:18 +02:00
7113e80184
Readded refresh param. 304 and ETag is still sent so shouldn't matter.
2012-08-12 17:30:09 +02:00
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
5b16c7a25d
This is unnessecary because we already run htmlentities() over the template engine
2012-08-11 20:53:56 +02:00
39b9052c2f
[tx-robot] updated from transifex
2012-08-11 02:05:58 +02:00
d3427be5e4
Following the code guidelines makes Michael happy :-)
2012-08-10 22:20:32 +02:00
85f2e737a4
Disable listening, instead checking the ACL to prevent DoS
2012-08-10 22:18:08 +02:00
11895a86b0
Activate ACLs
2012-08-10 22:02:04 +02:00
fb493c45dd
Calendar: update share backend using contacts backend as template
2012-08-10 14:40:48 +02:00
6a95e4288e
Contacts: Check format parameter
2012-08-10 14:40:43 +02:00
6d971d3b1d
Contacts: Better parameter names in addressbook share backend
2012-08-10 14:32:54 +02:00
3ec6dc56c9
ToDo item removed
2012-08-10 12:37:04 +02:00
e4450d1035
execute file hooks only if server side encryption is enabled
2012-08-10 12:27:09 +02:00
12628be38b
only call proxies for server side encryption
2012-08-10 11:44:38 +02:00
e73292339f
Check if webfinger is enabled
2012-08-10 10:01:56 +02:00
2c5ab91c7d
Used wrong class.
2012-08-10 01:39:05 +02:00
2dfc485149
XSRF checks
2012-08-10 00:44:35 +02:00
26a9d7ea71
Fixed 3 - THREE - errors in one method call :-P
2012-08-09 23:16:07 +02:00
5f51366435
Sanitzing user input
2012-08-09 22:14:09 +02:00
7780e37f38
LDAP: don't give Test Connection button red background on fail, it is becoming unreadable
2012-08-09 21:42:35 +02:00
3b13051f7a
Additional permission checks for editing and deleting contacts
2012-08-09 13:54:59 -04:00
7e3f5492cc
typo fixed
2012-08-09 17:56:43 +02:00
7955120aed
remove debug code from calendar - thanks michael for pointing that out :)
2012-08-09 17:39:16 +02:00
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
368ade6b2f
code cleanup
2012-08-09 17:25:57 +02:00
f9cec1426f
Change parameter name and update docs.
2012-08-09 17:04:14 +02:00
39814edf81
Another take at profile photo/thumbnail caching. oc-839.
2012-08-09 16:32:05 +02:00
bd7d566733
change private key passphrase; disable file proxy for keymanager operations
2012-08-09 15:45:34 +02:00
a969c23e59
disable admin choice of encryption mode once a decision was taken
2012-08-09 14:25:09 +02:00
800942ece7
change key password when user switches from client to server side encryption.
...
make use of the keymanager class in changekeypasscode()
2012-08-09 13:47:27 +02:00
00d7ae8319
move calendar settings from personal settings to in app settings
2012-08-09 12:37:26 +02:00
5a261b5b8f
ask user for passwords when switching from client to server side encryption
2012-08-09 12:19:51 +02:00
d24582503a
Fix require statements. Fix for oc-1460.
2012-08-09 11:35:14 +02:00
b830b3e24b
Start adding permission checks for addressbooks
2012-08-08 21:43:02 -04:00
f4285a25ef
Don't include shared addressbook if source not found
2012-08-08 19:12:59 -04:00
10cfcd4ff0
Remove useless setting of RUNTIME_NOAPPS
2012-08-08 22:42:50 +02:00
7522a23693
Remove unused RUNTIME_NOSETUPFS var
2012-08-08 22:42:50 +02:00
a7cbc9e713
lock system wide encryption settings once the admin took a decision
2012-08-08 18:27:12 +02:00
05648dac61
Don't return file handle if the mode supports writing and the file is not writable
2012-08-08 11:25:24 -04:00
5983643abd
fix setFileKey() call in updateKeyfile hook
2012-08-08 15:32:05 +02:00
dc596a72c3
remove function which is no longer needed
2012-08-08 14:20:29 +02:00
d4974b6d4a
set default dependencies in keymanager.php
...
fix calls in ocs.php
2012-08-08 14:15:35 +02:00
5bb3ea9740
define default properties in keymanager.php
2012-08-08 12:13:14 +02:00
35a1738a39
Use new sharing API in OC_Calendar_Share::allSharedwithuser
2012-08-07 23:31:06 +02:00
1e644b5a53
Add Event share backend
2012-08-07 23:27:06 +02:00
9580d0ef29
Initial calendar sharing backend
2012-08-07 14:57:52 -04:00
95031cb139
remoteStorage: Use OCP\\Util for redirecting for login and generating link
2012-08-07 20:43:00 +02:00
4e6b4b265b
remoteStorage: split auth allow template
2012-08-07 20:43:00 +02:00
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
2eac79b782
Some UI improvements on the addressbooks settings.
2012-08-07 00:06:18 +02:00
de7f48b050
Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
2012-08-06 17:37:10 -04:00
7c0a5d4a59
Check if New and Upload buttons exist before adding their width to the total breadcrumbs width
2012-08-06 17:35:22 -04:00
3be4f5f2f1
Sharing backends for contacts and addressbooks
2012-08-06 16:11:03 -04:00
14d13a740f
Load icons for addressbooks, fix statuses for types other than files
2012-08-06 15:24:08 -04:00
03d65af5dc
Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible
2012-08-06 15:09:01 -04:00
83117445ac
Fix offset for folder detection, no longer including '/Shared' in file target path
2012-08-06 14:33:47 -04:00
ea23854328
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/contacts/templates/part.chooseaddressbook.rowfields.php
2012-08-06 13:49:54 -04:00
ba0cf98175
Remove extra line, caused 'headers already sent' issues
2012-08-06 13:33:53 -04:00
fe6450002d
Change hardcoded urls to use linkTo function
2012-08-06 18:51:41 +02:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
e6759a980b
LDAP: layout settings form. Hope it is now a bit clearer and prettier.
2012-08-06 17:25:59 +02:00
9ca8d20a99
[tx-robot] updated from transifex
2012-08-06 02:02:50 +02:00
95c33e466c
LDAP: offer option to disable SSL certificate checks. Works around problems with self-signed certificates, for example. However, the best and right way to solve it is always to import the LDAP server cert to the owncloud server, so you it for testing only.
...
Like to hear wether it works, instead appending LDAPTLS_REQCERT=never to ldap.conf.
2012-08-05 23:00:47 +02:00
6fd48675e6
remove accidentally added blank lines
2012-08-05 22:03:47 +02:00
c10010e410
LDAP: check for always available attribute on userExists, fixes oc-1440
2012-08-05 22:02:34 +02:00
c3cbb463e3
add missing \
2012-08-05 21:35:37 +02:00
d546718179
LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302
2012-08-05 21:28:59 +02:00
80ca883d4c
Correct path to ajax file.
2012-08-05 03:36:16 +02:00
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
086397d8a1
Fix condition checking for resizing breadcrumbs
2012-08-04 15:57:49 -04:00
207ca3ec06
Dynamically resize breadcrumbs, fix for bug oc-468
2012-08-04 15:50:32 -04:00
da4057ecfd
fix label for versioning in admin settings
2012-08-04 18:51:09 +02:00
d7e77f6426
[tx-robot] updated from transifex
2012-08-04 02:04:21 +02:00
bef63527ce
Reorganize ajax scripts.
2012-08-03 21:32:27 +02:00
3610975bc1
Some fixes for keyboard shortcuts.
2012-08-03 21:32:27 +02:00
e3de746bb6
FF complained about missing charset.
2012-08-03 21:32:27 +02:00
578e074c00
White space.
2012-08-03 21:32:27 +02:00
98057dba5b
Revert "Removed text/plain header."
...
This reverts commit fa6d26b53c
2012-08-03 21:32:27 +02:00
09bb3bfaf8
Preparing for proper collection implementation
2012-08-03 15:05:45 -04:00
b12ed88794
Calendar: remove double html encoding
2012-08-03 16:18:33 +02:00
599741bdd6
audit: update appinfo to OC4
2012-08-03 16:05:48 +02:00
e36e00dc00
Merge branch 'chunked_upload'
2012-08-03 15:58:17 +02:00
773d7b119d
OCS api calls cleanup
2012-08-03 13:52:41 +02:00
a0b2474019
code cleanup and TODOs added
2012-08-03 12:21:49 +02:00
bed05f0302
only force re-login if server-side encryption is enabled
2012-08-03 11:59:32 +02:00
d5808f07ca
return a list of all public keys for a given file
2012-08-03 11:49:55 +02:00
7dc799c167
[tx-robot] updated from transifex
2012-08-03 02:04:12 +02:00
7dda5527f1
Return properly formatted jsondata.
2012-08-02 19:03:45 +02:00
d07f4a5ea8
Correct namespace usage.
2012-08-02 19:03:06 +02:00
40d2bb70d7
Remove logging
2012-08-02 19:01:55 +02:00
8f3357c305
I was a bit too fast in removing methods yesterday...
2012-08-02 18:57:03 +02:00
a484ee817c
If first addressbook was empty it was seen as if there where no contacts at all.
2012-08-02 18:50:20 +02:00
19b3109655
code cleanup
2012-08-02 13:55:23 +02:00
5996ea735a
remove debug output
2012-08-02 10:59:06 +02:00
6b058cd359
allow user to choose encryption mode
2012-08-02 10:40:32 +02:00
a1239a37aa
Line length...
2012-08-02 05:02:36 +02:00
30c3a783d9
Remove onunload handler when delete is cancelled.
2012-08-02 05:01:54 +02:00
20f8971222
Use popup class style for ninja-mode help.
2012-08-02 04:18:44 +02:00
f84e92e6e3
More files to delete \o/
2012-08-02 04:18:44 +02:00
937058cdec
Updated JS namespace.
2012-08-02 04:18:44 +02:00
91e828c6ce
[tx-robot] updated from transifex
2012-08-02 02:06:16 +02:00
f159f607de
And then the missing files ;)
2012-08-02 00:02:07 +02:00
a8faae4f42
Addressbooks settings rewrite and cleanup.
2012-08-02 00:02:07 +02:00
c4d1ad1b7d
Made dependencies of Kaymanager::setFileKey() explicit using dependency injection
2012-08-01 14:11:41 +01:00
e13f381189
add limit support to OC_DB & OCP/DB
2012-08-01 14:59:08 +02:00
a7f3a67bc2
get settings from DB and check the right checkbox in the settings
2012-08-01 10:37:21 +02:00
274d1ef87f
[tx-robot] updated from transifex
2012-08-01 02:02:35 +02:00
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
82f5f73dff
Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption
...
Conflicts:
apps/files_encryption/lib/crypt.php
2012-07-31 19:38:28 +01:00
84fd62b130
Implemented writing of keyfiles and directory hierarchy in proxy class
...
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
2012-07-31 19:35:36 +01:00
eebf76d344
Implemented writing of keyfiles and directory hierarchy in proxy class
...
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
2012-07-31 19:28:11 +01:00
3aff7a298c
use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want)
2012-07-31 19:00:54 +02:00
727f4357fb
remove superflous index (already indexed with primary key derived from <autoincrement> by MDB2), oracle will bark on this
2012-07-31 18:54:24 +02:00
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
f6863f9e51
get encryption mode from the settings
2012-07-31 16:52:21 +02:00
e4e6574e42
allow admin to choose between client and server side encryption
2012-07-31 16:37:37 +02:00
9bab06537c
update file encryption key over webdav properties for client side encryption
2012-07-31 15:03:28 +02:00
5eed59bd54
Changed fix parameter to OC.appSettings().
2012-07-31 14:18:32 +02:00
90a1b5a758
Unregister from personal settings.
2012-07-31 12:23:22 +02:00
19c55e2d44
Implemented app settings in popup.
2012-07-31 12:23:22 +02:00
dfae77dec1
Add notifications and undo support for replacing files when renaming
2012-07-30 12:22:11 -04:00
b465fc84ae
LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
2012-07-30 17:42:33 +02:00
b523366acd
LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
2012-07-30 17:30:11 +02:00
29dab0846e
Remove another accidently added 3rdparty app
2012-07-30 10:37:54 -04:00
530e7f03cd
Remove accidently added 3rd party apps
2012-07-30 10:34:12 -04:00
b9bd54bd98
Add additional error handling for emailing private links
2012-07-30 10:07:20 -04:00
dab708b625
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-30 10:07:20 -04:00
519eb39422
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-30 10:07:19 -04:00
3e183b2eea
Set filter to empty if not set by Ampache client
...
Conflicts:
apps/media/lib_ampache.php
2012-07-30 10:07:19 -04:00
d07b8448d1
Set the user id when authenticating user for Ampache, fixes bug oc-219
2012-07-30 10:07:19 -04:00
7d17c59a51
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-30 10:07:19 -04:00
f378415377
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-30 10:07:19 -04:00
f328f53ec1
Fix filesystem hash, no longer using basicOperation()
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
ee15c40b14
comment added
2012-07-30 12:43:17 +02:00
23391b3694
get/set key files, take shared files into account
2012-07-30 12:38:38 +02:00
01f25119d5
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-07-30 12:28:40 +02:00
f91783e9ab
Fix errors when no addressbook.
2012-07-30 12:28:10 +02:00
fa62ff62d2
Remove deprecated code.
2012-07-30 05:31:48 +02:00
d614c3b1d5
Code style.
2012-07-30 05:31:06 +02:00
118d9e17b6
Check if the are contacts marked as deleted and warn if so.
2012-07-30 04:57:14 +02:00
b25b73b5b4
Fixed potential error in logging.
2012-07-30 04:57:14 +02:00
fa6d26b53c
Removed text/plain header.
2012-07-30 04:57:14 +02:00
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
5262cde6a6
Add additional error handling for emailing private links
2012-07-29 18:02:09 -04:00
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
7ff04be091
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-28 11:06:36 -04:00
e02d8d7f7e
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-27 21:28:41 -04:00
fa4052d6f1
[tx-robot] updated from transifex
2012-07-28 02:05:38 +02:00
dd4765ad16
Set filter to empty if not set by Ampache client
2012-07-27 18:10:40 -04:00
6a4c46e2c2
Set the user id when authenticating user for Ampache, fixes bug oc-219
2012-07-27 18:05:18 -04:00
df9f5b902a
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-27 15:34:51 -04:00
896d27de36
Chunked upload: Support reusing local chunks
2012-07-27 19:35:33 +02:00
48f33be848
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-27 12:32:03 -04:00
bccd372565
Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/owncloud into merge-requests/76
2012-07-27 14:17:55 +02:00
f752a27605
write keyfiles to server
2012-07-27 14:00:41 +02:00
931c4695a6
run setup routine only for server side encryption
2012-07-27 13:58:58 +02:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
d8aca0c78e
apply fix suggested in oc-1132 - bugfix for oc-1132
2012-07-26 18:40:12 +02:00
6fbed6a588
LDAP: add Test Configuration functionality in the settings
2012-07-26 18:11:12 +02:00
bb229f7291
write private/public key from the client to the server
2012-07-26 17:19:55 +02:00
6c92a85d49
LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced.
2012-07-26 16:11:32 +02:00
e0121ea75e
LDAP: some cleanup
2012-07-26 16:11:32 +02:00
b893aa9567
code style
2012-07-26 16:11:32 +02:00
8cff0d997f
convert through caldav transmitted rgba calendarcolor to rgb
2012-07-26 14:48:00 +02:00
f7155b4276
convert through caldav transmitted rgba calendarcolor to rgb
2012-07-26 14:46:03 +02:00
e5c84488ff
Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption
...
Conflicts:
apps/files_encryption/lib/keymanager.php
2012-07-26 14:06:39 +02:00
bdb406916c
fixed path for filesystem view
2012-07-26 13:49:22 +02:00
3ab4ddd1da
function to ask for the encryption mode (server side or client side).
...
Needs to be implemented and integrated into the settings.
2012-07-26 13:47:43 +02:00
ba0ea21074
[tx-robot] updated from transifex
2012-07-26 08:04:12 +02:00
42c22bee36
[tx-robot] updated from transifex
2012-07-26 08:03:10 +02:00
efbd7ca166
Updated packages
2012-07-26 01:16:22 +02:00
95936024bc
Updated packages
2012-07-26 01:12:58 +02:00
add8f09355
No longer need hash() in shared storage, already implemented by the common file storage
2012-07-25 17:13:48 -04:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
f25ccaff59
Fix filesystem hash, no longer using basicOperation()
2012-07-25 16:55:01 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
37bccf54f2
[tx-robot] updated from transifex
2012-07-25 22:15:24 +02:00
9f51841c57
Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs
2012-07-25 18:28:56 +01:00
b94631de0c
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
2012-07-25 18:40:48 +02:00
3c9919e475
LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed.
2012-07-25 18:21:16 +02:00
adf5c953dd
Fixed use of OCFSV in getPrivateKey()
2012-07-25 16:56:52 +01:00
e6de086fb6
Fixed various bugs in hooks class
...
Fixed documentation syntax in keymanager
2012-07-25 16:51:48 +01:00
d17eb2983f
OpenID: fix include path
2012-07-25 17:45:59 +02:00
66b461629b
Started implementation of new encyryption classes into the encryption proxy
2012-07-25 16:26:03 +01:00
9b0870bb91
add some calendar sharing hooks in stable4 - bugfix for oc-1325
2012-07-25 17:02:24 +02:00
6d1ed388c0
keymanager class for basic operations to store and retrieve keys
2012-07-25 17:01:11 +02:00
d766ca8b19
Changed util class methods to use / create public keys in single shared public-keys directory, and group encryption-related user files
2012-07-25 15:33:25 +01:00
71b862e571
LDAP: replace deprecated constant
2012-07-25 15:11:58 +02:00
4a2295b75b
code style
2012-07-25 15:10:56 +02:00
9368ea73c8
added tests and methods relating to handling of legacy keys
2012-07-25 12:38:40 +01:00
6285cc2604
LDAP: remove debug output
2012-07-25 13:19:07 +02:00
ab1d9507a9
code style
2012-07-25 13:18:31 +02:00
edfd789a87
LDAP: remove obsolete require_once
2012-07-25 13:16:31 +02:00
8664729843
code style
2012-07-25 13:14:32 +02:00
15f7d838fa
code style
2012-07-25 13:13:01 +02:00
569e52b87c
remove unnecessary debug output
2012-07-25 13:11:42 +02:00
c8404a7bfa
code style
2012-07-25 13:10:59 +02:00
92f447ca50
code style
2012-07-25 13:09:51 +02:00
a6c5309e16
LDAP: adjust test after refactoring
2012-07-25 12:56:09 +02:00
b10f7aafb7
LDAP: silence warning, but handle the error
2012-07-25 12:56:09 +02:00
25ad1d5c3e
LDAP: split up LIB_LDAP into Access for LDAP interaction functions and Connection for configuration and resource management. Adjust user_ldap, group_ldap and the app accordingly.
2012-07-25 12:56:09 +02:00
d0aebf05bf
LDAP: group backend now implements the interface, does not inherit backend class
2012-07-25 12:56:08 +02:00
42492338fc
LDAP: put app under the OCA\user_ldap\ namespace
2012-07-25 12:56:08 +02:00
5888cb48b6
Support for OCA namespace
2012-07-25 12:56:08 +02:00
afdc5bf264
LDAP: switch user backend from extending class OC_User_Backend to implementing OC_User_Interface for improved flexibility
2012-07-25 12:56:08 +02:00
0bdebe0e4a
LDAP: pass user backend as instance, not classname
2012-07-25 12:56:08 +02:00
6f58eca534
Change read only check to isCreatable
2012-07-24 21:35:03 -04:00
fc72d4b10f
Add root directory checks for CRUDS permissions in shared storage
2012-07-24 21:16:47 -04:00
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
c60c6024a7
Remove toTmpFile() from shared storage, no longer needed
2012-07-24 14:50:43 -04:00
eac297e8c4
Improve file source caching for shared folders
2012-07-24 14:41:19 -04:00
e8675586af
Fix permission check for rmdir(), implement unlink(), rename(), and copy()
2012-07-24 14:22:07 -04:00
9216289856
Wrote new methods for testing if a file is encrypted using AES or Blowfish
...
Added more unit tests for crypt class
Added new method for generating 16 character pseudo-random initialisation vectors
Started writing new methods for handling legacy keys and en/de/re cryption
Added comments to lib/filecache.php explaining expected $path type
2012-07-24 17:57:20 +01:00
e6678bd454
Permission check should be made on parent folder when creating a new folder
2012-07-23 22:39:29 -04:00
b58e72cdb2
Alert user of errors when creating new files or folders
2012-07-23 22:35:34 -04:00
7b01e3285e
Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage
2012-07-23 22:05:53 -04:00
7967685771
move some openid files to 3rdparty
2012-07-24 00:02:01 +02:00
73734c98e0
- remove namespace from file property name (webdav)
...
- update script to fix broken properties in the database
2012-07-23 11:00:37 +02:00
bd63fddbf4
fix broken properties in the database
2012-07-23 10:34:01 +02:00
708c771296
update routine to fix broken file properties in db
2012-07-23 10:25:26 +02:00
25e1c13ef7
Remove unused ajax file.
2012-07-23 01:17:38 +02:00
67b6ff22bc
Cache DOM lookups, general cleanup.
2012-07-23 01:17:38 +02:00
b60e5942a5
Cleaner event handling.
2012-07-23 01:17:38 +02:00
fb9ef90c45
No need to set checksum on PHOTO.
2012-07-23 01:17:38 +02:00
0439a18324
Cleaner variable handling.
2012-07-23 01:17:38 +02:00
b00de0258b
Make sure notifier cleans up.
2012-07-23 01:17:38 +02:00
644b6e60d5
Revert "No need to set checksum for PHOTO."
...
This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c.
2012-07-23 01:17:38 +02:00
dc05fd7b92
No need to set checksum for PHOTO.
2012-07-23 01:17:38 +02:00
294e65fa38
Use insertContact
2012-07-23 01:17:38 +02:00
641bd7a456
Whitespace
2012-07-23 01:17:38 +02:00
b1010160b3
CSRF protection for eventsource
2012-07-22 16:37:49 +02:00
a49c07cf88
progressbar for New->From Url
2012-07-22 03:56:51 +02:00
59ab8b14c7
cache fileid's in oc_cache
2012-07-22 03:24:34 +02:00
ab8ce89df3
Added help for keyboard shortcuts.
2012-07-22 00:15:28 +02:00
38d38c1797
First stab at Ninja mode ;-)
2012-07-21 22:00:27 +02:00
359dc8736a
Improved scrollTo method. Still not quite there...
2012-07-21 22:00:27 +02:00
eb57544518
Added next/previous methods to contacts list.
2012-07-21 22:00:27 +02:00
7d520bc7a9
Remove wrong comment.
2012-07-21 22:00:27 +02:00
81b917b2f6
increase width of user migrates form in personal settings, so you can read the whole label in all languages
2012-07-21 19:50:45 +02:00
f9d3388854
Merge branch 'master' into calendar_import
2012-07-21 17:37:10 +02:00
57207ddb82
some style fixes for calendar
2012-07-21 17:09:10 +02:00
e07cd26571
Implemented undelete for contacts.
2012-07-21 16:02:12 +02:00
51bafd32d6
Made contactlist optional in insertContact().
2012-07-21 14:26:57 +02:00
00de757169
White space.
2012-07-21 14:26:26 +02:00
11aa571751
Added option to notify method.
2012-07-21 14:24:26 +02:00
687c87bc5b
DRYed inserting into contacts list.
2012-07-21 13:13:41 +02:00
ad12e13f14
Tasks: Remove unused code
2012-07-21 00:52:49 +02:00
060b8865a4
DRY for getting calendar timezone setting
2012-07-21 00:45:30 +02:00
1c30a97833
Style fixes
2012-07-21 00:45:30 +02:00
06b5e05c86
Damn, that Jenkins dude is tough ;)
2012-07-21 00:43:01 +02:00
8a19e134df
fix ununsed variables
2012-07-21 00:20:27 +02:00
48ec78299e
cleanup some obsolete foldersize code from the shared storage backend
2012-07-21 00:20:27 +02:00
42fbc111a2
Hide progressbar on error.
2012-07-20 22:25:09 +02:00
3103a4cb3f
Corrected retry count for uploaded imports.
2012-07-20 21:54:24 +02:00
38271ded75
Added CSRF checks
2012-07-20 20:12:36 +02:00
c9be9ab251
remove unused variables
2012-07-20 18:56:18 +02:00
7152b8b4ee
remove unused and depricated getFolderSize
2012-07-20 18:32:40 +02:00
ecf8e77dab
Remove unused file.
2012-07-20 17:11:13 +02:00
7fff386679
Code style.
2012-07-20 17:11:13 +02:00
3c2967074f
remove unused variable from dropbox filestorage backend
2012-07-20 16:48:28 +02:00
1224d7ec01
minor fixes for the google filestorage backend
2012-07-20 16:47:26 +02:00
23c71b15a0
remove unused variables from webdav file backend
2012-07-20 16:35:51 +02:00
c04aa8d6a9
Add CSRF checks
2012-07-20 15:45:17 +02:00
b3d7043f9c
Change uri fields from 100 to 200 chars.
2012-07-20 15:15:18 +02:00
8c06452434
fixing syntax error
2012-07-20 09:14:32 +02:00
5fe0027568
fixing syntax error
2012-07-20 08:20:45 +02:00
b8eea32478
Coding style.
2012-07-20 00:18:23 +02:00
1cbddcf211
Code style
2012-07-20 00:18:23 +02:00
616f2f336e
Trigger loading of more contacts a bit earlier.
2012-07-20 00:18:23 +02:00
5c0c9bbdc1
Cleaning up a bit.
2012-07-20 00:18:23 +02:00
fc46322d4c
Tweak dragging.
2012-07-20 00:18:23 +02:00
87da179e6c
Eye candy for the draggables.
2012-07-20 00:18:23 +02:00
ad14d67c8d
ftp user backend
2012-07-19 23:03:02 +02:00
b357a968c0
smb user backend
2012-07-19 22:42:26 +02:00
57fb37151a
imap user backend
2012-07-19 22:42:18 +02:00
d294e77721
Development snapshot:
...
- Added methods for sealing data with multiple keys
- Added method for encrypting data, generating iv and keyfile, and returning both
- Added 6 unit test cases (containing 12 tests) for Crypt class
- Commented out old unit tests for now
2012-07-18 18:52:00 +01:00
283561823f
Added methods for handling encrypted file + iv content
...
Improved IV generation
2012-07-17 19:15:59 +01:00
0bd7d14b7a
Sharing: offer an option to allow sharing with everyone, i.e. do not check group memberships
2012-07-17 14:09:01 +02:00
ec4891b7d3
Fixed require path.
2012-07-17 12:07:14 +02:00
2c9aa029a7
Added missing CSRF checks.
2012-07-17 12:04:34 +02:00
748fcabba4
Added CSRF checks to files_versions. Expect some error messages - and report them ;)
2012-07-17 11:57:38 +02:00
8444fc5787
Added CSRF checks to Tasks. Expect some error messages - and report them ;)
2012-07-17 11:52:11 +02:00
06ff6c6d7d
Added CSRF checks to Calendar. Expect some error messages - and report them ;)
2012-07-17 11:46:01 +02:00
9326f4f535
Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265.
2012-07-17 10:45:15 +02:00
f4a8c233cf
Added hook for postCreateUser. Probably fix for oc-1265.
...
Conflicts:
apps/calendar/appinfo/app.php
2012-07-17 10:35:46 +02:00
1f4d6896df
Wrong version comparison in update.php.
2012-07-17 03:59:41 +02:00
258df5eea2
Added hook for postCreateUser. Probably fix for oc-1265.
2012-07-17 03:04:04 +02:00
4b8a34df21
Wrong argument count in postCreateUser hook for contacts.
2012-07-17 01:37:28 +02:00
4de66880ed
If a contact wasn't loaded in the list you coulcn't access it from search result. Fixes oc-1264.
2012-07-17 01:35:35 +02:00
f128b96ac0
Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276.
2012-07-16 23:44:18 +02:00
eb2a15d58f
Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276.
2012-07-16 23:36:11 +02:00
47d50fc424
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-07-16 21:22:07 +02:00
d64300251b
Corrected javascript definition.
2012-07-16 21:21:37 +02:00
47566b0c42
stop using of OC_L10N::tA
2012-07-16 20:26:14 +02:00
19f2ce6997
improve webfinger for situations where owncloud is not installed in the server root
2012-07-16 19:58:05 +02:00
7ab35af6dd
use the remote.php infrastructure for remoteStorage
2012-07-16 19:58:05 +02:00
d4e2cb6e62
fix encoding fail in calendar app - bugfix for oc-1194
2012-07-16 19:53:19 +02:00
296f79d1a4
latin1 => utf8
2012-07-16 01:46:16 +02:00
7a7ac58094
Remove obsolete code.
2012-07-16 01:46:16 +02:00
2035bc7905
Fix sorting - again :-P
2012-07-16 01:46:16 +02:00
0fb1a76113
Bold active address book.
2012-07-16 01:46:16 +02:00
25f50e8273
Set the address book of the active contact active.
2012-07-16 01:46:16 +02:00
8fba6b9bc7
UI part of addressbook merging.
2012-07-16 01:46:16 +02:00
502f420678
Wrap image uploading in anonymous function.
2012-07-16 01:46:16 +02:00
001a47afb0
Remove obsolete FIXMEs.
2012-07-16 01:46:16 +02:00
225726c8d9
latin1 => utf8. I thought I did this a month ago?
2012-07-16 01:41:45 +02:00
dd95149238
Also unlink unsuccessful imports.
2012-07-15 17:34:30 +02:00
d49b789348
Merge branch 'master' into calendar_import
2012-07-15 16:56:38 +02:00
160e701fbf
Make list droppable too instead of just the header.
2012-07-15 12:28:29 +02:00
db034f05ca
Improve temp file handling.
2012-07-15 12:28:29 +02:00
8b49e304e0
Hide file form field behind image so it will maybe work with IE...
2012-07-15 12:28:29 +02:00
48521fcfaa
Made notifications more flexible.
2012-07-15 12:28:29 +02:00
d71da67bee
Typo.
2012-07-15 12:28:29 +02:00
7af608881b
Added notification.
2012-07-15 12:28:29 +02:00
4e684b9e9d
Fixed sorting of addressbooks.
2012-07-15 12:28:29 +02:00
287285880c
Removed obsolete TODO.
2012-07-15 12:28:28 +02:00
eba4f08015
Refactored contacts import.
2012-07-15 04:17:30 +02:00
87912a8c65
Fix loading previous or next contact after deleting one.
2012-07-15 04:17:30 +02:00
140263003a
Give default address book a more intuitive name and replace spaces with underscores in uri.
2012-07-14 14:11:43 +02:00
d45d73eecf
Try to avoid occasional error messages.
2012-07-14 14:11:43 +02:00
7d1f644011
use new way to register remote/public.php entries in user_webfinger
2012-07-13 23:24:22 +02:00
b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
50eef9a71c
update script to fix fscache
2012-07-13 15:17:36 +02:00
f496a9dea6
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:29:59 -04:00
ac395dced1
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:28:29 -04:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
7b2ec41477
Revert santizing toaddress, because PHPMailer now throws exceptions
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:57 -04:00
ebcf5bce3c
Sanitize toaddress for emailing private links
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:56 -04:00
91a15bae76
Revert santizing toaddress, because PHPMailer now throws exceptions
2012-07-11 16:02:43 -04:00
7077678f7f
Sanitize toaddress for emailing private links
2012-07-11 15:26:22 -04:00
d203fa2c50
Sanitizing file names
2012-07-11 19:15:11 +02:00
c3fea30811
Sanitizing file names
2012-07-11 19:14:04 +02:00
6af99f3a09
Development snapshot:
...
Rewrote crtpt class as Util, Hooks, and Crypt
Switched blowfish for openssl with AES
Added setup() method for creating user keys and directory structure
Many other changes complete and in progress
2012-07-11 17:51:27 +01:00
e896c0a9e3
Fix addressbook sharing, formatItems() changed in past commits
2012-07-11 11:33:48 -04:00
07efd39d8a
prevent script execution during slideshow
2012-07-11 15:44:39 +02:00
e248412ca9
use getStorage() to get versions location
...
update routine implemented
version number of files_versions increased
Conflicts:
apps/files_versions/lib/hooks.php
2012-07-11 11:06:29 +02:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
ca8028bd73
small fixes in merge request 104, use OCP\Files::getStorage
2012-07-11 02:33:11 +02:00
0b14b4e3e8
Call exit() to prevent further code execution if directory does not exist
2012-07-11 02:33:11 +02:00
ef1924dbbb
gallery :: display big picture according to exif
...
- fixes oc-314
- caching of the 'big' images in subfolder view
next to the tumbnails
- now choosen to use max 1200px for viewing
this helps speeding up the viewing process
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2012-07-11 02:33:10 +02:00
3134a962d9
Call exit() to prevent further code execution if directory does not exist
2012-07-10 18:59:42 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
bf09bcc854
add OCP\Files to access files
2012-07-10 19:22:06 +02:00
9be6432aac
shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height
2012-07-10 16:58:37 +02:00
acb9612332
fix thumbnail size calculation, use const for THUMBNAIL_HEIGHT
2012-07-10 16:58:37 +02:00
02c9b03b8e
Missing dir added.
2012-07-10 16:58:37 +02:00
3e53bf4a86
Fix for oc-972, oc-1144 and oc-1191
2012-07-10 16:58:37 +02:00
91da4b05b7
fixed typos
2012-07-10 15:51:57 +01:00
7f57591ef1
suppress error when using is_dir on non directory in smb backend
2012-07-10 14:20:30 +02:00
aeed130b3a
improve caching smb results a bit
2012-07-10 14:20:19 +02:00
8a902d8f65
improve filecache support for smb
2012-07-10 14:20:11 +02:00
a1fefea66f
split share and root config for smb backend, also sanitize config a bit more
2012-07-10 14:19:51 +02:00
8fcce55e76
share code between smb and ftp filestorage backends
2012-07-10 14:19:40 +02:00
539e4a1813
smb filestorage backend
2012-07-10 14:19:31 +02:00
9d2cbc88f0
Revert reversion of f5c329af98 :-P
2012-07-10 01:24:40 +02:00
34ac2ea1ba
Don't escape assigned values.
2012-07-10 01:24:40 +02:00
861c379255
Make sure the proper DOM is loaded and the right address book gets expanded.
2012-07-10 01:24:40 +02:00
0744e5a172
Look for the right field :-P
2012-07-10 01:24:40 +02:00
7cb74a0bf3
Reduce variables assigned.
2012-07-10 01:24:40 +02:00
50462903d6
Revert "Delay fetching of carddata and set ETag and size instead."
...
This reverts commit f5c329af98
2012-07-10 01:24:40 +02:00
b97eb3a48f
fixing oc-1198
2012-07-09 23:50:26 +02:00
43f00a2dc8
create uploads directory for ssl certificates if it didn't exists
2012-07-09 18:11:29 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
b67199bb45
add css id attribute, minor fixes
2012-07-09 16:04:46 +02:00
6f408c3651
add supersized slideshow
2012-07-09 15:13:23 +02:00
77f07c672e
remove hard coded path
2012-07-09 12:49:04 +02:00
6bf1473f0e
replace urlencoded slash
2012-07-09 11:58:16 +02:00
32b476d6ec
remove comments around code block
2012-07-09 10:19:19 +02:00
7d41d3aba8
webdav ssl cleanup
2012-07-09 09:40:33 +02:00
f5c329af98
Delay fetching of carddata and set ETag and size instead.
2012-07-09 01:48:42 +02:00
47aaca49a1
Rescan categories in small batches to reduce memory usage.
2012-07-09 00:16:14 +02:00
d1cf787197
Move code to OC_Contacts_App::scanCategories().
2012-07-09 00:15:37 +02:00
6d123e90f3
Remove deleted address book from list.
2012-07-08 23:38:03 +02:00
0b6cd8d203
Simplify VCF generation.
2012-07-08 23:36:52 +02:00
197086a952
Make it possible to import files using CR as eol.
2012-07-08 18:34:00 +02:00
dc8193fccb
Make it possible to import files using CR as eol.
2012-07-08 18:28:55 +02:00
334257d2b6
Implemented VCFExportPlugin.
2012-07-08 17:52:57 +02:00
3424785db0
Implemented Sabre iCalendar Export Plugin.
2012-07-08 16:58:17 +02:00
747b7fbbfe
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
2012-07-08 16:17:10 +02:00
f5c620006e
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
2012-07-08 16:15:52 +02:00
97106f198f
Set the loading class on the property being changed, not on its container.
2012-07-08 16:11:45 +02:00
d730d3edd4
Set the loading class on the property being changed, not on its container.
2012-07-08 16:10:12 +02:00
25b95a9ec7
Improve checking for active addressbooks and creating default addressbook.
2012-07-08 15:41:38 +02:00
554cb2d3ab
Add missing requesttoken.
2012-07-08 14:48:49 +02:00
47f96e2d5e
Missing semi-colon.
2012-07-08 14:42:33 +02:00
746eef0d5c
Format error response correctly.
2012-07-08 14:31:40 +02:00
e6a60198e4
Return error messages in correct format.
2012-07-08 14:11:48 +02:00
2b22f0db0a
Add missing requesttoken.
2012-07-08 13:28:12 +02:00
ea70ca3ce3
CSRF checks
2012-07-07 16:12:21 +02:00
2c318f45f4
CSRF checks
2012-07-07 16:08:27 +02:00
04a0755fd3
CSRF checks
2012-07-07 16:03:21 +02:00
b7c510a61a
CSRF checks
2012-07-07 16:02:33 +02:00
0abcf0a421
CSRF checks
2012-07-07 15:58:11 +02:00
c63db28eaf
CSRF check
2012-07-07 15:54:52 +02:00
b967530795
increase the time limit again to a sensible granularity of 1 min.
...
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
ca26bcc581
close file after write process
2012-07-06 17:09:20 +02:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
75d01b065d
Make export batch size configurable.
2012-07-06 13:49:04 +02:00
cafbd02337
Fix endless loop when no addressbooks.
2012-07-06 13:24:56 +02:00
a1872412bf
Correct hack ;)
2012-07-06 12:59:07 +02:00
ab1b4f1f03
Fugly fixed include.
2012-07-06 12:59:07 +02:00
963faf6458
CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
2012-07-06 12:35:29 +02:00
8353517969
use OC_Connector_Sabre_Client
2012-07-06 12:24:03 +02:00
f875240b47
comment out some code
2012-07-06 11:23:20 +02:00
9a10efd80f
Merge branch 'master' into calendar_import
2012-07-06 11:01:12 +02:00
a5a1d929ca
No need for being protected.
2012-07-06 03:22:42 +02:00
59b38e668d
Missing requesttoken
2012-07-06 03:22:42 +02:00
5e0b80dc8d
Contacts: Fix copy&paste error
2012-07-05 17:12:52 +02:00
51774cca6b
use OC_Filesystem for rollback
2012-07-05 14:20:40 +02:00
378fa2bc86
check if caview really exists
2012-07-05 12:17:33 +02:00
55cde0e5aa
moved remove and rename hook to libs/hooks.php
2012-07-05 11:35:08 +02:00
aa3b575ceb
disabled user upload of root certificates until sabredav client can handle them
2012-07-05 11:31:30 +02:00
aa95cf2c98
Merge branch 'master' into calendar_import
2012-07-05 11:30:37 +02:00
f86ecb3bf7
send ca cert path to sabredav client
2012-07-05 11:28:32 +02:00
9d00f4d2fb
Correct db default value.
2012-07-05 00:40:11 +02:00
dac2c14ae9
Add missing CSRF check.
2012-07-05 00:37:08 +02:00
b11b6afbb9
Hopefully fix for drag'n'drop import in oc-813.
2012-07-05 00:25:38 +02:00
5d79444852
Missing update script.
2012-07-04 22:58:31 +02:00
706a13544b
Remove ugly activation hack.
2012-07-04 22:13:36 +02:00
7ec2d6ce85
Merge branch 'master' into calendar_import
2012-07-04 21:15:32 +02:00
a4c2893128
some more work on calendar import - new import is (nearly) done
2012-07-04 21:14:40 +02:00
e258da5c3c
certificate should be only visible for users
2012-07-04 17:22:04 +02:00
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
b2eac08ad3
Query contacts in batches of 20. Possible fix for oc-1126.
2012-07-04 16:54:00 +02:00
5fb9b3e965
Disable expires header on thumbnail and photo.
2012-07-04 15:32:41 +02:00
6d3afb3857
Moved action buttons down to the add field menu. Fixes oc-1155.
2012-07-04 13:57:07 +02:00
f72a11f852
Moved action buttons down to the add field menu. Fixes oc-1155.
2012-07-04 13:49:39 +02:00
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
393eefa5d2
replace some direct links with OC.imagePath
2012-07-03 23:44:47 +02:00
f98bd1ad66
Merge branch 'master' into calendar_import
2012-07-03 22:35:46 +02:00
c036700c54
some more work on calendar import
2012-07-03 22:33:24 +02:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
b1c9785eb3
Merge branch 'master' of gitorious.org:owncloud/owncloud
...
Conflicts:
apps/files_versions/lib/versions.php
2012-07-03 18:17:32 +01:00
a775deaf22
Moved hooks and versions.php into new lib directory
...
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
2012-07-03 17:42:51 +01:00
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
1e36e1f2cb
Use formatted shared addressbook in all cases, addressbooks out of order now
2012-07-03 11:36:57 -04:00
4185bd6292
Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
2012-07-03 11:11:01 -04:00
b6cff93254
fix spelling fail in code
2012-07-03 16:47:46 +02:00
0b3ed2b048
Merge branch 'master' into calendar_import
2012-07-03 16:39:09 +02:00
ca2b1f7863
fix encoding fail in calendar app - bugfix for oc-1194
2012-07-03 13:55:48 +02:00
cfcfdd674e
Merge branch 'master' into calendar_import
2012-07-03 13:43:52 +02:00
29a9559fa9
some work on calendar import dialog
2012-07-03 13:43:18 +02:00
77b582e4e6
Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
2012-07-02 15:29:34 -04:00
88cbbc86b8
Text editor: Always use UTF-8 to keep Ace happy.
2012-07-02 19:06:40 +00:00
0a6f7b33c3
LDAP: make it UTF-8 save
2012-07-02 20:31:19 +02:00
ab036d4764
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
2012-07-02 17:52:51 +02:00
515adceace
LDAP: reset resource on failed bind
...
check for resource
2012-07-02 14:03:29 +02:00
e89a0949c4
remove some whitespace
2012-07-01 23:32:21 +02:00
803f2c2517
some work on calendar import
2012-07-01 21:36:09 +02:00
eca2e073f8
Don't reload the page after sending private link to email address
2012-07-01 11:54:32 -04:00
bf93dd4661
Don't reload the page after sending private link to email address
2012-07-01 11:53:29 -04:00
0b9b1757fe
Add share action to addressbooks!
2012-06-30 21:06:49 -04:00
47f46890c8
Fix generateTarget() for contacts backend
2012-06-30 21:03:36 -04:00
6a060ecd23
use light grey instead of white
2012-07-01 01:02:54 +02:00
c7a4075aaa
Updates contacts migration provider
2012-06-30 22:56:47 +00:00
be11f71d27
fix doc for OC_Calendar_Calendar::generateTextColor()
2012-07-01 00:31:05 +02:00
601237a0c3
add algorithm to generate the calendar's text color
2012-07-01 00:09:33 +02:00
2418d9a1a9
Change registerBackend calls class argument to strings
2012-06-30 17:33:30 -04:00
ce331bd1d3
improvements for dropoimport
2012-06-30 23:18:41 +02:00
a705b19cd5
little fix for import
2012-06-30 22:45:12 +02:00
f15941a967
improve dropimport
2012-06-30 22:26:29 +02:00
4890bbb30d
Merge branch 'master' into calendar_import
2012-06-30 22:08:36 +02:00
376431fa0d
import works now for dropimport
2012-06-30 22:08:30 +02:00
fa5b31ac9c
fix documentation style
2012-06-30 17:09:20 +02:00
8e0addebc3
fix some doc
2012-06-30 15:39:20 +02:00
34b2486d53
some improvements for calendar export
2012-06-30 15:23:21 +02:00
390f5cc89f
some work on (drop)import)
2012-06-30 15:17:29 +02:00
51173163ce
Contacts: align the bottom control buttons
2012-06-30 11:22:09 +00:00
704a1c655e
Contacts: fix add contact icon path
2012-06-30 11:07:54 +00:00
433d15d309
Merge branch 'master' into calendar_import
2012-06-30 12:50:26 +02:00
6e6f90a8a2
fix merge conflicts
2012-06-30 12:44:51 +02:00
34d4eb8edd
some more work on calendar import class
2012-06-30 12:42:36 +02:00
edc6a648d1
Fix placeholder value for optional fields in external storage UI
2012-06-29 19:35:57 -04:00
252453cd34
fix encryption test cases when not logged in
2012-06-30 01:05:18 +02:00
a4614f83ff
Don't add duplicate contacts in the list when en-/disable an address book.
2012-06-29 23:18:47 +02:00
246894243a
Merge branch 'master' into calendar_import
2012-06-29 21:46:09 +02:00
719c7f7f6e
Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
2012-06-29 13:01:00 -04:00
3ed7738d5e
Increment user_openid version to load new app type
2012-06-29 18:38:04 +02:00
f61793aa14
Coding style fixes
2012-06-29 18:38:04 +02:00
2b4ecbaba0
Whitespace fixes
2012-06-29 18:38:04 +02:00
652a874fa6
fix displaying of events
2012-06-29 18:13:52 +02:00
3bcf176a53
add some hooks to fix calendar sharing
2012-06-29 17:27:29 +02:00
7e9455c382
Allow multiple Google Drive and Dropbox external storages to be configured
2012-06-29 11:22:54 -04:00
2d49a491fb
Clear the mount point value for the new mount point row
2012-06-29 11:10:51 -04:00
f311c2a2ff
Hide the delete button on new mount point row
2012-06-29 11:10:51 -04:00
bda0026374
fix birthday calendar
2012-06-29 15:43:18 +02:00
b95996c02c
- when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
...
- don't allow renaming if a file/directory with the name already exists
2012-06-29 15:23:04 +02:00
08e707d258
some work on OC_Calendar_Import
2012-06-29 14:32:07 +02:00
60ec46f706
- remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
...
- if secure is set to true add 's' to http
2012-06-29 12:01:23 +02:00
75af5778a4
pass progresskey the correct way during calender import
2012-06-29 00:49:37 +02:00
31bba86e87
Fix external storage UI for Admin page
2012-06-28 17:55:22 -04:00
02e4e0e08f
Gallery: Get all the image information for a directory at once
2012-06-28 22:11:04 +02:00
91d92aed02
fix for previous commit
2012-06-28 19:13:43 +02:00
4b3af1f73b
use OC_Calendar_Export for publicly shared calendars
2012-06-28 19:12:50 +02:00
930bbeabd4
Calendar Export: replace spaces with dashes in the name of the calendar / event
2012-06-28 19:04:14 +02:00
9dd7ca2667
some changes and more doc for OC_Calendar_Export class
2012-06-28 18:54:13 +02:00
9a4709e68d
fix calendar export for Apple iCal - i hate bloody line ends
2012-06-28 16:41:00 +02:00
c4f5639cb4
Merge branch 'master' into calendar_export
2012-06-28 15:24:30 +02:00
bdd1baeb85
use public API
2012-06-28 14:18:57 +02:00
e5792cc064
adjust the name and/or location of the stored versions if the actual file gets moved or renamed
2012-06-28 14:06:20 +02:00
f22f49671b
move hook to erase versions from deleted files to the right place
2012-06-28 12:42:47 +02:00
52f99a7570
delete file versions if the user deletes a file
2012-06-28 11:48:57 +02:00
dac539b619
handover the correct timestamp
2012-06-28 11:46:17 +02:00
3cea1b062e
Merge branch 'master' into calendar_export
2012-06-28 09:27:54 +02:00
e04a605b9b
No need for this anymore.
2012-06-28 01:51:42 +02:00
a48aba316e
Smoother profile picture loading - hopefully.
2012-06-28 01:46:33 +02:00
db6139fd41
Don't overwrite fake directory stream for Amazon S3 storage
2012-06-27 19:44:52 -04:00
426193cf6c
Migration: Fix contacts and bookmarks
2012-06-27 21:18:31 +00:00
77b7f214d2
Load contactlist progressivly.
2012-06-27 22:44:28 +02:00
e029e8cb14
Merge branch 'master' into calendar_export
2012-06-27 22:27:55 +02:00
8712754f8c
fix style of some doc
2012-06-27 22:27:48 +02:00
1f738d8c9f
Merge branch 'master' into calendar_export
2012-06-27 22:24:12 +02:00
9b605969f1
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
2012-06-27 15:23:49 -04:00
77c66e8cc4
move some documentation to the right place
2012-06-27 21:05:46 +02:00
25a50f00bd
add merge calendar function and add some documentation to OC_Calendar_Calendar
2012-06-27 20:56:58 +02:00
b7f86cf282
Add Samba Share parameter to external storage UI
2012-06-27 12:24:21 -04:00
895d5707ee
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:09:11 -04:00
2c773d549d
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:07:42 -04:00
19f94774fb
Don't overwrite fake directory stream for Dropbox and Google Drive
2012-06-27 12:04:33 -04:00
c0e86489c9
no reason to strip tags at this point
2012-06-27 17:56:00 +02:00
c67ae2e7f1
no reason to strip tags at this point
2012-06-27 15:56:14 +02:00
235515e84b
Something like this should do it for sharing contacts
2012-06-27 15:44:42 +02:00
d5237c42bc
Util::formatDate() expect $timestamp as double
2012-06-27 15:05:40 +02:00
90b5cf680f
Merge branch 'master' into calendar_export
2012-06-27 14:05:11 +02:00
060a297260
enable highlighting of address in OSM.
2012-06-27 11:46:42 +02:00
7af76e36e1
enable highlighting of address in OSM.
2012-06-27 11:41:52 +02:00
79da782892
Improve error handling of Dropbox storage backend
2012-06-26 20:37:50 -04:00
3edc40a68a
Load default categories if there are none,
2012-06-27 02:12:53 +02:00
823bef3a09
Ensure event handlers are being set when adding first contact.
2012-06-27 02:12:53 +02:00
afd9705283
Add check for return value.
2012-06-27 02:12:53 +02:00
b9e1033563
Basic framework for contacts sharing
2012-06-27 01:05:36 +02:00
32f9901bcd
Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend()
2012-06-27 01:05:36 +02:00
28b7793d5b
Fixes and change database table from sharing to share
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
8198114615
Some more changes to getItems() and fixes in shared storage
2012-06-27 01:05:36 +02:00
71350bc618
I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
f55f13eebc
Don't call getLocalFile() until you know it actually is music
2012-06-26 14:51:31 -04:00
cad282b73f
Added some error checking.
2012-06-26 18:15:24 +02:00
1b2d09f9ca
Added missing requesttoken.
2012-06-26 18:15:24 +02:00
d8b181cd84
Added error checking on all db queries.
2012-06-26 18:15:24 +02:00
db115429f7
Added createUser hook.
2012-06-26 18:15:24 +02:00
de4a540ce6
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 16:30:34 +02:00
46e93168cd
Fix variable name.
2012-06-26 16:06:52 +02:00
7dc72a48cc
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 15:48:21 +02:00
ae00f40b97
add OC_Calendar_Object::createUID()
2012-06-26 15:21:41 +02:00
b9ce4e1f40
add OC_Calendar_Object::createUID()
2012-06-26 15:20:29 +02:00
9cb01bd093
xss fix
2012-06-26 14:27:50 +02:00
c7de74c471
Merge branch 'master' into calendar_export
2012-06-26 14:15:07 +02:00
bf756293c6
Added signals.
2012-06-26 05:26:50 +02:00
8df59852a4
Adjust pic width a bit.
2012-06-26 04:09:45 +02:00
b384d79bf8
Remove x-scrollbar from contacts list.
2012-06-25 23:32:03 +02:00
103ae6faa4
Media: Change includes in app.php to use the autoloader
2012-06-25 21:05:10 +02:00
a72eddeef7
LDAP: compare base trees case insensitively
2012-06-25 20:54:21 +02:00
fb53708d10
LDAP: compare base trees case insensitively
2012-06-25 20:53:45 +02:00
2250fb1159
Emit Completed.
2012-06-25 20:30:21 +02:00
2ad93849ab
Idiot proof dialog ;-)
2012-06-25 19:33:51 +02:00
dc4b891327
Better visual feedback and prevent drop on self.
2012-06-25 18:24:15 +02:00
b8d6ad0431
Improve styling on draggables.
2012-06-25 18:24:15 +02:00
380f41136c
Added placeholder msg to share with menu to clarify user list restricted to security context
2012-06-25 16:57:41 +01:00
9bb409d881
fix syntax error after merge
2012-06-25 17:34:28 +02:00
ef93bf223a
Try to conserve some memory. Should fix oc-1106 for master.
2012-06-25 17:26:44 +02:00
ad5aa5ac15
Try to conserve some memory. Should fix oc-1106 for stable4.
2012-06-25 17:16:34 +02:00
42a5cd21b9
Missing requesttoken.
2012-06-25 17:15:33 +02:00
ddf321d534
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-25 16:22:19 +02:00
56ed8ba70b
Select which address book to add a contact to. Fixes oc-1071.
2012-06-25 16:21:29 +02:00
594e19bddc
LDAP: always sanitize DN and DN-containing attributes
2012-06-25 13:22:49 +02:00
3f6a7859c9
LDAP: cheaper userExists() implementation, fixes oc-1012
2012-06-25 13:22:00 +02:00
d64a7716f1
LDAP: always sanitize DN and DN-containing attributes
2012-06-25 13:22:00 +02:00
a09a01a49f
sanitizeHTML() has to be called later to keep the path unchanged
2012-06-25 12:44:54 +02:00
85ac75b4f4
xss vulnerability fixed
2012-06-25 12:38:11 +02:00
9ee528bc74
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:15:20 +02:00
0083dbb3ce
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:11:06 +02:00
052bd8efbb
Drag'n'Drop contacts between addressbook. Still needs some css magic.
2012-06-25 03:42:27 +02:00
51d33768b8
Prevent errors and mini enhancement of saved window in bookmarks
2012-06-24 21:30:14 +00:00
0fb9d0bf29
Correct bookmark app : add through interface and remove missing css
2012-06-24 21:24:43 +00:00
e845e56749
Remove excessive debugging.
2012-06-24 22:25:32 +02:00
3afbc3d2dc
Add some DRYness to logging.
2012-06-24 22:25:32 +02:00
f10c51193b
Fixed function name.
2012-06-24 22:25:32 +02:00
df1eca4fa2
Also load categories from VJOURNAL.
2012-06-24 22:25:32 +02:00
61adae1e49
Use intervals for sessions deletion with postgres fix oc-492
2012-06-24 19:41:23 +00:00
f56b3df0bc
Resolve scanning issue case comparison of songs
2012-06-24 16:03:25 +00:00
c53a8fa541
Correct seq name in media songs fix oc-589
2012-06-24 16:02:41 +00:00
6da926f1c3
Resolve scanning issue case comparison of songs
2012-06-24 15:58:51 +00:00
5b908209de
Correct seq name in media songs fix oc-589
2012-06-24 15:12:05 +00:00
0f9b9fa111
Remove unneeded parameter.
2012-06-24 16:07:18 +02:00
5393c0cfed
Click to select which address book to add to.
2012-06-24 16:03:10 +02:00
9e6d2f2f82
Improve prev/next selection on delete.
2012-06-24 15:07:44 +02:00
a12557ca4d
another fix for oc-1044
2012-06-24 09:42:14 +02:00
ca5de26bac
another fix for oc-1044
2012-06-24 09:41:37 +02:00
17e289aef2
Merge branch 'master' into calendar_export
2012-06-23 19:54:12 +02:00
1c0e72cd5a
Text editor: Waste less space for line numbers
2012-06-23 14:43:52 +00:00
6e5573acb5
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-23 14:42:54 +00:00
5323983fc7
Text editor: Waste less space for line numbers
2012-06-23 14:42:37 +00:00
d39d7fb9ff
Remove references to /apps/ and correct inclusion of settings
2012-06-22 22:05:39 +00:00
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
ded9ea5ad3
Spelling fixes
2012-06-22 22:57:35 +02:00
ea3a6d9fcf
Merge resource error-suppressing fix
2012-06-22 22:54:25 +02:00
2e6e154475
Gallery: Fix opening folders with a ' in the name
2012-06-22 22:46:12 +02:00
0939b1b0ab
Merge branch 'master' into calendar_export
2012-06-22 21:36:51 +02:00
618a3c1d94
Fix removing personal mounts
2012-06-22 12:22:42 -04:00
b650f46698
Fix variable checks for mounting Google Drive
2012-06-22 12:22:42 -04:00
b591c83008
Text Editor: fix editor positioning
2012-06-22 16:20:09 +00:00
41cfd55f55
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-22 16:17:23 +00:00
96ec7a66bb
More session_write_close
2012-06-22 17:21:56 +02:00
0aafc717ec
Text Editor: fix editor positioning
2012-06-22 15:02:03 +00:00
aade44471d
pdf viewer no longer 'eats' keyboard input
2012-06-22 16:10:25 +02:00
1f06cdf81f
Small js fix.
2012-06-22 14:27:46 +02:00
07124ee38d
Cast translation to string.
2012-06-22 14:27:46 +02:00
e1fa9c282b
xss vulnerabilities fixed
2012-06-22 14:11:57 +02:00
b6c862b32f
use sanitizeHTML() function
...
Conflicts:
apps/gallery/lib/tiles.php
2012-06-22 14:03:05 +02:00
5b46734a40
xss vulnerability fixed
2012-06-22 13:58:15 +02:00
8c2803a7c1
Correct image path and apps path replacement
2012-06-22 13:12:03 +02:00
e5171da300
remove unnecessary closing PHP tag
2012-06-22 12:50:49 +02:00
19931e2008
remove unnecessary closing PHP tag
2012-06-22 12:49:56 +02:00
0d9534eb4b
LDAP: cheaper userExists() implementation
2012-06-22 12:43:09 +02:00
bef9b671ee
LDAP: cheaper userExists() implementation
2012-06-22 12:42:07 +02:00
65c14e21ce
date don't change correctly in the view list (bug #973 ) fixed
2012-06-22 11:32:57 +02:00
8c28aec664
date don't change correctly in the view list (bug #973 ) fixed
2012-06-22 11:30:40 +02:00
82f39d3292
Contacts: Fix name and carddav-url encoding
2012-06-21 23:30:04 +02:00
fd23c286ef
Calendar: Fix caldav url encoding
2012-06-21 23:30:04 +02:00
4a22f4ca78
Calendar: convert choosecalendar.rowfields template from plain php to html+php
2012-06-21 23:30:04 +02:00
1d07b9e291
Calendar: Missing userid in allCalendars call
2012-06-21 23:30:04 +02:00
c047fdafdb
Calendar: Fix missing template parameter 'shared' for new and update calendar
2012-06-21 23:30:04 +02:00
95b5202893
Correct usage of approot
2012-06-21 21:13:12 +00:00
d72b85684f
Only search for VEVENTs.
2012-06-21 20:53:50 +02:00
9045557258
Tasks: Add delete action
2012-06-21 20:18:12 +02:00
d75b5cfdd2
Tasks: Use list label for ordering by list
2012-06-21 20:18:08 +02:00
dda56c5e3d
Tasks: Fix position of the summary input
2012-06-21 20:17:49 +02:00
46ad51cbe2
dont change the encryption key during the test case
2012-06-21 18:53:52 +02:00
bd8b921de4
only use 1 fsview when initializing encryption
2012-06-21 18:36:16 +02:00
bf6abdde2d
Add missing ')'
2012-06-21 12:26:06 -04:00
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
37d12144c2
Fix URL delimiter.
2012-06-21 22:03:57 +02:00
ad7154b344
Fix being able to link directly to contact, that I broke in other commit.
2012-06-21 22:02:17 +02:00
b17bf59ced
Only search for VEVENTs.
2012-06-21 20:51:23 +02:00
b17e682609
Tasks: Add delete action
2012-06-21 19:49:28 +02:00
10351550cd
Tasks: Use list label for ordering by list
2012-06-21 19:49:28 +02:00
b9e3b0ddf9
Tasks: Fix position of the summary input
2012-06-21 19:49:28 +02:00
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
49033ff8e0
dont change the encryption key during the test case
2012-06-21 18:53:10 +02:00
6707e4187e
only use 1 fsview when initializing encryption
2012-06-21 18:35:12 +02:00
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
da9107fe69
fix saved file size for uploaded files
2012-06-21 18:07:56 +02:00
7b4cb44af8
truncate decrypted files based on size
2012-06-21 17:51:54 +02:00
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
1338279ca0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 16:42:16 +02:00
49d9eb7acf
fix calendar
2012-06-21 16:24:05 +02:00
096f5598b4
fix calendar
2012-06-21 16:23:13 +02:00
7c3f6f61db
Fixed missing jQuery event object - expire interface now works with Firefox
2012-06-21 14:54:24 +01:00
288c5e7581
fix a PHP Notice
2012-06-21 15:20:53 +02:00
f5740a6f92
fix a PHP Notice
2012-06-21 15:20:15 +02:00
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
3b4d2a971a
check if user is allowed to edit bookmarks
2012-06-21 12:29:50 +02:00
09d2f76727
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 11:51:50 +02:00
2f9763d216
check if user is allowed to edit bookmarks
2012-06-21 11:50:51 +02:00
37ed3b5bd2
make edit event form work with DateTime Property UTC
2012-06-21 11:35:58 +02:00
1db2539223
make edit event form work with DateTime Property UTC
2012-06-21 11:35:20 +02:00
cd005e6c62
use new sanitizeHTML() function
2012-06-21 10:28:43 +02:00
f8ec280b6e
correct presentation of HTML encoded characters
2012-06-21 09:44:20 +02:00
82e8cb23fe
Merge branch 'master' into calendar_export
2012-06-21 09:08:26 +02:00
fedfa4c98e
DateTime objects are directly comparable
2012-06-20 21:38:56 +02:00
a6dc7345d0
Gallery: Move code/js/css from main template to the right place
2012-06-20 21:28:37 +02:00
10a0d5a46c
More changes for updating the contacts list.
2012-06-20 21:00:49 +02:00
dc8c188ffe
Better error checking.
2012-06-20 21:00:49 +02:00
426ed27be2
Make sure address books are shown even if empty.
2012-06-20 21:00:49 +02:00
0f1fe0b505
Log error as ERROR.
2012-06-20 21:00:49 +02:00
e43d02fadb
fix encrypted flags not being saved correctly
2012-06-20 20:18:42 +02:00
9ba467d629
fix encryption for binary files
2012-06-20 20:18:42 +02:00
0f2600e9ea
add binary test case for encryption
2012-06-20 20:18:41 +02:00
e3f1507374
use absolute path for file proxies
2012-06-20 20:18:41 +02:00
40e7b56783
Merge branch 'master' into calendar_export
2012-06-20 20:15:07 +02:00
0f13cbb47d
Merge branch 'master' into calendar_repeat
2012-06-20 20:14:08 +02:00
c1d205cbf5
Merge branch 'master' into calendar_export
2012-06-20 20:14:03 +02:00
d0dbc8beab
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
2012-06-20 20:04:41 +02:00
f255ac8b3a
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
2012-06-20 20:03:25 +02:00
4b231c15d5
bookmarks: make read later-button draggable again, fixes oc-944
2012-06-20 19:43:02 +02:00
72215a818d
added new user settings interface for deleting old file versions
...
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
6308ca6b8a
Merge branch 'shared_log'
2012-06-20 17:20:46 +02:00
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
cd934d5d89
Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible
2012-06-20 17:10:49 +02:00
5cc75ad818
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-06-20 17:08:48 +02:00
8e427d80d3
use sanitizeHTML() function
2012-06-20 17:00:55 +02:00
0e61b5457b
use new sanitizeHTML() function
2012-06-20 17:00:33 +02:00
a7f0811829
bookmarks: make read later-button draggable again, fixes oc-944
2012-06-20 16:31:22 +02:00
5a2c93ec2d
use sanitizeHTML() function
2012-06-20 15:11:14 +02:00
572dd9fbad
Merge branch 'master' into calendar_repeat
2012-06-20 13:29:12 +02:00
27c995230c
Merge branch 'master' into calendar_export
2012-06-20 13:28:30 +02:00
1ecbf459c9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 13:01:55 +02:00
5b02217906
forgotten $, incorrect subtract
2012-06-20 12:47:31 +02:00
7c6b8475eb
LDAP: only map users within the User Base Tree
2012-06-20 12:47:24 +02:00
0289f442a8
forgotten $, incorrect subtract
2012-06-20 12:41:30 +02:00
8d89bba07c
use new sanitizeHTML() function
2012-06-20 12:23:26 +02:00
311c2bc0d3
Calendar: Write-close session to enable parallel events.php requests
2012-06-19 23:18:26 +02:00
c260db0e9a
Tasks: Fix resizing of the content part
2012-06-19 23:17:14 +02:00
0d43d6402d
Tasks: Use POST for ajax calls that change data
2012-06-19 23:17:00 +02:00
cff1b6e699
Don't use substr to get first char of string
2012-06-19 23:16:17 +02:00
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
0b9a48b4b6
Re-add missing loadhandlers() call.
2012-06-19 14:56:21 +02:00
33aec973df
Loading of contacts was placed outside of $(document).ready() function.
2012-06-19 14:55:14 +02:00
5ce0097b6f
Calendar: only run ->expand if the event is repeating
2012-06-19 13:30:45 +02:00
2b2da6fe35
Calendar: js fix
2012-06-19 13:26:55 +02:00
c8c105df33
Calendar: fix modifying of end DateTime object
2012-06-19 13:04:11 +02:00
a38463d41a
Merge branch 'master' into calendar_repeat
2012-06-19 11:30:12 +02:00
244920aeb0
LDAP: only map users within the User Base Tree
2012-06-19 01:15:58 +02:00
8c8a0cca75
Merge branch 'master' into calendar_export
2012-06-18 23:10:01 +02:00
a1364c9726
fixes oc-1026
2012-06-18 22:48:52 +02:00
debd9c8dfb
fix problem with encryption flag not being saved correctly in the filecache
2012-06-18 18:18:10 +02:00
16560fe5c1
Merge branch 'master' into calendar_repeat
2012-06-18 15:59:26 +02:00
6e405513ab
Merge branch 'master' into calendar_export
2012-06-18 15:59:21 +02:00
13aad8f06d
some little fixes for repeating events caching
2012-06-18 15:58:01 +02:00
79f9d61ec8
Allow apps to load before login, needed for user_openid
2012-06-18 15:40:48 +02:00
beed6e0f0e
Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
...
This reverts commit e3b58f6783
2012-06-18 14:47:58 +02:00
e3b58f6783
Revert "create OC_Calendar_Object::generateStartEndDate function"
...
This reverts commit aa7ce480f4
2012-06-18 14:47:09 +02:00
6b6d3d68d4
Merge branch 'master' into calendar_repeat
2012-06-18 14:34:43 +02:00
c2b7d05188
Merge branch 'master' into calendar_export
2012-06-18 14:34:38 +02:00
e5feb4e1aa
Remove obsolete js.
2012-06-18 02:22:22 +02:00
73fd4c979a
Update js after contactlist change.
2012-06-18 02:21:29 +02:00
d8048414aa
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:39:38 +02:00
a4f53922c2
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:36:25 +02:00
cab4a634df
Save addressbook id to be able to rearrange contacts properly.
2012-06-17 23:14:02 +02:00
3efec3fde9
Make contact list fit in viewport.
2012-06-17 23:12:48 +02:00
ea4d8ccf70
Rearrange markup.
2012-06-17 23:12:11 +02:00
8337b30e43
Add thumbnail links so they are loaded when addressbook is expanded.
2012-06-17 23:09:25 +02:00
7d84c4741c
Use uasort instead of usort.
2012-06-17 21:50:49 +02:00
46a771d2e6
Sort addressbooks.
2012-06-17 21:47:15 +02:00
fb700de4a4
Add effect on addressbook show/hide.
2012-06-17 21:37:13 +02:00
9e4a41e9cb
Add effect on addressbook show/hide.
2012-06-17 21:34:56 +02:00
5a8f4b8783
Adjustments for inview handler etc.
2012-06-17 20:25:32 +02:00
b6b6d69158
Moved parsing to the controller and js to contacts.js.
2012-06-17 20:25:32 +02:00
2875901fc7
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
91f5a1de39
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
b1cfc99f63
Styled address book entries.
2012-06-17 20:25:32 +02:00
56d25d4d1b
Make the parsing in the controller, not in the template. Assign only relevant entries to the template.
2012-06-17 20:25:32 +02:00
92e35bd843
now a little less in template - more in ajax controller
2012-06-17 20:25:32 +02:00
7f485d1b20
contacts app now lists contacts sorted by expandable/collapsable addressbooks
2012-06-17 20:25:32 +02:00
b8daae30b6
Merge branch 'master' into calendar_repeat
2012-06-17 16:41:49 +02:00
4b872d10fc
Merge branch 'master' into calendar_export
2012-06-17 16:41:44 +02:00
8d67ca09b5
user_migrate: remove old code
2012-06-17 12:07:16 +00:00
b064fc6968
user_migrate: remove old code
2012-06-17 12:06:40 +00:00
229587a31e
Merge branch 'master' into calendar_repeat
2012-06-17 08:36:26 +02:00
a8da950819
Merge branch 'master' into calendar_export
2012-06-17 08:36:20 +02:00
ad4f066bac
suppress error when using is_dir on non directory in smb backend
2012-06-17 03:09:49 +02:00
ed66c63c29
improve caching smb results a bit
2012-06-17 02:59:38 +02:00
769cbe9a4c
improve filecache support for smb
2012-06-17 02:54:23 +02:00
33ab91710f
PDF Viewer: Double encode link.
2012-06-16 19:49:57 +02:00
9c6d82d00d
PDF Viewer: Double encode link.
2012-06-16 19:48:33 +02:00
7f1e0287a9
Merge branch 'master' into calendar_repeat
2012-06-16 19:04:50 +02:00
56f8fc0f70
Merge branch 'master' into calendar_export
2012-06-16 19:04:45 +02:00
707660b35f
files_imageviewer: Double encode paths. Fixes oc-1016.
2012-06-16 18:57:51 +02:00
1118498050
files_imageviewer: Double encode paths. Fixes oc-1016.
2012-06-16 18:54:55 +02:00
4cbdd59859
Fix char encoding.
2012-06-16 18:38:20 +02:00
6642ef6a50
Fix string encoding probs.
2012-06-16 18:06:47 +02:00
fd9a4f8d51
Merge branch 'master' into calendar_repeat
2012-06-16 09:48:43 +02:00
be4820bbca
Merge branch 'master' into calendar_export
2012-06-16 09:48:32 +02:00
fc632b5795
fix merge conflicts
2012-06-16 09:48:07 +02:00
31ec93bd00
remove a lot of closing php tags and empty lines at a file's end in calendar app
2012-06-16 09:45:17 +02:00
05c1afd0d1
Merge branch 'master' into calendar_repeat
2012-06-16 09:41:31 +02:00
4d392801cc
Merge branch 'master' into calendar_export
2012-06-16 09:41:24 +02:00
cbe5449f47
remove a closing php tag in calendar
2012-06-16 09:40:32 +02:00
b6375e7a8c
remove a closing php tag in calendar
2012-06-16 09:40:03 +02:00
a6531d0311
Merge branch 'master' into calendar_repeat
2012-06-16 09:35:53 +02:00
81e8ffc4ba
Merge branch 'master' into calendar_export
2012-06-16 09:35:48 +02:00
bf2062b09d
write_close the session when scanning files or music
2012-06-16 01:35:39 +02:00
ec3033a5dd
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-15 19:34:25 -04:00
195c37f88a
fix for encryption binary files
2012-06-16 01:31:03 +02:00
c1744d2eb6
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:17:31 +00:00
8484e16516
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-15 23:14:48 +00:00
e37ef6dd47
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:14:40 +00:00
4268fe61ba
Calendar: Write-close session to enable parallel events.php requests
2012-06-16 00:44:23 +02:00
6d3ae575b6
Remove $DOCUMENTROOT, not used
2012-06-16 00:11:36 +02:00
03951ccc6b
fix encryption proxy for updated filecache
2012-06-15 23:11:55 +02:00
19bfe21401
add binary test case for encryption
2012-06-15 23:11:33 +02:00
fbd45a939f
Merge branch 'master' into calendar_repeat
2012-06-15 20:48:32 +02:00
4d2894f390
Merge branch 'master' into calendar_export
2012-06-15 20:48:26 +02:00
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
449760f665
add hasUpdated to oc_filestorage
2012-06-15 16:43:24 +02:00
5c6a7172ca
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:58:10 +02:00
8f6121ffa8
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:57:04 +02:00
aa7ce480f4
create OC_Calendar_Object::generateStartEndDate function
2012-06-15 12:11:22 +02:00
4767c70578
fix merge conflicts
2012-06-15 11:48:26 +02:00
22a33b509f
use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod
2012-06-15 11:39:19 +02:00
e4529301ff
change some function names in OC_Calendar_Repeat
2012-06-15 11:34:21 +02:00
5c10683432
use easier parseable date to init datetime
2012-06-15 11:29:16 +02:00
6f20d51646
fix generateEventOutput for calendar hook
2012-06-15 11:25:29 +02:00
b6a8de8530
don't clean and cache calendar on every update
2012-06-15 11:24:40 +02:00
f9c34942e1
applied merge request #128 : fixed some sorting and display issues with gallery app.
...
This also fix bug #872 for the new gallery
2012-06-15 10:46:29 +02:00
0dd4ea5a4f
Merge branch 'master' into calendar_export
2012-06-15 10:41:06 +02:00
4b7bdd5ace
Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128
...
Conflicts:
apps/gallery/templates/index.php
2012-06-15 09:51:04 +02:00
effb6f1309
Update stylesheet for type=url.
2012-06-15 04:32:01 +02:00
8a68d09b0f
Use type=url for URL field.
2012-06-15 04:32:01 +02:00
92083aa20c
Fix upload for Google Drive; Google Documents List API documentation was misleading
2012-06-14 20:57:08 -04:00
f6aa366857
Make sure there is a calendar after delete.
2012-06-15 02:10:55 +02:00
3c75ac5f62
Update calendar after delete.
2012-06-15 02:07:32 +02:00
ad8c4ab182
Only create new calendar when there are none. Fix oc-1007.
2012-06-15 01:55:02 +02:00
ad32c20300
Agree on argument type (cleaned this time).
2012-06-15 01:51:26 +02:00
6d43e6565e
Revert "Agree on argument type."
...
This reverts commit 0f6b1be0e6
2012-06-15 00:53:13 +02:00
0f6b1be0e6
Agree on argument type.
2012-06-15 00:50:42 +02:00
1e76a530ea
No need to find calendar twice.
2012-06-15 00:28:12 +02:00
31db583f03
Make events show again.
2012-06-15 00:26:34 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
96a3e28c2e
Cleanup code.
2012-06-14 23:05:31 +02:00
27ab6daeb0
If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier...
2012-06-14 23:05:31 +02:00
f3b30e4658
Forgot $ sign for variable
2012-06-14 15:14:01 -04:00
f7e686d4f1
Revert "Fix a counting mistake"
...
This reverts commit c20abfef38
2012-06-14 15:05:20 -04:00
ec69377ade
first load compatibility.js
2012-06-14 21:00:19 +02:00
4cc9bf09be
fix javascript error
2012-06-14 20:55:36 +02:00
4eb0c270aa
fixed handling of fallback_images
2012-06-14 19:38:43 +02:00
b025ff8de3
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:33:00 +02:00
12bfc551fb
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:31:38 +02:00
6e15b231b0
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-14 12:27:30 -04:00
47c03a0eff
Contacts: Fixes for CSRF.
2012-06-14 18:13:01 +02:00
3b58c7a407
Remove debug statements.
2012-06-14 18:03:50 +02:00
a3afd51b94
fixed one issue with last directory in structure having a lot of
...
subdirectories and finally some pictures
2012-06-14 18:02:07 +02:00
b6ee4c458b
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-14 18:00:45 +02:00
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
4510571aa1
Add app for logging access to shared files
2012-06-14 17:44:41 +02:00
fa67927eb5
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
...
Conflicts:
apps/gallery/templates/index.php
2012-06-14 17:08:52 +02:00
60bd2562d8
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
2012-06-14 15:16:13 +02:00
6468e0a1d5
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
2012-06-14 15:14:36 +02:00
df4737f52a
prevent xss attacks also if some javascript ends up in the alt-tag
2012-06-14 14:19:12 +02:00
d28a4f0638
prevent xss attacks also if some javascript ends up in the alt-tag
2012-06-14 14:17:30 +02:00
cd759aee00
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
2012-06-14 13:45:33 +02:00
87855f2506
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-14 13:44:42 +02:00
211a546600
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
2012-06-14 13:41:39 +02:00
756eb3548f
Use the right csrf token.
2012-06-14 13:23:12 +02:00
544f97f034
debugging output removed
2012-06-14 13:19:11 +02:00
4a47fa255d
xss vulnerability fixed for fancybox image viewer
2012-06-14 13:18:59 +02:00
b0ecef02e9
debugging output removed
2012-06-14 13:17:06 +02:00
e7b93b1807
xss vulnerability fixed for fancybox image viewer
2012-06-14 13:13:17 +02:00
bc6884b176
we don't neede the functions for empty stacks any more
2012-06-14 12:51:27 +02:00
b32afd1331
we don't have empty previewstacks any more - code cleaned up
2012-06-14 12:39:18 +02:00
56d2e99239
deleted some debugging output
2012-06-14 01:29:41 +02:00
22cd610a79
use images from deeper directories for preview if the actual directory doesn't contain any
2012-06-14 01:29:25 +02:00
9f59cc5eb0
improved look of directories not containing images directly
2012-06-14 01:29:17 +02:00
e99a95a756
now also working for directories only containing one image
2012-06-14 01:27:34 +02:00
4711c2bb41
fixed second_level_images issue
2012-06-14 01:27:26 +02:00
e4278574a8
fixed sorting errors and missbehaviours - now sorting like file browser
2012-06-14 01:27:01 +02:00
f9af0ef703
fix another ui bug of calendar
2012-06-13 22:21:23 +02:00
e154806838
fix another ui bug of calendar
2012-06-13 22:20:43 +02:00
92a11011b1
another ui fix
2012-06-13 22:15:12 +02:00
2e44ffaf02
another ui fix
2012-06-13 22:14:40 +02:00
4ff11308a3
fix a ui bug for calendar sharing
2012-06-13 22:13:24 +02:00
b1139e977a
fix a ui bug for calendar sharing
2012-06-13 22:12:54 +02:00
e543ec6eb6
show username of the body who shares in the summary
2012-06-13 22:07:30 +02:00
6bd80d6457
show username of the body who shares in the summary
2012-06-13 22:07:23 +02:00
7d29bee859
fix merge conflicts
2012-06-13 21:40:05 +02:00
61b044e00e
Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts
2012-06-13 21:39:12 +02:00
7a8e7f18db
Calendar: Clicking #datecontrol_date gives datepicker to jump to date
2012-06-13 21:39:12 +02:00
4da6b3a391
Calendar: Make button of #datecontrol_date
2012-06-13 21:39:12 +02:00
c24752dc1d
Merge branch 'master' into calendar_export
2012-06-13 21:38:33 +02:00
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
bd01e93469
Add support for mounting Google Drive in external storage UI
2012-06-13 13:54:50 -04:00
3e339f3d66
Remove check for encryption.
2012-06-13 19:04:47 +02:00
613a122437
Remove check for encryption.
2012-06-13 19:03:34 +02:00
d33d599b1b
Remove debug statements.
2012-06-13 18:57:12 +02:00
bc1e8cb0a2
Contacts: implemented CSRF prevention.
2012-06-13 17:35:42 +02:00
3a8b280c06
Merge branch 'master' into calendar_export
2012-06-13 15:29:47 +02:00
9bdad6fdbf
fix merge conflicts
2012-06-13 11:40:00 +02:00
7868b25dcc
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:34:35 -04:00
6f55a52858
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:33:05 -04:00
48116cf9ab
increase version of calendar app to force db upgrade
2012-06-12 19:54:07 +02:00
d54fc6dfd4
increase possible size of uri in database - fix oc-140
2012-06-12 19:54:07 +02:00
deb2f87556
increase version of calendar app to force db upgrade
2012-06-12 19:53:26 +02:00
dc0adbad02
increase possible size of uri in database - fix oc-140
2012-06-12 19:52:25 +02:00
f7727a322d
Merge branch 'master' into calendar_repeat
2012-06-12 19:26:52 +02:00
5f80be7664
Add support for mounting Dropbox in external storage UI
2012-06-12 11:36:43 -04:00
635a2f8ec9
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:32:00 +02:00
8626f04f5d
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:27:24 +02:00
71573f7934
Merge branch 'master' into calendar_repeat
2012-06-12 15:58:01 +02:00
c9d408ff8c
automatic cache repeating events after an update
2012-06-12 15:56:51 +02:00
ef6b6ac230
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:16:09 +02:00
f6e7c633a0
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:11:28 +02:00
cee9d400c0
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:33:37 +02:00
c44591e27a
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:32:37 +02:00
b70226b493
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-12 11:57:36 +02:00
4501407283
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:41:13 +02:00
b38ce8adfd
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:39:03 +02:00
5e37a10334
PDF.JS updated, compatibility.js added for browser support, should fix: oc-395
2012-06-12 00:50:34 +02:00
3be5e2af26
utf8 in der DB config
2012-06-11 23:04:28 +02:00
66c3ddcd74
Merge branch 'master' into calendar_repeat
2012-06-11 22:18:46 +02:00
210b71502b
Fix copy/paste error.
2012-06-11 22:18:14 +02:00
3c9be43aa4
add some information about repeating events caching on personal settings page
2012-06-11 22:16:26 +02:00
e0a5e3e992
Fix js for missing address fields.
2012-06-11 22:15:56 +02:00
c75a7966de
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:15:31 +02:00
ac11647d7a
Fix js for missing address fields.
2012-06-11 22:14:21 +02:00
4b86cbcb6f
Quick fix for index errors when not importing from files.
2012-06-11 22:14:21 +02:00
c75f9f9397
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
2012-06-11 22:14:21 +02:00
8af53829d5
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:14:21 +02:00
08a3a4f185
fix a bug in OC_Calendar_Repeat
2012-06-11 21:43:24 +02:00
759ddcbf32
Tasks: Fix resizing of the content part
2012-06-11 20:34:06 +02:00
0eee140eaf
Gallery: remove extra include of lib/base.php
2012-06-11 20:34:06 +02:00
eddad8bedb
Calendar: remove unused markup from #controls
2012-06-11 20:34:06 +02:00
f9bf34340c
Removed unecessary sanitization
2012-06-11 19:49:24 +02:00
68f819ee20
Removed double sanitization
2012-06-11 19:47:42 +02:00
9edd40354e
Merge branch 'master' into calendar_repeat
2012-06-11 19:46:12 +02:00
ad36fc8938
Fix double sanitization
2012-06-11 19:43:37 +02:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
1d493a70e7
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
2012-06-11 18:13:12 +02:00
18d19b022f
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-11 17:28:15 +02:00
09e744b793
connect OC_Calendar_repeat to events.php
2012-06-11 17:25:03 +02:00
009c4c9045
add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public
2012-06-11 17:15:50 +02:00
2dd84373c1
fix bug in OC_Calendar_Repeat
2012-06-11 17:13:20 +02:00
266c5238c9
LDAP: offer config option for Group Display Name attribute
2012-06-11 16:50:54 +02:00
fcc9a5c8d4
LDAP: offer config option for Group Display Name attribute
2012-06-11 16:48:43 +02:00
739589f485
make sure that contact data are always utf8 encoded to avoid encoding problems
2012-06-11 16:26:21 +02:00
24a1ab8c15
Merge branch 'master' into calendar_repeat
2012-06-11 15:38:02 +02:00
44e62c03e2
increase version number of calendar
2012-06-11 15:37:19 +02:00
32b366585d
some fixes for repeating events caching
2012-06-11 15:36:48 +02:00
e6c8febafc
add hooks to connect calendar / event changes with OC_Calendar_Repeat
2012-06-11 15:18:46 +02:00
5cb9d82b45
modify hooks in OC_Calendar_Calendar
2012-06-11 15:16:59 +02:00
eb3605aa63
modify hooks in OC_Calendar_Object
2012-06-11 15:15:13 +02:00
01bd048bb3
remove insert id
2012-06-11 15:01:48 +02:00
40459c8c66
some work on repeating events caching - basic class should work now :)
2012-06-11 15:00:51 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
74eece2620
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:56:41 +02:00
6d9947b3ff
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:55:54 +02:00
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
0df67aeae9
ldap: check array for emptiness, not nullness
2012-06-11 12:26:48 +02:00
c110308c1e
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-11 12:14:10 +02:00
7f5e8e39c4
ldap: check array for emptiness, not nullness
2012-06-11 12:13:55 +02:00
6da717b644
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
...
Backport for sanitized user data.
2012-06-11 11:57:36 +02:00
d294373f47
Sanitzing user input
2012-06-11 11:56:54 +02:00
f8337c9d72
Using POST instead of GET.
2012-06-11 11:56:11 +02:00
cc653a8a40
Sanitize user input
2012-06-11 11:54:45 +02:00
8f09299e24
Sanitizing user input
2012-06-11 11:54:03 +02:00
f2216dc9d2
Gallery: Fix database creation on update, also only from version less then 0.5
2012-06-11 11:20:51 +02:00
f4c459782b
Merge branch 'master' into calendar_repeat
2012-06-11 10:59:19 +02:00
ece1162949
use native sabredav functions to generate repeating events
2012-06-11 10:55:26 +02:00
e79e18d866
Copy/paste error.
2012-06-11 02:40:55 +02:00
3f9b967be7
Sanitizing user input
2012-06-11 00:36:58 +02:00
f8d2e21c66
Sanitize user input
2012-06-11 00:23:35 +02:00
27d1c1bb94
Sanitize user input
2012-06-11 00:14:28 +02:00
9f276729c2
Using POST instead of GET.
2012-06-10 23:38:26 +02:00
380aab470f
Sanitzing user input
2012-06-10 23:16:59 +02:00
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
40f8419fdf
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:56:55 +02:00
c898a8a6c9
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:54:52 +02:00
cdac0eae46
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-10 20:47:35 +02:00
6a44d02898
XSS--
2012-06-10 19:54:04 +02:00
bf4626da93
prevent XSS
2012-06-10 19:52:23 +02:00
c6a03ec6d8
remove include command for when
2012-06-10 18:41:17 +02:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
bdb76d4873
Merge branch 'master' into calendar_export
2012-06-10 18:37:16 +02:00
c11f6cc3f9
fix variable name and undefined index notice
2012-06-10 17:25:50 +02:00
3970be3d7f
fix variable name and undefined index notice
2012-06-10 17:25:19 +02:00
31d48d4ba4
adding missing file
2012-06-10 13:20:49 +02:00
de6b683b50
fix first time image loading error
2012-06-10 13:19:22 +02:00
2dca0926b0
gallery: removing search provider for now
2012-06-10 13:19:17 +02:00
7ee722e0da
removing app access check, fix title for links in tiles
2012-06-10 13:18:55 +02:00
e073cd756c
tabs for spaces, fix array key name
2012-06-10 13:18:47 +02:00
f6c07094c2
hide share button until sharing wont be fixed
2012-06-10 13:18:41 +02:00
1853a83874
adding navigation bar to gallery
2012-06-10 13:18:36 +02:00
fe64e625ff
remove old code
2012-06-10 13:18:30 +02:00
f0f9269161
adding missing file
2012-06-10 13:18:17 +02:00
6682c60866
pictures: update script and removal some all stuff
2012-06-10 13:17:23 +02:00
9c1cc15c8d
adding title when fancybox is displayed
2012-06-10 13:16:19 +02:00
c932f93a40
replace spaces with tabs, use const and linkTo instead of static path
2012-06-10 13:16:12 +02:00
276aefba81
hack for file download
2012-06-10 13:16:06 +02:00
71b4cddd52
removing test image
2012-06-10 13:16:00 +02:00
c67de113c6
aviod incorrect image size returning in gallery listing
2012-06-10 13:15:51 +02:00
63c02fd595
use fancybox to display image preview
2012-06-10 13:15:45 +02:00
7aff5eae6c
navigate on galleries
2012-06-10 13:15:39 +02:00
2b80102909
new db scheme
2012-06-10 13:15:32 +02:00
9b2b5e0f6d
git status
2012-06-10 13:15:23 +02:00
76f20eb57c
fix first time image loading error
2012-06-10 13:05:00 +02:00
746994c2be
Fixed merge conflict.
2012-06-10 12:59:36 +02:00
f90c8738ab
Contacts: Used non-existent var.
2012-06-10 12:48:39 +02:00
0838b4c225
gallery: removing search provider for now
2012-06-10 09:52:33 +02:00
be6848a549
let´s put the files_odfviewer application into the stable4 branch for convinience. We release it as part of ownCloud 4.0.x anyways.
2012-06-09 23:18:56 +02:00
995f9c7348
sanitize scope and host
2012-06-09 21:08:24 +02:00
322fd51261
avoid clickjacking
2012-06-09 21:08:24 +02:00
ab41b57f62
Add Dropbox storage backend
2012-06-09 15:02:48 -04:00
b46903fa76
sanitize when logged in as another user
2012-06-09 20:39:24 +02:00
d065b2d29e
prevent opening non-music files through the media ajax api
2012-06-09 17:39:14 +02:00
601bac746d
use absolute path for file proxies
2012-06-09 17:34:13 +02:00
e7f6f7e452
fix another XSS
2012-06-09 16:45:37 +02:00
642e7ce110
fix another XSS
2012-06-09 16:44:48 +02:00
f955f6a685
fix XSS in Calendar
2012-06-09 16:36:01 +02:00
c9214afff8
fix XSS in Calendar
2012-06-09 16:35:35 +02:00
ff4b175622
increase height of event dialog
2012-06-09 15:40:27 +02:00
009fbd89b4
fix creation of monthly repeated events
2012-06-09 15:40:27 +02:00
2862740674
increase height of event dialog
2012-06-09 15:38:03 +02:00
cfb9c764ca
fix creation of monthly repeated events
2012-06-09 15:15:00 +02:00
001293a702
removing app access check, fix title for links in tiles
2012-06-09 15:12:50 +02:00
0f454215e7
Code cleanup.
2012-06-09 15:04:08 +02:00
59d16c5f9a
Contacts: Use POST instead of GET.
2012-06-09 15:02:23 +02:00
081e1874cb
Contacts: Use POST instead of GET.
2012-06-09 15:00:44 +02:00
88341e5797
Code cleanup.
2012-06-09 15:00:44 +02:00
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +02:00
4aee5a7ce4
Tasks: Use POST for ajax calls that change data
2012-06-09 14:39:41 +02:00
c83f418a02
Merge branch 'master' into calendar_repeat
2012-06-09 12:30:39 +02:00
a9b561430a
add hooks for events
2012-06-09 12:30:09 +02:00
7ed30649bb
add hooks for calendars
2012-06-09 12:18:25 +02:00
cac995ee9f
some more work on repeating events caching
2012-06-09 11:49:25 +02:00
ac74d87e3e
some work on repeating events caching
2012-06-08 22:22:16 +02:00
201a40a1a3
tabs for spaces, fix array key name
2012-06-08 21:55:28 +02:00
0c7431e57d
hide share button until sharing wont be fixed
2012-06-08 21:44:33 +02:00
8bc22907b8
adding navigation bar to gallery
2012-06-08 21:44:33 +02:00
6b0a2ae60e
remove old code
2012-06-08 21:44:32 +02:00
71b04717ab
adding missing file
2012-06-08 21:44:31 +02:00
9e434dea60
tabs for spaces, removing thumbnail on file removal
2012-06-08 21:44:31 +02:00
ac36512102
Don't use substr to get first char of string
2012-06-08 21:38:10 +02:00
23533a763a
Don't fix bugs not present in this branch ;-)
2012-06-08 20:44:58 +02:00
5eb5d23ac1
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
...
Conflicts:
apps/contacts/ajax/uploadphoto.php
2012-06-08 20:43:42 +02:00
0a49bae87a
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
2012-06-08 20:39:54 +02:00
e83e30a8a9
Merge branch 'master' into calendar_repeat
2012-06-08 19:54:42 +02:00
8fcdccdcdc
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
2012-06-08 13:48:38 -04:00
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
eb192ff4f3
code cleanup from previous commit
2012-06-08 16:31:12 +02:00
cf1430df45
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-06-08 16:27:07 +02:00
0722ff6e32
fix for bug #872 : Folders not holding any images are ignored, even if they hold subfolders with images
2012-06-08 16:24:31 +02:00
0dc371f579
typo in var
2012-06-08 14:58:07 +02:00
f70615106f
typo in var
2012-06-08 14:57:27 +02:00
8c7fa15aaf
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:58:00 +02:00
4d3b7574f3
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:55:16 +02:00
65cd15ca15
fix merge conflicts
2012-06-08 11:21:55 +02:00
1d93a8fcfe
Merge branch 'master' into calendar_export
2012-06-08 11:20:17 +02:00
4768510923
split share and root config for smb backend, also sanitize config a bit more
2012-06-08 01:29:55 +02:00
4afcae8d56
Gallery: Fix database creation on update, also only from version less then 0.5
2012-06-07 23:38:50 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
d4f6f3e935
Contacts: Attempt to make file upload work in ICS Chrome.
2012-06-07 20:29:16 +02:00
33c802dcaa
Break text to fit in dialog.
2012-06-07 20:29:15 +02:00
0f68276921
LDAP: cache the results, reduce LDAP searches
2012-06-07 18:56:06 +02:00
c2f557f1dd
LDAP: cache the results, reduce LDAP searches
2012-06-07 18:55:32 +02:00
4beabe23e7
ldap: enable the destructor
2012-06-07 18:15:11 +02:00
6626598435
ldap: enable the destructor
2012-06-07 18:13:41 +02:00
14e1be56a0
pictures: update script and removal some all stuff
2012-06-07 17:08:04 +02:00
d2a8746c49
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-06-07 16:44:54 +02:00
f3f3c791ba
ldap: correct query condition and determining of success
2012-06-07 13:40:26 +02:00
691f00eb39
ldap: check index carefully, can be 0
2012-06-07 13:40:16 +02:00
44880ab3fa
ldap: remove unused private functions
2012-06-07 13:39:42 +02:00
6894882ca9
ldap: correct query condition and determining of success
2012-06-07 13:39:42 +02:00
470cb17f90
ldap: check index carefully, can be 0
2012-06-07 13:39:42 +02:00
9266f4da99
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
2012-06-07 13:10:19 +02:00
312536dbf9
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
2012-06-07 13:08:42 +02:00
de6d550cce
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:22:25 +02:00
e1f4978150
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:21:24 +02:00
3d48bf18d3
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:58:15 +02:00
3804f68ff5
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:55:40 +02:00
9c84149119
A bit of pixel-pushing.
2012-06-07 10:55:40 +02:00
8fd6cdf407
adding title when fancybox is displayed
2012-06-06 23:29:23 +02:00
5417d803c4
replace spaces with tabs, use const and linkTo instead of static path
2012-06-06 23:23:49 +02:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
6a812644e4
Correct remote and public, and last occurence of OC::
2012-06-06 20:24:15 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
a90089c792
hack for file download
2012-06-06 22:20:56 +02:00
7c88081acb
removing test image
2012-06-06 22:13:49 +02:00
aa0fc3c69a
aviod incorrect image size returning in gallery listing
2012-06-06 22:13:49 +02:00
671fe49809
use fancybox to display image preview
2012-06-06 22:13:49 +02:00
76e7e361ae
navigate on galleries
2012-06-06 22:13:49 +02:00
34a21a63ce
new db scheme
2012-06-06 22:13:49 +02:00
6d211155ab
git status
2012-06-06 22:13:48 +02:00
bb07c20bf4
fixed var name, $filename should be $foldername
2012-06-06 18:11:23 +02:00
c960e42a17
fixed var name, $filename should be $foldername
2012-06-06 18:08:51 +02:00
5c17338ac7
Contacts: Make js a tad DRYer. Added URL property.
2012-06-06 15:29:33 +02:00
ed950e3ba2
Correct mime type.
2012-06-06 15:29:33 +02:00
48ccfa42d3
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
2012-06-06 12:31:22 +02:00
190fca1121
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
2012-06-06 12:29:48 +02:00
ca0108aabf
Corrected typos.
2012-06-06 11:50:49 +02:00
517bd28940
Corrected typos.
2012-06-06 11:49:45 +02:00
6abe8f9e2e
fixed wrong function call
2012-06-06 10:40:22 +02:00
2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
d8d558377c
Merge branch 'master' into calendar_export
2012-06-06 10:11:34 +02:00
fce614b82c
Less aggressive caching on thumbnails too.
2012-06-06 01:06:13 +02:00
68670bcc66
Cleanup.
2012-06-06 01:06:13 +02:00
624f8ae36d
Also use OC_Cache here.
2012-06-06 01:06:13 +02:00
80de23d08b
Contacts: Removed temp dir cleanup after using OC_Cache.
2012-06-06 01:06:12 +02:00
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
a3c1f70be4
dont show config option for file upload size if we cant write the new value
2012-06-06 00:24:15 +02:00
063c9accb6
prevent creating files with a / the name
2012-06-06 00:04:02 +02:00
e6c4e53486
prevent creating files with a / the name
2012-06-06 00:02:51 +02:00
20aee83d07
Use UID for cache key.
2012-06-05 21:20:10 +02:00
cb941996c0
Contacts: Use OC_Cache for contact photo handling instead of temp dir.
2012-06-05 20:34:12 +02:00
3a5076d646
show pictures in folder with special characters, e.g. '+'
2012-06-05 17:58:23 +02:00
Bart Visscher
Arthur Schiwon
Michael Gapczynski
Jenkins for ownCloud
Frank Karlitschek
Jan-Christoph Borchardt
Georg Ehrke
Lukas Reschke
Jörn Friedrich Dreyer
jfd
Thomas Tanghus
Sam Tuke
Juan Carlos Cornejo
Robin Appelman
Bjoern Schiessle
jfd
BlackEagle
Johannes Willnecker
Tom Needham
Michael Gapczynski
Brice Maron
Stephan Bergemann
Marco B
Bartek Przybylski
Michiel de Jong