b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
f496a9dea6
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:29:59 -04:00
ac395dced1
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:28:29 -04:00
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
e896c0a9e3
Fix addressbook sharing, formatItems() changed in past commits
2012-07-11 11:33:48 -04:00
9d2cbc88f0
Revert reversion of f5c329af98 :-P
2012-07-10 01:24:40 +02:00
34ac2ea1ba
Don't escape assigned values.
2012-07-10 01:24:40 +02:00
861c379255
Make sure the proper DOM is loaded and the right address book gets expanded.
2012-07-10 01:24:40 +02:00
0744e5a172
Look for the right field :-P
2012-07-10 01:24:40 +02:00
7cb74a0bf3
Reduce variables assigned.
2012-07-10 01:24:40 +02:00
50462903d6
Revert "Delay fetching of carddata and set ETag and size instead."
...
This reverts commit f5c329af98
2012-07-10 01:24:40 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
f5c329af98
Delay fetching of carddata and set ETag and size instead.
2012-07-09 01:48:42 +02:00
47aaca49a1
Rescan categories in small batches to reduce memory usage.
2012-07-09 00:16:14 +02:00
d1cf787197
Move code to OC_Contacts_App::scanCategories().
2012-07-09 00:15:37 +02:00
6d123e90f3
Remove deleted address book from list.
2012-07-08 23:38:03 +02:00
0b6cd8d203
Simplify VCF generation.
2012-07-08 23:36:52 +02:00
dc8193fccb
Make it possible to import files using CR as eol.
2012-07-08 18:28:55 +02:00
334257d2b6
Implemented VCFExportPlugin.
2012-07-08 17:52:57 +02:00
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
97106f198f
Set the loading class on the property being changed, not on its container.
2012-07-08 16:11:45 +02:00
e6a60198e4
Return error messages in correct format.
2012-07-08 14:11:48 +02:00
2b22f0db0a
Add missing requesttoken.
2012-07-08 13:28:12 +02:00
75d01b065d
Make export batch size configurable.
2012-07-06 13:49:04 +02:00
cafbd02337
Fix endless loop when no addressbooks.
2012-07-06 13:24:56 +02:00
a1872412bf
Correct hack ;)
2012-07-06 12:59:07 +02:00
ab1b4f1f03
Fugly fixed include.
2012-07-06 12:59:07 +02:00
a5a1d929ca
No need for being protected.
2012-07-06 03:22:42 +02:00
59b38e668d
Missing requesttoken
2012-07-06 03:22:42 +02:00
5e0b80dc8d
Contacts: Fix copy&paste error
2012-07-05 17:12:52 +02:00
9d00f4d2fb
Correct db default value.
2012-07-05 00:40:11 +02:00
dac2c14ae9
Add missing CSRF check.
2012-07-05 00:37:08 +02:00
5d79444852
Missing update script.
2012-07-04 22:58:31 +02:00
706a13544b
Remove ugly activation hack.
2012-07-04 22:13:36 +02:00
b2eac08ad3
Query contacts in batches of 20. Possible fix for oc-1126.
2012-07-04 16:54:00 +02:00
6d3afb3857
Moved action buttons down to the add field menu. Fixes oc-1155.
2012-07-04 13:57:07 +02:00
1e36e1f2cb
Use formatted shared addressbook in all cases, addressbooks out of order now
2012-07-03 11:36:57 -04:00
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
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
0b9b1757fe
Add share action to addressbooks!
2012-06-30 21:06:49 -04:00
47f46890c8
Fix generateTarget() for contacts backend
2012-06-30 21:03:36 -04:00
c7a4075aaa
Updates contacts migration provider
2012-06-30 22:56:47 +00:00
2418d9a1a9
Change registerBackend calls class argument to strings
2012-06-30 17:33:30 -04:00
51173163ce
Contacts: align the bottom control buttons
2012-06-30 11:22:09 +00:00
704a1c655e
Contacts: fix add contact icon path
2012-06-30 11:07:54 +00:00
a4614f83ff
Don't add duplicate contacts in the list when en-/disable an address book.
2012-06-29 23:18:47 +02:00
bda0026374
fix birthday calendar
2012-06-29 15:43:18 +02:00
e04a605b9b
No need for this anymore.
2012-06-28 01:51:42 +02:00
a48aba316e
Smoother profile picture loading - hopefully.
2012-06-28 01:46:33 +02:00
426193cf6c
Migration: Fix contacts and bookmarks
2012-06-27 21:18:31 +00:00
77b7f214d2
Load contactlist progressivly.
2012-06-27 22:44:28 +02:00
235515e84b
Something like this should do it for sharing contacts
2012-06-27 15:44:42 +02:00
060a297260
enable highlighting of address in OSM.
2012-06-27 11:46:42 +02:00
3edc40a68a
Load default categories if there are none,
2012-06-27 02:12:53 +02:00
823bef3a09
Ensure event handlers are being set when adding first contact.
2012-06-27 02:12:53 +02:00
afd9705283
Add check for return value.
2012-06-27 02:12:53 +02:00
b9e1033563
Basic framework for contacts sharing
2012-06-27 01:05:36 +02:00
cad282b73f
Added some error checking.
2012-06-26 18:15:24 +02:00
1b2d09f9ca
Added missing requesttoken.
2012-06-26 18:15:24 +02:00
d8b181cd84
Added error checking on all db queries.
2012-06-26 18:15:24 +02:00
db115429f7
Added createUser hook.
2012-06-26 18:15:24 +02:00
46e93168cd
Fix variable name.
2012-06-26 16:06:52 +02:00
bf756293c6
Added signals.
2012-06-26 05:26:50 +02:00
8df59852a4
Adjust pic width a bit.
2012-06-26 04:09:45 +02:00
b384d79bf8
Remove x-scrollbar from contacts list.
2012-06-25 23:32:03 +02:00
dc4b891327
Better visual feedback and prevent drop on self.
2012-06-25 18:24:15 +02:00
b8d6ad0431
Improve styling on draggables.
2012-06-25 18:24:15 +02:00
ef93bf223a
Try to conserve some memory. Should fix oc-1106 for master.
2012-06-25 17:26:44 +02:00
052bd8efbb
Drag'n'Drop contacts between addressbook. Still needs some css magic.
2012-06-25 03:42:27 +02:00
e845e56749
Remove excessive debugging.
2012-06-24 22:25:32 +02:00
3afbc3d2dc
Add some DRYness to logging.
2012-06-24 22:25:32 +02:00
f10c51193b
Fixed function name.
2012-06-24 22:25:32 +02:00
0f9b9fa111
Remove unneeded parameter.
2012-06-24 16:07:18 +02:00
5393c0cfed
Click to select which address book to add to.
2012-06-24 16:03:10 +02:00
9e6d2f2f82
Improve prev/next selection on delete.
2012-06-24 15:07:44 +02:00
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
96ec7a66bb
More session_write_close
2012-06-22 17:21:56 +02:00
1f06cdf81f
Small js fix.
2012-06-22 14:27:46 +02:00
07124ee38d
Cast translation to string.
2012-06-22 14:27:46 +02:00
82f39d3292
Contacts: Fix name and carddav-url encoding
2012-06-21 23:30:04 +02:00
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
37d12144c2
Fix URL delimiter.
2012-06-21 22:03:57 +02:00
ad7154b344
Fix being able to link directly to contact, that I broke in other commit.
2012-06-21 22:02:17 +02:00
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
10a0d5a46c
More changes for updating the contacts list.
2012-06-20 21:00:49 +02:00
dc8c188ffe
Better error checking.
2012-06-20 21:00:49 +02:00
426ed27be2
Make sure address books are shown even if empty.
2012-06-20 21:00:49 +02:00
0f1fe0b505
Log error as ERROR.
2012-06-20 21:00:49 +02:00
0b9a48b4b6
Re-add missing loadhandlers() call.
2012-06-19 14:56:21 +02:00
33aec973df
Loading of contacts was placed outside of $(document).ready() function.
2012-06-19 14:55:14 +02:00
e5feb4e1aa
Remove obsolete js.
2012-06-18 02:22:22 +02:00
73fd4c979a
Update js after contactlist change.
2012-06-18 02:21:29 +02:00
a4f53922c2
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:36:25 +02:00
cab4a634df
Save addressbook id to be able to rearrange contacts properly.
2012-06-17 23:14:02 +02:00
3efec3fde9
Make contact list fit in viewport.
2012-06-17 23:12:48 +02:00
ea4d8ccf70
Rearrange markup.
2012-06-17 23:12:11 +02:00
8337b30e43
Add thumbnail links so they are loaded when addressbook is expanded.
2012-06-17 23:09:25 +02:00
7d84c4741c
Use uasort instead of usort.
2012-06-17 21:50:49 +02:00
46a771d2e6
Sort addressbooks.
2012-06-17 21:47:15 +02:00
fb700de4a4
Add effect on addressbook show/hide.
2012-06-17 21:37:13 +02:00
9e4a41e9cb
Add effect on addressbook show/hide.
2012-06-17 21:34:56 +02:00
5a8f4b8783
Adjustments for inview handler etc.
2012-06-17 20:25:32 +02:00
b6b6d69158
Moved parsing to the controller and js to contacts.js.
2012-06-17 20:25:32 +02:00
2875901fc7
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
91f5a1de39
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
b1cfc99f63
Styled address book entries.
2012-06-17 20:25:32 +02:00
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
92e35bd843
now a little less in template - more in ajax controller
2012-06-17 20:25:32 +02:00
7f485d1b20
contacts app now lists contacts sorted by expandable/collapsable addressbooks
2012-06-17 20:25:32 +02:00
4cbdd59859
Fix char encoding.
2012-06-16 18:38:20 +02:00
6642ef6a50
Fix string encoding probs.
2012-06-16 18:06:47 +02:00
effb6f1309
Update stylesheet for type=url.
2012-06-15 04:32:01 +02:00
8a68d09b0f
Use type=url for URL field.
2012-06-15 04:32:01 +02:00
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
96a3e28c2e
Cleanup code.
2012-06-14 23:05:31 +02:00
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
47c03a0eff
Contacts: Fixes for CSRF.
2012-06-14 18:13:01 +02:00
756eb3548f
Use the right csrf token.
2012-06-14 13:23:12 +02:00
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
613a122437
Remove check for encryption.
2012-06-13 19:03:34 +02:00
d33d599b1b
Remove debug statements.
2012-06-13 18:57:12 +02:00
bc1e8cb0a2
Contacts: implemented CSRF prevention.
2012-06-13 17:35:42 +02:00
c44591e27a
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:32:37 +02:00
ac11647d7a
Fix js for missing address fields.
2012-06-11 22:14:21 +02:00
4b86cbcb6f
Quick fix for index errors when not importing from files.
2012-06-11 22:14:21 +02:00
c75f9f9397
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
2012-06-11 22:14:21 +02:00
8af53829d5
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:14:21 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
1d493a70e7
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
2012-06-11 18:13:12 +02:00
739589f485
make sure that contact data are always utf8 encoded to avoid encoding problems
2012-06-11 16:26:21 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
6d9947b3ff
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:55:54 +02:00
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
e79e18d866
Copy/paste error.
2012-06-11 02:40:55 +02:00
40f8419fdf
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:56:55 +02:00
f90c8738ab
Contacts: Used non-existent var.
2012-06-10 12:48:39 +02:00
081e1874cb
Contacts: Use POST instead of GET.
2012-06-09 15:00:44 +02:00
88341e5797
Code cleanup.
2012-06-09 15:00:44 +02:00
0a49bae87a
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
2012-06-08 20:39:54 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
d4f6f3e935
Contacts: Attempt to make file upload work in ICS Chrome.
2012-06-07 20:29:16 +02:00
33c802dcaa
Break text to fit in dialog.
2012-06-07 20:29:15 +02:00
d2a8746c49
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-06-07 16:44:54 +02:00
3804f68ff5
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:55:40 +02:00
9c84149119
A bit of pixel-pushing.
2012-06-07 10:55:40 +02:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
5c17338ac7
Contacts: Make js a tad DRYer. Added URL property.
2012-06-06 15:29:33 +02:00
ed950e3ba2
Correct mime type.
2012-06-06 15:29:33 +02:00
fce614b82c
Less aggressive caching on thumbnails too.
2012-06-06 01:06:13 +02:00
68670bcc66
Cleanup.
2012-06-06 01:06:13 +02:00
624f8ae36d
Also use OC_Cache here.
2012-06-06 01:06:13 +02:00
80de23d08b
Contacts: Removed temp dir cleanup after using OC_Cache.
2012-06-06 01:06:12 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
20aee83d07
Use UID for cache key.
2012-06-05 21:20:10 +02:00
cb941996c0
Contacts: Use OC_Cache for contact photo handling instead of temp dir.
2012-06-05 20:34:12 +02:00
d194132b6f
Contacts: Cache standard photo less aggressively
2012-06-05 10:32:26 +02:00
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
3b9bf83fe7
Contacts: Make tmp file cleaup a bit safer.
2012-06-04 13:38:37 +02:00
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
855f404e5c
Contacts: Temporary files weren't deleted if crop window was closed without saving.
2012-06-04 13:14:31 +02:00
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
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
dbcd26be68
Contacts: Rewrote import script.
2012-05-29 23:41:53 +02:00
c9df18ed8c
Forgot a break.
2012-05-29 16:46:54 +02:00
51aa84e70a
Contacts: NOTE wasn't saved properly.
2012-05-29 16:43:59 +02:00
dff16e70a9
Contacts: Improve loading and cleanup of dialogs.
2012-05-29 16:43:59 +02:00
817f9ff57d
Contacts: Fix XSS.
2012-05-28 14:42:57 +02:00
df5bdc8e42
Contacts: Double check XSS, and fix a rookie error ;-)
2012-05-28 13:19:31 +02:00
a896da0d91
Contacts: XSS fix. Still some more to check.
2012-05-21 21:47:15 +02:00
d4072c82dd
some fixes for contacts, gallery and openid
2012-05-19 15:22:21 +02:00
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
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
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
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02:00
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
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
d216678481
Contacts: removed check for empty FN field because Chrome/Chromium barfed.
2012-05-16 23:45:43 +02:00
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
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
583dce5276
removing executable bit - again
2012-05-15 00:52:00 +02:00
e74f4b406f
Remove logging.
2012-05-14 17:50:24 +02:00
9b3d8660eb
Contacts: Had forgotten to call local function.
2012-05-14 17:49:33 +02:00
de850dfa52
Contacts: Fix layout in contacts list that I had broken in an earlier fix :-P
2012-05-14 17:49:33 +02:00
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
40f91d9f7c
Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated.
2012-05-14 10:13:45 +02:00
e7c106d91e
selective app loading for remote/public
2012-05-14 00:28:28 +02:00
4e1e978b89
Contacts: Forgot one file for the import fix.
2012-05-13 23:27:14 +02:00
9295f49553
Contacts: Add error checking and reporting to import from files app.
2012-05-13 23:27:14 +02:00
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
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
996020d82b
Revert "Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)"
...
This reverts commit a36a8faad4
2012-05-13 06:22:15 +02:00
19b55d3fce
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-05-12 13:43:34 +02:00
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
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
8e5240d579
Contacts: Make the structured name dialog modal to avoid confusion.
2012-05-11 18:21:55 +02:00
646a4bd635
Contacts: Clone event handlers as well.
2012-05-11 18:21:55 +02:00
08e0b6cf5e
Contacts: Also strip parameters.
2012-05-11 18:21:55 +02:00
e5840e1fe2
Contacts: Hack to add structured name from formatted name.
2012-05-11 01:14:11 +02:00
aa51639271
Contacts: Fix check for version.
2012-05-11 01:14:11 +02:00
78c11700f9
Added some margin.
2012-05-11 01:14:11 +02:00
Robin Appelman
Michael Gapczynski
Thomas Tanghus
Jörn Friedrich Dreyer
Bart Visscher
Tom Needham
Georg Ehrke
Bjoern Schiessle
Brice Maron
Stephan Bergemann
Michael Gapczynski
Lukas Reschke
Frank Karlitschek
Thomas Mueller