Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added types to emails. Support for custom types. Partial fix for oc-1508. | Thomas Tanghus | 2012-08-21 | 1 | -5/+23 |
| | |||||
* | Try to align and float contact parts better. | Thomas Tanghus | 2012-08-21 | 1 | -2/+4 |
| | |||||
* | Merge branch 'share_api' | Michael Gapczynski | 2012-08-19 | 2 | -2/+3 |
|\ | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php | ||||
| * | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-14 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php | ||||
| * \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-09 | 2 | -10/+19 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php | ||||
| * | | | Load icons for addressbooks, fix statuses for types other than files | Michael Gapczynski | 2012-08-06 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-06 | 2 | -1605/+1727 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php | ||||
| * \ \ \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-31 | 1 | -5/+55 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js | ||||
| * \ \ \ \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-25 | 2 | -469/+739 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php | ||||
| * | | | | | | Make file actions permissions aware | Michael Gapczynski | 2012-07-25 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge addressbooks. | Thomas Tanghus | 2012-08-16 | 1 | -3/+27 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Readded refresh param. 304 and ETag is still sent so shouldn't matter. | Thomas Tanghus | 2012-08-12 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Another take at profile photo/thumbnail caching. oc-839. | Thomas Tanghus | 2012-08-09 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Some UI improvements on the addressbooks settings. | Thomas Tanghus | 2012-08-07 | 1 | -6/+15 |
| |_|_|/ |/| | | | |||||
* | | | | Correct path to ajax file. | Thomas Tanghus | 2012-08-05 | 1 | -2/+2 |
| | | | | |||||
* | | | | Reorganize ajax scripts. | Thomas Tanghus | 2012-08-03 | 1 | -8/+8 |
| | | | | |||||
* | | | | Some fixes for keyboard shortcuts. | Thomas Tanghus | 2012-08-03 | 1 | -15/+34 |
| | | | | |||||
* | | | | Return properly formatted jsondata. | Thomas Tanghus | 2012-08-02 | 1 | -7/+7 |
| | | | | |||||
* | | | | Correct namespace usage. | Thomas Tanghus | 2012-08-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove logging | Thomas Tanghus | 2012-08-02 | 1 | -1/+0 |
| | | | | |||||
* | | | | I was a bit too fast in removing methods yesterday... | Thomas Tanghus | 2012-08-02 | 1 | -0/+14 |
| | | | | |||||
* | | | | If first addressbook was empty it was seen as if there where no contacts at all. | Thomas Tanghus | 2012-08-02 | 1 | -1/+4 |
| | | | | |||||
* | | | | Remove onunload handler when delete is cancelled. | Thomas Tanghus | 2012-08-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Use popup class style for ninja-mode help. | Thomas Tanghus | 2012-08-02 | 1 | -4/+4 |
| | | | | |||||
* | | | | Updated JS namespace. | Thomas Tanghus | 2012-08-02 | 2 | -1504/+1494 |
| | | | | |||||
* | | | | And then the missing files ;) | Thomas Tanghus | 2012-08-02 | 1 | -0/+186 |
| | | | | |||||
* | | | | Addressbooks settings rewrite and cleanup. | Thomas Tanghus | 2012-08-02 | 1 | -120/+24 |
| | | | | |||||
* | | | | Changed fix parameter to OC.appSettings(). | Thomas Tanghus | 2012-07-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Implemented app settings in popup. | Thomas Tanghus | 2012-07-31 | 1 | -2/+8 |
| |_|/ |/| | | |||||
* | | | Check if the are contacts marked as deleted and warn if so. | Thomas Tanghus | 2012-07-30 | 1 | -5/+55 |
| |/ |/| | |||||
* | | Cache DOM lookups, general cleanup. | Thomas Tanghus | 2012-07-23 | 1 | -113/+132 |
| | | |||||
* | | Cleaner event handling. | Thomas Tanghus | 2012-07-23 | 1 | -13/+8 |
| | | |||||
* | | No need to set checksum on PHOTO. | Thomas Tanghus | 2012-07-23 | 1 | -15/+4 |
| | | |||||
* | | Cleaner variable handling. | Thomas Tanghus | 2012-07-23 | 1 | -12/+6 |
| | | |||||
* | | Make sure notifier cleans up. | Thomas Tanghus | 2012-07-23 | 1 | -12/+16 |
| | | |||||
* | | Revert "No need to set checksum for PHOTO." | Thomas Tanghus | 2012-07-23 | 1 | -49/+55 |
| | | | | | | | | This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c. | ||||
* | | No need to set checksum for PHOTO. | Thomas Tanghus | 2012-07-23 | 1 | -55/+49 |
| | | |||||
* | | Use insertContact | Thomas Tanghus | 2012-07-23 | 1 | -13/+4 |
| | | |||||
* | | Whitespace | Thomas Tanghus | 2012-07-23 | 1 | -2/+2 |
| | | |||||
* | | Added help for keyboard shortcuts. | Thomas Tanghus | 2012-07-22 | 1 | -6/+14 |
| | | |||||
* | | First stab at Ninja mode ;-) | Thomas Tanghus | 2012-07-21 | 1 | -1/+65 |
| | | |||||
* | | Improved scrollTo method. Still not quite there... | Thomas Tanghus | 2012-07-21 | 1 | -3/+3 |
| | | |||||
* | | Added next/previous methods to contacts list. | Thomas Tanghus | 2012-07-21 | 1 | -0/+15 |
| | | |||||
* | | Remove wrong comment. | Thomas Tanghus | 2012-07-21 | 1 | -1/+1 |
| | | |||||
* | | Implemented undelete for contacts. | Thomas Tanghus | 2012-07-21 | 1 | -49/+71 |
| | | |||||
* | | Made contactlist optional in insertContact(). | Thomas Tanghus | 2012-07-21 | 1 | -0/+5 |
| | | |||||
* | | White space. | Thomas Tanghus | 2012-07-21 | 1 | -37/+37 |
| | | |||||
* | | Added option to notify method. | Thomas Tanghus | 2012-07-21 | 1 | -3/+21 |
| | | |||||
* | | DRYed inserting into contacts list. | Thomas Tanghus | 2012-07-21 | 1 | -30/+41 |
| | | |||||
* | | Hide progressbar on error. | Thomas Tanghus | 2012-07-20 | 1 | -0/+2 |
| | |