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
|
0744e5a172
|
Look for the right field :-P
|
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 |
|
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
|
0b6cd8d203
|
Simplify VCF generation.
|
2012-07-08 23:36:52 +02:00 |
|
Thomas Tanghus
|
334257d2b6
|
Implemented VCFExportPlugin.
|
2012-07-08 17:52:57 +02:00 |
|
Thomas Tanghus
|
cafbd02337
|
Fix endless loop when no addressbooks.
|
2012-07-06 13:24:56 +02:00 |
|
Thomas Tanghus
|
a5a1d929ca
|
No need for being protected.
|
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
|
706a13544b
|
Remove ugly activation hack.
|
2012-07-04 22:13:36 +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
|
47f46890c8
|
Fix generateTarget() for contacts backend
|
2012-06-30 21:03:36 -04:00 |
Georg Ehrke
|
bda0026374
|
fix birthday calendar
|
2012-06-29 15:43:18 +02: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 |
|
Thomas Tanghus
|
3edc40a68a
|
Load default categories if there are none,
|
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
|
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
|
07124ee38d
|
Cast translation to string.
|
2012-06-22 14:27:46 +02:00 |
|
Thomas Tanghus
|
37d12144c2
|
Fix URL delimiter.
|
2012-06-21 22:03:57 +02:00 |
|
Thomas Tanghus
|
dc8c188ffe
|
Better error checking.
|
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
|
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
|
c44591e27a
|
Contacts: Final (for now) fix to encoding probs on import.
|
2012-06-12 12:32:37 +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 |
|
Thomas Tanghus
|
40f8419fdf
|
Contacts: 11th hour fix for invalid VCARD from CardDAV.
|
2012-06-10 20:56:55 +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 |
Thomas Mueller
|
583dce5276
|
removing executable bit - again
|
2012-05-15 00:52:00 +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 |
|
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
|
2c6740b0c7
|
Some UI and code restructering according to usability tests: https://mail.kde.org/pipermail/owncloud/2012-May/003194.html
|
2012-05-10 16:53:25 +02:00 |
|
Thomas Tanghus
|
eda42cece9
|
Contacts: Don't try to render invalid properties.
|
2012-05-05 13:49:47 +02:00 |
|
Thomas Tanghus
|
e61e40c23d
|
Contacts: Hack around malformed BDAY.
|
2012-05-04 01:27:59 +02:00 |
Frank Karlitschek
|
97a8af7f25
|
ported oc_db
|
2012-05-03 13:06:08 +02:00 |
|
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Frank Karlitschek
|
351740601a
|
port oc_response
|
2012-05-03 10:46:27 +02:00 |
|
Bart Visscher
|
f7e410147f
|
Contacts: check for malformed VCards in calendar hook
|
2012-05-02 21:36:33 +02:00 |
|
Frank Karlitschek
|
82a61e2e1a
|
port oc_preferences
|
2012-05-02 15:54:34 +02:00 |