Thomas Müller
4b8632325a
Merge pull request #19627 from owncloud/users-deletebeforecreate
...
Delete last undoable user before user creation
2015-10-14 12:51:51 +02:00
Thomas Müller
3aeda33a99
Merge pull request #19630 from owncloud/fix-ie-pain
...
Fix more IE issues
2015-10-14 12:51:43 +02:00
Thomas Müller
8d5aff9db5
Merge pull request #19631 from owncloud/share-emailsenterror
...
Fix share email sending feedback
2015-10-14 12:51:32 +02:00
Thomas Müller
3d5b1df549
Merge pull request #19633 from owncloud/sidebar-alt-favorite
...
Move alt text for favorite action to image
2015-10-14 12:51:13 +02:00
Thomas Müller
d8f0afaf9f
Merge pull request #19634 from owncloud/notif-showtemporary
...
showTemporary instead of show for notifications
2015-10-14 12:50:55 +02:00
Thomas Müller
0a5349eec6
Merge pull request #19647 from owncloud/trashbin-removesidebar
...
Remove sidebar for trashbin view
2015-10-14 12:50:46 +02:00
Thomas Müller
321d2250d6
Merge pull request #19710 from owncloud/files-canceluploaddebounce-re
...
Debounce cancel upload message
2015-10-14 12:50:35 +02:00
Thomas Müller
156108dcdb
Merge pull request #19714 from owncloud/trash-deletesectionposition-2
...
Revert "Revert "Move trashbin specific CSS that modifies sidebar""
2015-10-14 12:49:56 +02:00
Thomas Müller
28d6da8158
Merge pull request #19738 from owncloud/proppatch-lastmodified
...
Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
2015-10-14 12:49:33 +02:00
Thomas Müller
b090ed7666
Merge pull request #19747 from owncloud/files-delete-hidenotif
...
Hide notification on delete
2015-10-14 12:49:22 +02:00
Thomas Müller
757f320531
Merge pull request #19580 from owncloud/issue-19399-remote-shares-case-sensitivity
...
Make sure that remote shares use the correct uid casing
2015-10-14 12:39:57 +02:00
Thomas Müller
a83e003ae3
Merge pull request #19645 from owncloud/file-conflict-disablecontinue
...
Disable "Continue" button in conflict dialog when no selection
2015-10-14 12:39:37 +02:00
Thomas Müller
f34b97bc98
Merge pull request #19699 from owncloud/hutchic-issue-18241-reload-page-link
...
refs #18241 Make the 'please reload this page' a clickable link
2015-10-14 12:39:19 +02:00
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
Roeland Jago Douma
002e9c76cd
Combine OCS API getUser method code into provisioning_api app
...
Fixes #13002
Move the cloud/users/{userid} code in total to the provisioning API.
2015-10-13 21:07:48 +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
Roeland Jago Douma
5e9ca79788
Do not calculate non essential info
...
There is no need to calculate a human readable date on the server side.
We supply the mtime and a client can easily convert that himself if
needed. This is already done most of the time since the date is often
not in the exact right format.
There is also no need to attach icon info. We have that available in
javascript. And else the client should get the right icon based on the
mimetype for its platform.
* Updated tests
2015-10-13 14:56:55 +02:00
michag86
23db51f69a
Merge branch 'master' into api-getusers-for-subadmins
2015-10-13 14:40:22 +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