1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-11 22:24:32 +01:00
Commit Graph

47 Commits

Author SHA1 Message Date
babelouest
c682a3585d Merge branch 'ldap' of https://github.com/owncloud/contacts into ldap
Conflicts:
	admin.php
	lib/backend/ldap.php
	lib/dispatcher.php
2014-05-09 14:54:49 -04:00
Thomas Tanghus
555d5c3b91 CalDAV link wasn't shown. Fix #475 2014-04-23 11:50:36 +02:00
babelouest
b8c3c4e1ea Merge branch 'master' of https://github.com/owncloud/contacts into ldap 2014-04-15 11:13:05 -04:00
Thomas Tanghus
26bed15085 UI permission fixes noticed when merging #457 2014-04-15 14:06:44 +02:00
babelouest
c674b8db00 code clean in js config dialog
distinction between a ldap addressbook edition and a local addressbook edition in the UI
several bug fixes
2014-04-09 13:38:09 -04:00
babelouest
e354d0fae3 use ocdialog
fix a bug in the contact.save() methid that was readonly for no reason
2014-04-07 19:40:21 -04:00
babelouest
489aaa1eae put dialog UI functions in a new js class
change addressbook name in UI when changed
2014-04-07 01:18:09 -04:00
babelouest
ec8053c915 Several corrections and improvements, thanks to the feedbacks on the PR 2014-04-04 18:50:55 -04:00
babelouest
e9c9f6d363 first batch of a working of add/update addressbook dialog window
several bugs remaining and code cleaning is necessary
2014-04-03 17:35:58 -04:00
babelouest
3f26148233 implementing ldap addressbook modification (draft) 2014-04-01 09:16:53 -04:00
babelouest
a8e6ab0d33 change new addressbook ui for a dialog
implemented delete ldap addressbook
2014-03-29 01:22:52 -04:00
Thomas Tanghus
a1c8fe7f1e Merge pull request #444 from owncloud/import_multi_format2
Import from multiple formats
2014-03-23 14:18:48 +01:00
Thomas Tanghus
f0ee17d22c On use jqXHR as argument to JSONResponse 2014-03-23 14:14:36 +01:00
babelouest
d7f8b57025 added standard vcard connector
cleaned code according to scrutinizer log
fixed import message on UI
2014-03-21 01:59:19 -04:00
babelouest
c85b284208 Revert "a little code cleaning, removed {count} value during the import process"
This reverts commit 2a43562229.
2014-03-12 14:23:42 -04:00
babelouest
2a43562229 a little code cleaning, removed {count} value during the import process 2014-03-12 13:32:09 -04:00
babelouest
56e33427fa fix route url bug 2014-03-11 13:33:31 -04:00
babelouest
919f540d01 Import from multiple formats 2014-03-11 16:43:32 +01:00
Thomas Tanghus
f6bfea77e7 Scrutinizer cleanup 2014-03-08 16:22:51 +01:00
Thomas Müller
835ef19ce2 fixing app url 2014-03-02 23:19:01 +01:00
Thomas Müller
162bc3d750 Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 23:01:56 +01:00
Thomas Tanghus
a9000d5ad6 Make sure address book ids are strings 2014-02-05 05:20:25 +01:00
Thomas Tanghus
24dbbdc7c0 Fix missing progress key on import 2013-10-24 14:36:11 +02:00
Thomas Tanghus
1d29b943ae Finally works with core master 2013-10-17 02:10:50 +02:00
Thomas Tanghus
dfffa028fb camelCase 2013-10-11 14:47:54 +02:00
Thomas Tanghus
f8c46f1ad1 Various route and request adjustments
* All request bodies are now JSON.
* Contact property add/update/delete uses the same PATCH route.
2013-10-03 04:15:12 +02:00
Thomas Tanghus
cfd8cd02b3 Now loads with OCP\AppFramework 2013-10-01 19:15:22 +02:00
Thomas Tanghus
f919966321 Check if progressbar is initialized before destroying it. 2013-09-14 18:35:44 +02:00
Thomas Tanghus
b9c5d465a5 Let AddressBookList.add return $.Deferred 2013-09-10 07:18:12 +02:00
Thomas Tanghus
322357dba1 New FileActions script for importing from filesystem. Closes #190
Needs owncloud/core#4784 to work properly
2013-09-10 00:30:39 +02:00
Thomas Tanghus
feb200bba6 Finally (re)implemented (de)activate address books. Closes #48 2013-09-05 22:08:34 +02:00
Thomas Tanghus
83d3320339 First iteration of barch deletion #110 2013-09-03 14:09:13 +02:00
Thomas Tanghus
c155faff21 Aha, now jqueryui.progressbar doesn't accept a string as value.
I wouldn't call that progress...
2013-08-15 20:11:40 +02:00
Thomas Tanghus
8895b6ff15 No need for progress on an indetermined progressbar. 2013-08-15 20:11:40 +02:00
Thomas Tanghus
b77f104447 Improve feedback on import. 2013-06-27 15:53:31 +02:00
Thomas Tanghus
fbeeb09266 Move all error message handling to one event handler. 2013-06-03 17:27:48 +02:00
Thomas Tanghus
62b25af612 Show import select on address book creation. 2013-05-25 01:35:42 +02:00
Thomas Tanghus
c97f498905 Ported export. Fixes #108 2013-05-24 20:35:23 +02:00
Thomas Tanghus
7c6ee2e45b Fix fail handlers 2013-05-24 03:34:06 +02:00
Thomas Tanghus
5940855319 Don't offer to select address book on import if there's only one 2013-05-11 01:42:09 +02:00
Thomas Tanghus
e7267209ef Backgroung load on import and async load on init. Closes #49 2013-05-08 06:47:36 +02:00
Thomas Tanghus
f76ca64ba4 Add renaming address books. 2013-05-07 19:16:06 +02:00
Thomas Tanghus
f9be55a833 Pixel pushing setting components. 2013-05-07 14:57:59 +02:00
Thomas Tanghus
757bc10216 Contacts: Implement move to address book. Still some rough edges. 2013-05-06 01:49:10 +02:00
Thomas Tanghus
a1e2b2ec64 Contacts: Add getOwner() and getMetaData() to js AddressBook object. 2013-05-04 22:41:44 +02:00
Thomas Tanghus
d4b18987ae Contacts: Abstract js address book access and further simplify import. 2013-05-02 20:42:24 +02:00
Thomas Tanghus
9c6b655c63 Contacts: Start on js AddressBook object 2013-05-02 20:42:23 +02:00