Frank Karlitschek
72e9a2ce57
moved to apps repository
2012-08-26 17:30:07 +02:00
Lukas Reschke
32bad688bd
Wrong function
...
https://github.com/owncloud/core/commit/2028c8116122f56d8087716e42162fdc
651819d3#commitcomment-1766755
2012-08-26 17:22:41 +02:00
Lukas Reschke
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
Lukas Reschke
4885a52ba4
Check if app is enabled
2012-08-26 16:05:40 +02:00
Lukas Reschke
bcd86bfd02
Remove some empty lines
2012-08-26 15:43:34 +02:00
Lukas Reschke
726be04e5f
Use sanitizeHTML instead of strip_tags
2012-08-26 15:41:41 +02:00
Jenkins for ownCloud
922982f070
[tx-robot] updated from transifex
2012-08-26 02:22:02 +02:00
Thomas Mueller
ad66d6d5e9
translation support for pdfviewer
2012-08-26 02:17:28 +02:00
Thomas Mueller
8e090d8f67
added translation for odfviewer
2012-08-26 02:17:28 +02:00
Jenkins for ownCloud
a1a3862274
[tx-robot] updated from transifex
2012-08-26 02:02:48 +02:00
Jenkins for ownCloud
bae07faa34
[tx-robot] updated from transifex
2012-08-26 01:20:16 +02:00
Thomas Mueller
814cb6bbfa
translation support for text editor and impress added
2012-08-26 00:39:23 +02:00
Jenkins for ownCloud
c82518cb0e
[tx-robot] updated from transifex
2012-08-26 00:12:05 +02:00
Jörn Friedrich Dreyer
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
jfd
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
jfd
e8ffd5c042
use limit parameter instead of LIMIT SQL for vcard
2012-08-25 02:27:43 +02:00
Jenkins for ownCloud
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
Jörn Friedrich Dreyer
fa3497f6ed
add backticks to SQL, use limit parameter instead of LIMIT SQL
2012-08-25 01:52:27 +02:00
Jörn Friedrich Dreyer
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
Jörn Friedrich Dreyer
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
Michael Gapczynski
0c4575db7a
Temporary fix to prevent rename action in root of Shared directory
2012-08-24 15:12:16 -04:00
Thomas Tanghus
ee04b626b4
Correct variable name.
2012-08-24 17:23:01 +02:00
Michael Gapczynski
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
Michael Gapczynski
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
Michael Gapczynski
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
Lukas Reschke
63d6884e23
Sanitizing the user input to prevent a reflected XSS. Thanks to Nico Golde (ngolde.de)
2012-08-24 15:00:53 +02:00
Arthur Schiwon
eadb894eff
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534
2012-08-24 15:00:53 +02:00
Lukas Reschke
9188d2a844
Add a missing exit();
2012-08-24 15:00:53 +02:00
Lukas Reschke
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
Lukas Reschke
1d530192b9
Disable user enumeration
2012-08-24 15:00:53 +02:00
Lukas Reschke
9917c611d3
Disable listing of all users
2012-08-24 15:00:52 +02:00
Lukas Reschke
78e8cbd52c
Check if webfinger is enabled
2012-08-24 14:58:48 +02:00
Michael Gapczynski
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
Lukas Reschke
3644517b01
Missed an "echo"
2012-08-24 14:58:47 +02:00
Lukas Reschke
4f7e4c20d2
Sanitize user input
2012-08-24 14:58:47 +02:00
Georg Ehrke
2832311640
fix label for versioning in admin settings
2012-08-24 14:54:17 +02:00
Bart Visscher
5e9f92e5dd
Calendar: remove double html encoding
2012-08-24 14:54:17 +02:00
Bart Visscher
646bc1fc24
Contacts: Fix no active Addressbooks
2012-08-24 14:54:16 +02:00
Arthur Schiwon
2af7473651
LDAP: sanitize base, user and group trees. fixes oc-1302
2012-08-24 14:54:16 +02:00
Thomas Tanghus
46d6fd15e4
Implemented sharing api for CalDAV.
2012-08-24 14:26:06 +02:00
Thomas Tanghus
d1421ca5ab
White-space.
2012-08-24 13:49:56 +02:00
Thomas Tanghus
b716296203
Forgot to reenable the export plugin.
2012-08-24 05:04:45 +02:00
Thomas Tanghus
953f9d95f8
Implemented sharing api for CardDAV. Next step CalDAV.
2012-08-24 04:56:21 +02:00
Jenkins for ownCloud
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
Thomas Tanghus
2cffcfbc03
Permission checking for shared addressbooks/contacts.
2012-08-23 22:03:36 +02:00
Thomas Tanghus
f568ba9c8c
Removed redundant __CLASS__ in logging.
2012-08-23 22:03:36 +02:00
Thomas Tanghus
fdb4c820d3
Fix for deleting queued contacts.
2012-08-23 22:03:35 +02:00
Thomas Tanghus
394617e0b6
Missing IM variable assignments.
2012-08-23 22:03:35 +02:00
Thomas Tanghus
069d16fdd4
Use correct js class in first-run template.
2012-08-23 22:03:35 +02:00
Thomas Tanghus
a3af9f4773
Used non-existing variable.
2012-08-23 22:03:35 +02:00
Thomas Tanghus
d5127b14be
Return newly created addressbook.
2012-08-23 22:03:35 +02:00
Arthur Schiwon
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
Thomas Tanghus
2d97164f80
Limit styles so they don't interfere with sharing dropdown.
2012-08-23 05:02:30 +02:00
Thomas Tanghus
6941266e7b
Remove obsolete closure.
2012-08-23 05:02:30 +02:00
Jenkins for ownCloud
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
Thomas Tanghus
99d17c5190
Don't add empty property parameters.
2012-08-23 01:18:59 +02:00
Thomas Tanghus
1df596e758
CSS fix for Windows.
2012-08-23 00:40:10 +02:00
Juan Carlos Cornejo
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
Juan Carlos Cornejo
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
Thomas Tanghus
61c7700ce6
Add support for IMPP properties.
2012-08-22 18:51:17 +02:00
Michael Gapczynski
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
Michael Gapczynski
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
Michael Gapczynski
25d474579a
Removing most of files_sharing, the Share API implemented the majority of it
2012-08-22 11:57:58 -04:00
Arthur Schiwon
536fbb9189
LDAP: fix potentially unavailable LDAP resource, which can prevent successful login
2012-08-22 15:22:52 +02:00
Arthur Schiwon
63c454c7b2
LDAP: make refreshInterval for background jobs configurable in the DB
2012-08-22 12:44:46 +02:00
Arthur Schiwon
056d9adb23
LDAP: bg jobs: sane default refresh interval
2012-08-22 12:44:46 +02:00
Arthur Schiwon
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
Arthur Schiwon
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
Thomas Tanghus
ac9fd79329
Email type list wasn't initialized.
2012-08-22 12:40:35 +02:00
Thomas Tanghus
78b7e28ce0
Removed unused variable.
2012-08-22 12:40:35 +02:00
Thomas Tanghus
5c1dd82998
Minor layout change.
2012-08-22 12:40:35 +02:00
Jenkins for ownCloud
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
Michael Gapczynski
53350b2f19
Remove unnecessary file
2012-08-21 10:33:20 -04:00
Frank Karlitschek
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
Thomas Tanghus
25dd0e940f
Preliminary support for Apple X-ABLabel. Also for oc-1508.
2012-08-21 03:57:48 +02:00
Thomas Tanghus
8d38dc04a0
Remove class contactsection
2012-08-21 03:57:48 +02:00
Michael Gapczynski
68f5dc2a44
Remove unnecessary files
2012-08-20 21:22:23 -04:00
Jenkins for ownCloud
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
Thomas Tanghus
1e42cd162e
Added types to emails. Support for custom types. Partial fix for oc-1508.
2012-08-21 00:20:18 +02:00
Thomas Tanghus
719ae155db
Try to align and float contact parts better.
2012-08-21 00:20:18 +02:00
Arthur Schiwon
ef3eebfd3e
Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534.
2012-08-20 17:24:10 +02:00
Michael Gapczynski
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
Jenkins for ownCloud
f893d21660
[tx-robot] updated from transifex
2012-08-20 02:03:51 +02:00
Jenkins for ownCloud
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
Thomas Tanghus
2d3ec5cb4b
Removed stray img element.
2012-08-19 17:05:45 +02:00
Thomas Tanghus
4946e23bdc
Strip slashes from commas and semi-colons.
2012-08-19 16:32:32 +02:00
Robin Appelman
a4e840f4f1
improve hasUpdated for archive storage backend
2012-08-19 06:29:57 +02:00
Robin Appelman
758ebe0446
don't report ctime in the archive storage backend since it isn't reliable
2012-08-19 06:18:40 +02:00
Robin Appelman
7f6a037b8c
small fix for normalizing paths in archives
2012-08-19 06:15:33 +02:00
Robin Appelman
808d6c58fe
ensure proper result format when using opendir on the archive storage backend
2012-08-19 05:45:55 +02:00
Robin Appelman
2ea46ee1ca
better file_get_contents, file_put_contents and toTmpFile for archive storage backend
2012-08-19 05:05:55 +02:00
Lukas Reschke
d54390b1a0
Optimized image size
2012-08-18 13:56:04 +02:00
Lukas Reschke
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
Jenkins for ownCloud
f1cabdd8e0
[tx-robot] updated from transifex
2012-08-18 02:04:07 +02:00
Georg Ehrke
41639f0517
fix fail in sql query of isDuplicate method of OC_Calendar_Import
2012-08-17 21:29:26 +02:00
Georg Ehrke
44272b9889
increase margin top of calendar import's color picker
2012-08-17 20:48:47 +02:00
Robin Appelman
53a888cc81
more path normalization
2012-08-17 01:22:54 +02:00
Jenkins for ownCloud
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
Michael Gapczynski
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
Jenkins for ownCloud
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
Thomas Tanghus
4c638f101e
Merge addressbooks.
2012-08-16 00:25:32 +02:00
Bart Visscher
dd3208fe6f
Fix webfinger documentation
2012-08-15 14:50:25 +02:00
Jenkins for ownCloud
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
Thomas Tanghus
a75870489c
Use correct class.
2012-08-14 20:06:45 +02:00
Lukas Reschke
db5b995a6b
Disable user enumeration
2012-08-14 17:23:26 +02:00
Michael Gapczynski
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
Arthur Schiwon
62e4f55f72
LDAP: adjust usersInGroup to updated interface
2012-08-14 14:30:03 +02:00
Arthur Schiwon
3c1380b093
LDAP: adjust getGroups to updated interface
2012-08-14 14:22:05 +02:00
Arthur Schiwon
452f55e163
adjust LDAP to updated interface
2012-08-14 14:14:20 +02:00
Jenkins for ownCloud
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
Michael Gapczynski
830676b475
Improve usability for configuring Dropbox and Google Drive external storage
2012-08-13 17:10:58 -04:00
Michael Gapczynski
d3bdab286b
Suggest mount point name, don't reload custom javascript file
2012-08-13 17:10:58 -04:00
Michael Gapczynski
98c7d40fcd
Throw exception in Dropbox and Google Drive storage constructors if parameters are not correct
2012-08-13 17:10:58 -04:00
Michael Gapczynski
7f12a65c24
Show access granted label immediately after granting access
2012-08-13 17:10:58 -04:00
Michael Gapczynski
0e6d22e25f
Prevent editing Dropbox configuration input after access granted
2012-08-13 17:10:58 -04:00
Michael Gapczynski
b6b2f8826b
Show access granted label next to Google Drive and Dropbox storage in configuration
2012-08-13 17:10:58 -04:00
Michael Gapczynski
be32625fcc
Fix remove button display for external storage
2012-08-13 17:10:58 -04:00
Thomas Mueller
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
Thomas Tanghus
d303763d1f
Automatically check radio when new addressbook fields get focus.
2012-08-13 15:07:15 +02:00
Bart Visscher
758f476fe3
Calendar: remove not used style rules
2012-08-12 22:40:36 +02:00
Bart Visscher
73b1b68fff
Rewrite remoteStorage settings, remove block echo
2012-08-12 22:30:13 +02:00
Bart Visscher
ab8e7f1da3
Remove unused gallery template
2012-08-12 22:30:13 +02:00
Bart Visscher
cb71996008
Change image links to use imagePath function
2012-08-12 22:30:13 +02:00
Thomas Tanghus
329bc28d06
Commented out unused(?) class that interfered with appsettings.
2012-08-12 18:44:18 +02:00
Thomas Tanghus
7113e80184
Readded refresh param. 304 and ETag is still sent so shouldn't matter.
2012-08-12 17:30:09 +02:00
Jenkins for ownCloud
355a1adb3a
[tx-robot] updated from transifex
2012-08-12 02:04:58 +02:00
Lukas Reschke
5b16c7a25d
This is unnessecary because we already run htmlentities() over the template engine
2012-08-11 20:53:56 +02:00
Jenkins for ownCloud
39b9052c2f
[tx-robot] updated from transifex
2012-08-11 02:05:58 +02:00
Lukas Reschke
d3427be5e4
Following the code guidelines makes Michael happy :-)
2012-08-10 22:20:32 +02:00
Lukas Reschke
85f2e737a4
Disable listening, instead checking the ACL to prevent DoS
2012-08-10 22:18:08 +02:00
Lukas Reschke
11895a86b0
Activate ACLs
2012-08-10 22:02:04 +02:00
Bart Visscher
fb493c45dd
Calendar: update share backend using contacts backend as template
2012-08-10 14:40:48 +02:00
Bart Visscher
6a95e4288e
Contacts: Check format parameter
2012-08-10 14:40:43 +02:00
Bart Visscher
6d971d3b1d
Contacts: Better parameter names in addressbook share backend
2012-08-10 14:32:54 +02:00
Lukas Reschke
e73292339f
Check if webfinger is enabled
2012-08-10 10:01:56 +02:00
Thomas Tanghus
2c5ab91c7d
Used wrong class.
2012-08-10 01:39:05 +02:00
Lukas Reschke
2dfc485149
XSRF checks
2012-08-10 00:44:35 +02:00
Thomas Tanghus
26a9d7ea71
Fixed 3 - THREE - errors in one method call :-P
2012-08-09 23:16:07 +02:00
Lukas Reschke
5f51366435
Sanitzing user input
2012-08-09 22:14:09 +02:00
Arthur Schiwon
7780e37f38
LDAP: don't give Test Connection button red background on fail, it is becoming unreadable
2012-08-09 21:42:35 +02:00
Michael Gapczynski
3b13051f7a
Additional permission checks for editing and deleting contacts
2012-08-09 13:54:59 -04:00
Georg Ehrke
7955120aed
remove debug code from calendar - thanks michael for pointing that out :)
2012-08-09 17:39:16 +02:00
Michael Gapczynski
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
Thomas Tanghus
f9cec1426f
Change parameter name and update docs.
2012-08-09 17:04:14 +02:00
Thomas Tanghus
39814edf81
Another take at profile photo/thumbnail caching. oc-839.
2012-08-09 16:32:05 +02:00
Georg Ehrke
00d7ae8319
move calendar settings from personal settings to in app settings
2012-08-09 12:37:26 +02:00
Thomas Tanghus
d24582503a
Fix require statements. Fix for oc-1460.
2012-08-09 11:35:14 +02:00
Michael Gapczynski
b830b3e24b
Start adding permission checks for addressbooks
2012-08-08 21:43:02 -04:00
Michael Gapczynski
f4285a25ef
Don't include shared addressbook if source not found
2012-08-08 19:12:59 -04:00
Bart Visscher
10cfcd4ff0
Remove useless setting of RUNTIME_NOAPPS
2012-08-08 22:42:50 +02:00
Bart Visscher
7522a23693
Remove unused RUNTIME_NOSETUPFS var
2012-08-08 22:42:50 +02:00
Michael Gapczynski
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
Bart Visscher
35a1738a39
Use new sharing API in OC_Calendar_Share::allSharedwithuser
2012-08-07 23:31:06 +02:00
Bart Visscher
1e644b5a53
Add Event share backend
2012-08-07 23:27:06 +02:00
Michael Gapczynski
9580d0ef29
Initial calendar sharing backend
2012-08-07 14:57:52 -04:00
Bart Visscher
95031cb139
remoteStorage: Use OCP\\Util for redirecting for login and generating link
2012-08-07 20:43:00 +02:00
Bart Visscher
4e6b4b265b
remoteStorage: split auth allow template
2012-08-07 20:43:00 +02:00
Jenkins for ownCloud
a9f894ce11
[tx-robot] updated from transifex
2012-08-07 02:07:50 +02:00
Thomas Tanghus
2eac79b782
Some UI improvements on the addressbooks settings.
2012-08-07 00:06:18 +02:00
Michael Gapczynski
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
Michael Gapczynski
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
Michael Gapczynski
3be4f5f2f1
Sharing backends for contacts and addressbooks
2012-08-06 16:11:03 -04:00
Michael Gapczynski
14d13a740f
Load icons for addressbooks, fix statuses for types other than files
2012-08-06 15:24:08 -04:00
Michael Gapczynski
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
Michael Gapczynski
83117445ac
Fix offset for folder detection, no longer including '/Shared' in file target path
2012-08-06 14:33:47 -04:00
Michael Gapczynski
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
Michael Gapczynski
ba0cf98175
Remove extra line, caused 'headers already sent' issues
2012-08-06 13:33:53 -04:00
Bart Visscher
fe6450002d
Change hardcoded urls to use linkTo function
2012-08-06 18:51:41 +02:00
Michael Gapczynski
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
Arthur Schiwon
e6759a980b
LDAP: layout settings form. Hope it is now a bit clearer and prettier.
2012-08-06 17:25:59 +02:00
Jenkins for ownCloud
9ca8d20a99
[tx-robot] updated from transifex
2012-08-06 02:02:50 +02:00
Arthur Schiwon
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
Arthur Schiwon
6fd48675e6
remove accidentally added blank lines
2012-08-05 22:03:47 +02:00
Arthur Schiwon
c10010e410
LDAP: check for always available attribute on userExists, fixes oc-1440
2012-08-05 22:02:34 +02:00
Arthur Schiwon
c3cbb463e3
add missing \
2012-08-05 21:35:37 +02:00
Arthur Schiwon
d546718179
LDAP: sanitize user and group base trees for strripos comparison. fixes oc-1302
2012-08-05 21:28:59 +02:00
Thomas Tanghus
80ca883d4c
Correct path to ajax file.
2012-08-05 03:36:16 +02:00
Michael Gapczynski
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
Michael Gapczynski
086397d8a1
Fix condition checking for resizing breadcrumbs
2012-08-04 15:57:49 -04:00
Michael Gapczynski
207ca3ec06
Dynamically resize breadcrumbs, fix for bug oc-468
2012-08-04 15:50:32 -04:00
Georg Ehrke
da4057ecfd
fix label for versioning in admin settings
2012-08-04 18:51:09 +02:00
Jenkins for ownCloud
d7e77f6426
[tx-robot] updated from transifex
2012-08-04 02:04:21 +02:00
Thomas Tanghus
bef63527ce
Reorganize ajax scripts.
2012-08-03 21:32:27 +02:00
Thomas Tanghus
3610975bc1
Some fixes for keyboard shortcuts.
2012-08-03 21:32:27 +02:00
Thomas Tanghus
e3de746bb6
FF complained about missing charset.
2012-08-03 21:32:27 +02:00
Thomas Tanghus
578e074c00
White space.
2012-08-03 21:32:27 +02:00
Thomas Tanghus
98057dba5b
Revert "Removed text/plain header."
...
This reverts commit fa6d26b53c
2012-08-03 21:32:27 +02:00
Michael Gapczynski
09bb3bfaf8
Preparing for proper collection implementation
2012-08-03 15:05:45 -04:00
Bart Visscher
b12ed88794
Calendar: remove double html encoding
2012-08-03 16:18:33 +02:00
Bart Visscher
599741bdd6
audit: update appinfo to OC4
2012-08-03 16:05:48 +02:00
Bart Visscher
e36e00dc00
Merge branch 'chunked_upload'
2012-08-03 15:58:17 +02:00
Jenkins for ownCloud
7dc799c167
[tx-robot] updated from transifex
2012-08-03 02:04:12 +02:00
Thomas Tanghus
7dda5527f1
Return properly formatted jsondata.
2012-08-02 19:03:45 +02:00
Thomas Tanghus
d07f4a5ea8
Correct namespace usage.
2012-08-02 19:03:06 +02:00
Thomas Tanghus
40d2bb70d7
Remove logging
2012-08-02 19:01:55 +02:00
Thomas Tanghus
8f3357c305
I was a bit too fast in removing methods yesterday...
2012-08-02 18:57:03 +02:00
Thomas Tanghus
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
Thomas Tanghus
a1239a37aa
Line length...
2012-08-02 05:02:36 +02:00
Thomas Tanghus
30c3a783d9
Remove onunload handler when delete is cancelled.
2012-08-02 05:01:54 +02:00
Thomas Tanghus
20f8971222
Use popup class style for ninja-mode help.
2012-08-02 04:18:44 +02:00
Thomas Tanghus
f84e92e6e3
More files to delete \o/
2012-08-02 04:18:44 +02:00
Thomas Tanghus
937058cdec
Updated JS namespace.
2012-08-02 04:18:44 +02:00
Jenkins for ownCloud
91e828c6ce
[tx-robot] updated from transifex
2012-08-02 02:06:16 +02:00
Thomas Tanghus
f159f607de
And then the missing files ;)
2012-08-02 00:02:07 +02:00
Thomas Tanghus
a8faae4f42
Addressbooks settings rewrite and cleanup.
2012-08-02 00:02:07 +02:00
Jörn Friedrich Dreyer
e13f381189
add limit support to OC_DB & OCP/DB
2012-08-01 14:59:08 +02:00
Jenkins for ownCloud
274d1ef87f
[tx-robot] updated from transifex
2012-08-01 02:02:35 +02:00
Jenkins for ownCloud
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
Michael Gapczynski
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
jfd
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
jfd
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
jfd
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
Thomas Tanghus
5eed59bd54
Changed fix parameter to OC.appSettings().
2012-07-31 14:18:32 +02:00
Thomas Tanghus
90a1b5a758
Unregister from personal settings.
2012-07-31 12:23:22 +02:00
Thomas Tanghus
19c55e2d44
Implemented app settings in popup.
2012-07-31 12:23:22 +02:00
Michael Gapczynski
dfae77dec1
Add notifications and undo support for replacing files when renaming
2012-07-30 12:22:11 -04:00
Arthur Schiwon
b465fc84ae
LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
2012-07-30 17:42:33 +02:00
Arthur Schiwon
b523366acd
LDAP: don't die on unexpected collisions, handle empty display-name attributes properly
2012-07-30 17:30:11 +02:00
Michael Gapczynski
29dab0846e
Remove another accidently added 3rdparty app
2012-07-30 10:37:54 -04:00
Michael Gapczynski
530e7f03cd
Remove accidently added 3rd party apps
2012-07-30 10:34:12 -04:00
Michael Gapczynski
b9bd54bd98
Add additional error handling for emailing private links
2012-07-30 10:07:20 -04:00
Michael Gapczynski
dab708b625
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-30 10:07:20 -04:00
Michael Gapczynski
519eb39422
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-30 10:07:19 -04:00
Michael Gapczynski
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
Michael Gapczynski
d07b8448d1
Set the user id when authenticating user for Ampache, fixes bug oc-219
2012-07-30 10:07:19 -04:00
Michael Gapczynski
7d17c59a51
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-30 10:07:19 -04:00
Michael Gapczynski
f378415377
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-30 10:07:19 -04:00
Michael Gapczynski
f328f53ec1
Fix filesystem hash, no longer using basicOperation()
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
Thomas Tanghus
01f25119d5
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-07-30 12:28:40 +02:00
Thomas Tanghus
f91783e9ab
Fix errors when no addressbook.
2012-07-30 12:28:10 +02:00
Thomas Tanghus
fa62ff62d2
Remove deprecated code.
2012-07-30 05:31:48 +02:00
Thomas Tanghus
d614c3b1d5
Code style.
2012-07-30 05:31:06 +02:00
Thomas Tanghus
118d9e17b6
Check if the are contacts marked as deleted and warn if so.
2012-07-30 04:57:14 +02:00
Thomas Tanghus
b25b73b5b4
Fixed potential error in logging.
2012-07-30 04:57:14 +02:00
Thomas Tanghus
fa6d26b53c
Removed text/plain header.
2012-07-30 04:57:14 +02:00
Jenkins for ownCloud
3430dcd367
[tx-robot] updated from transifex
2012-07-30 02:05:41 +02:00
Michael Gapczynski
5262cde6a6
Add additional error handling for emailing private links
2012-07-29 18:02:09 -04:00
Michael Gapczynski
e18639551d
Tweak appearance of undo delete notification
2012-07-29 18:02:08 -04:00
Jenkins for ownCloud
18f6552a08
[tx-robot] updated from transifex
2012-07-29 02:06:29 +02:00
Michael Gapczynski
7ff04be091
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-28 11:06:36 -04:00
Michael Gapczynski
e02d8d7f7e
Remove delete tipsy if file is deleted, fixes bug oc-958
2012-07-27 21:28:41 -04:00
Jenkins for ownCloud
fa4052d6f1
[tx-robot] updated from transifex
2012-07-28 02:05:38 +02:00
Michael Gapczynski
dd4765ad16
Set filter to empty if not set by Ampache client
2012-07-27 18:10:40 -04:00
Michael Gapczynski
6a4c46e2c2
Set the user id when authenticating user for Ampache, fixes bug oc-219
2012-07-27 18:05:18 -04:00
Michael Gapczynski
df9f5b902a
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-27 15:34:51 -04:00
Bart Visscher
896d27de36
Chunked upload: Support reusing local chunks
2012-07-27 19:35:33 +02:00
Michael Gapczynski
48f33be848
Only call mkdir() if the root folder does not exist for FTP external storage
2012-07-27 12:32:03 -04:00
Georg Ehrke
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
Michael Gapczynski
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
Jenkins for ownCloud
0a9c33e151
[tx-robot] updated from transifex
2012-07-27 02:04:26 +02:00
