Thomas Tanghus
|
de26552f2f
|
Correct namespace.
|
2012-11-12 01:24:56 +01:00 |
|
Thomas Tanghus
|
0f02508121
|
Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Conflicts:
contacts/ajax/contact/details.php
contacts/lib/addressbook.php
contacts/lib/vcard.php
|
2012-11-12 00:46:15 +01:00 |
|
Thomas Tanghus
|
814819092e
|
Use CRUDS consts as defined in https://github.com/owncloud/core/pull/356
|
2012-11-11 19:43:44 +01:00 |
|
Thomas Tanghus
|
7383915904
|
Added more error checking to db queries.
|
2012-10-31 21:37:49 +01:00 |
|
Thomas Tanghus
|
69cdc09d93
|
Use OCA namespace.
|
2012-10-25 03:34:12 +02:00 |
|
Thomas Tanghus
|
0179b9a488
|
Add parameter to control if shared addressbooks should also be returned.
|
2012-10-24 20:28:43 +02:00 |
|
Thomas Tanghus
|
2bd762c86f
|
Unshare Calendar/Event/Addressbook/Contact on delete.
|
2012-10-16 22:25:03 +02:00 |
|
Thomas Tanghus
|
d9a3f56b9d
|
Don't prevent calendar and contant data deletion on user deletion because of sharing permissions.
|
2012-10-02 23:22:29 +02:00 |
|
Thomas Mueller
|
089b7e8f8a
|
adding space between) and {
|
2012-09-07 15:21:03 +02:00 |
|
Bart Visscher
|
b179feeea2
|
Fix whitespace in contacts
|
2012-09-07 14:32:45 +02:00 |
|
Thomas Tanghus
|
09f7b632d4
|
Permission check in OC_Contacts_Addressbook::find()
|
2012-09-06 16:02:00 +02:00 |
|
Thomas Tanghus
|
c7b116f3d7
|
Reminder to unshare on delete when a method is provided.
|
2012-09-06 05:23:37 +02:00 |
|
Thomas Tanghus
|
8ff56cfbf2
|
Fix return values on update.
|
2012-08-31 05:12:18 +02:00 |
|
Thomas Tanghus
|
b454e6a3d3
|
Only show CRUDS actions if you have proper permissions.
|
2012-08-30 23:02:19 +02:00 |
|
Thomas Tanghus
|
5905e6c314
|
Error and permission checking.
|
2012-08-30 18:43:01 +02:00 |
|
Jörn Friedrich Dreyer
|
9fd888c372
|
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 |
|
Bart Visscher
|
e82dd11a00
|
Contacts: Fix no active Addressbooks
|
2012-08-24 14:54:16 +02:00 |
|
Thomas Tanghus
|
bd365e0910
|
Return newly created addressbook.
|
2012-08-23 22:03:35 +02:00 |
|
Michael Gapczynski
|
14d67ba771
|
Start adding permission checks for addressbooks
|
2012-08-08 21:43:02 -04:00 |
|
Michael Gapczynski
|
693b496fdd
|
Lots of refactoring to share API
|
2012-08-06 11:27:13 -04:00 |
|
Michael Gapczynski
|
4e99280907
|
Preparing for proper collection implementation
|
2012-08-03 15:05:45 -04:00 |
|
jfd
|
a57799bcec
|
escape all identifiers with backticks
|
2012-07-31 18:53:05 +02:00 |
|
Thomas Tanghus
|
3b2c7c5981
|
Fix errors when no addressbook.
|
2012-07-30 12:28:10 +02:00 |
|
Michael Gapczynski
|
93556984f2
|
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 |
|
Thomas Tanghus
|
61ec1d43ea
|
Code style.
|
2012-07-20 17:11:13 +02:00 |
|
Thomas Tanghus
|
7681e23761
|
Coding style.
|
2012-07-20 00:18:23 +02:00 |
|
Thomas Tanghus
|
87d0412ac3
|
Give default address book a more intuitive name and replace spaces with underscores in uri.
|
2012-07-14 14:11:43 +02:00 |
|
Michael Gapczynski
|
00ef91f830
|
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 |
|
Thomas Tanghus
|
c93a4ce0f2
|
Look for the right field :-P
|
2012-07-10 01:24:40 +02:00 |
|
Thomas Tanghus
|
e84c13f70a
|
Improve checking for active addressbooks and creating default addressbook.
|
2012-07-08 15:41:38 +02:00 |
|
Thomas Tanghus
|
412a583213
|
Fix endless loop when no addressbooks.
|
2012-07-06 13:24:56 +02:00 |
|
Bart Visscher
|
0f416a5219
|
Contacts: Fix copy&paste error
|
2012-07-05 17:12:52 +02:00 |
|
Thomas Tanghus
|
7caf34aac1
|
Remove ugly activation hack.
|
2012-07-04 22:13:36 +02:00 |
|
Michael Gapczynski
|
20bdeb71b4
|
Use formatted shared addressbook in all cases, addressbooks out of order now
|
2012-07-03 11:36:57 -04:00 |
|
Michael Gapczynski
|
f98a660abc
|
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 |
|
Thomas Tanghus
|
14b22239ee
|
Added error checking on all db queries.
|
2012-06-26 18:15:24 +02:00 |
|
Thomas Tanghus
|
1f6bb63f8d
|
Better error checking.
|
2012-06-20 21:00:49 +02:00 |
|
Thomas Mueller
|
39f99602bf
|
removing executable bit - again
|
2012-05-15 00:52:00 +02:00 |
|
Thomas Tanghus
|
f5a9b8d2e7
|
Contacts: Add error checking and reporting to import from files app.
|
2012-05-13 23:27:14 +02:00 |
|
Frank Karlitschek
|
3d62cf716a
|
ported oc_db
|
2012-05-03 13:06:08 +02:00 |
|
Frank Karlitschek
|
299cabaf87
|
port oc_preferences
|
2012-05-02 15:54:34 +02:00 |
|
Frank Karlitschek
|
a3dc9e8b2a
|
ported getUser
|
2012-05-01 18:50:31 +02:00 |
|
Frank Karlitschek
|
26930d0d83
|
finish porting of the LOG calls or the apps to the public api
|
2012-05-01 17:38:27 +02:00 |
|
Thomas Tanghus
|
29a4ffb730
|
Contacts: Fix for not being able to add contact to empty/non-existant address book.
|
2012-04-09 16:30:58 +02:00 |
|
Thomas Tanghus
|
56c1d9ee54
|
Localizin strings and adding error checking.
|
2012-01-11 20:07:15 +01:00 |
|
Thomas Tanghus
|
3702428369
|
CSS cleanup, more error checking, better error messages, general cleanup.
|
2012-01-11 04:05:30 +01:00 |
|
Thomas Tanghus
|
aa2fabaef9
|
Removed redundant DB queries.
|
2011-12-31 01:34:22 +01:00 |
|
Thomas Tanghus
|
a3bbcb16d2
|
Added license and waiver of conditions for jquery.inview.
CSS fix on contact list.
Query contacts from multiple address books.
|
2011-12-30 21:07:16 +01:00 |
|
Bart Visscher
|
b5b216fb3c
|
Contacts: small merge cleanups
|
2011-12-27 22:44:52 +01:00 |
|
Thomas Tanghus
|
ae4bb0b1cb
|
Misc. changes after review by bartv.
|
2011-12-16 17:42:07 +01:00 |
|
Thomas Tanghus
|
82fc2095c6
|
Updating of contact list when activating/adding/deleting address books now works.
|
2011-12-11 16:26:00 +01:00 |
|
Thomas Tanghus
|
6401ccef2e
|
Various fixes to multiple address books handling
|
2011-12-09 15:10:51 +01:00 |
|
Thomas Tanghus
|
51b21f2969
|
Added UI for selecting/editing address books.
Export, CardDAV link and activation/deactivation of address books done.
|
2011-12-04 20:25:46 +01:00 |
|
Brice Maron
|
05ba42ae8b
|
Add sequence name in insertid to be more portable
|
2011-10-29 11:40:48 +02:00 |
|
Jakob Sack
|
e916f7eeeb
|
Split OC_Contacts_Addressbook in _Addressbook and _VCard
|
2011-09-17 00:26:57 +02:00 |
|
Jakob Sack
|
22163ead6d
|
fix documentation
|
2011-09-15 23:20:49 +02:00 |
|
Jakob Sack
|
8cc8ec2378
|
Small fix in documentation
|
2011-09-15 22:45:40 +02:00 |
|
Jakob Sack
|
f3a9158cc5
|
Improve reading of vCard files
|
2011-09-15 11:06:21 +02:00 |
|
Jakob Sack
|
57fd341fc9
|
Improving contacts
|
2011-09-08 23:36:47 +02:00 |
|
Jakob Sack
|
d9bedf093b
|
Fix creation of UID in contacts
|
2011-08-11 11:20:12 +02:00 |
|
Jakob Sack
|
c548dd2e58
|
Small fixes
|
2011-08-10 22:27:55 +02:00 |
|
Jakob Sack
|
e8d3af0f3a
|
Some more fixes. It basically works but looks ugly
|
2011-08-09 17:42:54 +02:00 |
|
Jakob Sack
|
6782188d34
|
Fix naming bug
|
2011-08-09 14:15:11 +02:00 |
|
Jakob Sack
|
f07bfa704e
|
Some more work on the address book
|
2011-08-09 13:53:58 +02:00 |
|
Jakob Sack
|
f23b4b9ae0
|
New app: contacts
|
2011-08-06 22:32:06 +02:00 |
|