summaryrefslogtreecommitdiffstats
path: root/apps/contacts
Commit message (Expand)AuthorAgeFilesLines
* Contacts: Fix name and carddav-url encodingBart Visscher2012-06-212-3/+3
* Merge branch 'master' into multi_app_dirBrice Maron2012-06-214-6/+9
|\
| * Fix URL delimiter.Thomas Tanghus2012-06-211-1/+1
| * Fix being able to link directly to contact, that I broke in other commit.Thomas Tanghus2012-06-213-5/+8
* | Merge branch 'master' into multi_app_dirBrice Maron2012-06-2117-137/+195
|\|
| * More changes for updating the contacts list.Thomas Tanghus2012-06-202-14/+20
| * Better error checking.Thomas Tanghus2012-06-201-10/+13
| * Make sure address books are shown even if empty.Thomas Tanghus2012-06-201-12/+15
| * Log error as ERROR.Thomas Tanghus2012-06-201-1/+1
| * Re-add missing loadhandlers() call.Thomas Tanghus2012-06-191-0/+1
| * Loading of contacts was placed outside of $(document).ready() function.Thomas Tanghus2012-06-191-1/+2
| * Remove obsolete js.Thomas Tanghus2012-06-181-16/+0
| * Update js after contactlist change.Thomas Tanghus2012-06-181-14/+15
| * Removed erroneous value attributes. Partial fix for oc-1029.Thomas Tanghus2012-06-181-4/+4
| * Save addressbook id to be able to rearrange contacts properly.Thomas Tanghus2012-06-171-11/+16
| * Make contact list fit in viewport.Thomas Tanghus2012-06-171-1/+1
| * Rearrange markup.Thomas Tanghus2012-06-171-6/+8
| * Add thumbnail links so they are loaded when addressbook is expanded.Thomas Tanghus2012-06-171-2/+2
| * Use uasort instead of usort.Thomas Tanghus2012-06-171-1/+1
| * Sort addressbooks.Thomas Tanghus2012-06-171-0/+9
| * Add effect on addressbook show/hide.Thomas Tanghus2012-06-171-1/+1
| * Add effect on addressbook show/hide.Thomas Tanghus2012-06-171-1/+1
| * Adjustments for inview handler etc.Thomas Tanghus2012-06-171-5/+21
| * Moved parsing to the controller and js to contacts.js.Thomas Tanghus2012-06-171-25/+7
| * Obsolete language="Javascript".Thomas Tanghus2012-06-171-1/+1
| * Obsolete language="Javascript".Thomas Tanghus2012-06-171-1/+1
| * Styled address book entries.Thomas Tanghus2012-06-171-1/+2
| * Make the parsing in the controller, not in the template. Assign only relevant...Thomas Tanghus2012-06-171-17/+20
| * now a little less in template - more in ajax controllerStephan Bergemann2012-06-174-38/+45
| * contacts app now lists contacts sorted by expandable/collapsable addressbooksStephan Bergemann2012-06-174-33/+66
| * Fix char encoding.Thomas Tanghus2012-06-162-7/+8
| * Fix string encoding probs.Thomas Tanghus2012-06-165-17/+24
| * Update stylesheet for type=url.Thomas Tanghus2012-06-151-3/+3
| * Use type=url for URL field.Thomas Tanghus2012-06-151-1/+1
| * Cleanup code.Thomas Tanghus2012-06-141-10/+3
| * If Hr. Lerdorf had made up his mind on parameter order, life would have been ...Thomas Tanghus2012-06-141-1/+1
* | Merge branch 'master' into multi_app_dirBrice Maron2012-06-1419-47/+94
|\|
| * Contacts: Fixes for CSRF.Thomas Tanghus2012-06-141-2/+2
| * Use the right csrf token.Thomas Tanghus2012-06-141-2/+2
| * Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/ownclo...Michael Gapczynski2012-06-131-1/+1
| |\
| | * Make some apps compatibleLukas Reschke2012-06-112-3/+12
| | * RevertLukas Reschke2012-06-116-23/+23
| | * First try of implementing assignHTMLLukas Reschke2012-06-116-23/+23
| * | Remove check for encryption.Thomas Tanghus2012-06-131-5/+0
| * | Remove debug statements.Thomas Tanghus2012-06-132-19/+0
| * | Contacts: implemented CSRF prevention.Thomas Tanghus2012-06-1314-6/+52
| * | Contacts: Final (for now) fix to encoding probs on import.Thomas Tanghus2012-06-121-1/+2
| * | Fix js for missing address fields.Thomas Tanghus2012-06-111-6/+6
| * | Quick fix for index errors when not importing from files.Thomas Tanghus2012-06-111-1/+1
| * | Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc...Thomas Tanghus2012-06-111-2/+2