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

11655 commits

Author SHA1 Message Date
Thomas Müller
1f32a3e485 Merge pull request #20030 from owncloud/autoload-files-external-optimize 
Use optimized autoloader for files_external
 2015-10-26 08:42:28 +01:00
Jenkins for ownCloud
e6d64783a0 [tx-robot] updated from transifex 2015-10-26 01:55:04 -04:00
Lukas Reschke
b678eadc43 Use optimized autoloader for files_external 2015-10-25 23:34:30 +01:00
Lukas Reschke
13e817e901 Throw exception on getPath if file does not exist 
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.

This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.

While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.

I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
 2015-10-25 17:58:21 +01:00
Jenkins for ownCloud
eb10e3abc2 [tx-robot] updated from transifex 2015-10-25 01:55:04 -04:00
Jenkins for ownCloud
ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Lukas Reschke
cddc9abc06 Add tests for Sabre Auth plugin + make getCurrentUser compatible 2015-10-23 17:30:47 +02:00
Robin McCorkell
9a4d37f626 Display storage status as tooltip 2015-10-23 15:25:07 +02:00
Robin McCorkell
4ac33ab26b Remove status indicator on modification 2015-10-23 15:25:07 +02:00
Thomas Müller
e8b12a3c2c Merge pull request #19970 from owncloud/encryption-getuidonboolean 
Fix "Call to a member function getUID() on boolean" in Crypt
 2015-10-23 12:56:14 +02:00
Jenkins for ownCloud
a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Morris Jobke
db25f41da8 handle NoUserException in sharing code 
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
 2015-10-22 17:04:36 +02:00
Joas Schilling
e0a56317fa Fix "Call to a member function getUID() on boolean" in Crypt 2015-10-22 11:46:37 +02:00
Thomas Müller
bbea8c3545 Merge pull request #19937 from owncloud/detailsview-donotopenonrename 
Do not display details bar after rename
 2015-10-22 10:42:15 +02:00
Thomas Müller
8ed0214818 Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts 
Fix file upload, conflict dialog, also in public link
 2015-10-22 10:41:48 +02:00
Jenkins for ownCloud
c50bbb8cde [tx-robot] updated from transifex 2015-10-22 01:55:47 -04:00
Roeland Jago Douma
9b64fa7b92 [provisioning api] losen test 
Since we have no control of how backends sort their list of users and we
also don't want to sort yet another time the test now just checks if the
correct number of elements is returned and if they are from the list of
group members.
 2015-10-21 20:05:14 +02:00
Vincent Petry
e36c85178f Do not display details bar after rename 2015-10-21 13:43:39 +02:00
Vincent Petry
abd0ba1f25 Fix file upload, conflict dialog, also in public link 
- Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public
link page.
- Fix public link upload by properly adding the form data using a new
  utility function "addFormData". That one is needed because IE8 upload
  and regular upload use a different format...
 2015-10-21 12:18:06 +02:00
Morris Jobke
ee42e9d489 increase core version and add dav version number 2015-10-21 11:36:44 +02:00
Jenkins for ownCloud
74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Roeland Jago Douma
aeffd51145 Fix scrutinizer issues 
* PHPDoc
* Proper array initialization
 2015-10-20 21:47:37 +02:00
Robin Appelman
021ed8b2bd adjust tests for new dav classes 2015-10-20 16:22:45 +02:00
Hendrik Leppelsack
480a005b47 fix pagination on public file list 2015-10-20 16:11:10 +02:00
Thomas Müller
122f8d831b Merge pull request #19863 from owncloud/external-storage-wording 
fix wording on external storage checkbox, ref #19858
 2015-10-20 15:21:26 +02:00
Thomas Müller
257ccfa698 Merge pull request #19877 from owncloud/dropbox-fixmetadatacachepaths 
Fix Dropbox metadata cache with trimmed paths
 2015-10-20 15:17:28 +02:00
Thomas Müller
60abc2738b Merge pull request #18399 from owncloud/api-getusers-for-subadmins 
enable api getUsers for subadmins
 2015-10-20 14:28:31 +02:00
Thomas Müller
474f34eb6b Merge pull request #19636 from owncloud/share_expire_backgroun 
Add backgroundjob to expire link shares
 2015-10-20 14:27:15 +02:00
Thomas Müller
899165113c Merge pull request #19742 from owncloud/shareinfo_performance 
Do not calculate non essential info
 2015-10-20 14:25:36 +02:00
Robin Appelman
283798a220 remove locking for chunks 2015-10-20 14:15:59 +02:00
Robin Appelman
760335c57d fix locking in tests 2015-10-20 14:15:59 +02:00
Robin Appelman
ddc8749814 Adjust for wide locking 2015-10-20 14:14:56 +02:00
Robin Appelman
21d02673be Add tests for uploading to locked files 2015-10-20 14:14:56 +02:00
Robin Appelman
23eaf27a5b locking for chunked dav upload 2015-10-20 14:14:56 +02:00
Thomas Müller
adfb33b791 Merge pull request #19838 from owncloud/remove-files-remote.php 
Remove apps/files/appinfo/remote.php - this is no longer used
 2015-10-20 11:31:35 +02:00
Thomas Müller
5752e3b3c0 Merge pull request #19666 from owncloud/fix_13002 
Combine OCS API getUser method code into provisioning_api app
 2015-10-20 11:10:39 +02:00
Thomas Müller
50cb8106dc Merge pull request #19859 from owncloud/fix-long-groupnames 
ellipsize long group names in select2 dropdown, fix #16977
 2015-10-20 11:06:18 +02:00
Morris Jobke
e1c47d6823 use correct class name 2015-10-20 08:18:53 +02:00
Roeland Jago Douma
ec296b0b7d Add backgroundjob to expire link shares 
Simple background job to expire the link shares.

* added unit tests
 2015-10-20 08:18:53 +02:00
Jenkins for ownCloud
dfd44942c6 [tx-robot] updated from transifex 2015-10-20 01:55:03 -04:00
Vincent Petry
d795643ef9 Fix Dropbox metadata cache with trimmed paths 
Makes sure that the paths are trimmed to avoid duplicate entries like
"/test" and "test". This should make this storage slightly faster by
reducing the cache misses.
 2015-10-19 20:52:15 +02:00
Jörn Friedrich Dreyer
2895c91291 Merge pull request #17641 from owncloud/fix_objectstore_rename 
don't move files in cache twice, fixes renaming for objectstores
 2015-10-19 17:18:57 +02:00
Jan-Christoph Borchardt
acc906c4d8 fix wording on external storage checkbox, ref #19858 2015-10-19 21:26:47 +13:00
Jenkins for ownCloud
008082ebad [tx-robot] updated from transifex 2015-10-19 01:55:02 -04:00
Jan-Christoph Borchardt
3875ca2d19 ellipsize long group names in select2 dropdown, fix #16977 2015-10-19 16:11:53 +13:00
Jenkins for ownCloud
8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Joas Schilling
0d3d75b3b3 Increase the 2nd digit of shipped apps 2015-10-17 08:47:11 +02:00
Jenkins for ownCloud
c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Robin Appelman
d636bce8a4 fix encryption migration test 2015-10-16 21:41:51 +02:00
Robin Appelman
e4364426e2 Fix listing of trash files in test 2015-10-16 21:41:51 +02:00
Robin Appelman
2e8232e803 Fix trashbin handling of unknown/unlimited free space 2015-10-16 21:41:51 +02:00
Robin Appelman
d749b9a5ac Fix rename shared versions test 2015-10-16 21:41:51 +02:00
Robin Appelman
22c5c19376 handle versions expire for home storages with unlimited quota 2015-10-16 21:41:51 +02:00
Robin Appelman
416da0dfe9 fix delete orphan shares test with object home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
54cea05271 Fix preserving file ids when restoring a file with object storage 2015-10-16 21:41:51 +02:00
Robin Appelman
a87b34a059 dont assume home storage is local in trash test 2015-10-16 21:41:51 +02:00
Robin Appelman
8efd037eb8 Make shared folder size propagation test work with object home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
e7f75484f8 Fix shared storage tests for non local home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
0cdd46de60 fix sabre connector tests when using a non local home storage 2015-10-16 21:41:51 +02:00
Thomas Müller
6cd1126dd1 Merge pull request #19843 from owncloud/an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory 
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-manda…
 2015-10-16 21:28:55 +02:00
C. Montero Luque
9e6a4dce43 Merge pull request #19821 from owncloud/GreenArchon-fix-memberof-regression 
Revert "adjust to nested group fix
 2015-10-16 13:39:57 -04:00
Thomas Müller
8a036842aa Fix failing unit test 2015-10-16 17:36:27 +02:00
Thomas Müller
9d910deef0 Merge pull request #19836 from owncloud/share-fix-spinner-position 
Fix spinner positions in share tab
 2015-10-16 17:17:01 +02:00
Thomas Müller
ef3fefc00e Remove apps/files/appinfo/remote.php - this is no longer used 2015-10-16 16:49:51 +02:00
Thomas Müller
7e9714340e Merge pull request #19831 from owncloud/ext-dropbox-removecacheafterupload 
Remove Dropbox metadata from cache after upload
 2015-10-16 16:45:18 +02:00
Thomas Müller
97d4093891 Merge pull request #19828 from owncloud/ie9-placeholder-sickness 
[IE9] Prevent LDAP password field to become plain text
 2015-10-16 16:44:55 +02:00
Vincent Petry
90e34e26bd Fix spinner positions in share tab 
Also fix missing spinner when removing link share
 2015-10-16 15:54:27 +02:00
Vincent Petry
796179af00 Remove Dropbox metadata from cache after upload 
This will make sure that the next calls that read the mtime will get the
correct value.
 2015-10-16 13:47:00 +02:00
Vincent Petry
c406efe74f [IE9] Prevent LDAP password field to become plain text 
The placeholders library converts the password field to a text field to
achieve placeholders functionality. However this is buggy and doesn't
properly mask the password when it was set through $el.val().

This workaround sets the type back to password directly after setting a
value.
 2015-10-16 13:25:16 +02:00
Morris Jobke
ff5ed44330 Fix typo and adjust required version 2015-10-16 13:17:12 +02:00
Roeland Jago Douma
ca27024fa2 Fix webdav access 
* Correct namespace
* Pass the EventDispatcher to the webDAV server
 2015-10-16 13:17:12 +02:00
Thomas Müller
8fa59033ac Fix uni tests 2015-10-16 13:17:12 +02:00
Thomas Müller
2ff55560e2 Remove $ETagFunction - it was never used 2015-10-16 13:17:12 +02:00
Thomas Müller
f2889dc6e4 Consolidate webdav code - move all to one app 2015-10-16 13:17:12 +02:00
Lukas Reschke
d486949705 Adjust unit tests 2015-10-16 10:37:08 +02:00
Lukas Reschke
733542a264 Fix style 2015-10-16 10:36:38 +02:00
Frédéric Fortier
f178f612d8 Revert "adjust to nested group fix 
This reverts commit 845485cfe, which fixes #19816 regression.
 2015-10-16 09:39:07 +02:00
Jenkins for ownCloud
7224e99ccd [tx-robot] updated from transifex 2015-10-16 01:55:03 -04:00
Thomas Müller
e4528c3bf7 Merge pull request #19814 from owncloud/filelist-preventerrorwhennosidebar 
Do not register sidebar panels when no sidebar
 2015-10-15 19:59:37 +02:00
Thomas Müller
f50f78dd9b Merge pull request #19795 from owncloud/fix-language-level-compat 
Remove arbitrary expression in empty
 2015-10-15 16:42:32 +02:00
Vincent Petry
204b3ca189 Do not register sidebar panels when no sidebar 2015-10-15 16:30:50 +02:00
Joas Schilling
24420e9eb1 Fix doc blocks of LDAP classes 2015-10-15 08:29:35 +02:00
Jenkins for ownCloud
5bee7007dd [tx-robot] updated from transifex 2015-10-15 01:55:32 -04: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
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
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
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
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
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
Hendrik Leppelsack
bf722d93df apply new checkbox style to admin settings 2015-10-14 12:14:49 +02:00
Jenkins for ownCloud
f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04: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
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
Vincent Petry
915d37f226 Fallback to default mimetype detection mechanism 2015-10-13 16:44:01 +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
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
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
Jenkins for ownCloud
1f146d678c [tx-robot] updated from transifex 2015-10-13 01:55:06 -04: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
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
Jenkins for ownCloud
188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00
Arthur Schiwon
e3a148584a adjust fetchList with a single requested attribute accordingly 2015-10-09 20:07:35 +02:00
Arthur Schiwon
d127b3f0d2 adjust tests 2015-10-09 14:30:49 +02:00
Arthur Schiwon
2fddb1367a fix primary group retrieval 2015-10-09 14:12:59 +02:00
Thomas Müller
8cbf76755e Merge pull request #19643 from owncloud/public-download-spinner 
Set download cookie on public download
 2015-10-09 14:10:29 +02:00
Jenkins for ownCloud
5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Arthur Schiwon
a876efda50 treat dn as any other attribute when building the search() return array 2015-10-08 21:18:34 +02:00
Arthur Schiwon
dd2e887a8d adjust handling changed return array structure from search() and fetchList() 2015-10-08 20:32:15 +02:00
Thomas Müller
17ffa4a244 Merge pull request #19414 from owncloud/swift_primary_storage_tests 
Swift primary storage tests
 2015-10-08 14:08:56 +02:00
Thomas Müller
e5bbec79a6 Merge pull request #19611 from owncloud/fix-public-scroll 
Fix scrollbars in public template
 2015-10-08 13:01:01 +02:00
Vincent Petry
8e84ab8613 Remove sidebar for trashbin view 2015-10-08 12:59:13 +02:00
Vincent Petry
ececa90709 Set download cookie on public download 2015-10-08 12:50:56 +02:00
Vincent Petry
5bf43ec60a showTemporary instead of show for notifications 2015-10-08 10:52:39 +02:00
Jenkins for ownCloud
c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Arthur Schiwon
4a5cecd6fa allow an attribute to return more than one value 2015-10-07 18:57:49 +02:00
Vincent Petry
da8573840a Move alt text for favorite action to image 2015-10-07 18:01:31 +02:00
Thomas Müller
b2872ef759 Merge pull request #19589 from owncloud/shares-external-mount-provider 
Move the setup of external share mounts to a mountprovider
 2015-10-07 17:46:33 +02:00
Vincent Petry
f3ce5fd234 [IE8] Fix "new" button width 2015-10-07 17:34:38 +02:00
Vincent Petry
8a1a1c1326 Debounce cancel upload message 2015-10-07 16:34:06 +02:00
Thomas Müller
c8021441d0 Merge pull request #19489 from owncloud/fix-18297 
fix possible infinite loop when reading groups in the wizard
 2015-10-07 14:55:48 +02:00
Hendrik Leppelsack
ccfd052e81 move footer to bottom of public page 2015-10-07 13:03:43 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Hendrik Leppelsack
e7b2da79ec fix public empty message 2015-10-06 23:59:58 +02:00
Thomas Müller
648b86abdd Merge pull request #19610 from owncloud/ext-deletestoragefromdatabase 
Remove oc_storages entries after removing ext storages
 2015-10-06 21:58:59 +02:00
Robin Appelman
59cf817308 Merge pull request #19511 from owncloud/etag-share-permissions-update 
Mark shares as dirty when changing permissions
 2015-10-06 18:09:12 +02:00
Vincent Petry
bbebffb60c Remove oc_storages entries after removing ext storages 
When removing external storages, either system-wide or user-wide,
automatically remove the matching oc_storages and oc_filecache entries.

This can only work if the backend configuration doesn't contain any
substitution variable $user in which case the storage id cannot be
computed, so this case is ignored for now.
 2015-10-06 17:33:16 +02:00
Hendrik Leppelsack
c1a5e96435 fix scrollbars in public template 2015-10-06 16:52:05 +02:00
Robin Appelman
17756ebf5b fix phpdoc 2015-10-06 16:37:43 +02:00
Robin Appelman
d3c1fcf961 Fix getEtag for roots of shared storages 2015-10-06 16:33:37 +02:00
Jörn Friedrich Dreyer
5646e39248 test objectstore with ceph docker 
use default config for swift primary storage test config

allow testsuite to complete

fix timeout, script cleanup, enable debug for now

use btrfs loopback device, requires privileged container and absolute path

throw exception when storage has problems

debug by echo ...

sleep more, more debug
 2015-10-06 16:27:25 +02:00
Joas Schilling
13dd62f7b0 Make sure that remote shares use the correct uid casing 2015-10-06 15:16:19 +02:00
Vincent Petry
d546c5bb59 Propagate shares etag when group membership changed 2015-10-06 15:02:22 +02:00
Thomas Müller
4b31b349b8 Merge pull request #19595 from owncloud/fix-versions-log-entry 
Reset to auto if not set
 2015-10-06 13:45:35 +02:00
Robin Appelman
47c71d8e87 use microtime 2015-10-06 13:00:30 +02:00
Robin Appelman
41f9946272 clear hooks for tests 2015-10-06 11:38:41 +02:00
Robin Appelman
0817024e6f Mark shares as dirty when changing permissions 2015-10-06 11:38:41 +02:00
Thomas Müller
0385a62363 Merge pull request #19597 from owncloud/update-license-headers 
update licence headers via script
 2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00