| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Email type list wasn't initialized. | Thomas Tanghus | 2012-08-22 | 1 | -1/+7 |
| | | |||||
| * | Removed unused variable. | Thomas Tanghus | 2012-08-22 | 1 | -7/+5 |
| | | |||||
| * | Minor layout change. | Thomas Tanghus | 2012-08-22 | 2 | -57/+46 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-22 | 6 | -6/+15 |
| | | |||||
| * | Preliminary support for Apple X-ABLabel. Also for oc-1508. | Thomas Tanghus | 2012-08-21 | 4 | -15/+32 |
| | | |||||
| * | Remove class contactsection | Thomas Tanghus | 2012-08-21 | 1 | -1/+1 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-21 | 2 | -1/+21 |
| | | |||||
| * | Added types to emails. Support for custom types. Partial fix for oc-1508. | Thomas Tanghus | 2012-08-21 | 3 | -8/+25 |
| | | |||||
| * | Try to align and float contact parts better. | Thomas Tanghus | 2012-08-21 | 3 | -6/+8 |
| | | |||||
| * | Merge branch 'share_api' | Michael Gapczynski | 2012-08-19 | 10 | -22/+272 |
| |\ | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php | ||||
| | * | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-14 | 16 | -31/+135 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Contacts: Check format parameter | Bart Visscher | 2012-08-10 | 1 | -6/+8 |
| | | | | |||||
| | * | | Contacts: Better parameter names in addressbook share backend | Bart Visscher | 2012-08-10 | 1 | -7/+8 |
| | | | | |||||
| | * | | Additional permission checks for editing and deleting contacts | Michael Gapczynski | 2012-08-09 | 1 | -3/+76 |
| | | | | |||||
| | * | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-09 | 17 | -82/+148 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php | ||||
| | * | | | Start adding permission checks for addressbooks | Michael Gapczynski | 2012-08-08 | 3 | -15/+45 |
| | | | | | |||||
| | * | | | Don't include shared addressbook if source not found | Michael Gapczynski | 2012-08-08 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Sharing backends for contacts and addressbooks | Michael Gapczynski | 2012-08-06 | 2 | -0/+141 |
| | | | | | |||||
| | * | | | Load icons for addressbooks, fix statuses for types other than files | Michael Gapczynski | 2012-08-06 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Add share action back into addressbook settings, bump up z-index of dropdown ↵ | Michael Gapczynski | 2012-08-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | so the autocomplete list is visible | ||||
| | * | | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-08-06 | 78 | -3397/+4145 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php | ||||
| | * | | | | Lots of refactoring to share API | Michael Gapczynski | 2012-08-06 | 2 | -5/+5 |
| | | | | | | |||||
| | * | | | | Preparing for proper collection implementation | Michael Gapczynski | 2012-08-03 | 3 | -80/+6 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-31 | 15 | -270/+718 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js | ||||
| | * \ \ \ \ | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-25 | 55 | -928/+1331 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | |||||
| | * | | | | | | Rename $contacts to $has_contacts, it missed this commit: 7cb74a0 | Michael Gapczynski | 2012-07-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into share_api | Michael Gapczynski | 2012-07-11 | 40 | -423/+547 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php | ||||
| | * | | | | | | | 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 ↵ | Michael Gapczynski | 2012-07-03 | 3 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index, add public functions getItemShared(With)BySource() for contacts app | ||||
| | * | | | | | | | Change getItems() return to a 3-dimensional array to handle multiple shares ↵ | Michael Gapczynski | 2012-07-02 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the same item | ||||
| | * | | | | | | | Add share action to addressbooks! | Michael Gapczynski | 2012-06-30 | 2 | -1/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix generateTarget() for contacts backend | Michael Gapczynski | 2012-06-30 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Change registerBackend calls class argument to strings | Michael Gapczynski | 2012-06-30 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Something like this should do it for sharing contacts | Bart Visscher | 2012-06-27 | 2 | -0/+21 |
| | | | | | | | | | |||||
| | * | | | | | | | Basic framework for contacts sharing | Bart Visscher | 2012-06-27 | 2 | -0/+56 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-20 | 2 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-20 | 1 | -4/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Removed stray img element. | Thomas Tanghus | 2012-08-19 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Strip slashes from commas and semi-colons. | Thomas Tanghus | 2012-08-19 | 1 | -0/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Optimized image size | Lukas Reschke | 2012-08-18 | 3 | -0/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-18 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-17 | 4 | -17/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-16 | 6 | -3/+113 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge addressbooks. | Thomas Tanghus | 2012-08-16 | 3 | -26/+43 |
| | | | | | | | | | |||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-15 | 1 | -1/+49 |
| | | | | | | | | | |||||
| * | | | | | | | | Use correct class. | Thomas Tanghus | 2012-08-14 | 2 | -2/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Disable user enumeration | Lukas Reschke | 2012-08-14 | 1 | -4/+7 |
| | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-08-13 | 1 | -0/+1 |
| | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |