1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-04 15:24:35 +01:00
Commit Graph

28 Commits

Author SHA1 Message Date
babelouest
713ad24d67 fix bug #488 2014-12-08 15:56:12 -05:00
Jan ten Bokkel
34ff3c492c Revert "Removed t is undefined, which causes passman to hang."
This reverts commit dad944a951.
2014-10-27 18:08:54 +01:00
Sander
dad944a951 Removed t is undefined, which causes passman to hang. 2014-10-12 11:55:09 +02:00
Jörn Friedrich Dreyer
7d8fe72351 customize search results 2014-10-01 18:09:01 +02:00
jbtbnl
a9ade3079d Merge remote-tracking branch 'origin/master' into import-new-ui
Conflicts:
	css/contacts.css
	lib/controller/importcontroller.php
2014-08-26 17:42:14 +02:00
root
f7aed92d77 forgot to comment out 3 lines after last change 2014-07-04 11:19:55 -04:00
root
e789f0480c disable import vcf file by clicking on it on the file app (incompatible with the new import module) 2014-07-04 11:16:33 -04:00
babelouest
229c49d43e Merge branch 'master' of https://github.com/owncloud/contacts into import-new-ui
Conflicts:
	js/addressbooks.js
	templates/contacts.php
2014-05-10 12:09:23 -04:00
babelouest
da0d990472 adapted import ui to fit in the ocdialog
might be some bugs left though
2014-05-07 22:46:22 -04:00
babelouest
7f7a2f6a7d use ocdialog instead of bottom-left controls 2014-05-05 15:18:48 -04:00
babelouest
ec8053c915 Several corrections and improvements, thanks to the feedbacks on the PR 2014-04-04 18:50:55 -04:00
babelouest
a8e6ab0d33 change new addressbook ui for a dialog
implemented delete ldap addressbook
2014-03-29 01:22:52 -04:00
babelouest
919f540d01 Import from multiple formats 2014-03-11 16:43:32 +01:00
Thomas Tanghus
20e5d876fa Scrutinizer JS fixes 2014-03-08 06:30:29 +01:00
Thomas Tanghus
8cbfec3b0a Scrutinizer fixes 2014-03-08 04:32:18 +01:00
Thomas Tanghus
cfd8cd02b3 Now loads with OCP\AppFramework 2013-10-01 19:15:22 +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
a55c50fd73 Contacts: Use anchor instead of parameter. 2013-01-25 19:01:40 +01:00
Mario Ferraro
a00596cb70 Fix missing semicolons, trailing commas, leading/trailing whitespaces, mixed tabs/spaces. 2012-12-17 14:19:22 +00:00
Thomas Tanghus
307409b7e2 Open contact from search without reloading app. 2012-11-01 02:01:00 +01:00
Bart Visscher
b179feeea2 Fix whitespace in contacts 2012-09-07 14:32:45 +02:00
Jörn Friedrich Dreyer
114ba38fa8 unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:12:02 +02:00
Michael Gapczynski
d01ee747aa Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Thomas Tanghus
197e853588 Contacts: Used non-existent var. 2012-06-10 12:48:39 +02:00
Bart Visscher
28a12ee6ff Calendar & Contacts: Store import progress in OC_Cache
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Thomas Tanghus
f5a9b8d2e7 Contacts: Add error checking and reporting to import from files app. 2012-05-13 23:27:14 +02:00
Georg Ehrke
6310ea5f07 register text/x-vcard as a fileaction for vcard import 2012-03-19 09:58:44 +01:00
Georg Ehrke
0e1b92aafd add import function for contacts 2012-02-05 12:13:53 +01:00