| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-31 | 2 | -52/+51 |
|\ |
|
| * | Remove deprecated code. | Thomas Tanghus | 2012-07-30 | 1 | -16/+0 |
| * | Code style. | Thomas Tanghus | 2012-07-30 | 1 | -36/+69 |
| * | Fixed potential error in logging. | Thomas Tanghus | 2012-07-30 | 1 | -3/+3 |
* | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-25 | 7 | -132/+136 |
|\| |
|
| * | Damn, that Jenkins dude is tough ;) | Thomas Tanghus | 2012-07-21 | 3 | -11/+17 |
| * | Code style. | Thomas Tanghus | 2012-07-20 | 3 | -6/+6 |
| * | Coding style. | Thomas Tanghus | 2012-07-20 | 4 | -111/+111 |
| * | Wrong argument count in postCreateUser hook for contacts. | Thomas Tanghus | 2012-07-17 | 1 | -3/+3 |
| * | Remove obsolete FIXMEs. | Thomas Tanghus | 2012-07-16 | 1 | -2/+0 |
| * | Refactored contacts import. | Thomas Tanghus | 2012-07-15 | 1 | -1/+1 |
| * | Give default address book a more intuitive name and replace spaces with under... | Thomas Tanghus | 2012-07-14 | 1 | -2/+2 |
* | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-11 | 6 | -134/+225 |
|\| |
|
| * | Revert reversion of f5c329af981f59f78c12648ea41c258f477f3e82 :-P | Thomas Tanghus | 2012-07-10 | 1 | -1/+3 |
| * | Look for the right field :-P | Thomas Tanghus | 2012-07-10 | 1 | -1/+1 |
| * | Revert "Delay fetching of carddata and set ETag and size instead." | Thomas Tanghus | 2012-07-10 | 1 | -3/+1 |
| * | Delay fetching of carddata and set ETag and size instead. | Thomas Tanghus | 2012-07-09 | 1 | -1/+3 |
| * | Rescan categories in small batches to reduce memory usage. | Thomas Tanghus | 2012-07-09 | 1 | -9/+12 |
| * | Simplify VCF generation. | Thomas Tanghus | 2012-07-08 | 1 | -8/+5 |
| * | Implemented VCFExportPlugin. | Thomas Tanghus | 2012-07-08 | 1 | -0/+103 |
| * | Fix endless loop when no addressbooks. | Thomas Tanghus | 2012-07-06 | 1 | -3/+10 |
| * | No need for being protected. | Thomas Tanghus | 2012-07-06 | 1 | -1/+1 |
| * | Contacts: Fix copy&paste error | Bart Visscher | 2012-07-05 | 1 | -1/+1 |
| * | Remove ugly activation hack. | Thomas Tanghus | 2012-07-04 | 1 | -100/+57 |
| * | fix birthday calendar | Georg Ehrke | 2012-06-29 | 1 | -1/+3 |
| * | Load contactlist progressivly. | Thomas Tanghus | 2012-06-27 | 1 | -3/+11 |
| * | Load default categories if there are none, | Thomas Tanghus | 2012-06-27 | 1 | -6/+29 |
* | | Fix addressbook sharing, formatItems() changed in past commits | Michael Gapczynski | 2012-07-11 | 1 | -6/+4 |
* | | Use formatted shared addressbook in all cases, addressbooks out of order now | Michael Gapczynski | 2012-07-03 | 2 | -8/+21 |
* | | Load shared addressbooks inside OC_Contacts_Addressbook instead of the index,... | Michael Gapczynski | 2012-07-03 | 2 | -2/+2 |
* | | Change getItems() return to a 3-dimensional array to handle multiple shares o... | Michael Gapczynski | 2012-07-02 | 1 | -7/+12 |
* | | Fix generateTarget() for contacts backend | Michael Gapczynski | 2012-06-30 | 1 | -2/+2 |
* | | Something like this should do it for sharing contacts | Bart Visscher | 2012-06-27 | 1 | -0/+20 |
* | | Basic framework for contacts sharing | Bart Visscher | 2012-06-27 | 1 | -0/+54 |
|/ |
|
* | Added error checking on all db queries. | Thomas Tanghus | 2012-06-26 | 2 | -51/+149 |
* | Added createUser hook. | Thomas Tanghus | 2012-06-26 | 1 | -0/+10 |
* | Fix variable name. | Thomas Tanghus | 2012-06-26 | 1 | -1/+1 |
* | Added signals. | Thomas Tanghus | 2012-06-26 | 2 | -4/+14 |
* | Cast translation to string. | Thomas Tanghus | 2012-06-22 | 1 | -1/+1 |
* | Fix URL delimiter. | Thomas Tanghus | 2012-06-21 | 1 | -1/+1 |
* | Better error checking. | Thomas Tanghus | 2012-06-20 | 1 | -10/+13 |
* | Log error as ERROR. | Thomas Tanghus | 2012-06-20 | 1 | -1/+1 |
* | Cleanup code. | Thomas Tanghus | 2012-06-14 | 1 | -10/+3 |
* | If Hr. Lerdorf had made up his mind on parameter order, life would have been ... | Thomas Tanghus | 2012-06-14 | 1 | -1/+1 |
* | Contacts: Final (for now) fix to encoding probs on import. | Thomas Tanghus | 2012-06-12 | 1 | -1/+2 |
* | Contacts: Fix encoding errors, import errors, developer headache, paint cute ... | Thomas Tanghus | 2012-06-11 | 1 | -1/+1 |
* | Contacts: 11th hour fix for invalid VCARD from CardDAV. | Thomas Tanghus | 2012-06-10 | 1 | -0/+4 |
* | Contacts: Double check XSS, and fix a rookie error ;-) | Thomas Tanghus | 2012-05-28 | 1 | -1/+1 |
* | Contacts: XSS fix. Still some more to check. | Thomas Tanghus | 2012-05-21 | 1 | -0/+3 |
* | removing executable bit - again | Thomas Mueller | 2012-05-15 | 5 | -0/+0 |