rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Code Issues Releases Activity
760 Commits 18 Branches 95 Tags 40 MiB
d16ea83f24
Commit Graph

270 Commits

Author SHA1 Message Date
Thomas Tanghus
d16ea83f24 Try to align and float contact parts better. 2012-08-21 00:20:18 +02:00
Michael Gapczynski
d80d66fe58 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
Thomas Tanghus
1d9d5e64e9 Merge addressbooks. 2012-08-16 00:25:32 +02:00
Michael Gapczynski
839b873656 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
Thomas Tanghus
7ebe70e85c Readded refresh param. 304 and ETag is still sent so shouldn't matter. 2012-08-12 17:30:09 +02:00
Michael Gapczynski
a1ac3767ce 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
696a330c37 Another take at profile photo/thumbnail caching. oc-839. 2012-08-09 16:32:05 +02:00
Thomas Tanghus
50a4e8ed8d Some UI improvements on the addressbooks settings. 2012-08-07 00:06:18 +02:00
Michael Gapczynski
9fa545b2ec Load icons for addressbooks, fix statuses for types other than files 2012-08-06 15:24:08 -04:00
Michael Gapczynski
6db5e23c77 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
Thomas Tanghus
3996dfa330 Correct path to ajax file. 2012-08-05 03:36:16 +02:00
Thomas Tanghus
e59775c602 Reorganize ajax scripts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
1d094c2631 Some fixes for keyboard shortcuts. 2012-08-03 21:32:27 +02:00
Thomas Tanghus
95c00c16f6 Return properly formatted jsondata. 2012-08-02 19:03:45 +02:00
Thomas Tanghus
8de619ce1d Correct namespace usage. 2012-08-02 19:03:06 +02:00
Thomas Tanghus
5f315d9c3d Remove logging 2012-08-02 19:01:55 +02:00
Thomas Tanghus
73bca9b8ca I was a bit too fast in removing methods yesterday... 2012-08-02 18:57:03 +02:00
Thomas Tanghus
ceca4a1138 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
76d1507677 Remove onunload handler when delete is cancelled. 2012-08-02 05:01:54 +02:00
Thomas Tanghus
732a921411 Use popup class style for ninja-mode help. 2012-08-02 04:18:44 +02:00
Thomas Tanghus
af6ffc9505 Updated JS namespace. 2012-08-02 04:18:44 +02:00
Thomas Tanghus
4ff2f2aaf9 And then the missing files ;) 2012-08-02 00:02:07 +02:00
Thomas Tanghus
990e13cdd0 Addressbooks settings rewrite and cleanup. 2012-08-02 00:02:07 +02:00
Michael Gapczynski
9e16c8ae7c 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
Thomas Tanghus
14a44c6178 Changed fix parameter to OC.appSettings(). 2012-07-31 14:18:32 +02:00
Thomas Tanghus
76ede3d16e Implemented app settings in popup. 2012-07-31 12:23:22 +02:00
Thomas Tanghus
77dfaedc04 Check if the are contacts marked as deleted and warn if so. 2012-07-30 04:57:14 +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
Michael Gapczynski
d01ee747aa Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Thomas Tanghus
d55d41df8a Cache DOM lookups, general cleanup. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
039ed4f48d Cleaner event handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
15132e443c No need to set checksum on PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
c88ced278c Cleaner variable handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
8dc02e114c Make sure notifier cleans up. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
165255b6da Revert "No need to set checksum for PHOTO." 
This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c.
 2012-07-23 01:17:38 +02:00
Thomas Tanghus
34d39e320b No need to set checksum for PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
b59c9e187e Use insertContact 2012-07-23 01:17:38 +02:00
Thomas Tanghus
9ead8e1ac4 Whitespace 2012-07-23 01:17:38 +02:00
Thomas Tanghus
5dacba5c7e Added help for keyboard shortcuts. 2012-07-22 00:15:28 +02:00
Thomas Tanghus
4870056419 First stab at Ninja mode ;-) 2012-07-21 22:00:27 +02:00
Thomas Tanghus
a4fa076934 Improved scrollTo method. Still not quite there... 2012-07-21 22:00:27 +02:00
Thomas Tanghus
5c49ea9713 Added next/previous methods to contacts list. 2012-07-21 22:00:27 +02:00
Thomas Tanghus
92f2f870b7 Remove wrong comment. 2012-07-21 22:00:27 +02:00
Thomas Tanghus
164618e2dd Implemented undelete for contacts. 2012-07-21 16:02:12 +02:00
Thomas Tanghus
9f973e5b3d Made contactlist optional in insertContact(). 2012-07-21 14:26:57 +02:00
Thomas Tanghus
1d10e0ac78 White space. 2012-07-21 14:26:26 +02:00
Thomas Tanghus
ce161cf53d Added option to notify method. 2012-07-21 14:24:26 +02:00
Thomas Tanghus
d2e3a51128 DRYed inserting into contacts list. 2012-07-21 13:13:41 +02:00
Thomas Tanghus
1313be5352 Hide progressbar on error. 2012-07-20 22:25:09 +02:00
Thomas Tanghus
01a5494d45 Corrected retry count for uploaded imports. 2012-07-20 21:54:24 +02:00