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

9927 commits

Author SHA1 Message Date
Vincent Petry
1777609d47 Merge pull request #14532 from owncloud/defaultvalueforremoteid 
Add default value for remote_id
 2015-02-26 16:46:12 +01:00
Morris Jobke
0c1e6fad6c Merge pull request #14300 from owncloud/commandbus 
Add async command system to handle asynchronous operations
 2015-02-26 15:10:13 +01:00
Vincent Petry
80e5ad3131 Bump up files_sharing version for schema update 2015-02-26 15:04:15 +01:00
Morris Jobke
7b2b74d731 Merge pull request #14473 from owncloud/remove-uneeded-assignment 
Remove uneeded assignment
 2015-02-26 14:01:21 +01:00
Morris Jobke
62d54e4c2a fix files external test run and add common-tests option 2015-02-26 13:32:44 +01:00
Vincent Petry
ba71ee6059 Add default value for remote_id 
Fixes SQLite migration with non-null column.
 2015-02-26 12:09:21 +01:00
Morris Jobke
06aef4e8b1 Revert "Updating license headers" 
This reverts commit 6a1a4880f0.
 2015-02-26 11:37:37 +01:00
Thomas Müller
adc986f3e4 Merge pull request #14502 from owncloud/failing-mysql-master-tests 
Failing mysql master tests
 2015-02-26 01:48:37 -08:00
Joas Schilling
fe8df31fa5 Sort the array to be sure 2015-02-26 09:13:09 +01:00
Jenkins for ownCloud
8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Lukas Reschke
94bf2c8d6d Merge pull request #14509 from owncloud/fix/14231 
Show 404 page when accessing empty share URL
 2015-02-25 21:39:49 +01:00
Lukas Reschke
921a76ae2e Merge pull request #14245 from cmeh/master 
Message clean-up
 2015-02-25 17:46:41 +01:00
Lukas Reschke
fca4628a5c Show 404 page when accessing empty share URL 
Testplan:
- [ ] Without: Accessing `public.php?service=files&t=` throws an exception
- [ ] With: No exception thrown and 404 page displayed.

Fixes https://github.com/owncloud/core/issues/14231
 2015-02-25 17:29:12 +01:00
Joas Schilling
ac5bb97d04 Reset the group backend aswell 2015-02-25 16:03:12 +01:00
Joas Schilling
993d89b3cc Extend the class so the Filesystem is cleaned up 2015-02-25 16:03:10 +01:00
Robin Appelman
bf65b1f18b Rename getAsyncCommandBus to getCommandBus 2015-02-25 15:09:41 +01:00
Robin Appelman
27d047979d require command that do file access to be run sync when encryption is enabled 2015-02-25 15:09:41 +01:00
Robin McCorkell
695f43a1ed Merge pull request #10735 from owncloud/use_remote_addr 
Use getRemoteAddress which supports reverse proxies
 2015-02-25 13:24:39 +00:00
Thomas Müller
f5b6226732 Merge pull request #14462 from owncloud/add-some-php-docs 
Add some PHPDocs
 2015-02-25 02:53:22 -08:00
Thomas Müller
f6044fe429 Merge pull request #14460 from owncloud/revive/12971 
Add support for sftp custom port
 2015-02-25 02:52:25 -08:00
Robin McCorkell
af96078153 Merge pull request #14475 from owncloud/fix-ext-owncloud 
Fix bugs in ownCloud external storage
 2015-02-25 10:39:25 +00:00
Thomas Müller
799e144b04 Merge pull request #14151 from owncloud/update-sabre2.1 
Sabre Update to 2.1
 2015-02-25 02:21:55 -08:00
Robin McCorkell
edfeb05a05 Fix bugs in ownCloud external storage 2015-02-25 10:10:13 +00:00
Thomas Müller
b3de86d851 Remove locks plugin. 
Reasoning:
- a WebDAV server is not required to implement locking support
- WebDAV Locking is know to break the sync algorithm
- the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
 2015-02-25 10:30:47 +01:00
Jenkins for ownCloud
31f881415b [tx-robot] updated from transifex 2015-02-25 01:55:51 -05:00
Lukas Reschke
5bb0889b30 Remove uneeded assignment 
'files' is neither used in the controller or the template
 2015-02-24 19:50:23 +01:00
Thomas Müller
09a06e4f0a Merge pull request #14068 from owncloud/autotest-external-sftp 
[files_external] sftp tests
 2015-02-24 08:06:27 -08:00
Lukas Reschke
52495dc995 Merge pull request #13740 from owncloud/fix-12190-2 
Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
 2015-02-24 16:37:49 +01:00
Lukas Reschke
dbb665a361 Add some PHPDocs 
My IDE was crying...
 2015-02-24 13:44:40 +01:00
Lukas Reschke
1229184873 Fix code that never worked 
Introduced with 1df8a5a774 in February 2013…
 2015-02-24 13:26:23 +01:00
Lukas Reschke
6dd5bc0379 Fix code style as per review 2015-02-24 13:22:12 +01:00
SA
350f8eb86e Add support for sftp custom port 2015-02-24 13:15:38 +01:00
Lukas Reschke
165afb004b Use getRemoteAddress which supports reverse proxies 
Breaking change for 8.1 wiki (Security > Administrators):

The log format for failed logins has changed and uses now the remote address and is considering reverse proxies for such scenarios when configured correctly.
 2015-02-24 11:49:40 +01:00
cmeh
649a1ba255 Typo: Missing "n" 
A missing "n" was added in line 63.
 2015-02-24 10:15:56 +01:00
Joas Schilling
a320edaca5 Merge pull request #14419 from owncloud/preview_apostrophe_fix 
fix issue with previews not being displayed if filename contains apostrophe
 2015-02-24 09:58:53 +01:00
Jenkins for ownCloud
cdb4cfd939 [tx-robot] updated from transifex 2015-02-24 01:54:58 -05:00
Lukas Reschke
432d7be8cc Show a empty response for GET on non-files instead of the Browser Plugin 2015-02-23 22:27:23 +01:00
Vincent Petry
5b6caf763c Removed broken webdav tests 
The encryption webdav tests are too broad and do not qualify as unit
test. Also, since the sabre upgrade they are not fixable.
The matching functionality is already tested in other classes on a
smaller scale.
 2015-02-23 22:27:23 +01:00
Vincent Petry
9f6dcb9d3e Sabre Update to 2.1 
- VObject fixes for Sabre\VObject 3.3
- Remove VObject property workarounds
- Added prefetching for tags in sabre tags plugin
- Moved oc_properties logic to separate PropertyStorage backend (WIP)
- Fixed Sabre connector namespaces
- Improved files plugin to handle props on-demand
- Moved allowed props from server class to files plugin
- Fixed tags caching for files that are known to have no tags
  (less queries)
- Added/fixed unit tests for Sabre FilesPlugin, TagsPlugin
- Replace OC\Connector\Sabre\Request with direct call to
  httpRequest->setUrl()
- Fix exception detection in DAV client when using Sabre\DAV\Client
- Added setETag() on Node instead of using the static FileSystem
- Also preload tags/props when depth is infinity
 2015-02-23 22:27:23 +01:00
Lukas Reschke
f54cd14c7e Merge pull request #14439 from owncloud/fix-ajax-files-external 
Fix Ajax type casting for files_external
 2015-02-23 16:29:45 +01:00
Vincent Petry
4290e1990e Merge pull request #13829 from owncloud/appmanager-list 
Better caching for enabled apps
 2015-02-23 16:03:32 +01:00
Robin McCorkell
9d36959d82 Fix Ajax type casting for files_external 2015-02-23 14:57:37 +00:00
Thomas Müller
df3c73de72 Merge pull request #14403 from owncloud/update-license-headers 
Update license headers
 2015-02-23 13:53:16 +01:00
Jenkins for ownCloud
6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Jenkins for ownCloud
f63b09faca [tx-robot] updated from transifex 2015-02-23 01:55:10 -05:00
Georg Ehrke
8e02592e3f fix issue with previews not being displayed if filename contains apostrophe 2015-02-22 16:51:16 +01:00
Jenkins for ownCloud
ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Jenkins for ownCloud
906c0e7798 [tx-robot] updated from transifex 2015-02-21 01:54:38 -05:00
Lukas Reschke
6e9a2515ea Merge pull request #14278 from owncloud/fix-index 
Check if the offset exists before accessing
 2015-02-20 14:56:13 +01:00
Morris Jobke
7cb25149c8 Merge pull request #13645 from owncloud/fix-breadcrumb-backslash 
Parse backslash as directory separator in breadcrumb
 2015-02-20 13:36:38 +01:00
Jenkins for ownCloud
79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Lukas Reschke
602e563d99 Merge pull request #14366 from owncloud/remove-old-l10n-files 
Remove some old l10n files they arent loaded anymore
 2015-02-19 23:31:21 +01:00
Thomas Müller
b7ff0d44d8 apply backslash fix to _setCurrentDir 2015-02-19 20:20:33 +01:00
Morris Jobke
75a7bcb10c Merge pull request #14199 from owncloud/cast-type-manually 
Manually type-cast all AJAX files
 2015-02-19 17:19:54 +01:00
jknockaert
261b5eb90f again 2015-02-19 16:36:54 +01:00
Thomas Müller
df58eea93f Merge pull request #13505 from owncloud/streamline-scanning-code 
Streamline auth and CSRF check in scan.php
 2015-02-19 16:35:05 +01:00
jknockaert
9ff9f27f8a try again 2015-02-19 16:12:01 +01:00
jknockaert
a490e21d0d new try 2015-02-19 16:10:41 +01:00
jknockaert
417e40d218 Merge remote-tracking branch 'origin/master' 
Conflicts:
	apps/files_encryption/lib/stream.php
 2015-02-19 16:08:33 +01:00
jknockaert
d5ba6af259 back 2015-02-19 16:08:08 +01:00
jknockaert
470994ba1e OC8 version 2015-02-19 15:43:22 +01:00
Joas Schilling
e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Jenkins for ownCloud
294137dda6 [tx-robot] updated from transifex 2015-02-19 01:55:43 -05:00
Vincent Petry
610761d1f7 Merge pull request #14211 from owncloud/activity/225-files-extension-jenkins 
Activity/225 Move displaying of files related activities to files app
 2015-02-18 14:47:15 +01:00
Vincent Petry
837365fff2 Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins 
Activity/225 sharing extension
 2015-02-18 14:46:58 +01:00
Andreas Fischer
c640e2fa66 Update phpseclib to version 0.3.9. 2015-02-18 01:16:23 +01:00
Joas Schilling
0833a6e332 Correctly create activities for public downloads 2015-02-17 17:26:03 +01:00
Lukas Reschke
3213b04aef Check if the offset exists before accessing 
This checks if the offset exists before accessing it and also adds unit tests to this function which would have catched this before 🙈

Fixes https://github.com/owncloud/core/issues/14277
 2015-02-17 17:08:23 +01:00
Robin Appelman
5394a81c05 Dont fatal error test when encryption is enabled 2015-02-17 15:05:29 +01:00
Jenkins for ownCloud
30ca14021c [tx-robot] updated from transifex 2015-02-17 01:56:23 -05:00
Morris Jobke
fadf0a9443 Merge pull request #10673 from owncloud/smb-new 
New SMB storage backend
 2015-02-16 17:37:20 +01:00
Robin Appelman
6477e39be9 also make sure we have a leading slash for the test root 2015-02-16 14:01:08 +01:00
Thomas Müller
6cdc7a890a Merge pull request #14076 from owncloud/autotest-external-ftp 
[files_external] ftp tests
 2015-02-16 13:56:40 +01:00
Robin Appelman
6467369cad make sure the root has a trailing slash 2015-02-16 13:52:11 +01:00
Robin Appelman
35077ec34e remove outdated test 2015-02-16 13:52:11 +01:00
Robin Appelman
e98983485f handle deleting non existing files 2015-02-16 13:52:11 +01:00
Robin Appelman
e5731b6e1a Use better way to check for the existence of smbclient 2015-02-16 13:52:11 +01:00
Robin Appelman
d2255a1d30 New SMB storage backend 2015-02-16 13:52:11 +01:00
Lukas Reschke
cbe31fbf57 Use int instead of string 2015-02-16 12:01:05 +01:00
Thomas Müller
d001c4e375 Merge pull request #13922 from owncloud/smb-autotest-external 
[files_external] add SMB autotest
 2015-02-16 10:27:55 +01:00
Jenkins for ownCloud
31c0cce092 [tx-robot] updated from transifex 2015-02-15 01:54:31 -05:00
Jenkins for ownCloud
2f851ff8bb [tx-robot] updated from transifex 2015-02-14 01:54:42 -05:00
Joas Schilling
200c0c89dc Do not change behaviour of 'false' 2015-02-13 15:18:07 +01:00
Joas Schilling
d20a8fae45 Move displaying of files related activities to files app 2015-02-13 13:37:10 +01:00
Lukas Reschke
a7df23ceba Manually type-case all AJAX files 
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈

Fixes https://github.com/owncloud/core/issues/14196 for core
 2015-02-13 13:33:20 +01:00
Lukas Reschke
9904b30070 Ensure that passed argument is always a string 
Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour.

Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
 2015-02-13 12:49:34 +01:00
Roeland Jago Douma
bdd785f5e6 Always display max upload size in admin panel 2015-02-13 11:39:30 +01:00
Joas Schilling
b768a70616 Use filterNotificationTypes to filter the types and group the methods 2015-02-13 11:30:36 +01:00
Joas Schilling
9ccfbc14f6 Copy sharing related activity code to Files_Sharing activity extension 2015-02-13 11:16:43 +01:00
Jenkins for ownCloud
6b1ed4d688 [tx-robot] updated from transifex 2015-02-13 01:55:06 -05:00
Jenkins for ownCloud
e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
Lukas Reschke
1c1bd058e4 Remove unused file 
This file is unused and has been last modified two years ago. Furthermore it won't evne work anymore properly because it uses things  like `CONFIG_DATEFORMAT` which are gone a long time ago...
 2015-02-11 23:26:48 +01:00
Jenkins for ownCloud
9baf7a0a3f [tx-robot] updated from transifex 2015-02-11 01:55:07 -05:00
Morris Jobke
60cadf5647 [files_external] ftp tests 2015-02-10 22:34:58 +01:00
Morris Jobke
64a3e6eb22 add rreadme for files external tests 2015-02-10 20:43:32 +01:00
Morris Jobke
10e91c6a48 [files_external] sftp tests 2015-02-10 19:53:01 +01:00
Vincent Petry
bd01ff135a Merge pull request #13190 from is-apps/master-sftp-key 
Add SFTP public key authentication support
 2015-02-10 16:44:29 +01:00
Morris Jobke
f7bbe081b3 [files_external] add SMB autotest 2015-02-10 10:30:10 +01:00
Jenkins for ownCloud
124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Morris Jobke
1bb6de7c1b Merge pull request #13425 from owncloud/phpdoc_cleanup 
Cleanup of PHPDoc return types
 2015-02-10 01:14:00 +01:00
Morris Jobke
4a99849c6c Merge pull request #13663 from owncloud/issue/13624-notification-when-favorting-fails 
Only update favorite icon if the operation was successful
 2015-02-10 00:05:39 +01:00
blizzz
dc475ab3e0 Merge pull request #13925 from owncloud/fix-13898 
no fruitless count attempts, and notification should disappear
 2015-02-09 16:55:50 +01:00
Vincent Petry
2bb65dd9b1 Merge pull request #13364 from is-apps/files_external_cleanup 
Clean up files_external
 2015-02-09 13:20:42 +01:00
Jenkins for ownCloud
e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Jenkins for ownCloud
60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Morris Jobke
108f3327e6 Merge pull request #13502 from owncloud/streamline-authentication-in-newfile 
Streamline CSRF and login check
 2015-02-07 13:27:46 +01:00
Morris Jobke
77c0314503 Merge pull request #13655 from Sugaroverdose/fix_#13632 
Do not change color of 'new' button on hover and make new file menu more consistent with button
 2015-02-07 13:25:43 +01:00
Morris Jobke
57c1b499a1 Merge pull request #13848 from owncloud/ldap-warn 
Reduce log level of bind failed to WARN - fixes  #11624
 2015-02-07 13:24:11 +01:00
Morris Jobke
b2f6b8d62e Merge pull request #13889 from owncloud/catch-exception 
Catch exception properly
 2015-02-07 13:23:34 +01:00
Jenkins for ownCloud
4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Lukas Reschke
a67627140c Revert "Add OCS sharing info to capabilities" 2015-02-07 00:12:26 +01:00
Frank Karlitschek
0b421e821b Merge pull request #13692 from rullzer/capabilities 
Add OCS sharing info to capabilities
 2015-02-06 16:46:47 -05:00
Thomas Müller
b4b45a1a52 Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval 
Fix enc mig user retrieval
 2015-02-06 21:26:32 +01:00
Jenkins for ownCloud
988027fdca [tx-robot] updated from transifex 2015-02-06 15:26:04 -05:00
Arthur Schiwon
15b2d33599 always specify limit, except you do like questionable surprises 
always specify limit, except you do like questionable surprises, part 2
 2015-02-06 17:51:40 +01:00
Bjoern Schiessle
b2e13229fa don't check if we have a valid user 2015-02-06 17:31:15 +01:00
Roeland Jago Douma
fe2aca5aa8 Updated unit tests 2015-02-06 12:13:53 +01:00
Roeland Jago Douma
3be3e20c0f Bit better formatting when using json output 2015-02-06 10:55:33 +01:00
Roeland Jago Douma
d4e361db44 Updated sharing capabilities 
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
 2015-02-06 10:33:08 +01:00
Jenkins for ownCloud
bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Arthur Schiwon
2bcb786214 no fruitless count attempts, and notification should disappear 2015-02-05 16:25:22 +01:00
Jenkins for ownCloud
9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Lukas Reschke
cc80ce70b4 Catch exception properly 
`\OCA\Files\Helper::buildFileStorageStatistics` might throw an exception from `OC_Helper::getStorageInfo`, previously this lead to a uncatched exception being thrown when invoking this methods.

This was user triggable by for example calling `/index.php/apps/files/ajax/delete.php` with a not existing dir (for example `dir=asdf/../&allfiles=true`)
 2015-02-04 15:58:16 +01:00
Roeland Jago Douma
bcae79a85a Split up unit tests 2015-02-04 15:49:20 +01:00
Roeland Jago Douma
083ebca812 Added unit test to test getCapabilities for files_sharing 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
0452fde212 Converted getCapabilities to non static function 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
4801d9c02a Use single quotes 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
ea1f726b7d Only return capabilities if they are set 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
b3ea849a87 Added capabilities whether a server allows public links 
This fixes #13673.
It now lists link sharing, passwords enforced, and if public uploads are
allowed.
 2015-02-04 14:56:31 +01:00
blizzz
09216ef49b Merge pull request #13849 from owncloud/ldap-oc8-update 
no update routine needed from OC 7 to 8
 2015-02-04 14:19:58 +01:00
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Morris Jobke
166c4e266f Reduce log level of bind failed to WARN - fixes #11624 2015-02-03 11:44:28 +01:00
Arthur Schiwon
02a1cc01b6 no update routine needed from OC 7 to 8 2015-02-03 11:43:47 +01:00
Thomas Müller
a24d73aa0c Merge pull request #13837 from owncloud/endless-redirect 
Add callCheck to testremote.php
 2015-02-03 11:28:15 +01:00
Jenkins for ownCloud
6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Lukas Reschke
4270188252 Add callCheck to testremote.php 
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
 2015-02-02 19:39:41 +01:00
Morris Jobke
1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies 
encryption requires openssl and user_ldap requires ldap 🙊
 2015-02-02 12:49:45 +01:00
Joas Schilling
12f835b198 toggle back when the action was not performed 2015-02-02 11:17:55 +01:00
Morris Jobke
8e2b99c3a9 fix response for tags and show error message 2015-02-02 11:17:54 +01:00
Joas Schilling
df75a6e5f3 Only update favorite icon if the operation was successful 
Also shows a notification in case an error occured on updating the tags
 2015-02-02 11:17:54 +01:00
Thomas Müller
c9543c9e8e encryption requires openssl and user_ldap requires ldap 🙊 2015-02-02 09:20:05 +01:00
Jenkins for ownCloud
800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Jenkins for ownCloud
a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Lukas Reschke
012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares 
make sure that we get the correct user from the path
 2015-01-31 08:52:07 +01:00
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Bjoern Schiessle
9ef96e4dd5 no need to initialize the same view twice 2015-01-30 14:39:31 +01:00
Bjoern Schiessle
ed29c6ce86 get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated 2015-01-30 14:39:09 +01:00
Morris Jobke
e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache 
Dont remove a file from cache if the delete operation failed
 2015-01-30 14:08:44 +01:00
Jenkins for ownCloud
f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Morris Jobke
b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares 
make sure that we always create a public share key for remote shares
 2015-01-29 17:54:04 +01:00