wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28122 commits 157 branches 562 tags 714 MiB
Commit graph

28122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
d0cc8f5cee Specify PHP 5.4 as version for scrutinizer 
Let's see if this helps for cases such as https://github.com/owncloud/core/issues/19793
 2015-10-14 22:50:47 +02:00
Lukas Reschke
4e5eb3b828 Remove arbitrary expression in empty 
Those are only allowed in PHP 5.5, thus making our code incompatible with PHP 5.4

Fixes https://github.com/owncloud/core/issues/19793
 2015-10-14 22:35:46 +02:00
Thomas Müller
905474ebd4 Merge pull request #19787 from owncloud/kill-arrayparser 
Remove ArrayParser because it is unused
 2015-10-14 17:48:45 +02:00
Morris Jobke
d392ddab70 Remove ArrayParser because it is unused 2015-10-14 16:50:56 +02:00
Thomas Müller
fbccdedb5c Merge pull request #19731 from owncloud/update-list-of-deprecated-methods 
Update list of deprecated methods
 2015-10-14 16:34:55 +02:00
Thomas Müller
ba461b0c92 Merge pull request #19760 from owncloud/adding_occ_upgrade_text_note 
Adding occ upgrade text note
 2015-10-14 16:33:33 +02:00
Joas Schilling
d904a09a04 The constant is now deprecated 2015-10-14 15:29:38 +02:00
Thomas Müller
db4dae527c Merge pull request #19764 from owncloud/issue-19759-app-check-code-issue 
Variables don't have a class, so we can't use toString() on it
 2015-10-14 14:10:25 +02:00
Morris Jobke
aa10825026 update deprecation message 2015-10-14 14:08:45 +02:00
Joas Schilling
e2806b0ae8 Update list of deprecated methods 2015-10-14 14:08:45 +02:00
Joas Schilling
8379611dbe Variables don't have a class, so we can't use toString() on it 2015-10-14 13:16:58 +02:00
Thomas Müller
df1313d025 Merge pull request #19625 from owncloud/passwordchange-hidestrengthify 
Properly hide strengthify after password change
 2015-10-14 12:52:07 +02:00
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
Vincent Petry
915d37f226 Fallback to default mimetype detection mechanism 2015-10-13 16:44:01 +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