summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19631 from owncloud/share-emailsenterrorThomas Müller2015-10-144-13/+185
|\ | | | | Fix share email sending feedback
| * Add unit tests for sending e-mail for link sharesRoeland Jago Douma2015-10-082-10/+170
| |
| * Fix share email sending feedbackVincent Petry2015-10-082-3/+15
| | | | | | | | Redisplay email address after failure
* | Merge pull request #19633 from owncloud/sidebar-alt-favoriteThomas Müller2015-10-141-2/+1
|\ \ | | | | | | Move alt text for favorite action to image
| * | Move alt text for favorite action to imageVincent Petry2015-10-071-2/+1
| | |
* | | Merge pull request #19634 from owncloud/notif-showtemporaryThomas Müller2015-10-141-20/+8
|\ \ \ | | | | | | | | showTemporary instead of show for notifications
| * | | showTemporary instead of show for notificationsVincent Petry2015-10-081-20/+8
| |/ /
* | | Merge pull request #19647 from owncloud/trashbin-removesidebarThomas Müller2015-10-141-1/+2
|\ \ \ | | | | | | | | Remove sidebar for trashbin view
| * | | Remove sidebar for trashbin viewVincent Petry2015-10-081-1/+2
| |/ /
* | | Merge pull request #19710 from owncloud/files-canceluploaddebounce-reThomas Müller2015-10-141-6/+5
|\ \ \ | | | | | | | | Debounce cancel upload message
| * | | Debounce cancel upload messageVincent Petry2015-10-121-6/+5
| | | |
* | | | Merge pull request #19714 from owncloud/trash-deletesectionposition-2Thomas Müller2015-10-143-14/+18
|\ \ \ \ | | | | | | | | | | Revert "Revert "Move trashbin specific CSS that modifies sidebar""
| * | | | Revert "Revert "Move trashbin specific CSS that modifies sidebar""Thomas Müller2015-10-123-14/+18
| |/ / / | | | | | | | | | | | | This reverts commit 0738ddfb768c541e8a6b112fb2cd12d15676a0ab.
* | | | Merge pull request #19738 from owncloud/proppatch-lastmodifiedThomas Müller2015-10-142-6/+6
|\ \ \ \ | | | | | | | | | | Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
| * | | | Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"Vincent Petry2015-10-132-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression that makes PROPPATCH of mtime work like it did in OC <= 8.0. The PROPPATCH must be done on the "lastmodified" property. The "getlastmodified" now return 403 again.
* | | | | Merge pull request #19747 from owncloud/files-delete-hidenotifThomas Müller2015-10-141-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Hide notification on delete
| * | | | | Hide notification on deleteVincent Petry2015-10-131-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case a permanent notification "storage full" was displayed, it will be hidden after deleting a file. Directly after that a getstoragestats.php call is made that will decide whether to reshow the notification based on the new free space.
* | | | | Merge pull request #19580 from ↵Thomas Müller2015-10-143-0/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-19399-remote-shares-case-sensitivity Make sure that remote shares use the correct uid casing
| * | | | | Make sure that remote shares use the correct uid casingJoas Schilling2015-10-063-0/+41
| | | | | |
* | | | | | Merge pull request #19645 from owncloud/file-conflict-disablecontinueThomas Müller2015-10-141-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Disable "Continue" button in conflict dialog when no selection
| * | | | | | Check .conflicts for checkboxesMorris Jobke2015-10-081-1/+1
| | | | | | |
| * | | | | | Disable "Continue" button in conflict dialog when no selectionVincent Petry2015-10-081-0/+11
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #19699 from owncloud/hutchic-issue-18241-reload-page-linkThomas Müller2015-10-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | refs #18241 Make the 'please reload this page' a clickable link
| * | | | | | refs #18241 Make the 'please reload this page' a clickable linkColin Hutchinson2015-10-101-1/+1
| | | | | | |
* | | | | | | Merge pull request #19701 from owncloud/trash-restoreactioninlineThomas Müller2015-10-141-13/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make trashbin's "Restore" an inline action
| * | | | | | | Make trashbin's "Restore" an inline actionVincent Petry2015-10-121-13/+21
| | | | | | | |
* | | | | | | | Merge pull request #19727 from owncloud/fix_19678Thomas Müller2015-10-141-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Return path instead of itemsource
| * | | | | | | | Return path instead of itemsourceRoeland Jago Douma2015-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #19678 Errors should contain paths and not internal ids
* | | | | | | | | Merge pull request #19730 from owncloud/fix_17560Thomas Müller2015-10-142-0/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Squash collection shares
| * | | | | | | | | Squash collection sharesRoeland Jago Douma2015-10-132-0/+57
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If folder1 is shared to user2 and user3. And folder1/folder2 is shared to user4 and user5 then getting all the users with access to folder1/folder2 should only list user2 and user 3 once. Previously this was done twice since we request the info two times. This fix makes sure that we only append unique results to the array. * Added test
* | | | | | | | | Merge pull request #19733 from owncloud/remove-controls-whennotneededThomas Müller2015-10-144-9/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove controls for file lists that don't need it
| * | | | | | | | | Remove controls for file lists that don't need itVincent Petry2015-10-134-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove controls from sharing overview and favorite file lists which don't display paths.
* | | | | | | | | | Merge pull request #19744 from owncloud/admin-checkboxesThomas Müller2015-10-143-19/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Apply new checkbox style to admin settings
| * | | | | | | | | | apply new checkbox style to admin settingsHendrik Leppelsack2015-10-143-19/+19
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #19757 from owncloud/remove-empty-box-during-updateThomas Müller2015-10-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [update] show default error message if empty message
| * | | | | | | | | | | [update] show default error message if empty messageMorris Jobke2015-10-141-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #19756 from owncloud/the-futureThomas Müller2015-10-142-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Master is now 9.0.0 development
| * | | | | | | | | | Master is now 9.0.0 developmentJoas Schilling2015-10-142-4/+4
| | | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-1426-162/+562
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #19746 from owncloud/reference-v2-instead-of-v1Morris Jobke2015-10-132-27/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Reference v2 in the provider list
| * | | | | | | | | | Reference v2 in the provider listLukas Reschke2015-10-132-27/+27
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #19739 from owncloud/do-not-leak-exception-dataThomas Müller2015-10-133-15/+64
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [master] Do not print exception message
| * | | | | | | | | | Do not print exception messageLukas Reschke2015-10-133-15/+64
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of an error the error message often contains sensitive data such as the full path which potentially leads to a full path disclosure. Thus the error message should not directly get displayed to the user and instead be logged.
* | | | | | | | | | Merge pull request #19635 from owncloud/fix-ldap-value-limitationThomas Müller2015-10-137-52/+59
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | allow an attribute to return more than one value
| * | | | | | | | | | adjust fetchList with a single requested attribute accordinglyArthur Schiwon2015-10-091-1/+3
| | | | | | | | | | |
| * | | | | | | | | | adjust testsArthur Schiwon2015-10-092-4/+4
| | | | | | | | | | |
| * | | | | | | | | | fix primary group retrievalArthur Schiwon2015-10-091-1/+1
| | | | | | | | | | |
| * | | | | | | | | | treat dn as any other attribute when building the search() return arrayArthur Schiwon2015-10-083-6/+6
| | | | | | | | | | |
| * | | | | | | | | | adjust handling changed return array structure from search() and fetchList()Arthur Schiwon2015-10-084-13/+33
| | | | | | | | | | |
| * | | | | | | | | | allow an attribute to return more than one valueArthur Schiwon2015-10-072-29/+14
| | |_|_|_|_|/ / / / | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 09:42:42 +0000