Commit Graph

650 Commits

Author SHA1 Message Date
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
Bjoern Schiessle 060a297260 enable highlighting of address in OSM. 2012-06-27 11:46:42 +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
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
Thomas Tanghus db115429f7 Added createUser hook. 2012-06-26 18:15:24 +02:00
Thomas Tanghus 46e93168cd Fix variable name. 2012-06-26 16:06:52 +02:00
Thomas Tanghus bf756293c6 Added signals. 2012-06-26 05:26:50 +02:00
Thomas Tanghus 8df59852a4 Adjust pic width a bit. 2012-06-26 04:09:45 +02:00
Thomas Tanghus b384d79bf8 Remove x-scrollbar from contacts list. 2012-06-25 23:32:03 +02:00
Thomas Tanghus dc4b891327 Better visual feedback and prevent drop on self. 2012-06-25 18:24:15 +02:00
Thomas Tanghus b8d6ad0431 Improve styling on draggables. 2012-06-25 18:24:15 +02:00
Thomas Tanghus ef93bf223a Try to conserve some memory. Should fix oc-1106 for master. 2012-06-25 17:26:44 +02:00
Thomas Tanghus 052bd8efbb Drag'n'Drop contacts between addressbook. Still needs some css magic. 2012-06-25 03:42:27 +02:00
Thomas Tanghus e845e56749 Remove excessive debugging. 2012-06-24 22:25:32 +02:00
Thomas Tanghus 3afbc3d2dc Add some DRYness to logging. 2012-06-24 22:25:32 +02:00
Thomas Tanghus f10c51193b Fixed function name. 2012-06-24 22:25:32 +02:00
Thomas Tanghus 0f9b9fa111 Remove unneeded parameter. 2012-06-24 16:07:18 +02:00
Thomas Tanghus 5393c0cfed Click to select which address book to add to. 2012-06-24 16:03:10 +02:00
Thomas Tanghus 9e6d2f2f82 Improve prev/next selection on delete. 2012-06-24 15:07:44 +02:00
Brice Maron b5e3e150eb Correction of path looking for apps and css 2012-06-22 20:58:52 +00:00
Bart Visscher 96ec7a66bb More session_write_close 2012-06-22 17:21:56 +02:00
Thomas Tanghus 1f06cdf81f Small js fix. 2012-06-22 14:27:46 +02:00
Thomas Tanghus 07124ee38d Cast translation to string. 2012-06-22 14:27:46 +02:00
Bart Visscher 82f39d3292 Contacts: Fix name and carddav-url encoding 2012-06-21 23:30:04 +02:00
Brice Maron a5938e4e37 Merge branch 'master' into multi_app_dir 2012-06-21 20:19:31 +00:00
Thomas Tanghus 37d12144c2 Fix URL delimiter. 2012-06-21 22:03:57 +02:00
Thomas Tanghus ad7154b344 Fix being able to link directly to contact, that I broke in other commit. 2012-06-21 22:02:17 +02:00
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
Thomas Tanghus 10a0d5a46c More changes for updating the contacts list. 2012-06-20 21:00:49 +02:00
Thomas Tanghus dc8c188ffe Better error checking. 2012-06-20 21:00:49 +02:00
Thomas Tanghus 426ed27be2 Make sure address books are shown even if empty. 2012-06-20 21:00:49 +02:00
Thomas Tanghus 0f1fe0b505 Log error as ERROR. 2012-06-20 21:00:49 +02:00
Thomas Tanghus 0b9a48b4b6 Re-add missing loadhandlers() call. 2012-06-19 14:56:21 +02:00
Thomas Tanghus 33aec973df Loading of contacts was placed outside of $(document).ready() function. 2012-06-19 14:55:14 +02:00
Thomas Tanghus e5feb4e1aa Remove obsolete js. 2012-06-18 02:22:22 +02:00
Thomas Tanghus 73fd4c979a Update js after contactlist change. 2012-06-18 02:21:29 +02:00
Thomas Tanghus a4f53922c2 Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:36:25 +02:00
Thomas Tanghus cab4a634df Save addressbook id to be able to rearrange contacts properly. 2012-06-17 23:14:02 +02:00
Thomas Tanghus 3efec3fde9 Make contact list fit in viewport. 2012-06-17 23:12:48 +02:00
Thomas Tanghus ea4d8ccf70 Rearrange markup. 2012-06-17 23:12:11 +02:00
Thomas Tanghus 8337b30e43 Add thumbnail links so they are loaded when addressbook is expanded. 2012-06-17 23:09:25 +02:00
Thomas Tanghus 7d84c4741c Use uasort instead of usort. 2012-06-17 21:50:49 +02:00
Thomas Tanghus 46a771d2e6 Sort addressbooks. 2012-06-17 21:47:15 +02:00
Thomas Tanghus fb700de4a4 Add effect on addressbook show/hide. 2012-06-17 21:37:13 +02:00
Thomas Tanghus 9e4a41e9cb Add effect on addressbook show/hide. 2012-06-17 21:34:56 +02:00
Thomas Tanghus 5a8f4b8783 Adjustments for inview handler etc. 2012-06-17 20:25:32 +02:00
Thomas Tanghus b6b6d69158 Moved parsing to the controller and js to contacts.js. 2012-06-17 20:25:32 +02:00
Thomas Tanghus 2875901fc7 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus 91f5a1de39 Obsolete language="Javascript". 2012-06-17 20:25:32 +02:00
Thomas Tanghus b1cfc99f63 Styled address book entries. 2012-06-17 20:25:32 +02:00
Thomas Tanghus 56d25d4d1b Make the parsing in the controller, not in the template. Assign only relevant entries to the template. 2012-06-17 20:25:32 +02:00
Stephan Bergemann 92e35bd843 now a little less in template - more in ajax controller 2012-06-17 20:25:32 +02:00
Stephan Bergemann 7f485d1b20 contacts app now lists contacts sorted by expandable/collapsable addressbooks 2012-06-17 20:25:32 +02:00
Thomas Tanghus 4cbdd59859 Fix char encoding. 2012-06-16 18:38:20 +02:00
Thomas Tanghus 6642ef6a50 Fix string encoding probs. 2012-06-16 18:06:47 +02:00
Thomas Tanghus effb6f1309 Update stylesheet for type=url. 2012-06-15 04:32:01 +02:00
Thomas Tanghus 8a68d09b0f Use type=url for URL field. 2012-06-15 04:32:01 +02:00
Brice Maron 4753cc3ebd Merge branch 'master' into multi_app_dir
Conflicts:
	apps/bookmarks/ajax/addBookmark.php
	config/config.sample.php
	lib/app.php
	remote.php
2012-06-14 21:16:59 +00:00
Thomas Tanghus 96a3e28c2e Cleanup code. 2012-06-14 23:05:31 +02:00
Thomas Tanghus 27ab6daeb0 If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier... 2012-06-14 23:05:31 +02:00
Thomas Tanghus 47c03a0eff Contacts: Fixes for CSRF. 2012-06-14 18:13:01 +02:00
Thomas Tanghus 756eb3548f Use the right csrf token. 2012-06-14 13:23:12 +02:00
Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
2012-06-13 15:17:46 -04:00
Thomas Tanghus 613a122437 Remove check for encryption. 2012-06-13 19:03:34 +02:00
Thomas Tanghus d33d599b1b Remove debug statements. 2012-06-13 18:57:12 +02:00
Thomas Tanghus bc1e8cb0a2 Contacts: implemented CSRF prevention. 2012-06-13 17:35:42 +02:00
Thomas Tanghus c44591e27a Contacts: Final (for now) fix to encoding probs on import. 2012-06-12 12:32:37 +02:00
Thomas Tanghus ac11647d7a Fix js for missing address fields. 2012-06-11 22:14:21 +02:00
Thomas Tanghus 4b86cbcb6f Quick fix for index errors when not importing from files. 2012-06-11 22:14:21 +02:00
Thomas Tanghus c75f9f9397 Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e 2012-06-11 22:14:21 +02:00
Thomas Tanghus 8af53829d5 Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) 2012-06-11 22:14:21 +02:00
Lukas Reschke 2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Bjoern Schiessle 1d493a70e7 replace "=0D=0A" (\r\n) with a simple "\n" in vards during import 2012-06-11 18:13:12 +02:00
Bjoern Schiessle 739589f485 make sure that contact data are always utf8 encoded to avoid encoding problems 2012-06-11 16:26:21 +02:00
Lukas Reschke c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Thomas Tanghus 6d9947b3ff Contacts: Fix NOTE also on add, not just save. 2012-06-11 12:55:54 +02:00
Lukas Reschke 6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Thomas Tanghus e79e18d866 Copy/paste error. 2012-06-11 02:40:55 +02:00
Thomas Tanghus 40f8419fdf Contacts: 11th hour fix for invalid VCARD from CardDAV. 2012-06-10 20:56:55 +02:00
Thomas Tanghus f90c8738ab Contacts: Used non-existent var. 2012-06-10 12:48:39 +02:00
Thomas Tanghus 081e1874cb Contacts: Use POST instead of GET. 2012-06-09 15:00:44 +02:00
Thomas Tanghus 88341e5797 Code cleanup. 2012-06-09 15:00:44 +02:00
Thomas Tanghus 0a49bae87a Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-) 2012-06-08 20:39:54 +02:00
Brice Maron cf02f3c107 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00:00
Thomas Tanghus d4f6f3e935 Contacts: Attempt to make file upload work in ICS Chrome. 2012-06-07 20:29:16 +02:00
Thomas Tanghus 33c802dcaa Break text to fit in dialog. 2012-06-07 20:29:15 +02:00
Thomas Tanghus d2a8746c49 Edited combobox to adhere to coding standards and added a dblclick handler. 2012-06-07 16:44:54 +02:00
Thomas Tanghus 3804f68ff5 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:55:40 +02:00
Thomas Tanghus 9c84149119 A bit of pixel-pushing. 2012-06-07 10:55:40 +02:00
Brice Maron 5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Thomas Tanghus 5c17338ac7 Contacts: Make js a tad DRYer. Added URL property. 2012-06-06 15:29:33 +02:00
Thomas Tanghus ed950e3ba2 Correct mime type. 2012-06-06 15:29:33 +02:00
Thomas Tanghus fce614b82c Less aggressive caching on thumbnails too. 2012-06-06 01:06:13 +02:00
Thomas Tanghus 68670bcc66 Cleanup. 2012-06-06 01:06:13 +02:00
Thomas Tanghus 624f8ae36d Also use OC_Cache here. 2012-06-06 01:06:13 +02:00
Thomas Tanghus 80de23d08b Contacts: Removed temp dir cleanup after using OC_Cache. 2012-06-06 01:06:12 +02:00
Robin Appelman f7d221f5f0 update translations 2012-06-06 00:29:28 +02:00
Thomas Tanghus 20aee83d07 Use UID for cache key. 2012-06-05 21:20:10 +02:00
Thomas Tanghus cb941996c0 Contacts: Use OC_Cache for contact photo handling instead of temp dir. 2012-06-05 20:34:12 +02:00
Thomas Tanghus d194132b6f Contacts: Cache standard photo less aggressively 2012-06-05 10:32:26 +02:00
Bart Visscher 091b343d5c 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 3b9bf83fe7 Contacts: Make tmp file cleaup a bit safer. 2012-06-04 13:38:37 +02:00
Thomas Tanghus 2842088b75 Contacts: When editing photo on a newly created contact the name in the contact list was cleared. 2012-06-04 13:14:31 +02:00
Thomas Tanghus 855f404e5c Contacts: Temporary files weren't deleted if crop window was closed without saving. 2012-06-04 13:14:31 +02:00
Bart Visscher a33f580db1 Remove OC_App::register function
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Frank Karlitschek 22a04d8e93 don´t hardcode /tmp 2012-05-30 14:14:32 +02:00
Thomas Tanghus dbcd26be68 Contacts: Rewrote import script. 2012-05-29 23:41:53 +02:00
Thomas Tanghus c9df18ed8c Forgot a break. 2012-05-29 16:46:54 +02:00
Thomas Tanghus 51aa84e70a Contacts: NOTE wasn't saved properly. 2012-05-29 16:43:59 +02:00
Thomas Tanghus dff16e70a9 Contacts: Improve loading and cleanup of dialogs. 2012-05-29 16:43:59 +02:00
Thomas Tanghus 817f9ff57d Contacts: Fix XSS. 2012-05-28 14:42:57 +02:00
Thomas Tanghus df5bdc8e42 Contacts: Double check XSS, and fix a rookie error ;-) 2012-05-28 13:19:31 +02:00
Thomas Tanghus a896da0d91 Contacts: XSS fix. Still some more to check. 2012-05-21 21:47:15 +02:00
Georg Ehrke d4072c82dd some fixes for contacts, gallery and openid 2012-05-19 15:22:21 +02:00
Frank Karlitschek 7e49a33d64 getStorage belongs to files not to apps. 2012-05-19 10:44:08 +02:00
Thomas Tanghus 7922338050 Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form fields. 2012-05-18 17:39:19 +02:00
Frank Karlitschek 9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Thomas Tanghus b9cd0ecc8a Contacts: wrong name was set on initial load. 2012-05-17 16:46:39 +02:00
Thomas Tanghus 2f1e601809 Contacts: Disable in-app import if encryption is enabled, and make an attempt of supporting IE uploads too. Can't test it though... 2012-05-17 14:31:04 +02:00
Robin Appelman ac8bfc218e update translations 2012-05-17 00:36:21 +02:00
Thomas Tanghus d216678481 Contacts: removed check for empty FN field because Chrome/Chromium barfed. 2012-05-16 23:45:43 +02:00
Georg Ehrke 9e83c3f823 add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav 2012-05-16 21:05:15 +02:00
Thomas Tanghus 0f66870470 Contacts: Corrected i18n call. 2012-05-15 18:49:38 +02:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Thomas Tanghus e74f4b406f Remove logging. 2012-05-14 17:50:24 +02:00
Thomas Tanghus 9b3d8660eb Contacts: Had forgotten to call local function. 2012-05-14 17:49:33 +02:00
Thomas Tanghus de850dfa52 Contacts: Fix layout in contacts list that I had broken in an earlier fix :-P 2012-05-14 17:49:33 +02:00
Thomas Tanghus 1f2b37c08b Contacts: Photo upload handlers wern't being loaded for new contacts.
Name conflict with two FileUploads :-P
2012-05-14 11:08:00 +02:00
Thomas Tanghus 40f91d9f7c Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated. 2012-05-14 10:13:45 +02:00
Robin Appelman e7c106d91e selective app loading for remote/public 2012-05-14 00:28:28 +02:00
Thomas Tanghus 4e1e978b89 Contacts: Forgot one file for the import fix. 2012-05-13 23:27:14 +02:00
Thomas Tanghus 9295f49553 Contacts: Add error checking and reporting to import from files app. 2012-05-13 23:27:14 +02:00
Robin Appelman ee0294bbb1 update translations 2012-05-13 20:00:34 +02:00
Thomas Tanghus 56bd3f1220 Revert "Edited combobox to adhere to coding standards and added a dblclick handler."
This reverts commit 19b55d3fce.
2012-05-13 06:22:15 +02:00
Thomas Tanghus 996020d82b Revert "Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)"
This reverts commit a36a8faad4.

Moved it to unstable branch for now.
2012-05-13 06:22:15 +02:00
Thomas Tanghus 19b55d3fce Edited combobox to adhere to coding standards and added a dblclick handler. 2012-05-12 13:43:34 +02:00
Thomas Tanghus a36a8faad4 Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-) 2012-05-12 13:43:33 +02:00
Robin Appelman 736739bbbd load remote and public paths from info.xml during upgrade instead of setting them every time 2012-05-11 20:33:56 +02:00
Thomas Tanghus 8e5240d579 Contacts: Make the structured name dialog modal to avoid confusion. 2012-05-11 18:21:55 +02:00
Thomas Tanghus 646a4bd635 Contacts: Clone event handlers as well. 2012-05-11 18:21:55 +02:00
Thomas Tanghus 08e0b6cf5e Contacts: Also strip parameters. 2012-05-11 18:21:55 +02:00
Thomas Tanghus e5840e1fe2 Contacts: Hack to add structured name from formatted name. 2012-05-11 01:14:11 +02:00
Thomas Tanghus aa51639271 Contacts: Fix check for version. 2012-05-11 01:14:11 +02:00
Thomas Tanghus 78c11700f9 Added some margin. 2012-05-11 01:14:11 +02:00
Thomas Tanghus 7bc6e86969 Contacts: Fix some regressions from last commit. 2012-05-10 20:44:12 +02:00