Commit Graph

819 Commits

Author SHA1 Message Date
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
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
Jenkins for ownCloud 18f6552a08 [tx-robot] updated from transifex 2012-07-29 02:06:29 +02:00
Jenkins for ownCloud fa4052d6f1 [tx-robot] updated from transifex 2012-07-28 02:05:38 +02:00
Jenkins for ownCloud 0a9c33e151 [tx-robot] updated from transifex 2012-07-27 02:04:26 +02:00
Jenkins for ownCloud ba0ea21074 [tx-robot] updated from transifex 2012-07-26 08:04:12 +02:00
Jenkins for ownCloud 42c22bee36 [tx-robot] updated from transifex 2012-07-26 08:03:10 +02:00
Michael Gapczynski 30b58f5677 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 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Thomas Tanghus 25e1c13ef7 Remove unused ajax file. 2012-07-23 01:17:38 +02:00
Thomas Tanghus 67b6ff22bc Cache DOM lookups, general cleanup. 2012-07-23 01:17:38 +02:00
Thomas Tanghus b60e5942a5 Cleaner event handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus fb9ef90c45 No need to set checksum on PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus 0439a18324 Cleaner variable handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus b00de0258b Make sure notifier cleans up. 2012-07-23 01:17:38 +02:00
Thomas Tanghus 644b6e60d5 Revert "No need to set checksum for PHOTO."
This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c.
2012-07-23 01:17:38 +02:00
Thomas Tanghus dc05fd7b92 No need to set checksum for PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus 294e65fa38 Use insertContact 2012-07-23 01:17:38 +02:00
Thomas Tanghus 641bd7a456 Whitespace 2012-07-23 01:17:38 +02:00
Thomas Tanghus ab8ce89df3 Added help for keyboard shortcuts. 2012-07-22 00:15:28 +02:00
Thomas Tanghus 38d38c1797 First stab at Ninja mode ;-) 2012-07-21 22:00:27 +02:00
Thomas Tanghus 359dc8736a Improved scrollTo method. Still not quite there... 2012-07-21 22:00:27 +02:00
Thomas Tanghus eb57544518 Added next/previous methods to contacts list. 2012-07-21 22:00:27 +02:00
Thomas Tanghus 7d520bc7a9 Remove wrong comment. 2012-07-21 22:00:27 +02:00
Thomas Tanghus e07cd26571 Implemented undelete for contacts. 2012-07-21 16:02:12 +02:00
Thomas Tanghus 51bafd32d6 Made contactlist optional in insertContact(). 2012-07-21 14:26:57 +02:00
Thomas Tanghus 00de757169 White space. 2012-07-21 14:26:26 +02:00
Thomas Tanghus 11aa571751 Added option to notify method. 2012-07-21 14:24:26 +02:00
Thomas Tanghus 687c87bc5b DRYed inserting into contacts list. 2012-07-21 13:13:41 +02:00
Thomas Tanghus 06b5e05c86 Damn, that Jenkins dude is tough ;) 2012-07-21 00:43:01 +02:00
Thomas Tanghus 42fbc111a2 Hide progressbar on error. 2012-07-20 22:25:09 +02:00
Thomas Tanghus 3103a4cb3f Corrected retry count for uploaded imports. 2012-07-20 21:54:24 +02:00
Thomas Tanghus ecf8e77dab Remove unused file. 2012-07-20 17:11:13 +02:00
Thomas Tanghus 7fff386679 Code style. 2012-07-20 17:11:13 +02:00
Thomas Tanghus b3d7043f9c Change uri fields from 100 to 200 chars. 2012-07-20 15:15:18 +02:00
Thomas Mueller 8c06452434 fixing syntax error 2012-07-20 09:14:32 +02:00
Thomas Mueller 5fe0027568 fixing syntax error 2012-07-20 08:20:45 +02:00
Thomas Tanghus b8eea32478 Coding style. 2012-07-20 00:18:23 +02:00
Thomas Tanghus 1cbddcf211 Code style 2012-07-20 00:18:23 +02:00
Thomas Tanghus 616f2f336e Trigger loading of more contacts a bit earlier. 2012-07-20 00:18:23 +02:00
Thomas Tanghus 5c0c9bbdc1 Cleaning up a bit. 2012-07-20 00:18:23 +02:00
Thomas Tanghus fc46322d4c Tweak dragging. 2012-07-20 00:18:23 +02:00
Thomas Tanghus 87da179e6c Eye candy for the draggables. 2012-07-20 00:18:23 +02:00
Thomas Tanghus ec4891b7d3 Fixed require path. 2012-07-17 12:07:14 +02:00
Thomas Tanghus 2c9aa029a7 Added missing CSRF checks. 2012-07-17 12:04:34 +02:00
Thomas Tanghus 9326f4f535 Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265. 2012-07-17 10:45:15 +02:00
Thomas Tanghus 1f4d6896df Wrong version comparison in update.php. 2012-07-17 03:59:41 +02:00
Thomas Tanghus 4b8a34df21 Wrong argument count in postCreateUser hook for contacts. 2012-07-17 01:37:28 +02:00
Thomas Tanghus 4de66880ed If a contact wasn't loaded in the list you coulcn't access it from search result. Fixes oc-1264. 2012-07-17 01:35:35 +02:00
Thomas Tanghus f128b96ac0 Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276. 2012-07-16 23:44:18 +02:00
Thomas Tanghus eb2a15d58f Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD. Fixes oc-1276. 2012-07-16 23:36:11 +02:00
Thomas Tanghus d64300251b Corrected javascript definition. 2012-07-16 21:21:37 +02:00
Thomas Tanghus 7a7ac58094 Remove obsolete code. 2012-07-16 01:46:16 +02:00
Thomas Tanghus 2035bc7905 Fix sorting - again :-P 2012-07-16 01:46:16 +02:00
Thomas Tanghus 0fb1a76113 Bold active address book. 2012-07-16 01:46:16 +02:00
Thomas Tanghus 25f50e8273 Set the address book of the active contact active. 2012-07-16 01:46:16 +02:00
Thomas Tanghus 8fba6b9bc7 UI part of addressbook merging. 2012-07-16 01:46:16 +02:00
Thomas Tanghus 502f420678 Wrap image uploading in anonymous function. 2012-07-16 01:46:16 +02:00
Thomas Tanghus 001a47afb0 Remove obsolete FIXMEs. 2012-07-16 01:46:16 +02:00
Thomas Tanghus dd95149238 Also unlink unsuccessful imports. 2012-07-15 17:34:30 +02:00
Thomas Tanghus 160e701fbf Make list droppable too instead of just the header. 2012-07-15 12:28:29 +02:00
Thomas Tanghus db034f05ca Improve temp file handling. 2012-07-15 12:28:29 +02:00
Thomas Tanghus 8b49e304e0 Hide file form field behind image so it will maybe work with IE... 2012-07-15 12:28:29 +02:00
Thomas Tanghus 48521fcfaa Made notifications more flexible. 2012-07-15 12:28:29 +02:00
Thomas Tanghus d71da67bee Typo. 2012-07-15 12:28:29 +02:00
Thomas Tanghus 7af608881b Added notification. 2012-07-15 12:28:29 +02:00
Thomas Tanghus 4e684b9e9d Fixed sorting of addressbooks. 2012-07-15 12:28:29 +02:00
Thomas Tanghus 287285880c Removed obsolete TODO. 2012-07-15 12:28:28 +02:00
Thomas Tanghus eba4f08015 Refactored contacts import. 2012-07-15 04:17:30 +02:00
Thomas Tanghus 87912a8c65 Fix loading previous or next contact after deleting one. 2012-07-15 04:17:30 +02:00
Thomas Tanghus 140263003a Give default address book a more intuitive name and replace spaces with underscores in uri. 2012-07-14 14:11:43 +02:00
Thomas Tanghus d45d73eecf Try to avoid occasional error messages. 2012-07-14 14:11:43 +02:00
Robin Appelman b45d3ced79 fix remote and public.php 2012-07-13 22:44:35 +02:00
Michael Gapczynski f496a9dea6 Rename $contacts to $has_contacts, it missed this commit: 7cb74a0 2012-07-11 20:29:59 -04:00
Michael Gapczynski ac395dced1 Rename $contacts to $has_contacts, it missed this commit: 7cb74a0 2012-07-11 20:28:29 -04:00
Michael Gapczynski 4bf13adff2 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
Michael Gapczynski e896c0a9e3 Fix addressbook sharing, formatItems() changed in past commits 2012-07-11 11:33:48 -04:00
Thomas Tanghus 9d2cbc88f0 Revert reversion of f5c329af98 :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus 34ac2ea1ba Don't escape assigned values. 2012-07-10 01:24:40 +02:00
Thomas Tanghus 861c379255 Make sure the proper DOM is loaded and the right address book gets expanded. 2012-07-10 01:24:40 +02:00
Thomas Tanghus 0744e5a172 Look for the right field :-P 2012-07-10 01:24:40 +02:00
Thomas Tanghus 7cb74a0bf3 Reduce variables assigned. 2012-07-10 01:24:40 +02:00
Thomas Tanghus 50462903d6 Revert "Delay fetching of carddata and set ETag and size instead."
This reverts commit f5c329af98.
2012-07-10 01:24:40 +02:00
Jörn Friedrich Dreyer e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Thomas Tanghus f5c329af98 Delay fetching of carddata and set ETag and size instead. 2012-07-09 01:48:42 +02:00
Thomas Tanghus 47aaca49a1 Rescan categories in small batches to reduce memory usage. 2012-07-09 00:16:14 +02:00
Thomas Tanghus d1cf787197 Move code to OC_Contacts_App::scanCategories(). 2012-07-09 00:15:37 +02:00
Thomas Tanghus 6d123e90f3 Remove deleted address book from list. 2012-07-08 23:38:03 +02:00
Thomas Tanghus 0b6cd8d203 Simplify VCF generation. 2012-07-08 23:36:52 +02:00
Thomas Tanghus 197086a952 Make it possible to import files using CR as eol. 2012-07-08 18:34:00 +02:00
Thomas Tanghus dc8193fccb Make it possible to import files using CR as eol. 2012-07-08 18:28:55 +02:00
Thomas Tanghus 334257d2b6 Implemented VCFExportPlugin. 2012-07-08 17:52:57 +02:00
Thomas Tanghus 747b7fbbfe Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-) 2012-07-08 16:17:10 +02:00
Thomas Tanghus f5c620006e Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-) 2012-07-08 16:15:52 +02:00
Thomas Tanghus 97106f198f Set the loading class on the property being changed, not on its container. 2012-07-08 16:11:45 +02:00
Thomas Tanghus d730d3edd4 Set the loading class on the property being changed, not on its container. 2012-07-08 16:10:12 +02:00
Thomas Tanghus 25b95a9ec7 Improve checking for active addressbooks and creating default addressbook. 2012-07-08 15:41:38 +02:00
Thomas Tanghus 554cb2d3ab Add missing requesttoken. 2012-07-08 14:48:49 +02:00
Thomas Tanghus 47f96e2d5e Missing semi-colon. 2012-07-08 14:42:33 +02:00
Thomas Tanghus 746eef0d5c Format error response correctly. 2012-07-08 14:31:40 +02:00
Thomas Tanghus e6a60198e4 Return error messages in correct format. 2012-07-08 14:11:48 +02:00
Thomas Tanghus 2b22f0db0a Add missing requesttoken. 2012-07-08 13:28:12 +02:00
Thomas Tanghus 75d01b065d Make export batch size configurable. 2012-07-06 13:49:04 +02:00
Thomas Tanghus cafbd02337 Fix endless loop when no addressbooks. 2012-07-06 13:24:56 +02:00
Thomas Tanghus a1872412bf Correct hack ;) 2012-07-06 12:59:07 +02:00
Thomas Tanghus ab1b4f1f03 Fugly fixed include. 2012-07-06 12:59:07 +02:00
Thomas Tanghus a5a1d929ca No need for being protected. 2012-07-06 03:22:42 +02:00
Thomas Tanghus 59b38e668d Missing requesttoken 2012-07-06 03:22:42 +02:00
Bart Visscher 5e0b80dc8d Contacts: Fix copy&paste error 2012-07-05 17:12:52 +02:00
Thomas Tanghus 9d00f4d2fb Correct db default value. 2012-07-05 00:40:11 +02:00
Thomas Tanghus dac2c14ae9 Add missing CSRF check. 2012-07-05 00:37:08 +02:00
Thomas Tanghus b11b6afbb9 Hopefully fix for drag'n'drop import in oc-813. 2012-07-05 00:25:38 +02:00
Thomas Tanghus 5d79444852 Missing update script. 2012-07-04 22:58:31 +02:00
Thomas Tanghus 706a13544b Remove ugly activation hack. 2012-07-04 22:13:36 +02:00
Thomas Tanghus b2eac08ad3 Query contacts in batches of 20. Possible fix for oc-1126. 2012-07-04 16:54:00 +02:00
Thomas Tanghus 5fb9b3e965 Disable expires header on thumbnail and photo. 2012-07-04 15:32:41 +02:00
Thomas Tanghus 6d3afb3857 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:57:07 +02:00
Thomas Tanghus f72a11f852 Moved action buttons down to the add field menu. Fixes oc-1155. 2012-07-04 13:49:39 +02:00
Michael Gapczynski 1e36e1f2cb Use formatted shared addressbook in all cases, addressbooks out of order now 2012-07-03 11:36:57 -04:00
Michael Gapczynski 4185bd6292 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
Michael Gapczynski 77b582e4e6 Change getItems() return to a 3-dimensional array to handle multiple shares of the same item 2012-07-02 15:29:34 -04:00
Michael Gapczynski 0b9b1757fe Add share action to addressbooks! 2012-06-30 21:06:49 -04:00
Michael Gapczynski 47f46890c8 Fix generateTarget() for contacts backend 2012-06-30 21:03:36 -04:00
Tom Needham c7a4075aaa Updates contacts migration provider 2012-06-30 22:56:47 +00:00
Michael Gapczynski 2418d9a1a9 Change registerBackend calls class argument to strings 2012-06-30 17:33:30 -04:00
Tom Needham 51173163ce Contacts: align the bottom control buttons 2012-06-30 11:22:09 +00:00
Tom Needham 704a1c655e Contacts: fix add contact icon path 2012-06-30 11:07:54 +00:00
Thomas Tanghus a4614f83ff Don't add duplicate contacts in the list when en-/disable an address book. 2012-06-29 23:18:47 +02:00
Georg Ehrke bda0026374 fix birthday calendar 2012-06-29 15:43:18 +02:00
Thomas Tanghus e04a605b9b No need for this anymore. 2012-06-28 01:51:42 +02:00
Thomas Tanghus a48aba316e Smoother profile picture loading - hopefully. 2012-06-28 01:46:33 +02:00
Tom Needham 426193cf6c Migration: Fix contacts and bookmarks 2012-06-27 21:18:31 +00:00
Thomas Tanghus 77b7f214d2 Load contactlist progressivly. 2012-06-27 22:44:28 +02:00
Bart Visscher 235515e84b Something like this should do it for sharing contacts 2012-06-27 15:44:42 +02:00
Bjoern Schiessle 060a297260 enable highlighting of address in OSM. 2012-06-27 11:46:42 +02:00
Bjoern Schiessle 7af76e36e1 enable highlighting of address in OSM. 2012-06-27 11:41:52 +02:00
Thomas Tanghus 3edc40a68a Load default categories if there are none, 2012-06-27 02:12:53 +02:00
Thomas Tanghus 823bef3a09 Ensure event handlers are being set when adding first contact. 2012-06-27 02:12:53 +02:00
Thomas Tanghus afd9705283 Add check for return value. 2012-06-27 02:12:53 +02:00
Bart Visscher b9e1033563 Basic framework for contacts sharing 2012-06-27 01:05:36 +02:00
Thomas Tanghus cad282b73f Added some error checking. 2012-06-26 18:15:24 +02:00
Thomas Tanghus 1b2d09f9ca Added missing requesttoken. 2012-06-26 18:15:24 +02:00
Thomas Tanghus d8b181cd84 Added error checking on all db queries. 2012-06-26 18:15:24 +02:00