Commit Graph

27738 Commits

Author SHA1 Message Date
Thomas Müller bc6f76250a Merge pull request #19701 from owncloud/trash-restoreactioninline
Make trashbin's "Restore" an inline action
2015-10-14 12:38:49 +02:00
Thomas Müller 3e87560033 Merge pull request #19727 from owncloud/fix_19678
Return path instead of itemsource
2015-10-14 12:38:38 +02:00
Thomas Müller bfac6c5eb7 Merge pull request #19730 from owncloud/fix_17560
Squash collection shares
2015-10-14 12:38:16 +02:00
Thomas Müller 01cc38018a Merge pull request #19733 from owncloud/remove-controls-whennotneeded
Remove controls for file lists that don't need it
2015-10-14 12:37:55 +02:00
Thomas Müller 24011d8597 Merge pull request #19744 from owncloud/admin-checkboxes
Apply new checkbox style to admin settings
2015-10-14 12:37:34 +02:00
Thomas Müller 1e79cc00a9 Merge pull request #19757 from owncloud/remove-empty-box-during-update
[update] show default error message if empty message
2015-10-14 12:37:13 +02:00
Thomas Müller 6a07406132 Merge pull request #19756 from owncloud/the-future
Master is now 9.0.0 development
2015-10-14 12:36:34 +02:00
Martin 2c32811156 adding occ upgrade text note 2015-10-14 12:16:17 +02:00
Hendrik Leppelsack bf722d93df apply new checkbox style to admin settings 2015-10-14 12:14:49 +02:00
Morris Jobke 2f9f963616 [update] show default error message if empty message 2015-10-14 09:41:47 +02:00
Jenkins for ownCloud f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04:00
Joas Schilling 6ca58cd856 Master is now 9.0.0 development 2015-10-14 07:40:06 +02:00
Morris Jobke 3aee150b88 Merge pull request #19746 from owncloud/reference-v2-instead-of-v1
Reference v2 in the provider list
2015-10-13 18:08:43 +02:00
Vincent Petry cdc1386885 Hide notification on delete
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.
2015-10-13 17:24:52 +02:00
Lukas Reschke 5d53fb4bc8 Reference v2 in the provider list 2015-10-13 16:45:16 +02:00
Thomas Müller 77ad9e98a9 Merge pull request #19739 from owncloud/do-not-leak-exception-data
[master] Do not print exception message
2015-10-13 15:23:57 +02:00
Lukas Reschke abdbf10ebc Do not print exception message
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.
2015-10-13 14:12:10 +02:00
Thomas Müller 3f083353c1 Merge pull request #19635 from owncloud/fix-ldap-value-limitation
allow an attribute to return more than one value
2015-10-13 14:09:52 +02:00
Thomas Müller 2df006d0b7 Merge pull request #19735 from owncloud/extstorage-signature
Fix testDeleteStorage signature to match the one from the base class
2015-10-13 13:24:29 +02:00
Vincent Petry 02513f8d04 Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
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.
2015-10-13 12:51:21 +02:00
Vincent Petry f89e7769dc Fix testDeleteStorage signature to match the one from the base class
Prevents Strict warning when running autotest-external.sh
2015-10-13 11:56:11 +02:00
Vincent Petry ecb10db039 Remove controls for file lists that don't need it
Remove controls from sharing overview and favorite file lists which
don't display paths.
2015-10-13 11:36:24 +02:00
Thomas Müller 3891cd9068 Merge pull request #19677 from owncloud/silently-fail-app-upgrade-exceptions-master
Silently fail app upgrade exceptions
2015-10-13 11:04:02 +02:00
Thomas Müller 1cb4f1080a Merge pull request #19288 from RealRancor/restruct_config_sample_master
Restructure config.sample.php of master
2015-10-13 10:18:35 +02:00
Roeland Jago Douma 06aaa059d1 Squash collection shares
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
2015-10-13 10:05:49 +02:00
RealRancor b2ae4cab52 Restructure config.sample.php of master 2015-10-13 09:38:28 +02:00
Roeland Jago Douma 585e9cb0e9 Return path instead of itemsource
Fixes #19678

Errors should contain paths and not internal ids
2015-10-13 09:00:33 +02:00
Jenkins for ownCloud 1f146d678c [tx-robot] updated from transifex 2015-10-13 01:55:06 -04:00
Thomas Müller b9e515bfeb Merge pull request #19723 from owncloud/strip-directory
Strip directory from scriptName
2015-10-13 00:58:06 +02:00
Thomas Müller a743ceb8d5 Merge pull request #19719 from owncloud/edit-icon
add specific edit icon
2015-10-13 00:54:25 +02:00
Lukas Reschke e03f0542e4 Strip directory from scriptName
`\OCP\IRequest::getScriptName` will also return the directory, so if ownCloud is installed in a subfolder such as `owncloud/` it will resolve to `/owncloud/ocs/v2.php`. This made this check fail and also made it return invalid status codes.
2015-10-12 23:39:16 +02:00
Jan-Christoph Borchardt 81cd823c2a add specific edit icon 2015-10-13 09:42:32 +13:00
Thomas Müller 3444d62063 Revert "Revert "Move trashbin specific CSS that modifies sidebar""
This reverts commit 0738ddfb76.
2015-10-12 16:21:27 +02:00
Vincent Petry 47475f3b4c Debounce cancel upload message 2015-10-12 15:11:52 +02:00
Thomas Müller 64a8d01694 Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypes
Do not update mime types for folders with extension
2015-10-12 15:08:19 +02:00
Thomas Müller eb445103e9 Merge pull request #19708 from owncloud/revert-19628-files-canceluploaddebounce
Revert "Debounce cancel upload message"
2015-10-12 14:56:23 +02:00
Thomas Müller 5108f48c97 Merge pull request #19703 from owncloud/revert-19702-trash-deletesectionposition
Revert "Move trashbin specific CSS that modifies sidebar"
2015-10-12 14:55:51 +02:00
Björn Schießle 8a35034b4c Merge pull request #19704 from owncloud/fix_17997
also detect files in a .part folder as part file
2015-10-12 14:34:57 +02:00
Thomas Müller 0738ddfb76 Revert "Move trashbin specific CSS that modifies sidebar" 2015-10-12 13:59:29 +02:00
Bjoern Schiessle 8185eaa6dd also detect files in a .part folder as part file 2015-10-12 13:59:16 +02:00
Thomas Müller 0036c637fc Merge pull request #19657 from owncloud/setup-transport
Setup sendmail transport
2015-10-12 13:44:26 +02:00
Raghu Nayyar 4b1f2eb37e Merge pull request #19702 from owncloud/trash-deletesectionposition
Move trashbin specific CSS that modifies sidebar
2015-10-12 16:18:06 +05:30
Vincent Petry 783971422c Move trashbin specific CSS that modifies sidebar
Only when trashbin is enabled, its sidebar nav element must be fixed at
the bottom.
2015-10-12 11:39:04 +02:00
Thomas Müller aedb7a7e70 Revert "Debounce cancel upload message" 2015-10-12 11:30:15 +02:00
Vincent Petry 6b71efb2b1 Make trashbin's "Restore" an inline action 2015-10-12 11:27:23 +02:00
Robin Appelman 179c0be158 Merge pull request #19628 from owncloud/files-canceluploaddebounce
Debounce cancel upload message
2015-10-12 10:54:58 +02:00
Jenkins for ownCloud e16ac12f5a [tx-robot] updated from transifex 2015-10-12 01:54:59 -04:00
Jenkins for ownCloud d29d018cc7 [tx-robot] updated from transifex 2015-10-11 01:54:58 -04:00
Colin Hutchinson f49c1039c4 refs #18241 Make the 'please reload this page' a clickable link 2015-10-10 14:14:01 -04:00
Jenkins for ownCloud 188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00