Thomas Müller
b594aa18ee
Merge pull request #22110 from owncloud/comment-types-always-plural
...
types shall always be plural
2016-02-04 10:55:49 +01:00
Thomas Müller
2c41a266c0
Merge pull request #22072 from vincchan/trim-newusername-whitespace
...
Do not allow username to have whitespace at the beginning or at the end
2016-02-04 10:33:30 +01:00
Lukas Reschke
eee6d1f41b
Also check daily and testing channel
2016-02-03 20:08:40 +01:00
Lukas Reschke
5f300ac275
Allow specifing the signing path
2016-02-03 20:08:40 +01:00
Arthur Schiwon
9370491822
types shall always be plural
2016-02-03 19:28:15 +01:00
Roeland Jago Douma
96662c4d0d
[Share 2.0] Fix shareManager
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
eb904c7aa9
[Share 2.0] Fix defaultshare provider
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
78be766cf5
[Share 2.0] Use strings for ids
...
* sharedWith
* sharedBy
* shareOwner
Now all set/get strings with the id. (userId, groupId,
federatedsharerId).
This to avoid a huge amount of if statements
2016-02-03 19:25:29 +01:00
Thomas Müller
ab1c79827e
Merge pull request #22071 from owncloud/cache-split-insert
...
split cache->insert from cache->put
2016-02-03 14:32:28 +01:00
Vincent Chan
cc17ac9ff9
move whitspace check to user manager
2016-02-03 14:09:15 +01:00
Thomas Müller
aaf7299d28
Merge pull request #22070 from owncloud/share2_exceptions
...
Add sharing exceptions to OCP
2016-02-03 13:36:14 +01:00
Robin Appelman
f2bba59b79
split cache->insert from cache->put
2016-02-03 12:55:36 +01:00
Thomas Müller
621f54da51
Merge pull request #21997 from owncloud/checksums
...
Checksums
2016-02-03 11:36:22 +01:00
Thomas Müller
459a12c8b3
Merge pull request #22081 from owncloud/mount-cache-invalid-storage
...
filter invalid storages from the mount cache early
2016-02-03 11:36:04 +01:00
Roeland Jago Douma
2035a179bc
Add store/retrieve checksums
...
* Add extra db column to filecache
* Bump version
* Update filecache code to actually handle checksum
* Webdav code to store/retrieve checksums
2016-02-03 09:03:51 +01:00
Thomas Müller
77942ad38a
Merge pull request #22059 from owncloud/comments-readmark-dav
...
Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status
2016-02-03 09:00:32 +01:00
Robin Appelman
8a30058f52
filter invalid storages from the mount cache early
2016-02-02 18:10:13 +01:00
Arthur Schiwon
064b96ec1c
update routine was lacking where statements 🙈
2016-02-02 14:30:35 +01:00
Roeland Jago Douma
dc32f49c6e
[Share 2.0] Use GenericShareException
2016-02-02 14:23:45 +01:00
Roeland Jago Douma
4d7130ad31
[Share 2.0] Add exceptions to OCP
2016-02-02 14:07:11 +01:00
Thomas Müller
ce053b9808
Merge pull request #22013 from owncloud/share2_moveshare
...
[Share 2.0] Allow moving of shares
2016-02-02 13:34:50 +01:00
Thomas Müller
2d1d89ee29
Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags
...
Issue 22041 activities for systemtags
2016-02-02 13:08:01 +01:00
Thomas Müller
eee6f3d406
Merge pull request #22057 from owncloud/share2_update_hash
...
Update old password hashed for link shares on access
2016-02-02 12:37:31 +01:00
Thomas Müller
c9006d6d56
Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooks
...
Allow search in synced addressbooks
2016-02-02 12:37:12 +01:00
Roeland Jago Douma
2316cb1f8b
[Share 2.0] Allow moving of shares
...
* Only recipient can move a share
* Unit tests
2016-02-02 11:34:52 +01:00
Thomas Müller
b01d50216e
The local address book is replaced now by the system addressbook as part of the dav app
2016-02-02 10:56:33 +01:00
Roeland Jago Douma
df690cd1f2
getChildren should not return usergroup shares
2016-02-02 10:41:57 +01:00
Roeland Jago Douma
403547f0ea
[Share 2.0] Allow recipient to be passed in to getShareById
...
* This allows us to retrieve usergroup shares for a given id.
If the user deleted a share or moved it this will be a different share
2016-02-02 10:41:57 +01:00
Thomas Müller
4777f78187
Merge pull request #20903 from owncloud/sharing-mount-option
...
Add mount option to disable sharing
2016-02-02 10:26:24 +01:00
Thomas Müller
e60b217156
Merge pull request #22015 from owncloud/share-no-permissions
...
Block shares that dont have the correct source permissions
2016-02-02 10:26:06 +01:00
Joas Schilling
b5e40bc8f6
Fix IManager::isFormattingFilteredObject()
2016-02-02 10:11:58 +01:00
Joas Schilling
25cbc17bec
Add activities when a tag is (un-)assigned
2016-02-02 10:11:58 +01:00
Joas Schilling
d5126b1ad4
Dispatch events when tags are added/updated/deleted
2016-02-02 09:57:42 +01:00
Joas Schilling
591613fce2
Dispatch some events when tags are un-/assigned
2016-02-02 09:57:42 +01:00
Jenkins for ownCloud
9861a7f6cc
[tx-robot] updated from transifex
2016-02-02 01:55:41 -05:00
Roeland Jago Douma
619a4d2e52
Update old password hashed for link shares on access
...
Fixes https://github.com/owncloud/core/issues/16594
2016-02-01 21:46:32 +01:00
Thomas Müller
b4853f3fce
Merge pull request #21967 from owncloud/comments-webdav
...
Comments WebDAV adjustements
2016-02-01 16:17:45 +01:00
Thomas Müller
84d9704121
Merge pull request #22028 from owncloud/share_hook_expirationdate
...
Share hook expirationdate
2016-02-01 14:13:54 +01:00
Thomas Müller
e23cd35019
Merge pull request #21953 from owncloud/make-enable_avatars-more-robust
...
Make enable_avatars setting more robust
2016-02-01 14:08:40 +01:00
Thomas Müller
32067ac49b
Merge pull request #21989 from owncloud/make-csp-modifiable
...
Add public API to give developers the possibility to adjust the global CSP defaults
2016-02-01 10:10:40 +01:00
Thomas Müller
a025b2865f
Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithme
...
Add path filter to OCS Share API shared_with_me=true
2016-02-01 09:00:31 +01:00
Thomas Müller
5f4b204a49
Merge pull request #22012 from owncloud/storagenotavailableexception-code
...
Default to STATUS_ERROR in StorageNotAvailableException
2016-02-01 09:00:14 +01:00
Jenkins for ownCloud
2b376b9e5c
[tx-robot] updated from transifex
2016-01-31 01:54:49 -05:00
Roeland Jago Douma
1efe877d00
Emit hook for expirationDate verification
2016-01-30 15:40:31 +01:00
Jenkins for ownCloud
c14464875f
[tx-robot] updated from transifex
2016-01-30 01:55:56 -05:00
Thomas Müller
67bf225fbe
Merge pull request #21956 from owncloud/cross-cache-move
...
Add fallback moveFromCache implementation
2016-01-29 17:03:16 +01:00
Roeland Jago Douma
a24e7f6558
Add path filter to OCS Share API ?shared_with_me=true
...
This allows all clients to quickly get the share info for a given path.
Instead of returning everything and filtering it then manually on the
client side.
2016-01-29 15:36:23 +01:00
Robin Appelman
3c8aac3867
Add mount option to disable sharing
2016-01-29 13:14:26 +01:00
Arthur Schiwon
01cdc70f9c
introduce comments read marke tables, comes with user cleanup after deletion
2016-01-29 13:08:02 +01:00
Arthur Schiwon
d2882b9021
Comments WebDAV adjustements
2016-01-29 13:08:02 +01:00
Robin Appelman
ec3f6549f6
Add fallback moveFromCache implementation
2016-01-29 13:06:59 +01:00
Robin Appelman
e3b5639fc1
Block shares that dont have the correct source permissions
2016-01-29 13:05:53 +01:00
Robin McCorkell
2abb173599
Default to STATUS_ERROR in StorageNotAvailableException
2016-01-29 11:57:25 +00:00
Thomas Müller
62b9e81919
Merge pull request #21995 from owncloud/share2_delete_user_defined_group_shares
...
[Share 2.0] When deleting a group share delete children
2016-01-29 11:34:38 +01:00
Thomas Müller
24908a439a
Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-away
...
Do not create a loop that generates thousands of jobs
2016-01-29 10:02:52 +01:00
Joas Schilling
c83b3d6a26
Remove other broken usages in deprecated methods
2016-01-29 08:50:29 +01:00
Jenkins for ownCloud
1765e11f75
[tx-robot] updated from transifex
2016-01-29 01:55:53 -05:00
Roeland Jago Douma
1ff4ec1cd3
[Share 2.0] When deleting a group share delete children
...
For group shares we can have children. Those are custom shares when a
user has moved or deleted a group share. Those also have to be deleted
if the group share is removed.
2016-01-28 20:35:46 +01:00
Lukas Reschke
809ff5ac95
Add public API to give developers the possibility to adjust the global CSP defaults
...
Allows to inject something into the default content policy. This is for
example useful when you're injecting Javascript code into a view belonging
to another controller and cannot modify its Content-Security-Policy itself.
Note that the adjustment is only applied to applications that use AppFramework
controllers.
To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
$policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
To test this add something like the following into an `app.php` of any enabled app:
```
$manager = \OC::$server->getContentSecurityPolicyManager();
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('asdf');
$policy->addAllowedScriptDomain('yolo.com');
$policy->allowInlineScript(false);
$manager->addDefaultPolicy($policy);
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFontDomain('yolo.com');
$manager->addDefaultPolicy($policy);
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('banana.com');
$manager->addDefaultPolicy($policy);
```
If you now open the files app the policy should be:
```
Content-Security-Policy:default-src 'none';script-src yolo.com 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src yolo.com 'self';connect-src 'self';media-src 'self';frame-src asdf banana.com 'self'
```
2016-01-28 18:36:46 +01:00
Joas Schilling
ef73aedd7e
Deprecate the method and warn against using it
2016-01-28 15:40:23 +01:00
Robin Appelman
d7a777af3a
fix cachejail->update
2016-01-28 11:46:44 +01:00
Robin Appelman
1369f2c684
cleanup shared cache
2016-01-28 11:46:43 +01:00
Thomas Müller
b7710ab6d7
Merge pull request #21858 from owncloud/getMountsForFileId
...
add IUserMountCache->getMountsForFileId
2016-01-28 11:20:42 +01:00
Roeland Jago Douma
8d44e537ac
[Share 2.0] Remove setId and setProviderId from the interface
...
Those should only ever be set by the providers
2016-01-28 07:54:16 +01:00
Roeland Jago Douma
34e912ab6b
[Share 2.0] Fix interfaces and comments
...
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
2016-01-28 07:54:09 +01:00
Roeland Jago Douma
f2e70441e4
[Share 2.0] Add getShareManager to OCP\IServerContainer
2016-01-27 22:04:37 +01:00
Roeland Jago Douma
357b271cb4
[Share 2.0] Create IManger interface for share manager
2016-01-27 22:04:37 +01:00
Roeland Jago Douma
185b9c6edd
[Share 2.0] Move IShare to OCP
2016-01-27 22:04:37 +01:00
Roeland Jago Douma
0832cca54e
[Share 2.0] Fix IShare
2016-01-27 22:04:09 +01:00
Thomas Müller
90f2a2352d
Merge pull request #21963 from owncloud/fix-installer
...
Check whether ownCloud is installed
2016-01-27 20:25:51 +01:00
Thomas Müller
40a8686fe7
Merge pull request #21959 from owncloud/cache-interface-clean
...
clean cache interface
2016-01-27 19:33:35 +01:00
Lukas Reschke
cb1a64b949
Check whether ownCloud is installed
...
ownCloud might not yet be setup. This causes an issue as the user config requires a setup ownCloud. Thus this needs a block whether ownCloud is installed or not.
Fixes https://github.com/owncloud/core/issues/21955
2016-01-27 18:30:18 +01:00
Thomas Müller
816c23c17a
Merge pull request #21923 from owncloud/fix-errors-after-install
...
Fix errors after install
2016-01-27 16:16:31 +01:00
Thomas Müller
6973718fb8
Merge pull request #21940 from owncloud/share2_do_not_returned_removed_group_shares
...
[Share 2.0] Properly handle user deleted group shares
2016-01-27 16:16:06 +01:00
Robin Appelman
6682f31074
clean cache interface
2016-01-27 15:51:39 +01:00
Morris Jobke
1601d9235a
Make enable_avatars setting more robust
...
* handles the setting in the same way everywhere
* fixes #21949
2016-01-27 15:17:25 +01:00
Lukas Reschke
f32827e903
Ignore GD JPEG warnings
...
Fixes https://github.com/owncloud/core/issues/21873
2016-01-27 13:59:15 +01:00
Joas Schilling
0c7922cf70
Use new constants
2016-01-27 12:53:44 +01:00
Robin Appelman
644a8ab797
add IUserMountCache->getMountsForFileId
2016-01-27 12:53:44 +01:00
Thomas Müller
a067355a98
In case the hint of the HintException is empty we better use the exception message
2016-01-27 10:08:21 +01:00
Thomas Müller
1594371c8c
Merge pull request #21741 from owncloud/l10n-improvements
...
Move methods to the factory that are not related to translating, but to guessing/finding the language
2016-01-27 09:37:00 +01:00
Thomas Müller
5b7a1b13f3
Merge pull request #21887 from owncloud/share2_updateShare
...
[Sharing 2.0] update share
2016-01-27 09:36:41 +01:00
Thomas Müller
c274f03e12
Merge pull request #21906 from owncloud/querybuilder-clob-comparison
...
Querybuilder clob comparison
2016-01-27 09:36:21 +01:00
Thomas Müller
0fffc3a0de
Merge pull request #21930 from owncloud/less-error-messages
...
Avoid error message in log during setup because of existing data dir
2016-01-27 09:34:09 +01:00
Roeland Jago Douma
a4900d721f
[Share 2.0] Properly handle user deleted group shares
...
If a user deletes a group share we create a special share entry. To the
API this is just a normal group share for that user with permissions 0.
But we should not return this.
2016-01-27 09:02:12 +01:00
Jenkins for ownCloud
1df31c802b
[tx-robot] updated from transifex
2016-01-27 01:55:01 -05:00
Morris Jobke
e43aaf4a15
Avoid error message in log during setup because of existing data dir
2016-01-26 18:50:41 +01:00
Thomas Müller
aa598fc701
Merge pull request #21664 from owncloud/comments-dav
...
Comments DAV implementation
2016-01-26 17:20:32 +01:00
Lukas Reschke
8a4e1fbecd
Fix errors after install
...
When installing ownCloud the first time the first thing that an admin saw was an error message:
> Error PHP touch(): Unable to create file owncloud.log because Permission denied at /var/www/owncloud/lib/private/log/owncloud.php#48
Or something related. This lead to a lot confusion as can be seen in our forum and in our issue tracker. This change should make the error messages disappear in most cases (e.g. where the file can actually be written). To test this:
1. On master install ownCloud and check owncloud.log => Error message
2. On this branch install ownCloud and check owncloud.log => No error message
Fixes https://github.com/owncloud/core/issues/13736 and https://github.com/owncloud/core/issues/12893
2016-01-26 17:06:23 +01:00
Roeland Jago Douma
d11682dcb4
Fix comments from Thomas
2016-01-26 15:31:52 +01:00
Joas Schilling
01164e89a4
Move parameter to the right function call
2016-01-26 14:56:07 +01:00
Joas Schilling
76f506e264
Use our OCP constants
2016-01-26 14:56:07 +01:00
Joas Schilling
a0e8a9de61
Introduce helper method
2016-01-26 14:56:07 +01:00
Joas Schilling
7514695399
Fix Oracle comparisons
2016-01-26 14:56:07 +01:00
Joas Schilling
90ce876378
Adjust comments to the new constants
2016-01-26 14:56:07 +01:00
Roeland Jago Douma
c090d709e7
We must resolve to the proper usergroup share
2016-01-26 14:14:54 +01:00
Joas Schilling
3a6390031c
Move class to legacy folder
2016-01-26 14:10:05 +01:00
Joas Schilling
70396581eb
Add tests for findLanguage()
2016-01-26 14:02:32 +01:00
Joas Schilling
b24b198a83
Add tests for the factory
2016-01-26 14:02:31 +01:00
Joas Schilling
2cb26a9151
Fix the tests
2016-01-26 14:02:31 +01:00
Joas Schilling
c7abe68776
Deprecate OC_L10N in favor of a namespaces and DI version
2016-01-26 14:02:31 +01:00
Joas Schilling
4ea0d3c05d
Deprecate getFirstWeekDay() and getDateFormat() in favor of l()
2016-01-26 14:02:31 +01:00
Joas Schilling
6652a0fb6c
Move finding the language files and creating the function out of the object
2016-01-26 14:02:31 +01:00
Joas Schilling
7ec7464ee2
Move validation and fallbacks of app and lang to the constructor/factory
2016-01-26 14:02:31 +01:00
Joas Schilling
043625ee52
Move findLanguage() and setLanguageFromRequest() to factory
2016-01-26 14:02:31 +01:00
Joas Schilling
29a9306429
Move languageExists() to the factory
2016-01-26 14:02:31 +01:00
Joas Schilling
6aec550d6e
Move findAvailableLanguages() to the factory
2016-01-26 14:02:30 +01:00
Roeland Jago Douma
e508bcb7a7
[Share 2.0] Fire off hook
2016-01-26 13:59:58 +01:00
Roeland Jago Douma
46045ecc52
[Share 2.0] Add update share
2016-01-26 13:59:58 +01:00
Arthur Schiwon
ed546bd2a5
Comments DAV implementation
2016-01-26 12:10:14 +01:00
Thomas Müller
3da78c8f1c
Merge pull request #21901 from owncloud/fix-setup
...
Fix setup page
2016-01-26 11:42:55 +01:00
Thomas Müller
5285460669
Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-change
...
Changing the avatar of the user emits the changeUser event which trig…
2016-01-26 11:37:17 +01:00
Thomas Müller
2bafb1c649
Merge pull request #21894 from owncloud/refactor-csrf
...
Add new CSRF manager for unit testing purposes
2016-01-26 11:36:56 +01:00
Morris Jobke
2ecc202843
Fix setup page
...
* fixes #21897
2016-01-26 09:05:10 +01:00
Jenkins for ownCloud
ecf2d178b1
[tx-robot] updated from transifex
2016-01-26 01:56:06 -05:00
Thomas Müller
4c9e328211
Merge pull request #21892 from owncloud/issue-21890-parameters
...
Add parameters types to IQueryBuilder
2016-01-25 21:13:41 +01:00
Thomas Müller
a1ca9de0f5
Trigger change on avatar delete
2016-01-25 20:56:04 +01:00
Thomas Müller
f165ad8864
Changing the avatar of the user emits the changeUser event which triggers update of the system addressbook
2016-01-25 20:05:11 +01:00
Lukas Reschke
12b22c2759
Regenerate CSRF token upon login
...
Otherwise somebody else might be able to note down the CSRF token before login on a shared computer.
2016-01-25 20:03:40 +01:00
Lukas Reschke
a977465af5
Add new CSRF manager for unit testing purposes
...
This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf . Due to some of our required custom changes it is however not possible to use the Symfony component directly.
2016-01-25 20:03:40 +01:00
Joas Schilling
09ae160463
Replace other usages
2016-01-25 17:17:36 +01:00
Joas Schilling
c5046fb2a9
Add parameters to public interface
2016-01-25 17:17:20 +01:00
Thomas Müller
728caf13f8
Adding support of -1 as size to be passed into get and getFile
2016-01-25 16:54:40 +01:00
Thomas Müller
d69167caff
Merge pull request #21424 from owncloud/appversions
...
Use appConfig to get app versions
2016-01-25 10:02:02 +01:00
Thomas Müller
adf532fe4e
Merge pull request #21806 from owncloud/mdusher-master
...
[jenkins] Added ' to characters allowed in the username
2016-01-25 10:01:43 +01:00
Thomas Müller
ef4fca22d1
Merge pull request #21844 from owncloud/drop-image-path
...
Remove OC_Helper::imagePath and use the proper public interface
2016-01-25 10:00:21 +01:00
Morris Jobke
287e6d36bf
remove unused variable
2016-01-25 09:29:44 +01:00
Jenkins for ownCloud
a331979a67
[tx-robot] updated from transifex
2016-01-25 01:54:39 -05:00
Morris Jobke
75e6734ef4
Remove OC_Helper::imagePath and use the proper public interface
2016-01-24 18:04:20 +01:00
Thomas Müller
99e9c81c8b
Merge pull request #21841 from owncloud/share2_deletefromself
...
[Share 2.0] Add deleteFromSelf method
2016-01-22 17:27:17 +01:00
Thomas Müller
a203089cfd
Merge pull request #21836 from RomanKreisel/master
...
Solves #21835 (https://github.com/owncloud/core/issues/21835 )
2016-01-22 17:26:28 +01:00
Thomas Müller
7731b29136
Merge pull request #21719 from owncloud/move-notification-api-to-ocp
...
Move the notification API to public namespace
2016-01-22 16:20:26 +01:00
Roeland Jago Douma
a6600e95dc
[Share 2.0] Add deleteFromSelf method
...
This allows recipient to delete a share. For user shares this is the
same as deleting (at least for now).
But for group shares this means creating a new share with type 2. With
permissions set to 0.
2016-01-22 15:06:50 +01:00
Morris Jobke
bd456b5889
Fix addUserToGroup hook of the share code
...
* sets up the filesystem of the user that is added to a group
to properly accept shares
* fixes #18499
2016-01-22 14:17:37 +01:00
Thomas Müller
9b4c9a0357
Merge pull request #18531 from owncloud/ext-user-credentials
...
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
Thomas Müller
0bccdbc959
Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess
...
Add custom marker into htaccess and execute integrity check after installation
2016-01-22 13:13:59 +01:00
Thomas Müller
e3013a99ef
Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-autoguessing
...
Use path instead of app id for occ app signing
2016-01-22 13:13:41 +01:00
Lukas Reschke
bc62aa1ef5
Exclude .htaccess modifications from code checker
...
After the initial installation ownCloud will write some content into the .htaccess file such as the 404 or 403 directives. This adds a magic marker into the .htaccess file and only the content above this marker will be compared in the integrity checker.
2016-01-22 11:51:54 +01:00
Joas Schilling
31c5848e51
Allow automatic injection of the Manager
2016-01-22 11:02:40 +01:00
Thomas Müller
1410120758
Merge pull request #20768 from owncloud/mount-cache
...
cache mountpoints in the db
2016-01-22 11:01:54 +01:00
Joas Schilling
9ea7ae6f87
Adjust the since on the interface
2016-01-22 10:51:36 +01:00
Joas Schilling
ee02165005
Move the notification API to public namespace
2016-01-22 10:32:42 +01:00
Thomas Müller
e2e5eedb40
Merge pull request #21824 from owncloud/list-of-notifiers
...
Make it possible to get a list of notifiers for a potential settings …
2016-01-22 10:24:46 +01:00
Joas Schilling
3cca8498cb
Make it possible to get a list of notifiers for a potential settings page
2016-01-22 08:47:21 +01:00
Morris Jobke
75ee5a9e9a
Fix PHPDoc - @changed is no official tag -> use @since
2016-01-22 08:43:05 +01:00
Roman Kreisel
b35aa513ab
Solves #
2016-01-21 17:29:14 +01:00
Roeland Jago Douma
658959592d
[Share 2.0] Fix displaying old shares proplery
2016-01-21 16:06:12 +01:00
Roeland Jago Douma
3a582e88e5
Comments from Vincent
2016-01-21 16:06:12 +01:00
Roeland Jago Douma
9b5ea18ce5
Add Unit tests for the default share provider
2016-01-21 16:06:12 +01:00
Roeland Jago Douma
0a9cd91e1d
[Share 2.0] Add subfiles=x
2016-01-21 15:56:44 +01:00
Roeland Jago Douma
0c9f881e7d
[Share 2.0] Resolve group shares
2016-01-21 15:56:44 +01:00
Roeland Jago Douma
3666c34a19
[Sharing 2.0] Start with getShares
2016-01-21 15:56:44 +01:00
Thomas Müller
e2f231d051
Merge pull request #21761 from owncloud/share2_link
...
Share2 link
2016-01-21 15:43:08 +01:00
Thomas Müller
2b4532c6b9
Merge pull request #21797 from owncloud/proper-controller-in-core
...
Move controller in core/ to a common subfolder
2016-01-21 15:20:10 +01:00
Thomas Müller
7c7467fe42
Merge pull request #21792 from owncloud/systemtags-managerfactory
...
Allow custom implementation of system tag managers
2016-01-21 12:13:01 +01:00
Jenkins for ownCloud
50b303f3ad
[tx-robot] updated from transifex
2016-01-21 01:55:20 -05:00
Thomas Müller
2f7dcf1a2c
Merge pull request #21782 from owncloud/update-system-addressbook-on-user-change-2
...
Introduce IUser::setEMailAddress and add hook mechanism
2016-01-21 00:07:46 +01:00
Roeland Jago Douma
e40d21673e
[Share 2.0] Add fetching link shares to share manager
2016-01-20 21:12:26 +01:00
Lukas Reschke
ea367b598a
Use path instead of app id
...
This change requires the usage of a path instead of the App ID when signing code. This has the advantage that developers can also sign code under a different location to make it easier. (e.g. remove `.git`, …)
Also it adds an example command usage as well as a link to the documentation
2016-01-20 20:38:18 +01:00
Vincent Petry
899f9bd113
Allow custom implementation of system tag managers
...
Added config.php option to replace the default implementation of system
tag manager and system tag object mapper.
Also adjusted the comments manager factory to inject the server container
2016-01-20 16:36:10 +01:00
Robin Appelman
8a4c0829fb
use insertifnotexists
2016-01-20 16:32:56 +01:00
Robin Appelman
483c6b68e2
clear mount cache when removing applicables
2016-01-20 16:32:56 +01:00
Robin Appelman
bc7bd0cd05
handle changed mount points
2016-01-20 16:32:56 +01:00
Robin Appelman
be380accb9
clear mount cache when deleting user
2016-01-20 16:32:56 +01:00
Robin Appelman
99415a9f7f
multiple minor fies
2016-01-20 16:32:52 +01:00
Robin Appelman
fd37e72ee9
use getmountmanager
2016-01-20 16:30:22 +01:00
Robin Appelman
8940429976
log duplicates
2016-01-20 16:30:22 +01:00
Robin Appelman
f986fb99f2
Filter uncached mounts
2016-01-20 16:30:22 +01:00
Robin Appelman
cf6ee1c866
cache mountpoints in the db
2016-01-20 16:30:22 +01:00
Thomas Müller
647d8ea5de
Merge pull request #21775 from owncloud/apcu-iterator-constructor
...
Fix constructor arguments for APCUIterator
2016-01-20 15:23:01 +01:00
Thomas Müller
51b50bd260
Emit OC\User::changeUser on change of display name
2016-01-20 14:57:20 +01:00
Thomas Müller
aeb89947a2
Introduce IUser::setEMailAddress and add hook mechanism
2016-01-20 14:57:20 +01:00
Morris Jobke
7b54bf26ea
fix error message and comment
2016-01-20 14:21:54 +01:00
Michael U
dbfa143e2d
Added ' to characters allowed in the username
2016-01-20 14:11:27 +01:00
Morris Jobke
06fe4cabfc
move setup controller to core/controller
2016-01-20 10:23:57 +01:00
Roeland Jago Douma
7a946a05f5
Properly DI the servercontainer
2016-01-20 08:33:36 +01:00
Jenkins for ownCloud
f076bfac32
[tx-robot] updated from transifex
2016-01-20 01:54:54 -05:00
Thomas Müller
f0f308dfbf
Merge pull request #21744 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2016-01-19 12:17:25 +01:00
Morris Jobke
930555bd5e
properly use standard
...
* JEDEC standard - https://en.wikipedia.org/wiki/JEDEC_memory_standards#Unit_prefixes_for_semiconductor_storage_capacity
2016-01-19 10:41:12 +01:00
Roeland Jago Douma
0939520e1a
[Share 2.0] Share Object creation is a fragile thing
...
* We can't assume that the file still exists
* We can't assume that the user/group still exists
Basically we do not always nicely cleanup shares.
2016-01-18 19:57:30 +01:00
Thomas Müller
14c98b4df7
Merge pull request #21519 from owncloud/propagate-folder-size
...
propagate folder size in the same query for write updates
2016-01-18 16:57:30 +01:00
Robin Appelman
58afddfaa5
allow comparing clob using expressionbuilder->eq if you explicitly say you're comparing strings
2016-01-18 16:03:41 +01:00
Robin Appelman
a225fe4c96
Fix constructor arguments for APCUIterator
2016-01-18 12:20:05 +01:00
Robin Appelman
ebd15fd5ed
handle bool in setValue
2016-01-18 12:09:01 +01:00
Robin Appelman
895fd49fb2
also handle not null violations
2016-01-18 12:09:01 +01:00
Robin McCorkell
da4127d23b
Introduce CredentialsManager for storage of credentials in DB
...
CredentialsManager performs a simple role, of storing and retrieving
encrypted credentials from the database. Credentials are stored by user
ID (which may be null) and credentials identifier. Credentials
themselves may be of any type that can be JSON encoded.
The rationale behind this is to avoid further (mis)use of
oc_preferences, which was being used for all manner of data not related
to user preferences.
2016-01-18 11:10:41 +01:00
Robin McCorkell
88cd615214
Introduce IDBConnection::setValues()
...
setValues() attempts to insert a new row, or failing that, update an
existing row. The ability to set preconditions is also available.
2016-01-18 11:10:41 +01:00
Jenkins for ownCloud
e4d5229940
[tx-robot] updated from transifex
2016-01-18 01:54:41 -05:00
Jenkins for ownCloud
2095a31000
[tx-robot] updated from transifex
2016-01-17 01:54:53 -05:00
Thomas Müller
807cf750b3
Merge pull request #21705 from owncloud/improve-background-job-message
...
Improve background job error message
2016-01-15 20:12:26 +01:00
Robin Appelman
ddbbe1742f
propagate folder size in the same query for write updates
2016-01-15 15:36:52 +01:00
Thomas Müller
f6c4b10189
Add message key to context of logException
2016-01-15 14:55:30 +01:00
Thomas Müller
fcec704174
Merge pull request #21730 from owncloud/fix-install-of-shipped-apps
...
Fix installation of shipped apps
2016-01-15 14:33:40 +01:00
Thomas Müller
b7c0dc46be
Merge pull request #21702 from owncloud/fix_emit_scanFiles_II
...
Fix: emit 'scanFiles' will only fire on files and not on folders (II)
2016-01-15 14:31:49 +01:00
Scrutinizer Auto-Fixer
83a8e75614
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-01-15 12:54:26 +00:00
Thomas Müller
6824704699
Merge pull request #21117 from owncloud/owner-file-exists
...
Only return an owner if the file exists + improved getUidAndFilename
2016-01-15 13:31:56 +01:00
Thomas Müller
41106c1967
Merge pull request #21543 from owncloud/Larzenegger-master
...
[CI] Larzenegger master
2016-01-15 13:29:57 +01:00
Thomas Müller
416fb65605
Merge pull request #21717 from owncloud/addpublicgroupinterface
...
allow apps to add an OCP GroupInterface backend
2016-01-15 12:38:18 +01:00
Thomas Müller
b37634a57d
Merge pull request #21721 from owncloud/capped-memcache-indirect-set
...
Allow indirect set in CappedMemoryCache
2016-01-15 12:37:36 +01:00
Thomas Müller
d8867f7692
Merge pull request #21723 from owncloud/prevent-group-enable-for-apps
...
Prevent group enable for apps
2016-01-15 12:26:43 +01:00
Thomas Müller
52040a3f23
Merge pull request #20898 from owncloud/cache-interfaces
...
Public Cache interfaces
2016-01-15 12:02:31 +01:00
Jenkins for ownCloud
cd840f01ae
[tx-robot] updated from transifex
2016-01-15 01:54:57 -05:00
Thomas Müller
1d0724a772
Fixing CodeChecker usage 🙈
2016-01-14 17:35:28 +01:00
Thomas Müller
7d2a6d4c1a
- isolate include calls in installer.php which prevents local variables to be overwritten
...
- add the app to the autoloader before calling install.php
2016-01-14 17:28:00 +01:00
Thomas Müller
3f64d37f2a
Merge pull request #21623 from owncloud/stricter_defaultprovider
...
[Share 2.0] Default share provider should only query for supported types
2016-01-14 16:12:06 +01:00
Thomas Müller
953c4bf18a
Merge pull request #21714 from owncloud/groups-insertifnotexists
...
Groups insertifnotexists
2016-01-14 16:11:43 +01:00
Joas Schilling
e3a0858444
Check whether the app can be enabled for groups
2016-01-14 15:45:48 +01:00
Robin Appelman
d195584a32
Allow indirect set in CappedMemoryCache
2016-01-14 15:00:41 +01:00
Jörn Friedrich Dreyer
2ebb5726d7
add TODOs with the actual interface name
2016-01-14 14:34:35 +01:00
Jörn Friedrich Dreyer
64043e9bcc
move methods to correct interface, deprecate private interface
2016-01-14 14:28:03 +01:00
Jörn Friedrich Dreyer
bd77cd98c9
allow apps to add an OCP GroupInterface backend
2016-01-14 13:58:45 +01:00
Thomas Müller
5036e4527f
Use IDbConnectin::insertIfNotExist
2016-01-14 13:17:26 +01:00
Joas Schilling
436ce1f4a6
Use insertIfNotExists() when creating a group
2016-01-14 13:13:27 +01:00
Robin Appelman
7530f66f52
remove unneeded public cache methods
2016-01-14 13:01:46 +01:00
Robin Appelman
bdf51d9ea4
only trigger locking on lockingstorages
2016-01-14 13:01:43 +01:00
Robin Appelman
0724ac1e5e
split locking related methods to their own interface
2016-01-14 12:54:42 +01:00
Robin Appelman
3deb3bd163
Add IStorage interface for consistent naming
...
minor phpdoc fixed
2016-01-14 12:54:42 +01:00
Robin Appelman
e77e76fef4
fix object store storage
2016-01-14 12:54:42 +01:00
Robin Appelman
d2c579e167
fix quota wrapper
2016-01-14 12:54:42 +01:00
Robin Appelman
dcbeeced3b
add since tags
2016-01-14 12:54:42 +01:00
Robin Appelman
989995a852
fix phpdoc
2016-01-14 12:54:42 +01:00
Robin Appelman
a3d50ef49a
add watcher interface
2016-01-14 12:54:42 +01:00
Robin Appelman
c27894791e
Add updater interface and expose cache interfaces from storage
2016-01-14 12:54:42 +01:00
Robin Appelman
5fae07f422
add scanner interface
2016-01-14 12:54:42 +01:00
Robin Appelman
6d321f5f6b
Return a class from cache operations instead of an array
2016-01-14 12:54:42 +01:00
Robin Appelman
3ab0ccd4a2
add cache entry interface
2016-01-14 12:54:42 +01:00
Robin Appelman
2dcdc81477
propagator interface
2016-01-14 12:54:42 +01:00
Robin Appelman
cdc8c40d60
Add public cache interface
2016-01-14 12:54:42 +01:00
Roeland Jago Douma
663e71e4b3
Only select elements from the database that we support
2016-01-14 10:54:40 +01:00
Roeland Jago Douma
0f454ff5aa
Use namedparameter
2016-01-14 10:54:40 +01:00
Morris Jobke
86f08f59d6
use logException() to properly log the exception
2016-01-14 10:40:23 +01:00
Thomas Müller
4d037b76b4
Merge pull request #21704 from owncloud/fix-namespace-issue
...
Fix usage of PHP method within namespace
2016-01-14 10:25:34 +01:00
Thomas Müller
03c08bea9d
Merge pull request #21703 from owncloud/fix_share_create_hooks
...
[Share 2.0] Fix pre_share and post_share hooks
2016-01-14 09:56:37 +01:00
Morris Jobke
64c8427d81
Improved error message for failing background job
2016-01-14 09:49:40 +01:00
Morris Jobke
73dd8c17de
Fix usage of PHP method within namespace
...
* introduced wiht 045ea4eb
2016-01-14 09:24:21 +01:00
Jenkins for ownCloud
205fbcbfa3
[tx-robot] updated from transifex
2016-01-14 01:55:43 -05:00
Roeland Jago Douma
4cc2230c58
[Share 2.0] Fix pre_share and post_share hooks
2016-01-13 21:56:04 +01:00
Martin
06ca5cbade
Fix: emit 'scanFiles' will only fire on files and not on folders (II)
2016-01-13 21:40:48 +01:00
Thomas Müller
d1010696a1
Merge pull request #20497 from owncloud/bubble_up_hint_exception
...
Bubble up hint exceptions in hooks, so the user can see the hint
2016-01-13 17:36:42 +01:00
Roeland Jago Douma
5f5951c8cf
[Share 2.0] Let the factory do the factory stuff
...
* Updated unit tests (bit cleaner now)
2016-01-13 16:35:15 +01:00
Roeland Jago Douma
cbd3050f4c
[Share 2.0] Use full share id (providerId:shareId)
...
Now that we support multiple managers we communicate shares to the
outside as 'providerId:shareId'. This makes sures that id's are unique
when references from the OCS API.
However, since we do not want to break the OCS API v1 we need to
somewhat hack around this.
When we switch to OCS API v2 (which we should when we support more
custom providers). We will change the id to always be the fullShareId.
2016-01-13 16:35:15 +01:00
Roeland Jago Douma
67b7ebccd1
[Share 2.0] Add share provider factory
...
* Add providers
* Add share manager to server container
* Use share manager from server container
* Properly get the share manager
2016-01-13 16:35:14 +01:00
Roeland Jago Douma
b4de427c1e
[Share 2.0] Allow registering of share providers
...
* Properly register the default share provider
2016-01-13 16:35:07 +01:00
Thomas Müller
3ee3d02a76
Merge pull request #20018 from owncloud/cache_group_backend
...
The group database backend should cache groups
2016-01-13 15:58:21 +01:00
Thomas Müller
e7038a2736
Simply use logException() to log the exception - no need for custom code
2016-01-13 15:52:18 +01:00
Thomas Müller
fa75866879
Fix PHPDoc
2016-01-13 15:52:18 +01:00
Jörn Friedrich Dreyer
cbe995af31
Bubble up hint exceptions in hooks, so the user can see the hint
2016-01-13 15:52:18 +01:00
Hendrik Leppelsack
99b9ec41c1
support print stylesheets
2016-01-13 15:12:11 +01:00
Thomas Müller
37e8a87d46
Merge pull request #21591 from owncloud/add-code-checking-for-apps
...
Verify signature of apps with level "Official" coming from the appstore
2016-01-13 10:35:00 +01:00
Thomas Müller
b1ee51f255
Merge pull request #21630 from owncloud/add-some-security-headers-as-hardening
...
Add X-Download-Options and X-Permitted-Cross-Domain-Policies
2016-01-13 10:33:58 +01:00
Thomas Müller
5565b19382
Merge pull request #21648 from owncloud/smb-statcache-cap
...
cap the number of entries we cache in smb's statcache
2016-01-13 10:33:43 +01:00
Thomas Müller
3fd976995a
Merge pull request #21668 from owncloud/add-super-evil-and-hidden-config-switch-to-disable-integrity-checks-really-just-do-not-use-this
...
Add hidden config switch to disable code integrity checking
2016-01-13 10:30:02 +01:00
Thomas Müller
4129480eb0
Merge pull request #21671 from owncloud/fix-setup-on-master
...
Use legacy method when ownCloud is not yet installed
2016-01-13 10:29:36 +01:00
Thomas Müller
e22186d234
Merge pull request #21673 from owncloud/chrsch-master
...
-- Fixed error where $enabled is parsed but empty
2016-01-13 10:29:21 +01:00
Thomas Müller
c5a200c419
Merge pull request #21653 from owncloud/update-license-headers-2016
...
Update license headers 2016
2016-01-13 08:29:42 +01:00
Thomas Müller
59e9b93be6
Merge pull request #20948 from owncloud/fed-sync-contacts
...
Syncing system addressbooks across federated ownClouds
2016-01-13 08:27:51 +01:00
Jenkins for ownCloud
eb90fa78ad
[tx-robot] updated from transifex
2016-01-13 01:55:56 -05:00
Christoph Schaefer
4b3bef4dc7
-- Fixed error where $enabled is parsed but empty
2016-01-13 06:39:02 +01:00
Lukas Reschke
28049b510b
Use legacy method when ownCloud is not yet installed
...
The new `\OCP\ICertificateManager::getAbsoluteBundlePath` API instantiiates an ownCloud view which makes the installation fail as it queries the DB before it actually is setup. This change uses the old approach again for the case that the installation is not yet setup.
The client service is required for the `.htaccess` effectivity check in the setup. In the future we could move this to a JS based one (as we have for the other setupchecks) so we can get rid of such hacks.
Fixes https://github.com/owncloud/core/issues/21669 which was a regression in master caused by https://github.com/owncloud/core/issues/21336
2016-01-12 21:47:49 +01:00
Lukas Reschke
08e73d2c8f
Add hidden config switch to disable code integrity checking
...
This adds a hidden config flag that allows somebody to disable the code integrity check. If `integrity.check.disabled` is set to `true` in the config file:
1. The integrity check functions will return always an empty result
2. The integrity check is not performed when installing apps
3. The integrity check is not performed when updating apps
4. The integrity check is not performed when updating the core
Furthermore this adds support for a list of channels that the code checker will run on. At the moment this is only stable because I didn't want to break any build scripts that we have. Once we have a proper CA setup and updated the build process to sign the releases we can add the RC, alpha, beta as well as daily releases. So everything except "git" basically.
2016-01-12 18:48:36 +01:00
Thomas Müller
682821c71e
Happy new year!
2016-01-12 15:02:18 +01:00
Thomas Müller
dbddbb634b
Use EventDispatcher to allow additional setup of auth backends - move federation auth to federation app
2016-01-12 14:24:01 +01:00
Robin Appelman
d8d6368dd7
cap the number of entries we cache in smb's statcache
2016-01-12 13:26:58 +01:00
Robin Appelman
c15cab7ed6
Allow admins to add system wide root certificates
2016-01-12 12:50:59 +01:00
Lukas Reschke
4d0dcd3c53
Add X-Download-Options and X-Permitted-Cross-Domain-Policies
...
Two small security hardenings for our IE users and those with Adobe products. Aligns it more with https://github.com/twitter/secureheaders#secureheaders---
2016-01-12 10:37:16 +01:00
Thomas Müller
3317dd0a8e
Merge pull request #21637 from owncloud/reformat-irequest
...
fix identation in public/irequest.php
2016-01-12 09:13:17 +01:00
Thomas Müller
3ec8789c77
Merge pull request #21628 from owncloud/deprecated_secure_random_funcions
...
Replace deprecated function calls to SecureRandom
2016-01-12 09:12:13 +01:00
Morris Jobke
078cf8ae36
fix identation in public/irequest.php
2016-01-12 08:48:51 +01:00
Thomas Müller
d11d9407ce
Merge pull request #21624 from owncloud/l10n_deprecated_function
...
Remove unused deprecated function from l10n.php
2016-01-12 08:34:00 +01:00
Roeland Jago Douma
9f4b296685
Properly close cursors
2016-01-12 08:24:08 +01:00
Roeland Jago Douma
9e322828f2
Cache if a group exists
2016-01-12 08:24:08 +01:00
Roeland Jago Douma
3c8f4784e9
Inject DBConnection
...
* Use query builder
* Minor unit tests additions
2016-01-12 08:24:08 +01:00
Roeland Jago Douma
53e37804ec
The group database backend should cache groups
...
This avoids duplicated queries like first checking the group_users db
and then just doing a select on the group db. Those enries are linked
(and should be using foreign keys!)
This commit makes sure we cache those entries.
If a user is part of N groups this saves N queries on webdav access
2016-01-12 08:24:08 +01:00
Jenkins for ownCloud
44e91bb90a
[tx-robot] updated from transifex
2016-01-12 01:56:33 -05:00
Roeland Jago Douma
876fb83ddc
getMediumStrengthGenerator is deprecated and does not do anything anymore
2016-01-11 20:06:30 +01:00
Roeland Jago Douma
98c4951f45
getLowStrengthGenerator does not do anything anymore
2016-01-11 19:59:15 +01:00
Roeland Jago Douma
eccd9ca1cb
Remove unused deprecated function
2016-01-11 16:41:46 +01:00
Lukas Reschke
43dbe1cebf
Revert "Remove unneeded check if htaccess test file already exists"
2016-01-11 15:37:08 +01:00
Robin Appelman
a3cbdcf202
Faster AppConfig->getValues
2016-01-11 11:59:24 +01:00
Robin Appelman
ae7c49f93c
Use appconfig for getAppVersions
2016-01-11 11:59:24 +01:00
Lars
3a5087ccdf
tempnam accepts a directory as its first parameter, not a full path and filename.
...
tempnam falls back to creating a file in the system's temp directory. On systems with open_basedir restrictions, this may trigger an error message. By moving this below the checkTemporaryDirectory-loop, tempnam will only be tested if all alternatives fail and the error message is most likely avoided.
2016-01-11 11:50:31 +01:00
Lukas Reschke
3e8a5f8a53
Typo in error message
2016-01-11 11:40:58 +01:00
Robin Appelman
300eb54c87
de-deplicate getUidAndFilename
2016-01-11 11:40:58 +01:00
Robin Appelman
fd2e1086c6
dont return an owner for files that don't exist
2016-01-11 11:40:58 +01:00
Thomas Müller
94cf9e56b6
Merge pull request #21593 from owncloud/strict_autoloader
...
Stricter autoloader
2016-01-11 11:24:11 +01:00
Thomas Müller
939cd43b58
Merge pull request #21586 from owncloud/fix-no-minimum-version
...
Assume apps from the appstore are compatible with the current version
2016-01-11 11:23:36 +01:00
Thomas Müller
171b279753
Merge pull request #21594 from owncloud/cleanup_util
...
Remove generateRandomBytes from OC_Util
2016-01-11 09:55:35 +01:00
Jenkins for ownCloud
77a8085f84
[tx-robot] updated from transifex
2016-01-11 01:55:34 -05:00
Roeland Jago Douma
e01a488b31
Remove generateRandomBytes from OC_Util
2016-01-10 22:07:33 +01:00
Roeland Jago Douma
1a592e5745
Only '/tests' to be autoloaded when running unit tests
2016-01-10 21:36:14 +01:00
Roeland Jago Douma
fce8c42240
OC autoloader is not allowed to load 3rdparty
2016-01-10 21:32:52 +01:00
Lukas Reschke
c009d5dcc1
Verify signature of apps with level "Official" coming from the appstore
...
This change will verify the signature of all apps with the level "Official" coming from the appstore or if they have been signed before.
2016-01-10 19:40:28 +01:00
Lukas Reschke
e43bf54503
Assume apps from the appstore are compatible with the current version
...
Filtering is done server-side already so only compatible apps are delivered. Otherwise this leads to a ton of error messages as the info.xml cannot be read at that state.
Fixes https://github.com/owncloud/core/issues/21556
2016-01-10 17:02:50 +01:00
Lukas Reschke
74876fa6e7
Remove code related to session regeneration after some time
...
I do not really consider this necessary or a real security addition. Let's get rid of it thus, cleans up the code and makes the logic easier.
2016-01-10 11:01:30 +01:00
Lukas Reschke
a58ca89e7f
Use ISession::clear
...
The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment.
2016-01-10 10:39:22 +01:00
Jenkins for ownCloud
580deb09f8
[tx-robot] updated from transifex
2016-01-10 01:55:57 -05:00
Lukas Reschke
3d4cf2e598
Use proper class name
...
This has never worked before. Introduced with https://github.com/owncloud/core/pull/18658
2016-01-09 23:43:12 +01:00
Roeland Jago Douma
77c611d339
Just query the securerandom from the container
2016-01-09 19:57:03 +01:00
Jenkins for ownCloud
72b34575df
[tx-robot] updated from transifex
2016-01-09 01:55:50 -05:00
Roeland Jago Douma
17a066c18e
Properly close db cursors
2016-01-08 20:27:01 +01:00
Roeland Jago Douma
629bac22fd
Make sure to respect deleted group shares by user
2016-01-08 20:27:01 +01:00
Roeland Jago Douma
c882d46e5f
Moved to the query builder
...
Anything to keep Lukas happy
2016-01-08 20:27:01 +01:00
Roeland Jago Douma
066e3770bb
Make sure that permissions stay in sync for share_type 2
...
When a file/folder is shared with a group and one of the group members
moves this file/folder an extra entry is created in the share table.
When the permission of the group share is updated we used to only
sometimes update the shares for individual users.
* Added intergration tests
2016-01-08 20:27:01 +01:00
Thomas Müller
6ab5ad0593
Merge pull request #21447 from owncloud/leave-disabled-apps-off
...
Only enable apps that are not intentionally disabled
2016-01-08 18:17:15 +01:00
Thomas Müller
3de81be692
Merge pull request #21494 from owncloud/underscores-in-class-names
...
Remove underscores from class names - part 1
2016-01-08 18:11:25 +01:00
Thomas Müller
0f281cdd30
Merge pull request #21286 from owncloud/use-owncloud-mail-when-sending-caldav-schedule-mails
...
Adding IMip scheduling which uses ownClouds mail delivery
2016-01-08 17:58:33 +01:00
Thomas Müller
e60dddf57d
Merge pull request #21479 from owncloud/fix-broken-state-in-htaccess-test
...
Remove unneeded check if htaccess test file already exists
2016-01-08 15:53:16 +01:00
Thomas Müller
0f5132552c
Merge pull request #21292 from owncloud/checkAppEnabled-not-needed-anymore
...
core will handle invalid URLs and redirects properly
2016-01-08 13:36:11 +01:00
Thomas Müller
71999ef820
Merge pull request #21139 from owncloud/makeswifturltypeconfigurable
...
make url type configurable
2016-01-08 12:34:58 +01:00
Thomas Müller
b3550db02d
Adding IMip scheduling which uses ownClouds mail delivery
2016-01-08 12:21:41 +01:00
Thomas Müller
a0345b9465
Merge pull request #21032 from owncloud/router-error-handling
...
Router error handling + Base.php
2016-01-08 10:06:54 +01:00
Thomas Müller
a1a8a06042
Merge pull request #21527 from owncloud/remove_all_avatars
...
Remove all cache avatars on avatar deletion
2016-01-08 09:41:25 +01:00
Roeland Jago Douma
34c8249799
Deprecate remaining function and entire class
2016-01-07 21:29:51 +01:00
Lukas Reschke
9bf01283e7
Cleanup router code
...
- Some functions are entirely broken
- PHPDoc etc...
2016-01-07 21:29:51 +01:00
Lukas Reschke
0e561afe79
Check if app does exists
2016-01-07 21:29:45 +01:00
Roeland Jago Douma
4e6f6518ff
Remove all cache avatars on avatar deletion
...
Fixes #21513
Since we cache the generated avatars. We should also delete the
generated sizes when we remove the avatar.
2016-01-07 20:51:18 +01:00
Thomas Müller
1cc6fddead
Merge pull request #21498 from owncloud/cleanup-OC_DB
...
Cleanup OC_DB methods
2016-01-07 20:13:16 +01:00
Thomas Müller
46107f82d4
Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning
...
Issue 20218 min max owncloud version warning
2016-01-07 16:51:00 +01:00
Thomas Müller
f6f492ba4e
Merge pull request #21502 from owncloud/di_mimetypedetector
...
Add 'OCP\Files\IMimeTypeDetector' to DI container
2016-01-07 16:18:55 +01:00
Thomas Müller
9ca670f94f
Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developers
...
Allow downgrades for our brave developers, that switch between branches
2016-01-07 16:03:36 +01:00
Joas Schilling
c55da1fc8d
Add a warning to the app:check-code if the version is missing
2016-01-07 15:04:36 +01:00
Thomas Müller
601457d221
Merge pull request #20773 from owncloud/share2.0_create
...
[Sharing 2.0] create share
2016-01-07 14:57:05 +01:00
Morris Jobke
190cc2bb67
Remove OC_DB::getConnection
2016-01-07 14:54:55 +01:00
Morris Jobke
fddece9552
Remove OC_DB::insertid
2016-01-07 14:54:55 +01:00
Morris Jobke
0a41cfefe3
Remove beginTransaction, commit, rollback from OC_DB
2016-01-07 14:54:55 +01:00
Morris Jobke
3917d888bd
Remove OC_DB::isError
2016-01-07 14:54:55 +01:00
Morris Jobke
547fbfdb76
Remove OC_DB::dropTable
2016-01-07 14:54:54 +01:00
Joas Schilling
fd7ed93937
Allow downgrades for our brave developers, that switch between branches
2016-01-07 14:18:33 +01:00
Roeland Jago Douma
cd35ad6aaa
Add 'OCP\Files\IMimeTypeDetector' to DI container
...
* Added test to server container as well
2016-01-07 13:20:43 +01:00
Morris Jobke
fa97e3a5a3
OC_TemplateLayout -> OC\TemplateLayout
2016-01-07 09:31:11 +01:00
Morris Jobke
c464b32738
OC_DB_MDB2SchemaManager -> OC\DB\MDB2SchemaManager
2016-01-07 09:29:21 +01:00
Morris Jobke
604897945b
Move lib/repair to lib/private/repair
2016-01-07 09:14:35 +01:00
Jenkins for ownCloud
27dfa74d89
[tx-robot] updated from transifex
2016-01-07 01:55:48 -05:00
Thomas Müller
002161857c
Merge pull request #21398 from owncloud/sharing-disabled-cache
...
Cache isSharingDisabledForUser
2016-01-06 17:23:14 +01:00
Thomas Müller
b6bc17d014
Merge pull request #21443 from owncloud/fix-container-lookup
...
Lookup the App name instead of OCA
2016-01-06 17:22:41 +01:00
Thomas Müller
a2c19d3d1a
Merge pull request #21444 from owncloud/move-regenerate-below
...
Move regeneration of session ID into session classes
2016-01-06 17:21:43 +01:00
Roeland Jago Douma
1358e5dcd9
[Sharing 2.0] Some error cases report 404 instead of 403
2016-01-06 15:25:29 +01:00
Roeland Jago Douma
26280e1f19
[Sharing 2.0] Add L10N instance to manager for translated errors
2016-01-06 14:53:43 +01:00
Roeland Jago Douma
b15be8f96f
[Share 2.0] Make the share manager ready for share creation
2016-01-06 14:53:43 +01:00
Roeland Jago Douma
a08c497808
[Share 2.0] Make share provider ready for create shares
2016-01-06 14:53:43 +01:00
Roeland Jago Douma
4f2e84a0ec
[Share 2.0] Update share class
...
More getters and setters are required to properly create shares
2016-01-06 14:53:43 +01:00
Morris Jobke
7b8b2c73c5
Drop oc_gallery_sharing which was removed in 8.0.0
...
See c080dfe87d
2016-01-06 13:45:59 +01:00
Morris Jobke
516a6d7441
Remove unneeded check if htaccess test file already exists
...
* fixes #20199
2016-01-06 13:45:36 +01:00
Lukas Reschke
88c7face07
Inject OCSClient
...
Fixes https://github.com/owncloud/core/issues/21451
2016-01-06 11:40:22 +01:00
Jörn Friedrich Dreyer
a86e067154
Merge pull request #21442 from owncloud/annotate-type
...
Annotate type
2016-01-05 12:36:31 +01:00
Jenkins for ownCloud
d4034ffca0
[tx-robot] updated from transifex
2016-01-05 01:57:14 -05:00
Jörn Friedrich Dreyer
3f101039b9
add isset for optional params
2016-01-04 16:38:45 +01:00
Joas Schilling
761000624d
Only enable apps that are not intentionally disabled
2016-01-04 16:24:52 +01:00
Lukas Reschke
fec41e7539
Move regeneration of session ID into session classes
...
There were code paths that nowadays call ISession::login directly thus bypassing the desired regeneration of the session ID. This moves the session regeneration deeper into the session handling and thus ensures that it is always called. Furthermore, I also added the session regeneration to the remember me cookie plus added some test case expectations for this.
2016-01-04 15:09:01 +01:00
Thomas Müller
70ff90b1ec
Merge pull request #21393 from owncloud/fix-urlgenerator-call
...
No more deprecation messages in error log
2016-01-04 15:00:06 +01:00
Joas Schilling
2cf4e144cc
Lookup the App name instead of OCA
2016-01-04 14:47:49 +01:00
Lukas Reschke
26c3fa7911
Annotate type
...
Otherwise static code scanners will complain about this.
2016-01-04 14:18:01 +01:00
Jenkins for ownCloud
157bb50a39
[tx-robot] updated from transifex
2016-01-04 01:55:05 -05:00
Jenkins for ownCloud
970495a067
[tx-robot] updated from transifex
2015-12-31 01:55:16 -05:00
Thomas Müller
42897ac5cb
Merge pull request #21402 from owncloud/view-getuserobject-cache
...
Cache usermanager instance in view
2015-12-30 20:04:51 +01:00
Robin Appelman
45d0396404
Cache sharing disabled in the view
2015-12-30 14:42:22 +01:00
Robin Appelman
2d9d0aedf8
Cache usermanager instance in view
2015-12-30 14:28:53 +01:00
Thomas Müller
9e39e8f1c7
No more deprecation messages in error log
2015-12-29 17:31:28 +01:00
Thomas Müller
9392a555ae
Merge pull request #21331 from switch-ch/fix_ms_log
...
Fix owncloud logging with ms precision
2015-12-29 16:32:52 +01:00
Thomas Müller
edd051dc02
Merge pull request #21291 from owncloud/refactor-call-check
...
Refactor OC_Util::callCheck
2015-12-28 10:21:44 +01:00
Thomas Müller
eb509bcbe6
Merge pull request #17333 from owncloud/php7-scalar-types-controllers
...
Prefer scalar type hints over phpdoc annotation
2015-12-28 10:21:14 +01:00
Jenkins for ownCloud
89584716f8
[tx-robot] updated from transifex
2015-12-28 01:55:10 -05:00
Bernhard Posselt
23c754aed3
prefer scalar type hints over phpdoc annotation
...
use method exists lookup to be safe and not break on old hhvm versions
add test that checks if type hint is preferred over annotation
2015-12-24 09:20:26 +01:00
Christian Schnidrig
7fce06b3f3
When microtime(true) returns a whole number, then the parsing fails.
...
This patch makes sure, that the value can always be parsed correctly.
2015-12-22 15:06:32 +01:00
Morris Jobke
6f00729124
Refactor OC_Util::callCheck
2015-12-22 09:32:14 +01:00
Thomas Müller
0b913f00c7
Merge pull request #21289 from owncloud/issue-20399-keep-periodic-background-jobs
...
Do not delete background jobs, in case an exception occured
2015-12-21 09:47:07 +01:00
Lukas Reschke
2c4b9e03e0
Use new APCu API
...
This one is available since APCu 4.0, since we require APCu 4.0.6 this works fine. Also it brings us PHP 7 compatibility and thus fixes https://github.com/owncloud/core/issues/21095
2015-12-20 11:09:09 +01:00
Jenkins for ownCloud
7080594670
[tx-robot] updated from transifex
2015-12-20 01:55:09 -05:00
Jenkins for ownCloud
d0cb4c9ab3
[tx-robot] updated from transifex
2015-12-19 01:55:14 -05:00
Thomas Müller
95a255b0d4
Merge pull request #21281 from owncloud/allow-di-for-background-jobs
...
Allow background jobs to be service names for DI
2015-12-18 16:34:42 +01:00
Thomas Müller
6cdaf754b2
Merge pull request #21290 from owncloud/public-api-usage-getversion
...
Use OCP\Util::getVersion instead of the internal private implementation
2015-12-18 16:07:01 +01:00
Morris Jobke
2f98f64241
core will handle invalid URLs and redirects properly
2015-12-18 15:51:03 +01:00
Morris Jobke
ed98cdf532
Use OCP\Util::getVersion instead of the internal private implementation
2015-12-18 15:26:54 +01:00
Thomas Müller
36cc0528e3
Merge pull request #21288 from owncloud/deprecated_helper_mimetypes
...
Remove deprecated OC_Helper mimetype functions
2015-12-18 15:23:05 +01:00
Thomas Müller
a743047e82
Merge pull request #21283 from owncloud/cleanup_config
...
Cleanup OC_Config mess
2015-12-18 14:54:38 +01:00
Thomas Müller
50e8773307
Merge pull request #21280 from owncloud/drop-unused-methods
...
OC_Helper::makeURLAbsolute is not used anymore
2015-12-18 14:49:55 +01:00
Joas Schilling
6b813f56c9
Do not delete background jobs, in case an exception occured
...
This approach is not valid anymore. It initially was added for jobs
of non existing apps. But jobs of non-existing apps can not be created
so they will never be executed and so this call just catches other
cases which were not intended.
This reverts commit 4f4ad72460
.
2015-12-18 14:31:27 +01:00
Joas Schilling
a9935bd490
Add methods to interface which have always been required
2015-12-18 14:25:04 +01:00
Joas Schilling
0daed65e14
Allow dependency injection for background jobs
2015-12-18 14:20:30 +01:00
Roeland Jago Douma
b460bde7c6
Removed deprecated OC_Helper::mimeTypeIcon function
2015-12-18 14:00:20 +01:00
Joas Schilling
1f197134c8
Look up services in the app container before trying the core container
2015-12-18 13:45:07 +01:00
Joas Schilling
412e4ed3f6
Register app containers in the OC container
2015-12-18 13:45:07 +01:00
Thomas Müller
22d1b1285e
Merge pull request #21277 from owncloud/querybuild-joblist
...
Use the query builder for the joblist queries
2015-12-18 13:44:02 +01:00
Roeland Jago Douma
a54be132fc
Removed deprecated unsused function OC_Helper::getStringMimeType
2015-12-18 13:43:44 +01:00
Roeland Jago Douma
4f20e3bac0
Removed deprecated OC_Helper::getSecureMimeType
2015-12-18 13:42:59 +01:00
Morris Jobke
450e2f3bd3
Move OC_Helper code to OCP\Util for linkToRemote
2015-12-18 12:00:18 +01:00
Roeland Jago Douma
6fb60815c5
Use SystemConfig internally
2015-12-18 11:53:41 +01:00
Roeland Jago Douma
0a09004d39
Inject Config into SystemConfig
2015-12-18 11:53:41 +01:00
Roeland Jago Douma
82bf99c0cf
Get rid of legacy OC_Config
...
We were still using the lecagy class OC_Config all over the place. Which
was a wrapper around the new class OC\Config
2015-12-18 11:53:41 +01:00
Morris Jobke
e42f262d85
properly use OCP\Util instead of OC_Helper
2015-12-18 11:46:21 +01:00
Morris Jobke
3d55569a27
OC_Helper::makeURLAbsolute is not used anymore
2015-12-18 11:37:18 +01:00
Morris Jobke
4af7bf07bf
OC_Helper::userAvatarSet is not used anymore
2015-12-18 11:30:30 +01:00
Morris Jobke
a18c0983d5
Use TempManager instead of tmpFile
2015-12-18 11:25:33 +01:00
Morris Jobke
90b0831cec
Use TempManager instead of tmpFolder
2015-12-18 11:19:53 +01:00
Thomas Müller
9e97bef935
Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType
...
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-18 10:15:33 +01:00
Thomas Müller
551e553bf4
Merge pull request #21264 from owncloud/deprecated_oc_user_methods
...
Cleanup OC_User deprecated methods
2015-12-18 10:15:18 +01:00
Joas Schilling
0f836cfe9e
Make sure the interface and the implementation match
2015-12-18 10:04:30 +01:00
Joas Schilling
345e68cafa
Use the query builder for the joblist queries
2015-12-18 09:50:23 +01:00
Thomas Müller
1456e910ad
Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errors
...
Assert that there are no xml error left
2015-12-18 09:17:53 +01:00
Thomas Müller
228a75e2ec
Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRoute
...
Replace deprecated OC_Helper::linkToRoute calls
2015-12-18 07:56:42 +01:00
Roeland Jago Douma
2a280e2fad
Remove private deprecated OC_Helper::linkToRoute
2015-12-17 18:46:43 +01:00
Roeland Jago Douma
9fe3d2f1f8
OC_Helper::linkToRoute is deprecated
...
Replaced all calls to OC_Helper::linkToRoute with
OC::$server->getURLGenerator()->linkToRoute
2015-12-17 18:46:42 +01:00
Thomas Müller
b3c8e9ca32
Clear xml errors in updater
2015-12-17 17:46:07 +01:00
Thomas Müller
9b423f3532
Clear xml errors in ocs client
2015-12-17 17:34:15 +01:00
Thomas Müller
62b82cfe4b
Clear xml errors
2015-12-17 17:28:44 +01:00
Morris Jobke
ecdf88e41b
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-17 17:07:48 +01:00
Roeland Jago Douma
c64e827f00
Since avatar.js is now essentially empty remove it
2015-12-17 16:32:18 +01:00
Roeland Jago Douma
1f715289bf
Removed deprecated function OC_User::deleteUser
...
Replaced with proper OCP calls
2015-12-17 16:18:40 +01:00
Roeland Jago Douma
9201b9713e
Removed unused deprecated methods
2015-12-17 16:18:40 +01:00
Roeland Jago Douma
835911bce5
Removed deprecated private OC_User::createUser
...
All function calls are replaced with the recommended (which was already
the body of the function).
2015-12-17 16:18:40 +01:00
Roeland Jago Douma
7e44ea5da0
Remove deprecated function OC_User::getManager
...
Private deprecated function => removed
Replaced all instances with suggested replacement
2015-12-17 16:18:34 +01:00
Thomas Müller
1285b78086
Merge pull request #21200 from owncloud/files-authorizationheader
...
Use Authorization headers for public webdav in web UI
2015-12-17 15:30:13 +01:00
Thomas Müller
e3ed42135d
Merge pull request #21240 from owncloud/avatar_speedup
...
Avatar speedup
2015-12-17 14:43:21 +01:00
Thomas Müller
358b84c21d
Merge pull request #21253 from owncloud/deprecated_oc_helper_linkTo
...
Remove deprecated OC_Helper::linkTo
2015-12-17 14:43:02 +01:00
Thomas Müller
21bd19b6ae
Merge pull request #21241 from owncloud/fix_21226
...
Do not try to get the avatar if there is no user
2015-12-17 12:14:25 +01:00
Roeland Jago Douma
205c239eab
Remove deprecated OC_Helper::linkTo function
2015-12-17 11:51:40 +01:00
Roeland Jago Douma
19eeb23b91
OC_Helper::linkTo is deprecated
...
Replaced with suggested (and calling body of)
2015-12-17 10:53:21 +01:00
Roeland Jago Douma
db95c8d512
Do not try to get the avatar if there is no user
2015-12-17 09:14:04 +01:00
Jenkins for ownCloud
a7cd8103b5
[tx-robot] updated from transifex
2015-12-17 01:55:09 -05:00
Roeland Jago Douma
d796c43841
[Avatars] Add function to get the Node of the avatar
...
Since we usually just get the avatar and stream the content to the users
there is no need to first create an image in memory.
2015-12-16 20:29:02 +01:00
Thomas Müller
c92b49c82a
Merge pull request #21184 from owncloud/cli-logger-embedded-webserver
...
Let's print error messages to the builtin webserver console ... makes…
2015-12-16 20:26:29 +01:00
Vincent Petry
064dcc079d
Load base64 polyfill in IE and friends
2015-12-14 17:50:33 +01:00
Björn Schießle
efc030aa25
don't allow to create a federated share if source and target server are the same
2015-12-14 17:16:14 +01:00
Thomas Müller
a7ecb6e984
Let's print error messages to the builtin webserver console ... makes development a bit easier
2015-12-14 12:16:41 +01:00
Robin Appelman
9d732e35e1
Check if user isset in $_REQUEST first
2015-12-14 09:56:52 +01:00
Jenkins for ownCloud
74de12c698
[tx-robot] updated from transifex
2015-12-13 01:54:51 -05:00
Thomas Müller
f831d93f3f
Merge pull request #20878 from owncloud/proper-htaccess-support-in-code-signing-checker
...
Also run .htaccess routine when installing on another system than Apache
2015-12-11 11:46:37 +01:00
Thomas Müller
6317ba8cb4
Merge pull request #21135 from owncloud/add-polyfill
...
Add polyfills for PHP55, PHP56 and PHP70 functionalities
2015-12-11 11:40:51 +01:00
Thomas Müller
86bd95ea1b
Merge pull request #21020 from owncloud/add-directory-slash-to-setup-code
...
Add DirectorySlash to dynamic .htaccess write
2015-12-11 11:40:32 +01:00
Thomas Müller
c14f4e8506
Merge pull request #21045 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-12-11 11:39:25 +01:00
Thomas Müller
ecc3c174a0
Merge pull request #21128 from owncloud/dav-fopen-non-existing
...
Dont do a seperate request to check if a file exists when downloading a file from dav external storage
2015-12-11 10:48:22 +01:00
Jörn Friedrich Dreyer
eae8500a86
make url type configurable
2015-12-11 10:19:28 +01:00
Lukas Reschke
f3360d51c6
Use PHP polyfills
2015-12-11 08:47:36 +01:00
Morris Jobke
4569d88879
IMemcacheTTL was backported to 8.2.2
...
see #21113
2015-12-10 19:00:07 +01:00
Robin Appelman
97f5c095f4
Dont do a seperate request to check if a file exists for dav->fopen
2015-12-10 17:23:53 +01:00
Thomas Müller
ab1ea5ccc4
Merge pull request #21119 from owncloud/make-appconfig-more-robust
...
Make AppManager->checkAppForUser more robust
2015-12-10 16:44:40 +01:00
Scrutinizer Auto-Fixer
ffc49a24f0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-10 16:43:37 +01:00
Thomas Müller
7634c45e39
Merge pull request #21086 from owncloud/storage-nocheckavailforgetowner
...
Do not check storage availability for getOwner
2015-12-10 16:15:52 +01:00
Morris Jobke
f5e6c75804
Make AppManager->checkAppForUser more robust
...
* if the JSON that is stored in the DB is corrupt an error was thrown
* with this change it is properly handled and the app is disabled
2015-12-10 14:53:34 +01:00
Thomas Müller
df15d54db6
Merge pull request #21072 from owncloud/db-lock-ttl
...
Remove all locks after ttl from the db
2015-12-10 13:51:18 +01:00
Thomas Müller
744ef6141b
Merge pull request #21073 from owncloud/memcache-lock-ttl
...
Add ttl for redis based locking
2015-12-10 13:51:01 +01:00
Thomas Müller
9f4ceef7c9
Merge pull request #20984 from owncloud/fix-mysql-setup-unix-socket-master
...
Add unix_socket support for mysql during initial installation - fixes…
2015-12-10 10:13:49 +01:00
Thomas Müller
ea7fe672e8
Merge pull request #20775 from owncloud/comments-manager
...
add icommentsmanger and icomment implementation
2015-12-09 17:44:40 +01:00
Vincent Petry
4b68dd372d
Do not check storage availability for getOwner
...
Because the owner is always known thanks to the file cache and other
places, we don't need the remote storage to be actually available.
2015-12-09 17:31:14 +01:00
Arthur Schiwon
fdd06ba1f8
use getLastInsertId from query builder for convenience
2015-12-09 16:33:34 +01:00
Arthur Schiwon
55a2715eff
remove unused use statement
2015-12-09 16:25:42 +01:00
Arthur Schiwon
6af6febad0
php < 5.5 compatible
2015-12-09 16:25:31 +01:00
Thomas Müller
d5238b3d3c
Don't load commands of apps when in maintenance mode - fixes #20939
2015-12-09 15:15:10 +01:00
Robin Appelman
e191953942
Remove all locks after ttl from the db
2015-12-09 14:53:24 +01:00
Robin Appelman
e41f7b005d
add since
2015-12-09 14:45:08 +01:00
Robin Appelman
693a3c353e
ttl for memcache locking backends that support it
2015-12-09 14:41:15 +01:00
Robin Appelman
0a80bf5573
Add interface for memcache backends that support setting ttl on exisiting keys
2015-12-09 14:39:12 +01:00
Arthur Schiwon
249dc4490f
improve PHP doc and remove superflous by reference indicator
2015-12-09 14:34:23 +01:00
Arthur Schiwon
dec1f1d24a
anounce CommentsManager getter in public server interface
2015-12-09 14:34:23 +01:00
Arthur Schiwon
0c1c029571
hardening, add some checks for whitespace-only strings
2015-12-09 14:34:23 +01:00
Arthur Schiwon
f9081303b1
fix phpdoc
2015-12-09 14:34:23 +01:00
Arthur Schiwon
b44a33f68f
fix php doc
2015-12-09 14:34:23 +01:00
Arthur Schiwon
9a440c06b0
OC not oc
2015-12-09 14:34:23 +01:00
Arthur Schiwon
9dc4171830
parameter checks for setting actor and object to happen only in one place
2015-12-09 14:34:23 +01:00
Arthur Schiwon
4273689e9f
fix usage of empty
2015-12-09 14:34:23 +01:00
Arthur Schiwon
e3dbc3d40c
different strategy in cleaning up after user was deleted
...
we do not listen to deletion hooks anymore, because there is no guarantee that they
will be heard - requires that something fetches the CommentsManager first.
Instead, in the user deletion routine the clean up method will be called directly. Same way
as it happens for files, group memberships, config values.
2015-12-09 14:34:23 +01:00
Arthur Schiwon
2ce2de0ae5
add icommentsmanger and icomment implementation
...
register CommentsManager service, allow override, document in config.sample.php
don't insert autoincrement ids in tests, because of dislikes from oracle and pgsql
specify timezone in null date
only accepts strings for ID parameter that can be converted to int
replace forgotten hardcoded IDs in tests
react on deleted users
react on file deletion
Postgresql compatibility
lastInsertId needs *PREFIX* with the table name
do not listen for file deletion, because it is not reliable (trashbin, external storages)
add runtime cache for comments
2015-12-09 14:34:23 +01:00
Thomas Müller
04f4565fcd
Merge pull request #21060 from owncloud/support-for-read-only-config-dir
...
Add support for read only config dir
2015-12-09 14:32:00 +01:00
Thomas Müller
5c95939bf3
Merge pull request #21061 from owncloud/fix-oracle-last-insert-id-test
...
Fix the last insert id test by changing to an autoincremen…
2015-12-09 11:53:43 +01:00
Thomas Müller
eb14c9dc1e
Merge pull request #21056 from owncloud/check-return
...
Verify return type
2015-12-09 11:29:25 +01:00
Thomas Müller
74e7fb1438
Merge pull request #21055 from owncloud/fix-php-docs-for-console
...
Fix PHPDoc and check if path does exists
2015-12-09 11:28:53 +01:00
Joas Schilling
bef6344b27
Do not quote the table name for lastInsertId()
2015-12-09 11:09:02 +01:00
Thomas Müller
bb8dbc291b
Merge pull request #21005 from owncloud/verify_password_before_unshare
...
The ajax code path unshares a link share when updating the password
2015-12-09 10:05:20 +01:00
Thomas Müller
bc744ff6de
Merge pull request #21038 from owncloud/share-computesharepermissions-notstore
...
Fix (re)share permission checks in a few code paths
2015-12-09 10:04:56 +01:00
Thomas Müller
6ba22f0243
Merge pull request #21043 from owncloud/add-php-doc
...
Add type description
2015-12-09 10:04:30 +01:00
Lukas Reschke
b50987165e
Add support for read only config dir
...
We already support the `config_is_read_only` for the config file itself. However not for the whole directory (which is a bug).
This unifies the check in the checkServer routine with the one in base.php. Now one can enable a read only config folder so that ownCloud is not allowed to overwrite it's own source code.
To test this set the whole config folder to read only, clear your session, refresh, see it fails, add the new code, refresh, see it works. Also verify that setup still works fine. (obviously setup does not work with a read only config Also verify that setup still works fine. (obviously setup does not work with a read only config))
Fixes https://github.com/owncloud/core/issues/14455
2015-12-09 08:54:11 +01:00
Jenkins for ownCloud
dda9525c4b
[tx-robot] updated from transifex
2015-12-09 01:55:14 -05:00
Lukas Reschke
61da3d530d
Verify return type
...
Can also be null. Silences another security warning...
2015-12-09 07:32:19 +01:00
Lukas Reschke
11e98e2de6
Fix PHPDoc and check if path does exists
...
Mutes another security warning of some static scanners.
2015-12-09 06:57:24 +01:00
Vincent Petry
d0cca6c3ad
Add explicit check for groups excluded from sharing
...
Since isSharable() doesn't do the check for groups excluded from
sharing, adding an explicit check in the sharing code.
2015-12-08 16:48:33 +01:00
Lukas Reschke
7c45eaa70b
Add type description
...
Allows IDEs and static code analyzers. Would have saved me some minutes today :)
2015-12-08 15:20:54 +01:00
Thomas Müller
49095fa4bb
Merge pull request #21031 from owncloud/sanitize-findAppInDirectories
...
Sanitize the appId passed to `findAppInDirectories`
2015-12-08 13:52:04 +01:00
Thomas Müller
45fe8271ab
Merge pull request #21030 from owncloud/querybuilder-new-features
...
Querybuilder new features
2015-12-08 13:51:45 +01:00
Thomas Müller
85409b6701
Merge pull request #20786 from owncloud/systemtags-dav
...
DAV endpoint for system tags
2015-12-08 13:51:25 +01:00
Vincent Petry
6e4006d139
Add reshare permission checks
...
Added in isSharable() in incoming remote share.
Added in isSharable() in regular incoming share.
Added in FileInfo to make sure the proper attributes are returned to the
clients.
2015-12-08 13:13:26 +01:00
Vincent Petry
e241d26316
Compute share permissions in the view
...
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
2015-12-08 13:04:22 +01:00
Joas Schilling
9f98849306
Add a method to the get "to use" table and column name
2015-12-08 11:04:28 +01:00
Thomas Müller
fe8dc0bd5e
Merge pull request #21022 from owncloud/get-rid-of-by-reference
...
Get rid of by reference
2015-12-08 11:04:25 +01:00
Lukas Reschke
715f89a9d9
Sanitize the appId passed to `findAppInDirectories`
...
Would have prevented quite some security bugs in the past. Nice hardening for now.
2015-12-08 10:03:22 +01:00
Joas Schilling
a3391248e4
Add select distinct to the query builder
2015-12-08 09:49:21 +01:00
Joas Schilling
f2c7acb3c0
Allow getting the last insert id without much hassle
2015-12-08 09:40:20 +01:00
Lukas Reschke
4b293dffe5
Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTML
2015-12-08 08:56:47 +01:00
Lukas Reschke
70c228a7cc
Get rid of passing a reference
...
Fixes https://github.com/owncloud/core/issues/14643
2015-12-08 08:56:46 +01:00
Lukas Reschke
8289943a0f
Do not trust casting
2015-12-08 08:50:00 +01:00
Lukas Reschke
451ba4ddaa
Remove unused repair steps
...
These ones are not necessary anymore for the new major release.
2015-12-08 08:46:41 +01:00
Lukas Reschke
6ea7410041
Remove legacy check
...
This one is not required anymore as we have the RepairConfig repair step since November 2014.
2015-12-08 08:44:42 +01:00
Lukas Reschke
8903afec26
Don't write directives from CLI
2015-12-08 08:17:04 +01:00
Lukas Reschke
0a89073c47
Run .htaccess updates in any case
...
This is the same what we also do in updater.php and thus this aligns the code. Makes the code paths more consistent.
2015-12-08 08:16:24 +01:00
Lukas Reschke
235094ab54
Remove version check out of .htaccess
...
This can now be achieved using the new code signing.
2015-12-08 08:16:23 +01:00
Lukas Reschke
3bce1b20fe
Add DirectorySlash to dynamic .htaccess write
...
When `DirectorySlash off` is set then Apache will not lookup folders anymore. This is required for example when we use the rewrite directives on an existing path such as `/core/search`. By default Apache would load `/core/search/` instead `/core/search` so the redirect would fail here.
This leads however to the problem that URLs such as `localhost/owncloud` would not load anymore while `localhost/owncloud/` would. This has caused problems such as https://github.com/owncloud/core/pull/21015
With this change we add the `DirectorySlash off` directive only when the `.htaccess` is writable to the dynamic part of it. This would also make `localhost/owncloud` work again as it would trigger the 404 directive which triggers the redirect in base.php.
2015-12-08 08:10:55 +01:00
Jenkins for ownCloud
736e133c04
[tx-robot] updated from transifex
2015-12-08 01:56:19 -05:00
Thomas Müller
4100263bd6
Merge pull request #20996 from owncloud/issue-12215-remove-password-reset-when-not-possible
...
Issue 12215 remove password reset when not possible
2015-12-07 19:55:26 +01:00
Scrutinizer Auto-Fixer
453e1bf66e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-07 15:43:36 +00:00
Roeland Jago Douma
780d80d7c3
The ajax code path unshares a link share when updating the password
...
In order to not mess up existing shares if the password gets verified we
should first fire this validation.
2015-12-07 16:38:49 +01:00
Thomas Müller
663f31b127
Merge pull request #20993 from owncloud/issue-20666-language-always-overwritten
...
Do not overwrite the language when it's just missing for one app
2015-12-07 16:19:21 +01:00
Joas Schilling
87bc02c6cd
Allow specifying a custom reset-password-url
2015-12-07 15:41:40 +01:00
Thomas Müller
a9e5faf7d0
Merge pull request #20981 from owncloud/issue-19848-multiple-emails-for-sharelink
...
Allow sending a share email to multiple users
2015-12-07 15:17:19 +01:00
Joas Schilling
f8f3c9ecf9
Remove password reset when the user can not change the password
2015-12-07 15:14:19 +01:00
Joas Schilling
c6dbe8ac63
Do not overwrite the language when it's just missing for one app
2015-12-07 14:46:53 +01:00
Thomas Müller
d155c8e5fe
Add unix_socket support for mysql during initial installation - fixes #20210
2015-12-07 12:00:31 +01:00
Joas Schilling
5b87413792
Allow sending a share email to multiple users
2015-12-07 10:49:34 +01:00
Thomas Müller
764b2932ff
Merge pull request #20960 from owncloud/drop-OC_Util-getUrlContent
...
Remove OC_Util::getUrlContent and replace by proper usage of public i…
2015-12-07 10:21:16 +01:00
Thomas Müller
f3d49a89fe
Merge pull request #11131 from owncloud/use-phpini-wrapper
...
Replacing ini_get instances with inigetwrapper usages
2015-12-07 10:20:59 +01:00
Thomas Müller
0c3d97921f
Merge pull request #20904 from owncloud/view-mime-filter
...
Fix mimetype filter in getDirectoryContent
2015-12-07 10:20:43 +01:00
Thomas Müller
e1f2965e54
Merge pull request #20949 from owncloud/fix_20892
...
[Sharing] Properly check if a group already has access
2015-12-07 10:20:05 +01:00
Thomas Müller
c1fb9fa483
Merge pull request #20957 from owncloud/use-correct-method-signature
...
Use correct method signature
2015-12-07 10:18:03 +01:00
Thomas Müller
c9069d5711
Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntry
...
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
2015-12-07 10:17:44 +01:00
Jenkins for ownCloud
884946276e
[tx-robot] updated from transifex
2015-12-07 01:54:35 -05:00
Jenkins for ownCloud
d14f128329
[tx-robot] updated from transifex
2015-12-06 01:54:33 -05:00
Jenkins for ownCloud
f0b1ba713d
[tx-robot] updated from transifex
2015-12-05 01:55:14 -05:00
Morris Jobke
4548a0aa90
Remove OC_Util::getUrlContent and replace by proper usage of public interfaces
2015-12-04 18:02:47 +01:00
Vincent Petry
316b907a13
Fixed system tags DAV and API and docs
2015-12-04 17:30:50 +01:00
Morris Jobke
46a6c6d70b
remove OC_App::getActiveNavigationEntry - not unsed anymore
2015-12-04 17:26:28 +01:00
Morris Jobke
e6d4496fc2
Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\App
2015-12-04 17:23:51 +01:00
Lukas Reschke
d522797227
Use correct method signature
...
This function takes only one parameter
2015-12-04 15:52:42 +01:00
Roeland Jago Douma
11d8b336e2
[Sharing] Properly check if a group already has access
...
The old code check was to liberal resulting in wrong matches if a user
with the same name as the group already had access.
Fixes 20892
2015-12-04 12:22:21 +01:00
Thomas Müller
6034c9142d
Merge pull request #20933 from owncloud/more-OC_Config-cleanups
...
More cleanups of OC_Config usage
2015-12-04 09:06:47 +01:00
Jenkins for ownCloud
a2848af625
[tx-robot] updated from transifex
2015-12-04 01:56:31 -05:00
Thomas Müller
602b636d3e
Merge pull request #20807 from owncloud/dont-append-redirect-url-if-user-is-already-logged-in
...
Don't append redirect URL if user is logged-in
2015-12-03 16:53:59 +01:00
Thomas Müller
2ceae43989
Merge pull request #20545 from owncloud/scan-storage-in-background-job
...
Move files/ajax/scan.php to background job
2015-12-03 16:53:46 +01:00
Morris Jobke
c60c793cf2
More cleanups of OC_Config usage
2015-12-03 16:41:23 +01:00
Thomas Müller
1fe7957fd0
Merge pull request #20924 from owncloud/use-url-generator-to-generate-link
...
Use URLGenerator instead of hard-coded WEBROOT
2015-12-03 15:26:14 +01:00
Vincent Petry
cc72c6a30d
Added dav endpoints for system tags
2015-12-03 15:23:21 +01:00
Lukas Reschke
1f69dcb593
Use URLGenerator instead of hard-coded WEBROOT
...
Fixes https://github.com/owncloud/core/issues/20922
2015-12-03 14:42:14 +01:00
Morris Jobke
aa0265bd34
Replace OC_Config in setup
2015-12-03 14:35:15 +01:00
Thomas Müller
2d1cc8aaeb
Merge pull request #19461 from owncloud/reuse_code
...
reuse code
2015-12-03 13:55:50 +01:00
Robin Appelman
19b2fe6a3a
Fix mimetype filter in getDirectoryContent
2015-12-03 13:09:13 +01:00
Jesús Macias
9dd11091d4
Fix code from comments
2015-12-03 10:00:11 +01:00
Jesús Macias
98f5c50aa4
Migrate storate status code to storagenotavailablexception
2015-12-03 09:59:45 +01:00
Jesús Macias
4ead2bc861
Fix code from PR comments
2015-12-03 09:58:55 +01:00
Jesús Macias
7cd13f462a
Add new external storage exceptions for different errors
2015-12-03 09:57:59 +01:00
Thomas Müller
e7239b6553
Merge pull request #20872 from owncloud/systemtags-better-not-found-exception
...
Systemtags better not found exception
2015-12-03 09:26:05 +01:00
Thomas Müller
a5c80ba8bc
Merge pull request #20894 from owncloud/post-delete-meta-view
...
Also add metadata for postDelete hooks triggered from the view
2015-12-03 09:24:54 +01:00
Thomas Müller
7fefd4f4d9
Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place
...
User IUser::getEMailAddress() all over the place
2015-12-03 09:21:53 +01:00
Thomas Müller
09600058d0
Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff
...
Replace old config code with usage of proper APIs
2015-12-02 21:54:42 +01:00
Thomas Müller
dcc7ff09ba
Adding unit test for MailNotifications::sendInternalShareMail()
2015-12-02 21:42:14 +01:00
Thomas Müller
eebe2b9c23
User IUser::getEMailAddress() all over the place
2015-12-02 21:25:05 +01:00
Thomas Müller
df5872ec50
Merge pull request #20719 from owncloud/adding-system-addressbook-of-users
...
Adding system addressbook for users of this instance - a occ command …
2015-12-02 16:17:58 +01:00
Morris Jobke
37ecde065b
Replace old config code with usage of proper APIs
2015-12-02 15:56:59 +01:00
Morris Jobke
baecfc4080
Reduce OC_Config usage in lib/
...
* replaced by proper public interfaces
2015-12-02 14:49:40 +01:00
Thomas Müller
28ceab2f61
Fix endless recursion
2015-12-02 14:44:41 +01:00
Robin Appelman
0062888aaf
Also add metadata for postDelete hooks triggered from the view
2015-12-02 13:51:26 +01:00
Thomas Müller
8d218bf3ef
Merge pull request #20875 from owncloud/remove-changepropagator
...
remove old propagation logic
2015-12-02 13:03:31 +01:00
Lukas Reschke
4d9af08f12
Execute only for web and not for CLI
2015-12-02 11:49:33 +01:00
Lukas Reschke
09d9e430d8
Add a trailing slash to generated URLs
2015-12-02 11:27:07 +01:00
Lukas Reschke
125b7e7512
Ensure that ownCloud is always accessed with a trailing slash
2015-12-02 11:26:41 +01:00
Thomas Müller
812a390f32
Merge pull request #20879 from owncloud/check-if-rewrite-base-is-set-if-rewrite-is-active
...
Check if rewrite base is set if rewrite is active
2015-12-02 10:56:44 +01:00
Thomas Müller
c46ea30248
Merge pull request #20865 from owncloud/post-delete-meta
...
Add metadata to post delete hooks
2015-12-02 10:12:54 +01:00
Thomas Müller
f840d8dee7
Merge pull request #20874 from owncloud/allow-di-mimetypedetector
...
Allow DI for OCP\Files\IMimeTypeDetector
2015-12-02 10:12:35 +01:00
Thomas Müller
0bd0212731
Merge pull request #20877 from owncloud/fix-empty-expirationDate
...
Check the expiration date for null
2015-12-02 10:12:16 +01:00
Thomas Müller
4c695e63c0
Fix comments
2015-12-02 09:20:58 +01:00
Thomas Müller
0391cc0451
Fix getCloudId
2015-12-02 09:14:41 +01:00
Thomas Müller
6abc02cb88
Proposal: add enumeration function to IUserManager which simply calls a callbask for each user in all backends
2015-12-02 09:14:41 +01:00
Thomas Müller
df6fc6cc70
Add the user's cloud id to the vCard
2015-12-02 09:14:41 +01:00
Thomas Müller
dad6470baa
Add IUser::getAvatarImage() for easy access
2015-12-02 09:14:41 +01:00
Jenkins for ownCloud
4f4b91a9ec
[tx-robot] updated from transifex
2015-12-02 02:00:28 -05:00
Roeland Jago Douma
b00db2c933
DI in avatar code
...
* DI in avatar code
* Use the node API
* More unit tests
* Unit tests no longer require DB
2015-12-01 22:15:43 +01:00
Lukas Reschke
6a067b1ec9
Set RewriteBase to / if OC::WEBROOT is not set
2015-12-01 22:03:25 +01:00
Lukas Reschke
002e719789
Set "SetEnv" within base `.htaccess` file
...
mod_rewrite as used by the front controller may require a `RewriteBase` in case the installation is done using an alias. Since we cannot enforce a writable `.htaccess` file this will move the `front_controller_active` environment variable into the main .htaccess file. If administrators decide to have this one not writable they can still enable this feature by setting the `front_controller_active` environment variable within the Apache config.
2015-12-01 19:06:48 +01:00
Morris Jobke
3061e5d2fc
Check the expiration date for null
...
* null is always less than any value -> expirationDate gets null
which is "no date set"
* ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075
2015-12-01 17:43:05 +01:00
Robin Appelman
62cc316c6a
remove old propagation logic
2015-12-01 16:50:20 +01:00
Joas Schilling
44852ce324
Allow DI for OCP\Files\IMimeTypeDetector
2015-12-01 16:49:20 +01:00
Lukas Reschke
2515cb17be
Support pretty URLs
...
This changeset allows ownCloud to run with pretty URLs, they will be used if mod_rewrite and mod_env are available. This means basically that the `index.php` in the URL is not shown to the user anymore.
Also the not deprecated functions to generate URLs have been modified to support this behaviour, old functions such as `filePath` will still behave as before for compatibility reasons.
Examples:
http://localhost/owncloud/index.php/s/AIDyKbxiRZWAAjP => http://localhost/owncloud/s/AIDyKbxiRZWAAjP
http://localhost/owncloud/index.php/apps/files/ => http://localhost/owncloud/apps/files/
Due to the way our CSS and JS is structured the .htaccess uses some hacks for the final result but could be worse... And I was just annoyed by all that users crying for the removal of `index.php` ;-)
2015-12-01 16:46:07 +01:00
Thomas Müller
74e8c25a5b
Merge pull request #20285 from owncloud/add-integrity-checker
...
Add code integrity checker foundation
2015-12-01 15:27:50 +01:00
Joas Schilling
1d0c041ac8
Add a method to get the list of tags from the TagNotFound Exception
2015-12-01 14:54:34 +01:00
Robin Appelman
0d63e95a5d
Add metadata to post delete hooks
2015-12-01 13:22:58 +01:00
Joas Schilling
1761fdd9ee
Fix the docs of the exceptions and remove hardcoded language from the message
2015-12-01 12:32:50 +01:00
Lukas Reschke
4971015544
Add code integrity check
...
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release 😉 ). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png )
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-12-01 11:55:20 +01:00
Joas Schilling
3c5a6b829e
Allow DI the system tag stuff without Application class
2015-11-30 17:08:29 +01:00
Thomas Müller
08248f66ba
Merge pull request #20650 from owncloud/systemtags-core
...
Implement systemtag managers and mapper
2015-11-30 15:38:43 +01:00
Thomas Müller
995ceeb8d9
Merge pull request #20815 from owncloud/avatar-cache-size
...
cache resized avatars
2015-11-30 14:27:05 +01:00
Thomas Müller
fc21aa6c41
Merge pull request #20248 from owncloud/use-phpunit-groups-to-run-database-code-in-isolation
...
Use phpunit groups to run database code in isolation
2015-11-30 14:25:35 +01:00
Lukas Reschke
f4eb15d340
Show error template
...
Otherwise this leads to an endless redirection in case of a CSRF exception. Also sets user expectation right.
2015-11-30 11:25:52 +01:00
Thomas Müller
a94819f4a4
Merge pull request #20809 from owncloud/dont-trust-update-server-message
...
Don't trust update server
2015-11-30 11:20:30 +01:00
Thomas Müller
f9fc254672
Add DB group to some files_external tests
...
Adding group Db to federation tests and ldap tests
Add group DB to Test_UrlGenerator
Adding group DB to trashbin and versions tests
Adding group DB to Test_Util_CheckServer for pg
2015-11-30 10:55:10 +01:00
Joas Schilling
c4bebf66d4
Do not count the entries when we only need to know if it is at least one
2015-11-30 10:20:00 +01:00
Joas Schilling
aa1a0a15ea
Fix use statements
2015-11-30 10:12:15 +01:00
Thomas Müller
9c1dbaf0ad
Merge pull request #20788 from owncloud/catch-missing-route
...
Dont die when we're missing a route
2015-11-30 10:11:12 +01:00
Joas Schilling
6816b36cdb
Add backticks inside function to escape the column
2015-11-30 10:07:00 +01:00
Vincent Petry
17ce120736
Revert "Dont bother with stream_resolve_include_path if the path is already absolute"
2015-11-29 10:54:29 +01:00
Robin Appelman
6b7e748245
cache resized avatars
2015-11-28 17:33:16 +01:00
Lukas Reschke
391bc49dab
Move files/ajax/scan.php to background job
...
The background job will now be executed in chunks of 500 users all 10 minutes.
2015-11-28 13:06:53 +01:00
Lukas Reschke
f3e9106864
Don't trust update server
...
In case the update server may deliver malicious content this would allow an adversary to inject arbitrary HTML into the response. So very bad stuff.
While signing the response would be better and something we can also do in the future (considering the code signing work), this is already a good first start.
2015-11-28 12:21:53 +01:00
Robin Appelman
4c4331982c
Merge pull request #20789 from owncloud/scanner-skip-not-available
...
Skip unavailable storages in scanner
2015-11-27 22:57:47 +01:00
Vincent Petry
b666367a79
Added system tags data structure and PHP side managers
...
Added SystemTagManager and SystemTagObjectMapper
2015-11-27 17:54:29 +01:00
Thomas Müller
2b316eaa83
Merge pull request #20792 from owncloud/autoloader-absolute-paths
...
Dont bother with stream_resolve_include_path if the path is already absolute
2015-11-27 16:03:39 +01:00
Robin Appelman
b05c8faba8
Dont die when we're missing a route
2015-11-27 14:29:06 +01:00
Robin Appelman
816cd66b4b
also log exception
2015-11-27 14:28:15 +01:00
Thomas Müller
bdbefe17d6
Merge pull request #20782 from mitar/better-https
...
Also allow empty value for no-HTTPS
2015-11-27 14:24:23 +01:00
Robin Appelman
50474c6041
Dont bother with stream_resolve_include_path if the path is already absolute
2015-11-27 14:12:14 +01:00
Robin Appelman
ae71f80f4a
Skip unavailable storages in scanner
2015-11-27 14:02:50 +01:00
Mitar
59511d97ee
Also allow empty value for no-HTTPS.
...
This makes it work better with old version of Nginx.
2015-11-27 01:01:56 -08:00
Morris Jobke
7aed592957
Add full interface of server container as alias
2015-11-26 18:20:25 +01:00
Thomas Müller
8fe878afe9
Merge pull request #20602 from owncloud/fix-installed-apps
...
Always installed apps includes the hardcoded ones from shipped.json
2015-11-26 16:50:05 +01:00
Thomas Müller
80c43ffc6c
Merge pull request #20702 from owncloud/move-user-principal-into-subfolder
...
Users are available under it's own principal resource named 'principa…
2015-11-26 16:49:49 +01:00
Thomas Müller
19d5059109
Merge pull request #20393 from owncloud/querybuilder-select-with-alias
...
Add a method to select a field or value with alias
2015-11-26 16:19:20 +01:00
Thomas Müller
97ebc6d80c
Merge pull request #20746 from owncloud/untangle-linkToDocs
...
Untangle the linkToDocs method in OC_Helper
2015-11-26 15:08:28 +01:00
Thomas Müller
4d22c75d49
Merge pull request #20562 from owncloud/comments-interfaces
...
public interfaces for Comments
2015-11-26 15:06:35 +01:00
Morris Jobke
675417a75c
Untangle the linkToDocs method in OC_Helper
...
* now uses the proper URLGenerator interface
* add comment about DI problems
2015-11-26 13:58:43 +01:00
Thomas Müller
3882cc8ef3
Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup
...
Remove last occurences of OC_Helper::getMimeType()
2015-11-26 12:37:25 +01:00
Arthur Schiwon
d660c6162f
proper description for IllegalIDChangeException
2015-11-26 12:15:00 +01:00
Thomas Müller
5a33390a69
Merge pull request #20731 from owncloud/per-storage-updater
...
Make Cache\Updater per storage
2015-11-26 12:01:44 +01:00
Morris Jobke
0b8296a756
remove unused method
2015-11-26 10:58:30 +01:00
Morris Jobke
4fcab98694
Remove unused internal methods
...
* removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace
* keeps public interface wrapper working as expected
2015-11-26 10:25:43 +01:00
Morris Jobke
9318606faf
Remove last occurences of OC_Helper::getMimeType()
...
* ref #4774
2015-11-26 10:18:32 +01:00
Thomas Müller
b799e42b4e
Introduce \OCP\IUser::getEMailAddress()
2015-11-25 22:23:34 +01:00
Thomas Müller
9ec2f8886e
Merge pull request #20691 from owncloud/share2.0_di_fixes
...
[Sharing 2.0] di fixes
2015-11-25 15:25:50 +01:00
Thomas Müller
afe76840f8
Merge pull request #20705 from owncloud/fix_20648
...
Fix overriding function from 3rdparty warning
2015-11-25 15:24:20 +01:00
Robin Appelman
b025f07fb7
Make Cache\Updater per storage
2015-11-25 14:16:00 +01:00
Thomas Müller
50f6817ce9
Merge pull request #20439 from owncloud/etag-propagate-in-storage
...
Take submount etag into account for folder etags
2015-11-25 12:49:54 +01:00
Thomas Müller
89b9f5518b
Merge pull request #20636 from owncloud/savre-3.0
...
sabre/dav 3.0 and related
2015-11-24 16:20:48 +01:00
Thomas Müller
4bb346a1e6
Merge pull request #20692 from owncloud/federation_auto_add_servers
...
auto-add ownClouds to the list of trusted servers
2015-11-24 16:19:39 +01:00
Thomas Müller
ae36c01b95
Adjust sabre changes in core
2015-11-24 15:11:54 +01:00
Roeland Jago Douma
cfdf2b9976
Fix overriding function from 3rdparty warning
...
Fixes #20648
2015-11-24 13:25:50 +01:00
Björn Schießle
964fa1fce3
use hooks to auto add server to the list of trusted servers once a federated share was created
2015-11-24 11:34:38 +01:00
Thomas Müller
b7b6770d35
Merge pull request #20693 from owncloud/phpdoc_node
...
Consistent interface declaration OCP\Files\Node
2015-11-24 10:56:53 +01:00
Thomas Müller
d785883eb2
Merge pull request #20682 from owncloud/objectid-to-string
...
Make sure that object id can be a string
2015-11-24 10:56:34 +01:00
Roeland Jago Douma
85976b7293
[Sharing 2.0] Fix phpdoc etc
2015-11-24 10:26:36 +01:00
Roeland Jago Douma
a2b8483779
[Sharing 2.0] Default share provider only generic DI
...
No injection of userfolders etc. Only generic DI components
(IRootFolder) etc should be used to make sure we can also run this from
the cli
2015-11-24 10:26:36 +01:00
Roeland Jago Douma
aeae73b364
[Sharing 2.0] Removed unused DI stuff
...
The share manager etc should not care about filtering stuff. They should
return what is asked for them.
2015-11-24 10:26:36 +01:00
Jenkins for ownCloud
cb69e6c201
[tx-robot] updated from transifex
2015-11-24 01:56:32 -05:00
Arthur Schiwon
ab8937ba6a
missing setters for setChildrenCount and setLatestChildDateTime (formerly …Timestamp)
2015-11-23 23:58:22 +01:00
Roeland Jago Douma
5873821b8d
Consistent interface declaration
2015-11-23 22:03:19 +01:00
Arthur Schiwon
4005c0337b
give creation datetime setter and getter a more meaningful and less misleading name
2015-11-23 17:32:22 +01:00
Arthur Schiwon
d43abd0b8f
public interfaces for Comments
2015-11-23 17:21:11 +01:00
Joas Schilling
018bd3ee24
Make sure that object id can be a string
2015-11-23 14:18:15 +01:00
Morris Jobke
728648ad77
Replace new occurences of ini_get with IniWrapper methods
2015-11-23 14:12:36 +01:00
Clark Tomlinson
9caf4ffbfc
Replacing ini_get instances with inigetwrapper usages
2015-11-23 14:12:31 +01:00
Thomas Müller
021137d7ae
Merge pull request #20679 from owncloud/fixphpdoc
...
p() supports string as argument
2015-11-23 13:32:46 +01:00
Thomas Müller
df906f475b
Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId
...
lastInsertId() is properly working with Oracle if the table name is p…
2015-11-23 13:29:08 +01:00
Thomas Müller
240cc1c4ea
Merge pull request #20543 from owncloud/share2.0_fix_hooks
...
Move hook and delete children logic to share manager
2015-11-23 13:28:49 +01:00
Joas Schilling
1c7d7288c4
Add a method to select a field or value with alias
2015-11-23 13:28:31 +01:00
Roeland Jago Douma
1360e22d7c
[Sharing 2.0] Move hook and delete children logic to share manager
...
To make sure hooks are always fired and child entries are always
cleaned. This logic is moved to the share manager.
* Updated unit tests
2015-11-23 12:28:54 +01:00
Morris Jobke
7138659080
p() supports string as argument
2015-11-23 12:11:23 +01:00
Thomas Müller
aa660ec232
Throw an exception in case no table name is passed into lastInsertId of the Oracle adapter
2015-11-23 11:44:08 +01:00
Thomas Müller
9f69021691
lastInsertId() is properly working with Oracle if the table name is properly passed in
2015-11-23 11:44:08 +01:00
Joas Schilling
a370c29068
Use a DateTime object instead of a timestamp
2015-11-23 11:41:48 +01:00
Individual IT Services
1835462ec4
reuse code
2015-11-23 11:02:46 +01:00
Thomas Müller
79bbda994b
Merge pull request #16902 from owncloud/jsocclient
...
Web UI uses Webdav instead of ajax/* calls
2015-11-23 09:38:01 +01:00
Thomas Müller
2f89eef334
Merge pull request #20524 from owncloud/pgsql-version-check-error
...
assume pgsql >=9 if checking the version fails
2015-11-23 09:05:13 +01:00
Jenkins for ownCloud
56e05a90af
[tx-robot] updated from transifex
2015-11-23 01:54:53 -05:00
Robin Appelman
2d7c9f0ba9
also match ie11 with Request::USER_AGENT_IE
2015-11-22 16:05:52 +01:00
Vincent Petry
a05e40932c
Now using IE8 workaround of davclient.js for all IE versions
2015-11-22 16:05:52 +01:00
Thomas Müller
358858c9e3
Fix undefined HTTP_USER_AGENT
2015-11-22 16:05:50 +01:00
Vincent Petry
fb3d5c7856
Add evert's davclient.js + es6-promise + IE8 workaround
...
- Add davclient.js lib
- Add es6-promise required by that lib
- Wrote IE8 workaround lib/shim for davclient.js
2015-11-22 16:05:49 +01:00
Jenkins for ownCloud
2321cc4854
[tx-robot] updated from transifex
2015-11-22 01:54:53 -05:00
Thomas Müller
427d107b9f
Merge pull request #20614 from owncloud/use-mocks-when-testing-isSharingDisabledForUser
...
Use mocks when testing isSharingDisabledForUser
2015-11-20 15:22:52 +01:00
Thomas Müller
c86483f3ed
Adjust PHPDoc as suggested
2015-11-20 14:38:29 +01:00
Thomas Müller
479cee66f4
Merge pull request #20034 from owncloud/icewind_streams_0.3.0
...
Bump 3rdparty for icewind/streams-0.3.0
2015-11-19 17:27:30 +01:00
Thomas Müller
c565a7b042
Fix failing unit test 💀
2015-11-19 16:44:43 +01:00
Joas Schilling
ea2bf49be0
Adjust the method name to reflect it's behaviour
2015-11-19 16:08:21 +01:00
Thomas Müller
30dd610a2a
Merge pull request #20563 from owncloud/systemtags-interface
...
Core interfaces for system tags and its manager
2015-11-19 15:47:47 +01:00
Thomas Müller
9ec2850c78
Use mocks when testing isSharingDisabledForUser
2015-11-19 15:36:16 +01:00
Roeland Jago Douma
ca6bd5cacd
Follow the interface again
2015-11-19 14:34:59 +01:00
Robin Appelman
888df3933d
take the etag of child mounts into account for the folder etag
...
this replaces shared etag propagation
2015-11-19 13:32:00 +01:00
Robin Appelman
d006a7c723
Fix scanning of incomplete folders
2015-11-19 13:30:50 +01:00
Robin Appelman
02f847bc66
use relative path
2015-11-19 13:30:50 +01:00
Robin Appelman
d5061b8139
fix fileinfo for non existing files
2015-11-19 13:30:50 +01:00
Robin Appelman
1736c70075
Some more cleanup for getFIleInfo/getDirectoryContent
2015-11-19 13:30:50 +01:00
Robin Appelman
02be8a3a12
Split getting cache entry and checking update to a seperate method
2015-11-19 13:29:12 +01:00
Vincent Petry
ea6341df29
Core interfaces for system tags and its manager
2015-11-19 11:31:25 +01:00
Morris Jobke
1189528e1f
Always installed apps includes the hardcoded ones from shipped.json
...
* fixes #20568
2015-11-19 09:11:14 +01:00
Jenkins for ownCloud
c10be07c1b
[tx-robot] updated from transifex
2015-11-19 01:55:13 -05:00
Robin Appelman
71b86c0ed4
Handle non existing users as owner in the view
2015-11-18 17:08:18 +01:00
Thomas Müller
8d74e28af6
Merge pull request #20438 from owncloud/memcache-key-length-fix
...
Handle errors on memcached level
2015-11-18 14:20:57 +01:00
Thomas Müller
6efa72867a
Merge pull request #20540 from owncloud/fix-format-call-in-logger
...
Try to fix logging errors we did observe on ci ....
2015-11-18 09:18:54 +01:00
Thomas Müller
aba119951e
Merge pull request #20494 from owncloud/storage-forbidden-exception
...
Allow storage wrappers to through a forbidden exception with retry information for clients
2015-11-18 09:13:45 +01:00
Thomas Müller
8db9c49cda
Merge pull request #20551 from owncloud/notification-fix-tests
...
Notification - Add tests for the "return $this" and fix it on the new method
2015-11-18 09:12:27 +01:00
Thomas Müller
20c251a575
Merge pull request #20188 from owncloud/webdav-exposeshareowner
...
Expose share owner id and display name via files webdav
2015-11-17 13:40:25 +01:00
Thomas Müller
74ce6d29e1
Merge pull request #20544 from owncloud/move-index-to-appframework
...
Move index.php from files to AppFramework
2015-11-17 12:49:38 +01:00
Joas Schilling
e2cfcd992c
Allow storage wrappers to through a forbidden exception with retry information
2015-11-17 10:39:52 +01:00
Joas Schilling
2fde6a77d7
Add tests for the "return $this" and fix it on the new method
2015-11-17 09:26:13 +01:00
Thomas Müller
705d208a8a
Merge pull request #20539 from owncloud/notification-api-adjustment
...
Notification api update
2015-11-17 08:39:06 +01:00
Lukas Reschke
daa388ce8d
Move index.php from files to AppFramework
...
1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.
2015-11-16 21:10:11 +01:00
Thomas Müller
6ffd042a64
fixes #20538
2015-11-16 16:29:21 +01:00
Joas Schilling
40d5d55124
Remove the icon for now
2015-11-16 16:17:23 +01:00
Joas Schilling
1666af89c2
Add "is primary action" to actions
2015-11-16 16:14:52 +01:00
Thomas Müller
8169e4fdc8
Merge pull request #20465 from owncloud/forms.css
...
Move form styles from styles.css to inputs.css
2015-11-16 15:29:02 +01:00
Roeland Jago Douma
1e9fc33212
[Share2.0] OCS Share API getShare uses new code
2015-11-16 13:32:28 +01:00
Robin Appelman
cc1db4ba87
assume pgsql >=9 if checking the version fails
2015-11-16 13:11:32 +01:00
Vincent Petry
84e5b76d3c
Add getOwner() method to FileInfo and Node API
2015-11-13 10:41:33 +01:00
Hendrik Leppelsack
7ab56de58b
move form styles from styles.css to inputs.css
2015-11-13 00:19:57 +01:00
Thomas Müller
aff4aed43c
Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precision
...
enable microseconds in log timestamps
2015-11-12 17:30:32 +01:00
Christian Schnidrig
d0464bf772
enable microseconds in log timestamps
2015-11-12 10:33:20 +01:00
Thomas Müller
3248db05f1
Merge pull request #17920 from andyboeh/master
...
Add possibility for alternative logins to force redirection of login page
2015-11-12 10:15:23 +01:00
Thomas Müller
af05be1ac7
Merge pull request #20461 from owncloud/assetpipeline-on-upgrade
...
Do not use the asset pipeline when doing updates
2015-11-12 08:51:30 +01:00
Jenkins for ownCloud
9145aa607a
[tx-robot] updated from transifex
2015-11-12 01:55:09 -05:00
Joas Schilling
c9753655dc
Do not use the asset pipeline when doing updates
2015-11-11 18:18:33 +01:00
Jenkins for ownCloud
5dd59b4bd2
[tx-robot] updated from transifex
2015-11-11 01:55:47 -05:00
Thomas Müller
c9b671a12f
Handle errors on memcached level - fixes #17397
2015-11-10 15:58:17 +01:00
Robin Appelman
bbe2f5c2d5
Merge pull request #20224 from owncloud/fileinfo-owner
...
Add getOwner to FileInfo
2015-11-10 14:36:15 +01:00
Thomas Müller
cc4321317e
Merge pull request #20428 from owncloud/add-log-statement-for-trusted-domain-error
...
Add warning log entry when user accesses untrusted domain
2015-11-10 13:19:27 +01:00
Lukas Reschke
ba67dd9818
Add warning log entry when user accesses untrusted domain
2015-11-10 12:02:10 +01:00
Thomas Müller
480bf14698
Merge pull request #20389 from owncloud/storage_not_available
...
use a HintException to have some useful user output in case of an error
2015-11-10 11:53:47 +01:00
Robin Appelman
331ef0e3c0
Add getOwner to FileInfo
2015-11-10 10:55:29 +01:00
Björn Schießle
2960a208cd
use a HintException to have some useful user output in case of an error
2015-11-10 10:54:17 +01:00
Thomas Müller
422d29ae48
Merge pull request #20373 from owncloud/use-random-int-if-it-exists
...
Use native CSPRNG if available
2015-11-10 10:10:23 +01:00
Robin Appelman
960c8cb5bc
Merge pull request #16604 from owncloud/cache-escape-like
...
escape like parameter in cache operations
2015-11-10 09:45:00 +01:00
Thomas Müller
f8e020ff87
Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirement
...
Do not allow two different version requirements
2015-11-10 00:27:05 +01:00
Roeland Jago Douma
402e0afbc5
Fix Error message when sharing outside of group
...
For #19788
2015-11-09 15:52:17 +01:00
Lukas Reschke
045ea4eb2b
Use native CSPRNG if available
...
Unfortunately only PHP 7…
2015-11-09 15:04:22 +01:00
Joas Schilling
fe04451cb1
Do not allow two different version requirements
2015-11-09 11:10:37 +01:00
Jenkins for ownCloud
f8637b6082
[tx-robot] updated from transifex
2015-11-08 01:55:13 -05:00
Roeland Jago Douma
0bb5eadf89
[autoloader] Make sure to load construct full paths
...
This reduces a lot of the autoloader magic and makes sure that we
generate full paths in the autoloader.
2015-11-06 13:36:19 +01:00
Thomas Müller
cc4f4f222d
Merge pull request #20348 from owncloud/issue-20303-integer-group-names
...
Make sure that group names are strings not integers
2015-11-06 11:48:40 +01:00
Thomas Müller
8047597a81
Merge pull request #20288 from owncloud/fix_20234
...
make sure that we update the unencrypted size for the versions
2015-11-06 11:17:17 +01:00
Joas Schilling
292dc553c3
Make sure that group names are strings not integers
2015-11-06 10:40:09 +01:00
Robin Appelman
d36e1bbab2
escape like parameter for move queries
2015-11-05 16:41:33 +01:00
Robin Appelman
d514200b56
Add escapeLikeParameter to IDBConnection
2015-11-05 16:41:30 +01:00
Robin Appelman
b05e1b6ed3
define escape character for like statements on oracle
2015-11-05 16:29:35 +01:00
Robin Appelman
b394fe8709
define escape character for like statements on sqlite
2015-11-05 16:28:54 +01:00
Robin Appelman
236c3c62cc
move from OC_DB to IDBConnection
2015-11-05 16:25:02 +01:00
Roeland Jago Douma
0be05fdddd
Add unshare hooks
2015-11-05 15:59:09 +01:00
Roeland Jago Douma
6624fa212a
The new sharing code now handles deletion
...
OCS -> ShareManager -> DefaultShareProvider
2015-11-05 15:59:09 +01:00
Roeland Jago Douma
9567fa1194
Initial setup of shareing 2.0 sharemanager and share
...
* Added sharemanager class
This is the central class where all API calls talk to (OCS/Activity).
This in turn talks to the share providers to get the actual sharing
done.
It uses all ShareObjects
* Added share class
Simple class to hold all the share properties that is passed around
* Added IShareProvider interface
Interface that providers os a share have to implement.
2015-11-05 15:59:08 +01:00
Arthur Schiwon
51ead4e59b
subadmin methods should not return any null user or group
2015-11-05 11:50:57 +01:00
Thomas Müller
6e7461f64c
Merge pull request #20320 from owncloud/drop-file_map
...
Drop unused table file_map
2015-11-05 10:03:41 +01:00
Morris Jobke
3778680f3f
Drop unused tables principalgroups and principals
...
* was removed in 3e84f170e7
2015-11-05 08:40:21 +01:00
Morris Jobke
6b6f19bb94
Drop unused table file_map
...
* used only for windows support
* windows support was dropped in 8.2.0 - see #17379
* was introduced in fd8cb9974b
* ref #18935
2015-11-05 08:21:53 +01:00
Jenkins for ownCloud
2f4fa5b49c
[tx-robot] updated from transifex
2015-11-05 01:55:14 -05:00
Thomas Müller
ba02a3771b
Merge pull request #20053 from owncloud/getfileinfo-locking
...
Don't lock if we're only reading cache metadata
2015-11-04 22:40:17 +01:00
Robin Appelman
a2cfbd975a
mark path as checked
2015-11-04 16:34:39 +01:00
Björn Schießle
d1a090e3e2
adjust comment, this parameter was added for 9.0
2015-11-04 15:12:22 +01:00
Robin Appelman
c487f0f138
when a file is locked use old cache data
2015-11-04 14:45:10 +01:00
Thomas Müller
bb216feeb2
Merge pull request #18361 from owncloud/sharing_performance_improvements
...
improve calculation of share recipients
2015-11-04 14:44:31 +01:00
Robin Appelman
0a56313ca4
fix whitespace
2015-11-04 14:41:03 +01:00
Björn Schießle
6d0a324144
make sure that we update the unencrypted size for the versions
2015-11-04 10:59:05 +01:00
Thomas Müller
c59ca9203d
Merge pull request #18821 from owncloud/global-classes
...
Global classes in core CSS
2015-11-04 10:30:10 +01:00
Bjoern Schiessle
4719305e3b
cache result from parent folders
2015-11-04 09:27:29 +01:00
Jenkins for ownCloud
7fe047425f
[tx-robot] updated from transifex
2015-11-04 01:55:44 -05:00
Robin Appelman
fc7f7e5c37
only lock in getDirectoryContent if we need to update the cache
2015-11-03 18:23:22 +01:00
Robin Appelman
4f2656993e
only lock in getFileInfo if we need to update the cache
2015-11-03 18:23:22 +01:00
Robin Appelman
0397871f7e
Split checkUpdate
2015-11-03 18:23:22 +01:00
Thomas Müller
b2a437ffff
Add a new core capability which tells the clients which url to use
2015-11-03 14:27:36 +01:00
Thomas Müller
620dc7ce22
Merge pull request #20196 from owncloud/use-actual-mimetype-detection-instead-of-oath
...
Use actual mimetype detection instead of extension
2015-11-02 17:36:13 +01:00
Raghu Nayyar
56b537271e
Global Classes for Core.
...
Move up the global styles up the hierarchy.
Adds Clear Left, Right and both.
New CSS file for Global Styles.
2015-11-02 20:54:02 +05:30
Thomas Müller
b6ca23afe1
Merge pull request #20189 from owncloud/use-get-http-protocol
...
Use getHttpProtocol instead of $_SERVER
2015-11-02 10:13:41 +01:00
Jenkins for ownCloud
2374a0df5d
[tx-robot] updated from transifex
2015-11-01 01:54:58 -04:00
Lukas Reschke
40ae54d60a
Use actual mimetype detection instead of extension
...
We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
2015-10-31 00:55:37 +01:00
Lukas Reschke
78cad94ff4
Add support for Redis password auth
...
For enhanced security it is recommended to configure Redis to only accept connections with a password. (http://redis.io/topics/security )
This is especially critical since Redis supports the LUA scripting language and thus a simple SSRF vulnerability (as proven in http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/ for example) may lead to a remote code execution.
2015-10-30 20:19:23 +01:00
Lukas Reschke
bafb86fb9f
Use getHttpProtocol instead of $_SERVER
2015-10-30 18:05:30 +01:00
Morris Jobke
ef76998eda
Add warning for broken l10n json files
...
* makes it easier to spot broken l10n files
2015-10-30 09:10:16 +01:00
Jenkins for ownCloud
91b2cdc62b
[tx-robot] updated from transifex
2015-10-30 01:55:52 -04:00
Thomas Müller
73d9699be9
Merge pull request #20135 from owncloud/check-if-null-subadmin
...
Drop OC_SubAdmin and replace usages
2015-10-29 17:07:45 +01:00
Robin Appelman
c30a68e2f8
Merge pull request #20060 from owncloud/cache-move-final-update-transaction
...
include the final update in the transaction when moving a folder in the cache
2015-10-29 16:45:59 +01:00
Thomas Müller
1ce911d2f9
Merge pull request #19592 from owncloud/availability-root-always-exists
...
The root of a storage always exists
2015-10-29 14:14:56 +01:00
Robin Appelman
01d3393b7b
include the final update in the transaction when moving a folder in the cache
2015-10-29 12:34:49 +01:00
Thomas Müller
530f7229e7
Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename
...
On rename, also refresh storage_mtime of the target file
2015-10-29 11:57:00 +01:00
Lukas Reschke
c6f6a8758b
Drop OC_SubAdmin and replace usages
2015-10-29 11:31:18 +01:00
Thomas Müller
9ab44f1f00
Merge pull request #11509 from owncloud/internal_email_template
...
Allow separate templates for internal and external share notifications
2015-10-29 11:27:05 +01:00
Robin Appelman
33eb13e415
The root of a storage always exists
2015-10-29 11:21:50 +01:00
Stephen Colebrook
6feb31bf96
Allow separate templates for internal and external share notifications
2015-10-29 10:24:24 +01:00
Joas Schilling
e5a7e3124a
Add a repair step that checks for group membership on shares
2015-10-29 09:26:26 +01:00
Joas Schilling
ca2fd30073
Remove shares where the parent does not exist anymore
2015-10-29 09:26:26 +01:00
Jenkins for ownCloud
527ef76dd6
[tx-robot] updated from transifex
2015-10-29 01:55:45 -04:00
Thomas Müller
8ad3df9b9e
Merge pull request #19182 from cweiske/support-bzip2
...
Fix #19181 : Support .bz2 app archives
2015-10-28 14:05:11 +01:00
Thomas Müller
49e30abc82
Merge pull request #20102 from owncloud/fix_subadmin
...
Make \OC\SubAdmin php-5.4 compatible
2015-10-28 10:51:38 +01:00
Roeland Jago Douma
07fe1df8c1
Make \OC\SubAdmin php-5.4 compatible
...
* Also close some cursors while we are at it
2015-10-28 09:09:16 +01:00
Jenkins for ownCloud
d74811fcc8
[tx-robot] updated from transifex
2015-10-28 01:55:29 -04:00
Jenkins for ownCloud
0875a4a18f
[tx-robot] updated from transifex
2015-10-27 01:55:44 -04:00
Thomas Müller
40ba8d267f
Merge pull request #19837 from owncloud/always-enabled-apps
...
Store list of apps which cannot be disabled in shipped.json
2015-10-26 17:14:29 +01:00
Vincent Petry
b900782513
Also adjust storage_mtime of target after rename
...
Some storages like Dropbox change their mtime on rename...
2015-10-26 15:41:23 +01:00
Lukas Reschke
8f09d5b67c
Update license headers
2015-10-26 14:04:01 +01:00
Thomas Müller
7e3b4754f6
Merge pull request #20031 from owncloud/remove-dead-code
...
Remove dead code from autoloader
2015-10-26 11:07:56 +01:00
Thomas Müller
d4d954b2d9
Merge pull request #19982 from owncloud/fix-link-sharing-regression-master
...
Ensure the password is only hashed in case it's changed on the client…
2015-10-26 10:57:31 +01:00
Thomas Müller
2038b2ec34
Fail hard if shipped.json is missing
2015-10-26 09:53:04 +01:00
Thomas Müller
5a5bcccd0d
Don't show apps which are always enabled in the app manager
2015-10-26 09:53:04 +01:00
Thomas Müller
6fc59f85b6
Store list of apps which cannot be disabled in shipped.json
2015-10-26 09:53:04 +01:00
Lukas Reschke
ff1271c7f3
Remove dead code
...
Those variables are never written to. Thus this is dead code which should be removed.
2015-10-25 23:47:53 +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
Robin Appelman
9d7138aa50
Dont lock /$user/files
2015-10-23 14:59:16 +02:00
Roeland Jago Douma
9071e756a1
Fix for broken ajax/share.php endpoint
...
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
2015-10-23 09:24:03 +02:00
Volker Fröhlich
711e1235ea
Expose syslog tag in the configuration
2015-10-22 17:42:55 +02:00
Thomas Müller
4f5ff9c105
Ensure the password is only hashed in case it's changed on the client - fixes #19950
2015-10-22 17:32:40 +02:00
Thomas Müller
e471600834
Merge pull request #19890 from owncloud/db-keep-shared-locks
...
Keep shared locks until the end of the request so we can reuse them
2015-10-22 10:43:00 +02:00
Lukas Reschke
23e22c52b0
Use IRequest's `getScriptName` functionality instead of $_SERVER['SCRIPT_NAME']
2015-10-21 17:33:49 +02:00
Lukas Reschke
8133d46620
Remove dependency on ICrypto + use XOR
2015-10-21 17:33:41 +02:00
Thomas Müller
f7f2a160dd
Merge pull request #19918 from owncloud/send-begin-message
...
Update: state which step we are going to start and warn if it might b…
2015-10-21 14:52:19 +02:00
Thomas Müller
1060be0886
Merge pull request #19927 from owncloud/install-shipped-apps-on-upgrade
...
Install new shipped apps on upgrade
2015-10-21 14:43:27 +02:00
Roeland Jago Douma
c515628ebe
Legacy OC_SubAdmin is now just a wrapper
2015-10-21 11:32:38 +02:00
Roeland Jago Douma
0e9ab13943
New \OC\SubAdmin class
...
* DI
* Tests
* moved OC_SubAdmin to legacy
* Added to private OC\GroupManager
2015-10-21 11:32:38 +02:00
Thomas Müller
d8276af301
Install new shipped apps on upgrade -fixes #19925
2015-10-21 11:14:12 +02:00
Thomas Müller
d0aeb268d6
Merge pull request #19883 from owncloud/provide-iappcontainer
...
Provide IAppContainer as dependency injection
2015-10-21 10:49:26 +02:00
Thomas Müller
cf9b8fc182
Merge pull request #18184 from owncloud/ocs-merge-headers
...
Merge headers of ocs results
2015-10-21 10:36:37 +02:00
Robin Appelman
f39c73c79c
add phpdoc
2015-10-21 09:43:30 +02:00
Robin Appelman
cc7bd53d17
Keep shared locks until the end of the request so we can reuse them
2015-10-21 09:43:30 +02:00
Joas Schilling
9200bbeaba
Update: state which step we are going to start and warn if it might be slow
2015-10-21 09:17:38 +02:00
Jenkins for ownCloud
74f41349b7
[tx-robot] updated from transifex
2015-10-21 01:56:16 -04:00
Christian Weiske
a543d20958
Fix #19181 : Support .bz2 app archives
...
At first a bz2 handling in needs to be fixed; PEAR's Archive_Tar
otherwise gives the following error:
> Unsupported compression type "bz"
> Supported types are "gz", "bz2" and "lzma2"
After that we can whitelist the application/bz2 MIME type in the installer.
2015-10-20 21:56:24 +02:00
Thomas Müller
1a84c8e9d2
Merge pull request #19884 from owncloud/locking_exception
...
catch all exception if table doesn't exists
2015-10-20 13:44:00 +02:00
Thomas Müller
64dc222ce5
Merge pull request #19874 from owncloud/delete-cookie-instead-of-setting-value-to-empty
...
Delete cookie instead of emptying value
2015-10-20 12:47:46 +02:00
Björn Schießle
168c2055ba
catch all exception if table doesn't exists
2015-10-20 11:34:08 +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
Morris Jobke
a0743f12c6
Provide IAppContainer as dependency injection
2015-10-20 10:33:53 +02:00
Morris Jobke
5944b33d56
[OCI setup] remove static logger/config calls
...
* logger/config object are already injected - this only uses it
2015-10-20 08:53:57 +02:00
Jenkins for ownCloud
dfd44942c6
[tx-robot] updated from transifex
2015-10-20 01:55:03 -04:00
Lukas Reschke
5588c5f262
Delete cookie instead of emptying value
...
PHP will handle session cookies with an empty values as an E_WARNING error. ([php/#68063](https://bugs.php.net/bug.php?id=68063 ))
ownCloud sets the cookie to an empty value in case the session expires, it however after this starts a new session. Due to potential race conditions this can in unlikely cases lead to the fact that the session never gets restarted and the user is left with an empty cookie. PHP tries then to use the empty cookie which makes the instance not usable.
To work around any race condition we now tell PHP to explicitly delete the value which can be done by using `null` as value, PHP will then send a cookie with the value "deleted". Also theepiration has been set to -1.
2015-10-19 19:54:12 +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
Robin Appelman
9c5337ca3e
Merge pull request #19833 from owncloud/fix_view_rmdir
...
Removemount expects absolutePath
2015-10-19 16:22:42 +02:00
Thomas Müller
7fe7655070
The full name has to be tested if it's a dir - fixes #19854
2015-10-19 10:07:33 +02:00
Jenkins for ownCloud
008082ebad
[tx-robot] updated from transifex
2015-10-19 01:55:02 -04:00
Jenkins for ownCloud
8d25528c49
[tx-robot] updated from transifex
2015-10-18 01:55:07 -04:00
Jenkins for ownCloud
c378456137
[tx-robot] updated from transifex
2015-10-17 01:55:34 -04:00
Robin Appelman
0c6c36d0c5
fix objectstore files having create permissions
2015-10-16 21:41:51 +02:00
Robin Appelman
e46741cf5d
detect object homestorage in share code
2015-10-16 21:41:51 +02:00
Jörn Friedrich Dreyer
aab226cef7
don't move files in cache twice, fixes renaming for objectstores
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
Roeland Jago Douma
8fdb12f8fb
Check for error when resharing
2015-10-16 20:43:17 +02:00
Roeland Jago Douma
9e86d71cc5
When sharing with the owner show the path
...
The error message should contain the path that is being shared not the
numeric id.
2015-10-16 20:43:17 +02:00
Thomas Müller
a2ec080427
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory
2015-10-16 17:25:22 +02:00
Roeland Jago Douma
3a14cfc295
Removemount expects absolutePath
2015-10-16 14:14:00 +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
Jenkins for ownCloud
7224e99ccd
[tx-robot] updated from transifex
2015-10-16 01:55:03 -04:00
Bjoern Schiessle
dd6cb67030
check if fopen was successful before continue
2015-10-15 16:27:38 +02:00
Bjoern Schiessle
c7883b1769
only wrap source if fopen was successful
2015-10-15 16:27:38 +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
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
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
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
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
Martin
2c32811156
adding occ upgrade text note
2015-10-14 12:16:17 +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
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
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
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
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
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
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
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
Jenkins for ownCloud
d29d018cc7
[tx-robot] updated from transifex
2015-10-11 01:54:58 -04:00
Vincent Petry
8098c06e70
Do not update mime types for folders with extension
...
Some folders might have an extension like "test.conf".
This fix prevents to overwrite the folder's mime type with another mime
type while running the mimetype repair step.
2015-10-09 18:16:36 +02:00
Thomas Müller
4cb5970947
Always pass in ILogger
2015-10-09 14:08:22 +02:00
Thomas Müller
bd21e5925c
Clean code
2015-10-09 13:46:59 +02:00
Thomas Müller
38143d670b
Catch exceptions during app upgrade - fixes #16240
2015-10-09 13:44:30 +02:00
Robin Appelman
a42dd117e2
Merge pull request #19654 from owncloud/db-locking-no-scan-transaction
...
Dont use a transaction in the scanner while using db based locking
2015-10-09 12:38:54 +02:00
Morris Jobke
bf579a153f
fix IE8 user agent detection
2015-10-09 11:19:06 +02:00
Vincent Petry
c7aef6c368
Fix uploading avatar and root certs in IE8
2015-10-09 11:19:05 +02:00
Jenkins for ownCloud
5cb83937fa
[tx-robot] updated from transifex
2015-10-09 01:55:02 -04:00
Thomas Müller
020bb33150
Merge pull request #19034 from owncloud/http-request-warning
...
Prevent warning decoding content
2015-10-08 21:51:47 +02:00
Thomas Müller
3130438fcc
Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstores
...
make mkdir recursive, add phpdoc to api
2015-10-08 21:28:53 +02:00
Lukas Reschke
18394205c2
Setup sendmail transport
...
Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854 and https://github.com/owncloud/core/issues/19110
2015-10-08 16:48:18 +02:00
Thomas Müller
1227786930
Merge pull request #19650 from owncloud/disable-appstore-for-ee
...
Disable app store for EE by default
2015-10-08 16:00:41 +02:00
Robin Appelman
7ff5a6ccf4
Dont use a transaction in the scanner while using db based locking
2015-10-08 15:29:04 +02:00
Jörn Friedrich Dreyer
89a63ec74b
make mkdir recursive, add phpdoc to api
2015-10-08 14:54:21 +02:00
Lukas Reschke
9866037d0c
Disable app store for EE by default
...
This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc.
Administrators can still enable the app store by setting `appstoreenabled` to true in the config file.
2015-10-08 14:52:52 +02:00
Thomas Müller
fd5636cda7
Merge pull request #19644 from owncloud/issue-19617-catch-exception-when-cleaning-locks
...
Catch "missing table" exception when cleaning up locks
2015-10-08 13:39:34 +02:00
Thomas Müller
2fda4e38e2
Merge pull request #19546 from owncloud/fix-search-for-node-api
...
Fix search operations for the Node API
2015-10-08 13:17:26 +02:00
Thomas Müller
8d2c8cf2a2
Merge pull request #19607 from owncloud/use-url
...
Use `/` if installed in main folder
2015-10-08 13:01:41 +02:00
Thomas Müller
95c8d7598b
Merge pull request #19609 from owncloud/check_dav_move_permissions
...
[webdav] Check if source can be deleted before move
2015-10-08 13:01:20 +02:00
Joas Schilling
336a127426
Catch "missing table" exception when cleaning up locks
2015-10-08 11:37:51 +02:00
Joas Schilling
e6d9869cf7
Only use zip64 when we have 64 bit php
2015-10-08 09:13:08 +02:00
Jenkins for ownCloud
c5649a634f
[tx-robot] updated from transifex
2015-10-08 01:54:58 -04:00
Thomas Müller
70ba594f45
Merge pull request #19537 from owncloud/fix-white-page-of-death
...
Fixes last causes for WSOD
2015-10-07 14:55:11 +02:00
Thomas Müller
9f25745649
Fix single file download - fixes #19614
2015-10-07 13:15:58 +02:00
Roeland Jago Douma
1ee56c702d
[WEBDAV] check if delete of source is allowed on move
...
Fixes #5251
If we perform a move we need to make sure first that the source can be
deleted. Else the dest might be cleared but the move will fail later.
* Added unit tests
Eventually we need more and better checking here.
2015-10-07 11:58:16 +02:00
Joas Schilling
937fb70757
Do not trigger the update exception when we already show an error
2015-10-07 08:07:52 +02:00
Jenkins for ownCloud
cd818e7419
[tx-robot] updated from transifex
2015-10-07 01:55:56 -04: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
Robin Appelman
c2d76d2010
fix internal path when searching in storage root
2015-10-06 15:54:17 +02:00
Olivier Paroz
3173ed29df
The minimum size for internalRootLength is 1
2015-10-06 15:54:17 +02:00
Morris Jobke
285e73ac72
validate HTTP protocol in case of an exception
2015-10-06 15:25:31 +02:00
Lukas Reschke
6a4f22c61f
Use `/` if installed in main folder
...
Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour.
Fixes https://github.com/owncloud/core/issues/19196
2015-10-06 15:24:19 +02:00
Thomas Müller
79524ce163
Merge pull request #19605 from owncloud/add-get-http-protocol
...
Add \OCP\IRequest::getHttpProtocol
2015-10-06 15:23:00 +02:00
Joas Schilling
13dd62f7b0
Make sure that remote shares use the correct uid casing
2015-10-06 15:16:19 +02:00
Lukas Reschke
80a232da6a
Add \OCP\IRequest::getHttpProtocol
...
Only allow valid HTTP protocols.
Ref https://github.com/owncloud/core/pull/19537#discussion_r41252333 + https://github.com/owncloud/security-tracker/issues/119
2015-10-06 14:18:46 +02:00
Thomas Müller
48ef5b6b3b
OC_Log not longer exists
2015-10-06 14:18:22 +02:00
Thomas Müller
319e61f0ea
Merge pull request #19407 from owncloud/lock-zip-content
...
Lock zip content
2015-10-06 11:47:43 +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
b05422544d
Fixes last causes for WSOD
...
* print plain text if rendering of exception/error page is not possible
2015-10-06 10:20:53 +02:00
Morris Jobke
8366ce2767
deduplicate @xenopathic
2015-10-06 09:52:19 +02:00
Thomas Müller
da640adf68
Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotingroup
...
Remove invalid share items from result when missing group membership
2015-10-06 09:24:22 +02:00
Thomas Müller
26b92c406c
Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sharing-subfile
...
Make sure the share we found is for the same item
2015-10-06 09:23:44 +02:00
Jenkins for ownCloud
3ff60cc2e3
[tx-robot] updated from transifex
2015-10-06 01:55:00 -04:00
Morris Jobke
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
Robin Appelman
b1ce53f890
use a normal rename when moving from the same storage in the encryption wrapper
2015-10-05 20:55:57 +02:00
Thomas Müller
be46cd6737
Refactor single file download into it's own method
2015-10-05 17:47:15 +02:00
Thomas Müller
57f841da2c
Recursively lock folder contents
2015-10-05 17:31:37 +02:00
Vincent Petry
1c7244c120
Remove invalid share items from result when missing group membership
...
Group shares usually have subshare entries for every user. In some
situations it can happen that the user was removed from the group but
the subshare entries still exist.
This fix makes sure that such subshare entries are not returned any more
as the user isn't in the group any more.
2015-10-05 17:21:34 +02:00
Thomas Müller
3bf818450a
release locks in case of exception
2015-10-05 16:53:57 +02:00
Thomas Müller
def8e0c12a
log the exception during zip creation
2015-10-05 16:53:57 +02:00
Thomas Müller
b5dce05cb6
Lock files which are zipped
2015-10-05 16:53:57 +02:00
Thomas Müller
149792abe6
Clean PHPDoc
2015-10-05 16:53:57 +02:00
Bjoern Schiessle
bf82015254
add some output to explain the pre-conditions for decrypt-all
2015-10-05 12:41:05 +02:00
Joas Schilling
3bbb65998f
Make sure all variables are defined
2015-10-05 12:03:36 +02:00
Joas Schilling
8de0773214
Make sure the share we found is for the same item
2015-10-05 11:55:37 +02:00
Thomas Müller
56c35da8d5
Merge pull request #19416 from owncloud/node-hook-connector
...
pass view hooks trough to the node hooks
2015-10-05 10:25:04 +02:00
Jenkins for ownCloud
2ffb1c2135
[tx-robot] updated from transifex
2015-10-04 01:55:02 -04:00
Thomas Müller
99d7352ef9
Merge pull request #19545 from owncloud/fix-16908
...
Add remark that $run is not supported anymore
2015-10-03 10:17:36 +02:00
Jenkins for ownCloud
e0084059b9
[tx-robot] updated from transifex
2015-10-03 01:56:20 -04:00
Lukas Reschke
f6e055b2fd
Add remark that $run is not supported anymore
...
Fixes https://github.com/owncloud/core/issues/16908
2015-10-02 23:19:26 +02:00
Thomas Müller
ff89824135
Merge pull request #19272 from owncloud/mimetypes-enhanced
...
Introduce a few new mimetypes for code, fix recursive mimetype aliases
2015-10-02 17:50:34 +02:00
Robin Appelman
8bdffb5ed3
Merge pull request #19525 from owncloud/share-preventmovemountpointintosharedfolder
...
Prevent moving mount point into already shared folder (outgoing)
2015-10-02 16:50:38 +02:00
Vincent Petry
64ca00925b
Prevent moving mount point into already shared folder (outgoing)
...
It is already not allowed to share a folder containing mount points /
incoming shares.
This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
2015-10-02 16:14:42 +02:00
Roeland Jago Douma
c80dd82fe4
Added mimetype repair step
...
* Version number increased
2015-10-02 16:06:56 +02:00
Robin McCorkell
aeb20675dd
Allow recursive mimetype aliases
...
application/xml -> text/html -> text/code
2015-10-02 15:28:23 +02:00
Robin Appelman
af01c04360
Merge pull request #19533 from owncloud/free-space-inf
...
Work around INF=0 on some shared hosts
2015-10-02 15:04:28 +02:00
Robin Appelman
a1d0d23b6a
Work around INF=0 on some shared hosts
2015-10-02 14:16:13 +02:00
Morris Jobke
6b53f7c40e
[l10n] remove unused static methods
2015-10-02 12:51:45 +02:00
Thomas Müller
8944cb539e
Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude
...
save excluded groups in json format
2015-10-02 12:14:36 +02:00
Joas Schilling
7707bbe648
Allow identifying whether the current item is the filtered one
2015-10-02 09:53:39 +02:00
Jörn Friedrich Dreyer
3098fd0d30
Merge pull request #19505 from owncloud/returnfloatforquota
...
always return float, update doc
2015-10-02 08:57:04 +02:00
Jörn Friedrich Dreyer
b18307aafb
Merge pull request #19480 from owncloud/fix-l10n
...
Fix l10n on master
2015-10-02 08:56:33 +02:00
Jenkins for ownCloud
3b4592718a
[tx-robot] updated from transifex
2015-10-02 01:54:51 -04:00
Thomas Müller
b6591084a1
Merge pull request #19463 from owncloud/fix_18132
...
encryption: versions should always use the keys of the original file, no need to …
2015-10-01 16:56:28 +02:00
Thomas Müller
b2dd5cb616
save excluded groups in json format - fixes #10983
2015-10-01 15:37:55 +02:00
Jörn Friedrich Dreyer
1d617c4bf6
always return float, update doc
2015-10-01 13:45:49 +02:00
Robin Appelman
1c3e28a73b
Add tests
2015-10-01 13:17:22 +02:00
Robin Appelman
dc49e76747
stricter check if thumbnail is cached
2015-10-01 13:14:47 +02:00
Robin Appelman
884e2fcd6e
to much copy paste
2015-10-01 13:14:47 +02:00
Robin Appelman
9925ff33f1
use cache data we already have to check if a thumbnail of specific size is cached
2015-10-01 13:14:47 +02:00
Robin Appelman
52d4495793
use the fileinfo to check if we have a valid file
2015-10-01 13:14:47 +02:00
Robin Appelman
f4d180ee5c
allow passing the fileinfo to the preview manager
2015-10-01 13:14:47 +02:00
Bjoern Schiessle
e7232a848b
versions should always use the keys of the original file, no need to create new one
2015-10-01 10:10:19 +02:00
Morris Jobke
cc0812332c
add more precise version to also repair git master instances
2015-10-01 08:27:12 +02:00
Vincent Petry
6e104bc933
Repair step to remove bogus expiration dates from non-link shares
2015-10-01 08:27:12 +02:00
Thomas Müller
ff75652cb7
Merge pull request #19299 from owncloud/fixgetRawPathInfo
...
Fix get raw path info, always return a string
2015-09-30 22:17:02 +02:00
Robin Appelman
be8ad69d35
Merge pull request #19478 from owncloud/cache-found-l10n-per-app
...
cache found l10n per app and not globally
2015-09-30 19:08:42 +02:00
Morris Jobke
73819c4f05
Fix l10n on master
...
* $app isn't useful for this case
* kill it with 🔥
2015-09-30 17:29:54 +02:00
Morris Jobke
5a2b30d78f
cache found l10n per app and not globally
...
* fixes: if the first call to this is with an app that has no translations
all future call will get a list with only english in there - even
if their l10n holds more translations
2015-09-30 16:49:16 +02:00
Thomas Müller
1d8c10cf63
Merge pull request #19468 from owncloud/fix-36-vs-32-previews
...
Change small thumbnails to 32 px
2015-09-30 15:47:34 +02:00
Thomas Müller
acd6c9b605
Merge pull request #19460 from owncloud/fix-postScanFile-and-make-it-available-to-utils-scanner
...
Fix postScanFile event and make it available to utils scanner
2015-09-30 15:03:50 +02:00
Robin Appelman
a2817372ad
Clean temp files used for thumbnail generation
2015-09-30 14:07:59 +02:00
Thomas Müller
10978a7a61
Merge pull request #19373 from owncloud/sidebar-preview-cover
...
Cover both width and height for the sidebar preview
2015-09-30 11:07:18 +02:00
Morris Jobke
1051a3c6f5
Change small thumbnails to 32 px
...
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
2015-09-30 10:49:48 +02:00
Olivier Paroz
cc64c09ee5
Make postScanFile and postScanFolder available to OC\Files\Utils\Scanner
2015-09-30 01:53:49 +02:00
Olivier Paroz
9ea05c898e
Always send a postScanFile event when done scanning a file
...
postScanFile is important when scanning external storage as it indicates when the file is ready to be used
2015-09-30 01:50:15 +02:00
Robin Appelman
a5ad5bf29b
Fix preview caching
2015-09-29 17:10:08 +02:00
Thomas Müller
90810cc605
Merge pull request #19355 from owncloud/cache_result_of_checkUpgrade
...
[jenkins] Cache result of check upgrade
2015-09-29 16:19:39 +02:00
Thomas Müller
99f440148f
Merge pull request #19441 from owncloud/debug-log-mode-during-upgrade
...
[upgrade] switch to debug logging on upgrade
2015-09-29 16:08:31 +02:00
Individual IT Services
fbe43e6a26
cache result of \OCP\Util::needUpgrade()
...
reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement
move caching to \OCP\Util::needUpgrade
renaming variable
fixing testNeedUpgradeCore()
cache result of checkUpgrade() in self::$needUpgrade
reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement
move caching to \OCP\Util::needUpgrade
renaming variable
fixing testNeedUpgradeCore()
fix typo in variable name
deleting tabs
2015-09-29 15:34:42 +02:00
Morris Jobke
5acb38b5b3
[upgrade] switch to debug logging on upgrade
...
* resets afterwards
* adds output about the previous log level
2015-09-29 14:35:32 +02:00
Lukas Reschke
e735a9915c
Add blob: scheme to default CSP policy
...
Fixes https://github.com/owncloud/core/issues/19438
2015-09-29 14:27:35 +02:00
Thomas Müller
c2dd0f80ec
Merge pull request #19424 from owncloud/use-jsqueeze
...
Use jsqueeze
2015-09-29 13:44:26 +02:00
Thomas Müller
69430e0310
Merge pull request #19367 from owncloud/lock-transaction-no-log
...
remove warning when trying to get a lock while in transaction
2015-09-29 13:18:34 +02:00
Thomas Müller
6414b4b516
Merge pull request #19426 from owncloud/fix-legacy-CSP-for-images
...
Whitelist "data:" in legacy CSP headers
2015-09-29 13:17:23 +02:00
Robin Appelman
f41a38ba15
Cover both width and height for the sidebar preview
2015-09-29 13:07:03 +02:00
Phil Davis
7940a3fb65
Session closed exception wording
...
and a small comment typo
2015-09-29 12:17:47 +05:45
Jenkins for ownCloud
aa3596a410
[tx-robot] updated from transifex
2015-09-29 01:55:02 -04:00
Olivier Paroz
c4bac1655d
Fix CSP for images for legacy apps
...
Fixes #19425
2015-09-28 23:21:26 +02:00
Thomas Müller
766b69a0c8
User upstream class SeparatorFilter
2015-09-28 22:52:45 +02:00
Thomas Müller
d40867d855
Suer JSqueezeFilter instead of JSMinFilter
2015-09-28 22:51:43 +02:00
Robin Appelman
00020535f9
pass view hooks trough to the node hooks
2015-09-28 17:18:46 +02:00
Robin Appelman
1e5a41f008
Add hook connector to connect view and node hooks
2015-09-28 17:18:40 +02:00
Thomas Müller
d68079f932
Merge pull request #18548 from owncloud/repair-mimetype-limitversion
...
Repair mime types only when upgrading from OC 8.0
2015-09-28 12:56:36 +02:00
Thomas Müller
65124b48dd
Adding ownCloud/TarStreamer
2015-09-28 11:46:54 +02:00
Victor Dubiniuk
057994f4aa
Uniform behavour for tar and zip
2015-09-28 11:46:54 +02:00
Victor Dubiniuk
027fb4e3fe
More corrections
2015-09-28 11:46:54 +02:00
Victor Dubiniuk
28df7be319
Add namespace. Fix broken zip
2015-09-28 11:46:54 +02:00
Victor Dubiniuk
74d879d039
Add PHpdoc
2015-09-28 11:46:54 +02:00
Victor Dubiniuk
e3b95e8473
Introduce streamer
2015-09-28 11:46:53 +02:00
Jenkins for ownCloud
60f123193b
[tx-robot] updated from transifex
2015-09-28 05:07:18 -04:00
Thomas Müller
0aaece7de7
Merge pull request #19346 from owncloud/drop-passwords-from-exception-log
...
Remove passwords from logged exception stack traces
2015-09-25 20:04:01 +02:00
Thomas Müller
8f2a14c5d6
Merge pull request #19297 from owncloud/fix_19119
...
Do not blindy copy expiration date on reshare
2015-09-25 14:36:07 +02:00
Robin Appelman
b2a528e303
remove warning when trying to get a lock while in transaction
2015-09-25 14:16:50 +02:00
Thomas Müller
8432c73611
Merge pull request #19030 from owncloud/oparoz-smarter-logger
...
[jenkins] Dump Arrays, Objects and Exceptions to the log
2015-09-25 14:15:59 +02:00
Thomas Müller
787c668b39
Merge pull request #19360 from owncloud/move-filter-method-into-config-object
...
Move the filtering of sensitive data to the config class
2015-09-25 14:05:04 +02:00
Thomas Müller
68bf4440d3
Merge pull request #19293 from owncloud/individual-it-move_initTemplate
...
[jenkins] do not load unnecessary code in case of webdav
2015-09-25 13:49:51 +02:00
Joas Schilling
ab69a22606
Deduplicate constant
2015-09-25 13:17:23 +02:00
Roeland Jago Douma
9a373cb5bb
Do not blindy copy expiration date on reshare
...
If a file/folder is reshared we should not blindly copy the expiration
date of the parent share. User/Group shares do not have expiration dates
currently, and thus this is always set to null.
Fixes #19119
* Added testcase
2015-09-25 13:06:05 +02:00
Individual IT Services
db84791bb0
Todo for myself to eliminate double code
...
This will be in a new PR
2015-09-25 15:43:12 +05:45
Individual IT Services
2e42f99d00
add $prepend option to addStyle() & addVendorStyle()
2015-09-25 15:41:55 +05:45
Joas Schilling
faba02564a
Move the filtering of sensitive data to the config class
2015-09-25 11:08:33 +02:00
Joas Schilling
e91e36f8df
Add the L10N Factory to the container interface
2015-09-25 09:05:12 +02:00
Thomas Müller
e7bc2a10e3
Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue
...
fix issue with version rollback and thumbnails
2015-09-24 21:06:27 +02:00
Morris Jobke
db8e7ce8b9
Remove passwords from logged exception stack traces
...
* fixed #16318
* create logException in ILogger
* add unit tests
2015-09-24 20:01:30 +02:00
Thomas Müller
ebdd6d96ce
Merge pull request #19306 from owncloud/app-code-check-version
...
[App Code Check] add check for version and mandatory fields
2015-09-24 17:38:48 +02:00
Olivier Paroz
f140084a8d
Use a 3rd party normalizer for the logger
2015-09-24 17:13:39 +02:00
Morris Jobke
03bf2f786a
public, remote and default_enable are not deprecated
2015-09-24 16:47:00 +02:00
Thomas Müller
5ee46c8500
Merge pull request #19337 from owncloud/fix-shipped-check-for-apps
...
Correctly check whether an app is shipped
2015-09-24 14:51:59 +02:00
Thomas Müller
383f381489
Merge pull request #19340 from owncloud/enc_fix_user_check
...
only check if the user exists if a user was added as parameter
2015-09-24 14:51:38 +02:00
Morris Jobke
5a3e57c2f5
encode arrays as string
2015-09-24 12:48:44 +02:00
Thomas Müller
8d6ec660a2
Merge pull request #19248 from owncloud/allow-status-code-403-and-503-for-listeners
...
Convert exceptions to SabreExceptions for the HTTP status code
2015-09-24 12:35:37 +02:00
Bjoern Schiessle
d697ea58a4
only check if the user exists if a user was added as parameter
2015-09-24 12:21:40 +02:00
Joas Schilling
9da4869cd4
Correctly check whether an app is shipped
2015-09-24 12:06:29 +02:00
Morris Jobke
9b652ed5d5
[App Code Check] add check for version and mandatory fields
...
* ref #17598
* including unit tests for mandatory fields/versions
2015-09-24 11:58:12 +02:00
Thomas Müller
330ea18996
Merge pull request #19303 from owncloud/usecorrectvariable
...
Use correct variable
2015-09-24 11:34:19 +02:00
Thomas Müller
5a11e145da
Clean code
2015-09-24 11:03:01 +02:00
Thomas Müller
11974477bd
Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null
...
Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder
2015-09-24 10:57:49 +02:00
Thomas Müller
df75c17e52
Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches
...
Prevent wrong matches in getRelativePath
2015-09-24 10:25:00 +02:00
Joas Schilling
70572c1e3c
Allow `set('column', 'null')` to work like in Doctrine
2015-09-24 09:53:09 +02:00
Jörn Friedrich Dreyer
8b90a55831
use correct variable
...
wow ... just wow ...
2015-09-23 23:41:39 +02:00
Joas Schilling
2c00587b5d
Add since-tag
2015-09-23 16:16:57 +02:00
Joas Schilling
1493e86dea
Allow listeners to set status code and message
2015-09-23 15:15:07 +02:00
Thomas Müller
2ea2ec0004
Show 'Apps' in the browser title when app management is open
2015-09-23 15:00:58 +02:00
Jörn Friedrich Dreyer
d54d9a573f
Revert "use correct variable"
...
This reverts commit 52cbaff061
.
2015-09-23 14:09:52 +02:00
Jörn Friedrich Dreyer
52cbaff061
use correct variable
...
wow ... just wow ...
2015-09-23 13:59:37 +02:00
Jörn Friedrich Dreyer
d81416c51d
return '' instead of false
2015-09-23 12:32:49 +02:00
Thomas Müller
af39e59e88
getService() is not needed -> remove
2015-09-23 12:00:07 +02:00
Individual IT Services
bf1cb20e90
do not load unnecessary code in case of webdav
...
changing from "protected static" to "protected"
as suggested by @nickvergessen
https://github.com/owncloud/core/pull/19114#discussion_r39719851
moving initTemplate() into template constr.
reduce to move initTemplate only
cleanup spaces
2015-09-23 11:57:10 +02:00
Thomas Müller
ee649d58c5
Merge pull request #19289 from owncloud/fix-type-hint-errors-container
...
Fix type hint errors in the container and the interface
2015-09-23 11:42:03 +02:00
Thomas Müller
bcdb3c26da
Merge pull request #19236 from owncloud/call_dot_directories_function
...
Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
2015-09-23 11:34:23 +02:00
Thomas Müller
ad71d92acf
Merge pull request #19247 from owncloud/fix_locking_copy_operation
...
locking: handle exceptions correctly during copy operation
2015-09-23 11:28:27 +02:00
Morris Jobke
56a795ad37
Merge branch 'master' into fix-type-hint-errors-container
2015-09-23 11:01:59 +02:00
Thomas Müller
f3d60df56d
Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_filelocks
...
[jenkins] Individual it reduce db calls for filelocks
2015-09-23 10:59:58 +02:00
Vincent Petry
0bda4d54c5
Repair mime types only when upgrading from OC 8.0
2015-09-23 10:51:37 +02:00
Joas Schilling
ee75f9f594
Fix type hint errors in the container and the interface
2015-09-23 10:13:41 +02:00
Martin
491250320a
Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used.
2015-09-22 17:53:15 +02:00
Lukas Reschke
63b2bc136a
Move mimetype files into /resources/config/
2015-09-22 16:43:28 +02:00
Lukas Reschke
a8e8a9dfb9
Move certificate bundle into resources/config/
2015-09-22 16:43:28 +02:00
Robin Appelman
498e8f712c
Merge pull request #19268 from owncloud/revert-18911
...
Revert "Show cached previews directly"
2015-09-22 16:05:38 +02:00
Individual IT Services
5f11049852
reduce amount of db calls needed for file-locks
...
return result of insertIfNotExist()
reducing initLockField, throwing exeption in releaseLock
don't throw exception in releaseLock()
cleaning up whitespaces
2015-09-22 15:04:15 +02:00
Robin Appelman
d9db959331
Revert "Show cached previews directly"
...
This reverts commit 1b708e26ef
.
2015-09-22 15:01:31 +02:00
Vincent Petry
b9cd5bc1dc
Prevent wrong matches in getRelativePath
...
Before this fix, the root "/files" with path "/files_trashbin" would
return "_trashbin" as relative path...
2015-09-22 11:34:37 +02:00
Bjoern Schiessle
17a64360e5
catch excexptions during the copy operation and make sure that we free the lock correctly
2015-09-22 11:32:10 +02:00
Lukas Reschke
36ce254ffd
Move dummy backend to Tests namespace
2015-09-22 11:01:11 +02:00
Thomas Müller
67231ed9a7
Merge pull request #19231 from phil-davis/r1
...
Minor text typos
2015-09-21 23:35:30 +02:00
Phil Davis
a165710e99
Minor text typos
...
that I noticed while looking at some code.
2015-09-21 23:04:25 +05:45
Thomas Müller
fd6b4de2d4
Merge pull request #18481 from owncloud/fix-apache-login-master
...
Repeated calls to loginWithApache() should not not try to set user in…
2015-09-21 16:09:33 +02:00
Thomas Müller
d8901cf7cd
Merge pull request #19221 from owncloud/improved_error_messages
...
decrypt-all: improved error message if user doesn't exists
2015-09-21 16:06:43 +02:00
Robin Appelman
b23a5e6886
Merge pull request #17347 from owncloud/dav-fopen-overwrite
...
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 14:13:04 +02:00
Robin Appelman
b520a1e520
Merge pull request #19081 from owncloud/prevent0bytedownloads
...
prevent 0 byte downloads when storage returns false
2015-09-21 13:50:35 +02:00
Robin Appelman
4ecf710dcd
dont download the existing file for webdav if we're going to overwrite it
2015-09-21 13:45:25 +02:00
Bjoern Schiessle
d2e90b6050
improved error message if user doesn't exists
2015-09-21 13:19:35 +02:00
Thomas Müller
0f2865abb2
Repeated calls to loginWithApache() should not not try to set user information in the session again
2015-09-21 11:55:41 +02:00
Thomas Müller
e589226f58
fix PHPDoc
2015-09-21 11:54:46 +02:00
Thomas Müller
2c8eaacec7
Merge headers of ocs results
2015-09-21 11:54:46 +02:00
Thomas Müller
6006a03ef1
Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares
...
Discard expiration date from result for non-link shares
2015-09-21 11:47:37 +02:00
Georg Ehrke
b3ff773bbf
delete cached preview when rolling back file's version
...
add random number using OC.parseQueryString and _.extend()
version rollback: add missing prefix to OC\Preview::post_delete
add test to assure that the rollback hook is called
2015-09-20 11:22:40 +02:00
Thomas Müller
9dc136a0d0
Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7
...
[jenkins] changed ZipStreamer to use composer for updates, update to 0.7
2015-09-18 17:03:49 +02:00
Thomas Müller
bbf128f1b2
Merge pull request #19098 from owncloud/db-lock-no-transaction
...
Remove the need for the transaction in the database locking backend
2015-09-18 17:02:18 +02:00
Thomas Müller
eb41a4da7f
Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer-0.7
2015-09-18 14:43:37 +02:00
Lukas Reschke
7c6d811584
Prefer OCS Id from database
...
To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
2015-09-18 13:27:26 +02:00
Lukas Reschke
947e3d7ab5
Add repair step for outdated OCS IDs
...
There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved")
To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
2015-09-18 13:27:26 +02:00
Thomas Müller
188d6d2e28
Merge pull request #18911 from owncloud/preview-show-cached-directly
...
Show cached previews directly
2015-09-18 13:02:10 +02:00
Thomas Müller
0101b1c65f
Merge pull request #18840 from owncloud/fix-app-disable-route
...
Rebuild app navigation in JS
2015-09-18 13:00:58 +02:00
Thomas Müller
0eb37e2d64
Merge pull request #19092 from owncloud/allow-checking-for-notifiers
...
Allow checking whether there are notifiers registered
2015-09-18 11:57:56 +02:00
Thomas Müller
2eeb1b2b79
Merge pull request #19088 from owncloud/fix-availability-int
...
Explicitly cast number to integer
2015-09-18 08:31:56 +02:00
Thomas Müller
100d9e1976
Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenance
...
Make sure Maintenance is checked before auth and others
2015-09-18 08:17:58 +02:00
Joas Schilling
44e6c4f398
Do not "use" Server
2015-09-17 15:11:05 +02:00
Robin Appelman
e9b1aa6037
improve doc
2015-09-17 14:09:28 +02:00
Joas Schilling
5eddde6486
Add a Sabre plugin that emits an event for apps
2015-09-17 13:59:27 +02:00
Robin Appelman
05fddec022
expire old lock rows
2015-09-17 13:55:04 +02:00
Vincent Petry
1911472b88
Discard expiration date from result for non-link shares
2015-09-17 13:45:26 +02:00
Jörn Friedrich Dreyer
773941dfb0
prevent 0 byte downloads when storage returns false
2015-09-17 11:16:00 +02:00
Joas Schilling
c3420fface
Allow checking whether there are notifiers registered
2015-09-17 11:08:17 +02:00
Robin Appelman
7c66328381
Remove the need for the transaction in the database locking backend
2015-09-17 11:07:59 +02:00
Joas Schilling
bc89bca803
Make sure Maintenance is checked before auth and others
2015-09-17 11:06:51 +02:00
Jenkins for ownCloud
91365a8969
[tx-robot] updated from transifex
2015-09-17 01:57:20 -04:00
Jenkins for ownCloud
0155bcf278
[tx-robot] updated from transifex
2015-09-17 01:55:25 -04:00
Thomas Müller
a1e343ae7c
Merge pull request #19086 from owncloud/restore-loadapp-autoload
...
Restore loadApp() autoload registration
2015-09-16 15:19:41 +02:00
Thomas Müller
b0414f6a30
Merge pull request #19022 from owncloud/console-loader-validroot
...
Register valid root for all installed apps in console
2015-09-16 15:17:43 +02:00
Robin McCorkell
a0094d28f1
Explicitly cast number to integer
2015-09-16 11:22:52 +01:00
Robin McCorkell
862afd80b3
Restore loadApp() autoload registration
...
Also changes the autoloader validRoots into a hashmap to try and reduce
duplicate entries
2015-09-16 10:48:03 +01:00
Thomas Müller
ed872589a3
Merge pull request #19077 from owncloud/check-maintenance-before-everything-else-master
...
Check for maintenance mode first so we send the 503 instead of login…
2015-09-16 10:22:10 +02:00
Joas Schilling
e0992c1297
Check for maintenance mode first so we send the 503 instead of login verification
2015-09-16 09:38:36 +02:00
Arthur Schiwon
c17d022ca4
started to implement sharee list view. not completed yet, do not cry please.
2015-09-16 07:23:27 +02:00
Arthur Schiwon
ffd4e0dc5a
split off expirationView
2015-09-16 07:23:26 +02:00
Arthur Schiwon
f9c232c4ce
split off linkShareView
2015-09-16 07:23:26 +02:00
Arthur Schiwon
dcb084a617
split ShareDialogResharerInfoView from base view
2015-09-16 07:23:26 +02:00
Arthur Schiwon
83d91ddf20
further work on reimplementing the dialog layout
2015-09-16 07:23:25 +02:00
Arthur Schiwon
edd163a611
refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability
2015-09-16 07:23:25 +02:00
Bjoern Schiessle
9bd4f2d41e
occ script to disable encryption and to decrypt all files again
2015-09-15 22:39:44 +02:00
Robin Appelman
9883d5b85d
Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic
...
Use the view logic for getFolderContent for the node api
2015-09-15 18:04:01 +02:00
Robin Appelman
e545c2eec5
Merge pull request #17811 from owncloud/dav-lock-wide
...
Wrap the entire dav PUT in a read lock
2015-09-15 17:22:00 +02:00
Thomas Müller
ae9ea244f2
Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all
...
Function does return void
2015-09-15 17:03:34 +02:00
Thomas Müller
decdaf0018
Merge pull request #19024 from owncloud/remove-get_temp_dir
...
Remove get_temp_dir()
2015-09-15 14:18:29 +02:00
Lukas Reschke
7953cc9494
Function does return void
...
This function does return void and not a bool.
2015-09-15 14:02:10 +02:00
Thomas Müller
e82a225d04
Merge pull request #18964 from owncloud/availability-integer
...
Use integer for availability instead of bool
2015-09-15 13:24:55 +02:00
Lukas Reschke
8e1b403b16
Catch apps which have been removed manually
2015-09-15 12:10:23 +02:00
Lukas Reschke
4680691ca6
Define allowed app roots earlier
...
The autoloader needs to be run before including the app.php, otherwise it depends on what app gets executed first and apps that rely on the dependency of other apps in app.php may break.
2015-09-15 12:10:23 +02:00
Robin McCorkell
f8619870ea
Remove get_temp_dir()
2015-09-15 11:33:25 +02:00
Lukas Reschke
65ebba44ce
Allow /tests folder in autoloader by default
...
Given the fact that "/tests" is not shipped by default and this has broken some applications and frustrated quite some people we should add "/tests" to the default allowed autoloading set.
I do consider the security impact marginally since the /tests folder is not shipped within the release as well as usually has a hard requirement on being called by phpunit.
2015-09-15 11:32:07 +02:00
Robin McCorkell
5ca690e2f8
Use integer for availability instead of bool
2015-09-15 10:18:32 +02:00
Robin McCorkell
31a8949adf
Prevent warning decoding content
2015-09-14 22:36:40 +01:00
Robin McCorkell
35d4851af2
Merge branch 'master' into fix-app-disable-route
2015-09-14 19:50:52 +01:00
Robin Appelman
688981b55c
allow hook cancel
2015-09-14 20:35:33 +02:00
Robin Appelman
75f126da49
use the correct path for cache updates when doing chunked assembly
2015-09-14 20:35:33 +02:00
Robin Appelman
6386327150
work directly on storages when doing a chunked upload assembly
2015-09-14 20:35:33 +02:00
Robin Appelman
b424151459
handle notfound exceptions in lock plugin
2015-09-14 20:35:33 +02:00
Robin Appelman
e612d3123f
wrap the entire put operation in a read lock
2015-09-14 20:35:33 +02:00
Robin Appelman
209abaadbb
expose locking api in sabre connector
2015-09-14 20:35:33 +02:00
Thomas Müller
fb9e75edb6
Merge pull request #18973 from owncloud/try-fixing-app-config-on-oracle
...
Do not compare the value on Oracle
2015-09-14 17:59:52 +02:00
Robin McCorkell
dad56921ae
Register valid root for all installed apps in console
...
We need to use commands from apps that aren't enabled (so don't get loaded).
2015-09-14 16:58:25 +01:00
Nicolai Ehemann
6c6be72e6b
use zipstreamer via composer
2015-09-14 15:33:28 +02:00
Nicolai Ehemann
be2023dae3
lib/private/files.php: adapted to minimally changed ZipStreamer API
2015-09-14 12:57:50 +02:00
Joas Schilling
0e805d5310
Do not compare the value on Oracle
...
As per docs: http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
> Large objects (LOBs) are not supported in comparison conditions.
2015-09-14 12:14:25 +02:00
Lukas Reschke
3adbfbfd69
Use / instead of an empty string as cookie path
...
When an empty string is used as cookie path PHP will assign the current directory as cookie path.
This means when an user had installed an ownCloud under "/", which is mapped to an empty string in \OC::$WEBROOT, and accessed it the cookie was set to values such as "/index.php/apps/files" since the web browser assumed this to be a directory. This means that multiple encryption cookies were set for the same domain resulting in potential havoc.
With this patch the path will be set to "/" in case an empty web root is installed which makes the cookie accessible to the whole domain.
To test this setup multiple ownCloud instances on the same domain under different ports and have both installed under "/", then try to login in both of it and previously this can in some cases lead to a lockout of the user.
Note that this affects the cookies that the browsers do sent and thus to test this you need to clear all cookies from your browser previously. I consider this an acceptable behaviour for now since this code is only in master.
Fixes https://github.com/owncloud/core/issues/18919
2015-09-14 11:22:34 +02:00
Jenkins for ownCloud
211a243784
[tx-robot] updated from transifex
2015-09-14 01:55:35 -04:00
Bernhard Posselt
fd74522804
make resolve public to avoid boiler plate code
...
add resolve to public interface
2015-09-13 17:44:24 +02:00
Frank Karlitschek
7562e4959b
Merge pull request #18658 from owncloud/configurable-temp
...
Configurable temporary directory
2015-09-12 22:04:41 +02:00
Jenkins for ownCloud
9860a79441
[tx-robot] updated from transifex
2015-09-12 01:55:35 -04:00
Lukas Reschke
1924dd348a
Merge pull request #18653 from owncloud/dav-stream-guzzle
...
stream webdav downloads using http client
2015-09-11 17:10:10 +02:00
Robin McCorkell
188d0e09b8
Add reset method to mimetype loader
...
Used to solve concurrency issues
2015-09-11 12:44:53 +01:00
Robin McCorkell
e99988b9c7
Merge pull request #18676 from owncloud/ext-eventdispatcher
...
files_external event dispatcher
2015-09-11 09:34:05 +01:00
Robin McCorkell
620173c792
Merge pull request #18851 from owncloud/memcached-getallkeys-fallback
...
Fallback to complete Memcached flush if getAllKeys fails
2015-09-10 20:33:18 +01:00
Lukas Reschke
fb717f254f
Merge pull request #18699 from owncloud/notification-manager
...
Notification manager
2015-09-10 15:26:36 +02:00
Lukas Reschke
89cd929560
Merge pull request #17791 from owncloud/make-eventsource-compatible-with-win10
...
Add custom CSP for Win 10 compatibility
2015-09-10 15:00:35 +02:00
Lukas Reschke
0b91087489
Write to session in batch at the end of the request
2015-09-09 12:48:37 +02:00
Lukas Reschke
e579dd62fd
Write session data to single key
...
This prevents decrypting values multiple times.
2015-09-09 12:48:08 +02:00
Lukas Reschke
bfa26db472
Use md5 over the version file to prevent cyclyc dependency
2015-09-09 12:48:08 +02:00
Morris Jobke
c4c9c5ffad
Merge pull request #18684 from owncloud/explicit-upgrade-version
...
Explicit upgrade version + prevent downgrades
2015-09-09 11:08:55 +02:00
Björn Schießle
acee9d4750
Merge pull request #18908 from owncloud/allow-0-as-password
...
Allow 0 and false as password
2015-09-09 10:29:29 +02:00
Jenkins for ownCloud
bf01c3d72a
[tx-robot] updated from transifex
2015-09-09 01:54:49 -04:00
Robin Appelman
9f11b27797
Use the view logic for getFolderContent for the node api
2015-09-08 22:38:50 +02:00
Lukas Reschke
a03422c55a
Cache generated result
...
Saves 50ms
2015-09-08 21:28:15 +02:00
Robin Appelman
1b708e26ef
Show cached previews directly
2015-09-08 19:51:15 +02:00
Lukas Reschke
7cbf2bc56d
Allow 0 and false as password
...
When we use the check for "empty" here passwords such as 0 will not work.
Fixes https://github.com/owncloud/password_policy/issues/8
2015-09-08 17:53:29 +02:00
Morris Jobke
73d3839962
Merge pull request #18881 from owncloud/kill-sendfile
...
Remove XSendFile support
2015-09-08 14:02:12 +02:00
Joas Schilling
38001d824b
Move interfaces to private until they are no longer experimental
2015-09-08 09:01:02 +02:00
Joas Schilling
190d2c3d5b
Add tests for the notification manager
2015-09-08 09:01:02 +02:00
Joas Schilling
c6469be8bd
Add tests for notification
2015-09-08 09:01:02 +02:00
Joas Schilling
acf8149f17
Add tests for Action
2015-09-08 09:01:01 +02:00
Joas Schilling
0d154595f8
Fix the subject of notifications
2015-09-08 09:01:01 +02:00
Joas Schilling
57c273b2da
Fix closures and adding parsed Actions
2015-09-08 09:01:01 +02:00
Joas Schilling
d04021b1ac
Fix the request type and the validity
2015-09-08 09:01:01 +02:00
Joas Schilling
21b83dc730
Allow getting the request type
2015-09-08 09:01:01 +02:00
Joas Schilling
913e2e9ae6
Use an INotification to getCount() and markProcessed()
2015-09-08 09:01:01 +02:00
Joas Schilling
3bdfef9107
Add the request type to the action
2015-09-08 09:01:01 +02:00
Joas Schilling
f0ecfa6e6c
Add the app id to the markProcessed method
2015-09-08 09:01:01 +02:00
Joas Schilling
0bcae89d14
Handle InvalidArgumentException more gracefully
2015-09-08 09:01:01 +02:00
Joas Schilling
f16c5a38a8
Add language to the preparation method
2015-09-08 09:01:01 +02:00
Joas Schilling
5437aeeaa2
Nothing is set in stone here yet
2015-09-08 09:01:01 +02:00
Joas Schilling
4e347170ac
Notification API
2015-09-08 09:00:57 +02:00
Jenkins for ownCloud
d044884cfa
[tx-robot] updated from transifex
2015-09-08 01:55:56 -04:00
Lukas Reschke
84797023ed
Remove XSendFile support
...
Required to ensure proper locking
2015-09-07 16:52:50 +02:00
Morris Jobke
c57595bcb4
Merge pull request #18839 from owncloud/autoloader-supersecure
...
Restrict autoloaded paths to loaded apps (and other enhancements)
2015-09-07 00:09:00 +02:00
Roeland Douma
24f5f50b20
Merge pull request #18742 from owncloud/mimetype-updatedb
...
Introduce mimetype DB update occ command
2015-09-06 16:56:35 +02:00
Jenkins for ownCloud
3642fb701a
[tx-robot] updated from transifex
2015-09-06 01:54:56 -04:00
Robin McCorkell
b64e3f8db6
Fallback to complete Memcached flush if getAllKeys fails
...
Newer Memcached's do not support the underlying protocol commands that
getAllKeys() is implemented with. We should fallback to clearing
everything in that case, as causing (temporary) performance problems for
other applications on the server is better than having stale cached data.
2015-09-05 20:02:49 +01:00
Robin McCorkell
0fac2e3f3a
Unique exception for invalid autoload paths, better handling
...
Background jobs are tolerant of stale entries left by disabled apps,
which will cause an autoload exception.
2015-09-05 16:50:02 +01:00
Robin McCorkell
b06bc409e0
Rebuild app navigation in JS
...
Retrieve all app navigations to prevent reloading appinfo/app.php and
causing an error when the app isn't fully loaded. The addition/deletion
logic has been moved to JS, simplifying a lot of code.
2015-09-05 02:24:18 +01:00
Robin McCorkell
895e633732
Resolve autoloader valid roots before checking
...
Allows symlinked app directories to work properly
2015-09-05 00:04:59 +01:00
Robin McCorkell
b3acf09c60
Only add valid root for enabled apps
2015-09-05 00:04:58 +01:00
Robin McCorkell
cdf01f0419
Split mimetype handling to new class
2015-09-04 17:28:20 +01:00
Morris Jobke
7f8bca64cb
Merge pull request #18833 from owncloud/share-prevent-twice
...
Prevent sharing twice with user when already a group
2015-09-04 18:26:50 +02:00
Vincent Petry
f100ef0fc6
Prevent sharing twice with user when already a group
2015-09-04 16:22:01 +02:00
Individual IT Services
3bc287ff63
Merge pull request #18794 from individual-it/reuse_systemConfig
...
reuse existing $systemConfig variable
2015-09-04 14:03:56 +05:45
Jenkins for ownCloud
4100b151cc
[tx-robot] updated from transifex
2015-09-04 01:55:31 -04:00
Morris Jobke
e54513cddd
Merge pull request #18799 from owncloud/appconfig-with-one-request
...
Only query the appconfig once per request
2015-09-03 16:13:14 +02:00
Joas Schilling
38a164aa7a
Make sure the array exists
2015-09-03 15:41:30 +02:00
Vincent Petry
1f9974894d
Merge pull request #18810 from owncloud/shared-mount-delay-setup
...
Delay setting up the filesystem for a share owner untill the share is used
2015-09-03 15:09:57 +02:00
Morris Jobke
038b09b0b0
Proper details about git submodule update
...
* fixes #18801
2015-09-03 14:55:26 +02:00
Robin Appelman
8123df9489
setup owner when getting users for share
2015-09-03 14:34:46 +02:00
Morris Jobke
a1e13d95ad
Merge pull request #18777 from owncloud/locking-default
...
enable transational locking by default
2015-09-03 11:33:10 +02:00
Joas Schilling
21ba3b8737
Only query the appconfig once
2015-09-03 11:30:57 +02:00
Individual IT Services
cd0a5372ee
reuse existing $systemConfig variable
2015-09-03 12:44:35 +05:45
Lukas Reschke
f9e90e92d4
Encode HTML tags in JSON
...
While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
2015-09-03 00:44:46 +02:00
Joas Schilling
8f2110e5da
Revert "Soft fail when deleting and no entry found"
2015-09-02 19:52:45 +02:00
Robin Appelman
4880d7729b
enable transational locking by default
2015-09-02 16:56:47 +02:00
Robin McCorkell
c9c246a3f5
Soft fail when deleting and no entry found
2015-09-02 14:50:07 +01:00
Robin Appelman
0f6df2e0b6
Allow creating previewss that cover the specified dimensions
2015-09-02 10:32:39 +02:00
Morris Jobke
73b43db4f9
Merge pull request #18744 from owncloud/fix-ocs-router
...
Delay adding OCS prefix to route collection until all is loaded
2015-09-02 08:05:15 +02:00
Jenkins for ownCloud
310084cc25
[tx-robot] updated from transifex
2015-09-01 14:03:19 -04:00
Robin Appelman
1c10fb5c9f
also use httpclient for uploadFile
2015-09-01 18:01:27 +02:00
Robin Appelman
9858a6f705
Merge pull request #18743 from owncloud/autoloader-check-log-path
...
Show the path as part of the exception for not allowed autoloading paths
2015-09-01 17:20:21 +02:00
Robin McCorkell
5b2529b448
Delay adding OCS prefix to route collection until all is loaded
...
->addPrefix() iterates over all registered routes, so must be run after
all apps have had a chance to load their OCS routes.
2015-09-01 15:42:41 +01:00
Robin Appelman
01dcf7f32c
Show the path as part of the exception for not allowed autoloading paths
2015-09-01 16:06:52 +02:00
Vincent Petry
87b3e28f06
Merge pull request #18730 from owncloud/appframework_proper_304
...
Properly return 304 in AppFramework
2015-09-01 15:39:59 +02:00
Robin McCorkell
9e9ffb1356
Allow access to full alias and mapping arrays
2015-09-01 14:07:14 +01:00
Robin Appelman
e9b91b1798
verify the path in the autoloader
2015-09-01 15:03:28 +02:00
Roeland Jago Douma
f12caf930e
Properly return 304
...
The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.
* Added unit test
2015-09-01 11:04:41 +02:00
Vincent Petry
6ccbf4bce6
Improved update version detection logic
2015-08-31 18:35:35 +02:00
Vincent Petry
85b62c7d82
Merge pull request #18635 from owncloud/stickify-files-and-sharing-notification-types
...
Sticky the notification types of files and sharing
2015-08-31 17:56:48 +02:00
Robin McCorkell
3142a20f25
Expose files_external services from Server
...
Not exposed to OCP yet
2015-08-31 15:18:26 +01:00
Vincent Petry
f8d8de5da6
Merge pull request #17899 from owncloud/enc_make_key_storage_root_configurable
...
Make root of key storage configurable
2015-08-31 15:58:30 +02:00
Morris Jobke
c34fbea197
Merge pull request #18691 from owncloud/request-no-read
...
Decode request content only on getContent
2015-08-31 14:58:48 +02:00
Vincent Petry
3b37c20319
Simplify comparison algo
2015-08-31 14:31:17 +02:00
Robin McCorkell
e60c4bada1
Decode request content only on getContent
2015-08-31 01:05:25 +01:00
Robin McCorkell
a0dfaf9be3
Clean up TempManager to follow code guidelines
...
tmpBaseDir can be overridden for unit testing purposes
2015-08-30 23:30:56 +01:00
Morris Jobke
b50ac6ff2f
Merge pull request #10149 from owncloud/storage-wrapper-check
...
Check result of storage wrappers
2015-08-30 19:48:37 +02:00
Bjoern Schiessle
37513f9411
don't read certificates if ownCloud is not installed
2015-08-30 19:00:03 +02:00
Bjoern Schiessle
289e9130f3
make system root of key storage configurable
2015-08-30 19:00:03 +02:00
Vincent Petry
d5b0b55eef
Throw exception on downgrade attempt
2015-08-30 18:07:22 +02:00
Vincent Petry
2b08659f7d
Restrict upgrades to explicit allowed version
...
version.php now contains the previous ownCloud version from which
upgrades are allowed. Any other upgrades will show a message that the
upgrade/downgrade is not supported.
2015-08-30 18:04:18 +02:00
Vincent Petry
045f8cc971
Merge pull request #18651 from owncloud/ocs_share_create_with_expire
...
Allow to directly set the expireDate on a new (link)share
2015-08-30 10:50:12 +02:00
Roeland Jago Douma
2aff11c80b
Actually validate the expire date on share
...
* Added more intergration tests
2015-08-30 10:31:43 +02:00
Robin Appelman
4cb8ca1860
Check result of storage wrappers
2015-08-30 10:02:42 +02:00
root
acae208f2f
moved code to /lib/private/tempmanager.php
...
fix for unit test
some fixes
2015-08-29 16:59:02 +01:00
Vincent Petry
723f8c8f1b
Merge pull request #18620 from owncloud/add-public-interface-for-factory
...
Add a public interface for the language factory so apps can use it
2015-08-29 16:44:08 +02:00
Robin Appelman
df8cb2cc63
stream webdav downloads using http client
2015-08-29 14:56:15 +02:00
Robin Appelman
b67d395089
allow streamed responses in http client
2015-08-29 14:56:08 +02:00
Joas Schilling
0ddcc7da44
Merge pull request #18511 from owncloud/downgrad-sharing-error-logs-to-debug
...
Change log level of debugging logs to debug
2015-08-28 21:05:02 +02:00
Björn Schießle
6e210d960c
Merge pull request #18423 from owncloud/occ_encrypt_all
...
occ command line tool to encrypt all files
2015-08-28 20:44:55 +02:00
Joas Schilling
42f0651b83
Sticky the notification types of files and sharing
2015-08-28 18:40:50 +02:00
Joas Schilling
37b00b7443
Add since tag
2015-08-28 15:46:55 +02:00
Joas Schilling
a12d354762
Deprecate OC_L10N::get()
2015-08-28 12:04:52 +02:00
Jenkins for ownCloud
933ac14b76
[tx-robot] updated from transifex
2015-08-28 01:55:25 -04:00
Joas Schilling
c3c7689b67
Add a public interface for the language factory so apps can use it
2015-08-27 13:14:50 +02:00
Jenkins for ownCloud
46978b616c
[tx-robot] updated from transifex
2015-08-27 01:55:20 -04:00
Bjoern Schiessle
e51fe617d8
copy always file by file to encrypt/decrypt it if needed
2015-08-26 14:58:22 +02:00
Bjoern Schiessle
8c08dd0ac2
occ tool to encrypt all files
2015-08-26 14:58:22 +02:00
Lukas Reschke
3d2ee95f1e
Remove last occurence of `forcessl`
...
This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
2015-08-26 14:29:36 +02:00
Thomas Müller
40203d7d1e
Remove languages which are no longer maintained on transifex
2015-08-26 12:19:24 +02:00
Jenkins for ownCloud
90e11ee005
[tx-robot] updated from transifex
2015-08-26 04:10:42 -04:00
Thomas Müller
749e3d5219
Merge pull request #18553 from owncloud/write-l10n-on-login
...
Save detected l10n of browser on login
2015-08-26 08:44:25 +02:00
Thomas Müller
534b2e407a
Merge pull request #17662 from owncloud/locking-db
...
Database backend for locking
2015-08-26 03:56:37 +02:00
Morris Jobke
e9241fcd8c
Merge pull request #18562 from owncloud/explicit-use-statuscode-200
...
Explicitly specify status code 200 as response code
2015-08-25 22:02:27 +02:00
Jenkins for ownCloud
2171cc02c3
[tx-robot] updated from transifex
2015-08-25 12:39:10 -04:00
Lukas Reschke
f3561e2349
Explicitly specify status code 200 as response code
...
Potentially fixes https://github.com/owncloud/core/issues/17586
2015-08-25 18:07:40 +02:00
Morris Jobke
4f13f96981
Save detected l10n of browser on login
...
* fixes owncloud/activity#373
2015-08-25 15:47:31 +02:00
Thomas Müller
6f6a5f6c29
Adding path to log message
2015-08-25 14:31:21 +02:00
Thomas Müller
2f86be9ced
Merge pull request #18523 from owncloud/crazy-scanner
...
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
2015-08-25 09:23:42 +02:00
Vincent Petry
fe575feca8
Prevent scanner going crazy with unavailable storages
2015-08-24 16:42:53 +02:00
Morris Jobke
e88b380973
Remove DEBUG constant and use config value
...
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
2015-08-24 15:14:05 +02:00
Lukas Reschke
bd13126a80
Fix master again
...
Caused due to merge of two PRs
2015-08-24 12:19:03 +02:00
Joas Schilling
4e0e2eb222
Change log level of debugging logs to debug
2015-08-24 12:12:08 +02:00
Morris Jobke
b3495a1dc9
Merge pull request #18482 from owncloud/encrypt-session-data
...
Add a session wrapper to encrypt the data before storing it on disk
2015-08-24 12:10:15 +02:00
Vincent Petry
fe568ab64d
Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy
...
Use client service to work behind proxy for checks for remote ownCloud instances
2015-08-24 11:05:14 +02:00
Vincent Petry
31d62c10bf
Merge pull request #17501 from tbartenstein/patch-1
...
Update fileinfo.php
2015-08-24 09:57:27 +02:00
Morris Jobke
40b1054530
Merge pull request #18254 from owncloud/mitigate-breach
...
Add mitigation against BREACH
2015-08-24 09:14:27 +02:00
Lukas Reschke
0a1d551090
Use IClientService to check for remote ownCloud instances
...
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
2015-08-22 14:39:43 +02:00
Lukas Reschke
6a3fb0d3b3
Handle failures gracefully, remove switch
2015-08-21 19:16:28 +02:00
Joas Schilling
36eef2ddab
Add a session wrapper to encrypt the data before storing it on disk
2015-08-21 17:59:23 +02:00
Morris Jobke
ac086a11c1
Merge pull request #18426 from owncloud/joblist-next-non-existing
...
handle non existing job classes in $jobList->getNext
2015-08-21 10:34:33 +02:00
Joas Schilling
9573d7d60d
Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-activities
...
Issue 18358 object type and id for activities
2015-08-20 15:53:36 +02:00
Joas Schilling
c58316b1ae
Expand the doc blocks on the new methods
2015-08-20 15:35:24 +02:00
Morris Jobke
d725de505e
Merge pull request #18439 from owncloud/fix-appmanagement-install
...
[app management] fix dependency check on install
2015-08-20 13:26:55 +02:00
Joas Schilling
6697844c01
Remove unnecessary code
2015-08-20 13:10:11 +02:00
Morris Jobke
06d8edd963
Merge pull request #17434 from owncloud/update-showappnameonappupdate
...
Display app names in update page for app updates
2015-08-20 11:50:01 +02:00
Vincent Petry
a2674b2b30
Additions to update page
...
Apps to update and to disable will always be shown.
Main title changes only when apps need updated, not core.
Added bullet style.
Exclude incompatible apps from updated apps list.
2015-08-20 11:14:30 +02:00
Joas Schilling
389a32e92a
Add test coverage for Activity Event and Manager
2015-08-20 10:25:49 +02:00
Morris Jobke
29decf698c
[app management] fix dependency check on install
2015-08-19 21:32:56 +02:00
Morris Jobke
b3356b1288
Merge pull request #18432 from owncloud/ext-backends.simple
...
Migrate simple external storage backends to new registration API [part 1]
2015-08-19 20:04:20 +02:00
Thomas Müller
313cb092f9
Merge pull request #18427 from owncloud/fix-format-ocs
...
Fix format of log/private/ocs.php
2015-08-19 19:09:32 +02:00
Vincent Petry
b919ae96f0
Display app names in update page for app updates
...
Whenever the update page is displayed for apps, show app names instead
of the core update text.
2015-08-19 18:03:35 +02:00
Joas Schilling
4314c8fc6f
Use an IEvent object instead of a huge parameter list
2015-08-19 17:44:57 +02:00
Joas Schilling
bc2aa14849
Extend the interfaces IManager and IConsumer to allow passing in the object
2015-08-19 17:44:57 +02:00
Robin McCorkell
3b27603762
Revert "Fix mounting wrapped storages resulting in many-layered wrapping"
...
This reverts commit 75a5e6e12b
.
2015-08-19 14:41:43 +01:00
Robin McCorkell
3bb793b6a7
Implement password authentication mechanisms
...
Introduces the basic password authentication mechanism, along with a
mechanism based on ownCloud credentials stored in the user session.
Change to lib/private is an extension of PermissionsMask, as
isSharable() override was missing.
Session credentials auth mechanism now disables sharing on applied
storages, as credentials will not be available.
2015-08-19 14:20:09 +01:00
Lukas Reschke
40b87b1394
Add warning for not existing CA bundle when updating
...
For newer releases we shall use an integrity check. But that's a good alternative for now.
2015-08-19 15:03:33 +02:00
Morris Jobke
8fbb0c7b49
Fix format of log/private/ocs.php
...
Fixes https://github.com/owncloud/core/pull/14314#discussion_r37305256
2015-08-19 14:21:10 +02:00
Robin Appelman
beaef820cf
handle non existing job classes in $jobList->getNext
2015-08-19 14:16:05 +02:00
Morris Jobke
127b6e2f3f
Merge pull request #18374 from owncloud/router-apps
...
Only load app routes if the app has already been loaded [re-merge]
2015-08-19 09:52:09 +02:00
Bernhard Posselt
66d8476e9e
Merge pull request #14314 from owncloud/clean-up-ocs-code
...
Cleanup OCS code
2015-08-18 16:47:53 +02:00
Robin McCorkell
1c26755686
Only load app routes if the app has already been loaded
2015-08-18 09:18:36 +01:00
Robin McCorkell
675d852c7d
Merge pull request #17182 from owncloud/user_ini_upload_size
...
Update .user.ini when setting upload size limit
2015-08-17 13:27:47 +01:00
Morris Jobke
24e20a51eb
Degrade log message about missing app in appstore to debug
...
* fixes #18154
2015-08-17 11:27:41 +02:00
Thomas Müller
0b64268910
Adding EventDispatcher to IServerContainer
2015-08-14 15:40:15 +02:00
Lukas Reschke
a7e4785be9
Cleanup OCS code
...
This removes unused code from `OC_OCS` which nobody understood what it really was for anyways.
2015-08-14 13:42:56 +02:00
Lukas Reschke
8313a3fcb3
Add mitigation against BREACH
...
While BREACH requires the following three factors to be effectively exploitable we should add another mitigation:
1. Application must support HTTP compression
2. Response most reflect user-controlled input
3. Response should contain sensitive data
Especially part 2 is with ownCloud not really given since user-input is usually only echoed if a CSRF token has been passed.
To reduce the risk even further it is however sensible to encrypt the CSRF token with a shared secret. Since this will change on every request an attack such as BREACH is not feasible anymore against the CSRF token at least.
2015-08-14 01:31:32 +02:00
Thomas Müller
1d219cf799
With V2 we should ensure that the status codes are kept in sync
2015-08-13 10:45:25 +02:00
Thomas Müller
abd3d5c6a5
Merge pull request #17982 from owncloud/appframework-sanitize-name
...
Sanitize class names before registerService/query
2015-08-12 12:19:24 +02:00
Thomas Müller
eb13cb8d75
Merge pull request #18127 from owncloud/dav-request-tests
...
add test framework for doing full request webdav tests
2015-08-12 10:07:20 +02:00
Robin McCorkell
cd5342d0ff
Merge pull request #18202 from owncloud/revert-route-breaking-changes
...
Revert route breaking changes
2015-08-11 15:28:06 +01:00
Robin Appelman
b7cbff23d9
handle single file dav endpoints
2015-08-11 14:46:46 +02:00
Robin Appelman
fd35365041
only add tags plugin when loggedin
2015-08-11 14:43:46 +02:00
Robin Appelman
b0c8654f9e
split out creating the sabre dav server to it's own factory
2015-08-11 14:43:46 +02:00
Robin Appelman
8c5302847b
add test framework for doing full request webdav tests
2015-08-11 14:43:46 +02:00
Robin McCorkell
cd0a2874de
Merge pull request #17852 from owncloud/register-alias-factory
...
Add test for factories
2015-08-11 13:30:56 +01:00
Joas Schilling
32ccd66214
Revert "make knowledge base url configurable"
...
This reverts commit 8fb89056bd
.
2015-08-11 14:20:25 +02:00
Joas Schilling
c16fd29f29
Revert "Only load app routes if the app has already been loaded"
...
This reverts commit 50ebea41f6
.
2015-08-11 14:19:59 +02:00
Thomas Müller
aed068b237
Merge pull request #17868 from owncloud/x-forwarded-for
...
Set default 'forwarded for' headers for reverse proxy
2015-08-11 14:02:46 +02:00
Thomas Müller
d5bba42030
Merge pull request #17932 from owncloud/fix_move_files
...
make sure that hooks are emitted properly on file move operation
2015-08-11 13:54:09 +02:00
Joas Schilling
acd54fbeda
Merge pull request #16528 from owncloud/activity-302-improve-settings
...
Activity 302 improve settings
2015-08-11 11:24:27 +02:00
Joas Schilling
669d705792
Merge pull request #17830 from owncloud/issue-17825-dont-silently-ignore-invalid-consumers-extensions
...
Throw a InvalidArgumentException when a consumer/extension is invalid
2015-08-11 10:16:20 +02:00
Morris Jobke
d56e03bb94
Merge pull request #18096 from sualko/patch-1
...
add data: to allowed image domains
2015-08-10 23:05:07 +02:00
Robin McCorkell
8944af57cb
Set default `forwarded_for_headers` to 'HTTP_X_FORWARDED_FOR'
2015-08-10 23:04:52 +02:00
Thomas Müller
54aa57b47a
Merge pull request #18109 from owncloud/fix-router-app-loaded
...
Only load app routes if the app has already been loaded
2015-08-10 21:42:13 +02:00
Thomas Müller
bfb9a8e58e
Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder
...
Automatic db prefix query builder
2015-08-10 21:41:32 +02:00
Roeland Douma
c2856c05aa
Merge pull request #15093 from rullzer/capabilities_manager
...
Capabilities manager
2015-08-10 20:33:50 +02:00
Joas Schilling
e6eb74958f
Remove unnecessary DB prefixes from existing query builder usages
2015-08-10 16:21:41 +02:00
Joas Schilling
5fea6f753e
Automatically prefix table names with *PREFIX* unless specified
2015-08-10 16:20:42 +02:00
Robin Appelman
d979e54030
log a warning while trying to acquire a db lock from within a transaction
2015-08-10 14:39:34 +02:00
Robin Appelman
58e96e53b0
add method to check if we're inside a transaction
2015-08-10 14:15:44 +02:00
Robin Appelman
06065189d7
cleanup empty locks
2015-08-10 14:15:29 +02:00
Roeland Jago Douma
f0b617b508
Use DI
...
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
2015-08-10 10:45:16 +02:00
Roeland Jago Douma
c80c9819dc
Move core capabilities to new class
2015-08-10 10:45:16 +02:00
Roeland Jago Douma
7e6a2b71fd
Added Capabilities Manager
...
* This should allow the capabilities to be intergrated into the
appframework
* Unit tests
* Throw exception if closure does not return ICapability instance
2015-08-10 10:45:08 +02:00
michag86
c7c021e1c9
Update installer.php
2015-08-10 10:34:44 +02:00
michag86
1a23690522
Check if archive contains a directory named like appid
2015-08-10 09:36:16 +02:00
Robin McCorkell
214729a552
Merge pull request #14779 from owncloud/use-iterator-directory
...
Use the new IteratorDirectory instead of the fakedir wrapper
2015-08-07 22:16:47 +01:00
Morris Jobke
ca8f7fd69c
Merge pull request #18124 from owncloud/share-permwrongvar
...
Fix removal of share permissions when share disabled for user
2015-08-07 18:42:35 +02:00
Lukas Reschke
77f71fbb08
Merge pull request #18120 from owncloud/appframework-isessio
...
Add \OCP\ISession to AppFramework
2015-08-07 18:03:51 +02:00
Vincent Petry
b3a1aef934
Merge pull request #13641 from owncloud/cache-storage-status
...
Store storage availability in database
2015-08-07 17:31:03 +02:00
Vincent Petry
143e4a81f0
Fix removal of share permissions when share disabled for user
2015-08-07 15:43:27 +02:00
Robin McCorkell
fcc03e588a
Add \OCP\ISession to AppFramework
2015-08-07 12:29:57 +01:00
Thomas Müller
0595c05200
Adding header support to class OC_OCS_Result
2015-08-07 13:12:43 +02:00
blizzz
795f4ad4c0
Merge pull request #18091 from owncloud/add-backbonejs
...
Add Backbone.js
2015-08-07 00:30:15 +02:00
Robin McCorkell
50ebea41f6
Only load app routes if the app has already been loaded
2015-08-06 16:09:34 +01:00
Vincent Petry
6c139674a4
Merge pull request #18030 from owncloud/dav-upload-updater
...
go trough the updater when uploading over webdav
2015-08-06 15:28:10 +02:00
Arthur Schiwon
ffaf5fed0e
load backbone universally
2015-08-06 12:27:18 +02:00
Arthur Schiwon
67bb5712e4
make available as OC.Backbone to avoid conflicts
2015-08-06 12:08:42 +02:00
Arthur Schiwon
1aaef6fde7
files and sharing will require backbonejs
2015-08-06 11:09:47 +02:00
Thomas Müller
db1416346c
Following the spec:
...
"`statuscode`: The OCS status code of the response, everything except 100 MUST be handled as failure."
2015-08-05 17:49:44 +02:00
Bernhard Posselt
7cb0934fa2
Merge pull request #18035 from owncloud/ocs-2.0
...
Adding ocs/v2.php with status code mapper
2015-08-05 17:28:08 +02:00
Thomas Müller
a70f145d71
Merge pull request #17961 from owncloud/make_knowledgebase_configurable
...
make knowledge base url configurable
2015-08-05 11:54:58 +02:00
sualko
ead25de628
add data: to allowed image domains
2015-08-05 11:41:25 +02:00
Thomas Müller
6c46430cdb
Return 200 not null - we should return consistent types
2015-08-05 11:23:29 +02:00
Lukas Reschke
90a11efecd
Remove "use" statement
...
Ref https://bugs.php.net/bug.php?id=66773
2015-08-05 09:31:21 +02:00
Lukas Reschke
4efa7c09b1
Use StringUtils::equals on CSRF token and add unit tests
2015-08-04 18:34:33 +02:00
Thomas Müller
728780aee8
Merge pull request #18024 from owncloud/phpseclib-2.0
...
Update phpseclib to 2.0 for increased PHP7 compatibility
2015-08-04 16:33:14 +02:00
Lukas Reschke
c6a181d00b
[PHP 7] Change type hint to also accept Errors
...
PHP 7 changed the exception types and thus our error handler needs to be able to catch this.
Without this in some cases just a white page is shown instead of an error message.
2015-08-04 11:54:05 +02:00
Thomas Müller
3ecf7fce79
Fix unit test within OCSController
2015-08-03 22:19:04 +02:00
Thomas Müller
649cc2fa89
Remove duplicate and unused code
2015-08-03 21:03:11 +02:00
Thomas Müller
cd1bfd7eb6
Fix authors
2015-08-03 21:02:41 +02:00
Thomas Müller
3358db320b
Reduce duplicate code
2015-08-03 18:06:07 +02:00
Thomas Müller
bacf1603ff
Adding ocs/v2.php with status code mapper
2015-08-03 16:05:50 +02:00
Robin Appelman
9729e67e3d
more phpdoc
2015-08-03 16:02:24 +02:00
Robin Appelman
cd205249e4
more phpdoc
2015-08-03 15:46:23 +02:00
Robin Appelman
132a564a21
rename path field to key
2015-08-03 15:46:19 +02:00
Morris Jobke
767ca44988
Merge pull request #17820 from owncloud/dav-exception-log-class
...
also log the class for dav exceptions
2015-08-03 15:14:21 +02:00
Robin Appelman
c39ded21d2
initialize unused (for now) ttl field to 0
2015-08-03 14:13:36 +02:00
Robin Appelman
96a9d171b3
Fix db schema
2015-08-03 14:13:36 +02:00
Robin Appelman
86acd535c2
use the database backend for locking if no memcache is configured for it
2015-08-03 14:13:36 +02:00
Robin Appelman
4ea7cbb0f5
Add database backend for high level locking
2015-08-03 14:13:35 +02:00
Robin Appelman
a8552a1b24
split off keeping track of acquire locks
2015-08-03 14:12:56 +02:00
Robin Appelman
2a90cbe603
go trough the updater when uploading over webdav
2015-08-03 13:42:36 +02:00
Andreas Fischer
3b803db6d8
Update phpseclib to 2.0
2015-08-03 09:43:45 +02:00
Bjoern Schiessle
51a67a54e0
always update file cache, the cache can handle partial data correctly if the file doesn't already exists in the file cache
2015-07-31 17:14:32 +02:00
Jenkins for ownCloud
de01951da3
[tx-robot] updated from transifex
2015-07-31 01:56:30 -04:00
Robin McCorkell
182bc17aeb
Sanitize class names before registerService/query
...
Leading backslashes are removed, so a `registerService('\\OC\\Foo')`
can still be resolved with `query('OC\\Foo')`.
2015-07-30 21:02:16 +01:00
Thomas Müller
22fd04eb41
Merge pull request #17981 from owncloud/correct-regex
...
Correct regular expressions
2015-07-30 16:07:46 +02:00
Morris Jobke
80810ae10f
Merge pull request #17963 from owncloud/remove-derecated-mysql-functions
...
Moving mysql setup code over to Doctrine
2015-07-30 15:21:54 +02:00
Lukas Reschke
e95bc68ac7
Check for PDO instead of removed function for PHP 7 compatibility
2015-07-30 12:32:22 +02:00
Lukas Reschke
ad4c731c4c
Correct regular expressions
...
Previously the regex was only matching on single characters. Meaning that file names such as "👍 .txt" where possible while "👍 " alone never was. This check apparently never worked as expected.
2015-07-30 11:22:14 +02:00
Jenkins for ownCloud
a07254856c
[tx-robot] updated from transifex
2015-07-30 01:55:20 -04:00
Thomas Müller
c3cac887f5
- more injection
...
- less static calls
- use params on sql queries
- handle sql exception on database and user creation gracefully
2015-07-30 00:04:30 +02:00
Thomas Müller
114f128fc3
Moving mysql setup code over to Doctrine
2015-07-29 23:12:59 +02:00
Thomas Müller
5ed38a75d6
Remove remainings of mssql
2015-07-29 18:19:31 +02:00
Bjoern Schiessle
8fb89056bd
make knowledge base url configurable
2015-07-29 18:07:04 +02:00
Robin McCorkell
3ef680d966
Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydefault
...
Disable filesystem_check_changes by default
2015-07-29 15:34:02 +01:00
Vincent Petry
7c9405a921
Disable filesystem_check_changes by default
...
This will prevent detecting remote changes done in the data folder /
root storage by default. In the rare cases where the data folder is
shared with other apps/users outside ownCloud and change detection is
needed, the admin will have to set the option explicitly from now on.
Note that this doesn't affect external storages which have their own
setting in the mount options.
2015-07-29 12:01:12 +02:00
Bjoern Schiessle
fb4c99fe06
make sure that we emit the hooks if a file gets moved from a subfolder to the root folder with the nodes API
2015-07-29 11:02:38 +02:00
Jenkins for ownCloud
e77b2e5317
[tx-robot] updated from transifex
2015-07-29 01:55:08 -04:00
Morris Jobke
c34e63bb1f
Merge pull request #15543 from rullzer/mimetypedetector
...
Mimetypedetector
2015-07-28 13:35:26 +02:00
Roeland Douma
73169b0edb
Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file
...
Remote shares should be uique
2015-07-28 13:06:25 +02:00
Andreas Böhler
3a0d42ecf3
Add hook 'pre_displayLoginPage'
2015-07-28 13:00:18 +02:00
Andreas Böhler
3645308d0b
Add possibility for alternative logins to force redirection of login page
2015-07-28 10:31:49 +02:00
Jenkins for ownCloud
c683b1d3c9
[tx-robot] updated from transifex
2015-07-28 01:55:00 -04:00
Vincent Petry
6ada1e3276
Merge pull request #17902 from owncloud/fix_17898
...
get header size before we open the file to avoid locking exception
2015-07-27 16:58:32 +02:00
Thomas Müller
68f14a943a
Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption
...
Only set is encrypted when encryption is enabled
2015-07-27 16:06:39 +02:00
Roeland Jago Douma
d276aebf40
Pass config dir as parameter to detection class
...
In order to properly test the mimetype function:
* constructor takes path to configdir
* Added unit tests for mimetype (only if vfsStream is available)
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
88fb389eab
Proper deprecate methods
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
9cdd637050
Loading of mapping/aliases is done in class
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
141a0f0f47
Move mimetypedetection to files/type/detection
2015-07-27 14:59:45 +02:00
Roeland Jago Douma
6db6689740
Added mimetype detector
...
* Copied unit tests from old functions
2015-07-27 14:58:45 +02:00
Bjoern Schiessle
0736b45d92
get header size before we open the file to avoid locking exception
2015-07-27 14:29:07 +02:00
Thomas Müller
c030ae9dec
Merge pull request #17879 from owncloud/scan-check-path
...
check if the user is trying to scan a valid path
2015-07-27 13:39:53 +02:00
Robin Appelman
f74525c349
check if the user is trying to scan a valid path
2015-07-27 11:21:48 +02:00
Morris Jobke
c9e22f70c8
Add PHPDoc for classes and interfaces
2015-07-27 10:49:26 +02:00
Bernhard Posselt
d8673dabe3
add test for factories
...
use ref for factory test
use a factory for registerAlias
Ensure we construct SimpleContainer
Use single instance of DIContainer in routing tests
2015-07-25 01:59:30 +02:00
Thomas Müller
11244736ae
Merge pull request #17838 from owncloud/sharing-password-policy-master
...
Use a hook to integrate sharing password verification
2015-07-24 16:47:18 +02:00
Robin Appelman
91fbee8988
also log the class for dav exceptions
2015-07-24 13:30:52 +02:00
Thomas Müller
1f8ee61006
Merge pull request #17755 from owncloud/alias-container-alive
...
Add registerAlias method to shortcut interface registration #17714
2015-07-24 13:11:32 +02:00
Morris Jobke
5265a44260
Remove commented code
2015-07-24 00:47:41 +02:00
Bernhard Posselt
582f07950f
Merge pull request #17075 from owncloud/bootstrap-tooltip
...
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
Thomas Müller
632e39a750
Fix PHPDoc on setPassword
2015-07-23 16:11:06 +02:00
Joas Schilling
9cee8ff9f8
Only set is encrypted when encryption is enabled
2015-07-23 15:18:59 +02:00
Thomas Müller
ac08685234
Use a hook to integrate sharing password verification
2015-07-23 14:44:48 +02:00
Joas Schilling
02323eca01
Throw a InvalidArgumentException when a consumer/extension is invalid
2015-07-23 11:00:29 +02:00
Joas Schilling
8d47260144
Allow types to be method specific
2015-07-22 15:10:34 +02:00
Lukas Reschke
874ccbfb81
Add custom CSP for Win 10 compatibility
...
The default content-security-policy of ownCloud forbids inline
JavaScript for security reasons. IE starting on Windows 10 will
however also obey the CSP which will break the event source fallback.
As a workaround thus we set a custom policy which allows the execution
of inline JavaScript.
This fixes https://github.com/owncloud/core/issues/14286
2015-07-21 20:40:32 +02:00
Joas Schilling
20cd0ae55b
Add a log message when the Doctrine Query Builder is retrieved
2015-07-21 15:53:28 +02:00
Joas Schilling
f9071ed5b7
Comment out LIMIT 0 case because of the mixed results
2015-07-21 15:25:48 +02:00
Joas Schilling
c9564503c2
Fix tests for setFirstResult and setMaxResults on oracle
2015-07-21 15:25:48 +02:00
Joas Schilling
f77e5f411d
Fix existing usages by removing the quotes
2015-07-21 15:25:47 +02:00
Joas Schilling
516f7e8299
Add unit tests and automatic quoting
2015-07-21 15:25:47 +02:00
Joas Schilling
de348180ae
Use the public interface and our method instead of the doctrine thing
2015-07-21 15:25:47 +02:00
Joas Schilling
1bfb944d51
Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers
2015-07-21 15:25:47 +02:00
Morris Jobke
2d691c2fb4
Merge pull request #17381 from owncloud/fix_sharing_add_to_group
...
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
Roeland Douma
40170f35f6
Merge pull request #17766 from owncloud/escape-ampersand
...
Escape ampersand in logout URL
2015-07-21 09:32:16 +02:00
Jenkins for ownCloud
24f12e65ec
[tx-robot] updated from transifex
2015-07-21 01:54:52 -04:00
Morris Jobke
5a5c59639b
Escape ampersand in logout URL
...
* fixes #17757
2015-07-21 00:26:30 +02:00
Bernhard Posselt
d20e2002a6
Merge pull request #17743 from owncloud/return-proper-statuscodes
...
Return proper status code in case of a CORS exception
2015-07-20 18:03:25 +02:00
Robin McCorkell
75a5e6e12b
Fix mounting wrapped storages resulting in many-layered wrapping
...
This usually doesn't cause issues, but in unit tests sometimes a wrapped
storage is passed to Filesystem::mount() and gets rewrapped, hitting the
XDebug function nesting level limit when used.
2015-07-20 16:27:26 +01:00
Robin McCorkell
df19cabb44
Store storage availability in database
...
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.
Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
2015-07-20 16:27:26 +01:00
Robin McCorkell
aac84f732d
Unit test OC_Files::setUploadLimit()
...
There was also a bug with checking the upper limit on the passed upload
size. PHP does funny things with integer vs float comparisons, so our
check didn't work. Now the check is much simpler, and ensures the value
is sane.
2015-07-20 15:03:09 +01:00
Robin McCorkell
d3bcafe618
Update .user.ini when setting upload size limit
2015-07-20 12:52:43 +01:00
Lukas Reschke
7dda86f371
Return proper status code in case of a CORS exception
...
When returning a 500 statuscode external applications may interpret this as an error instead of handling this more gracefully. This will now make return a 401 thus.
Fixes https://github.com/owncloud/core/issues/17742
2015-07-20 12:54:22 +02:00
Joas Schilling
0dd1a785fe
Merge pull request #16935 from owncloud/allow-app-check-code-for-deprecated-classes
...
Allow app check code for deprecated classes
2015-07-20 08:39:53 +02:00
Jenkins for ownCloud
83a13c0635
[tx-robot] updated from transifex
2015-07-20 01:54:47 -04:00
Lukas Reschke
1e4496c1cb
Merge pull request #17698 from owncloud/allow-update-of-disabled-apps
...
Allow upgrade of not enabled apps
2015-07-19 12:14:13 +02:00
Bernhard Posselt
a4e3939204
add registerAlias method to shorcut interface registration
...
remove unused import
add since tag
fix typo
2015-07-18 13:43:54 +02:00
Björn Schießle
f363fc2d4a
Merge pull request #17540 from owncloud/enc_detect_legacy_files2
...
make sure that we always detect legacy files correctly
2015-07-17 21:42:32 +02:00
Thomas Müller
2e1cc2d825
Merge pull request #17682 from owncloud/fix-undefined-REMOTE_ADDR-master
...
Fixing 'Undefined index: REMOTE_ADDR'
2015-07-17 14:27:33 +02:00
Bjoern Schiessle
16d8014cdd
set targetIsEncrypted to true if file cache indicates that we try to read a encrypted file
2015-07-17 13:30:08 +02:00
Bjoern Schiessle
a2e2005e67
make sure that we always detect legacy files correctly
2015-07-17 13:30:08 +02:00
Morris Jobke
f7a78cf650
Merge pull request #17663 from owncloud/occ-memcache
...
Missing memcache should not cause occ hard-fail
2015-07-17 13:15:47 +02:00
Joas Schilling
3566dcf246
PR #17046 deprecated OCP\Util::mb_(sub)str_replace()
2015-07-17 12:34:56 +02:00
Joas Schilling
8a64abf4e4
Only decorate the type when it was matched
2015-07-17 12:34:56 +02:00
Joas Schilling
a0c6f2e5e0
Use the decorator pattern
2015-07-17 12:34:56 +02:00
Joas Schilling
bba87a2a3b
Restructor the code into different classes instead of extending
2015-07-17 12:34:56 +02:00
Joas Schilling
eb1c437941
Check for methods as good as possible
2015-07-17 12:34:56 +02:00
Joas Schilling
2783a78070
Allow checking for functions
2015-07-17 12:34:56 +02:00
Joas Schilling
f228a3dc28
Add support for deprecated constants
2015-07-17 12:34:56 +02:00
Joas Schilling
483c886291
Add deprecation version to the list
2015-07-17 12:34:56 +02:00
Joas Schilling
d2fc1b2302
Correctly handle use statements
2015-07-17 12:34:56 +02:00
Joas Schilling
4e95031ec4
Allow app:check-code to check for deprecated methods
2015-07-17 12:34:55 +02:00
Morris Jobke
3fae984b56
Merge pull request #17282 from owncloud/s2s-catchremotelockexceptions
...
Throw lock exceptions if remote share returned 423 status code
2015-07-17 11:34:34 +02:00
Jenkins for ownCloud
8723410319
[tx-robot] updated from transifex
2015-07-17 01:54:52 -04:00
Thomas Müller
bd71540c8a
Fixing 'Undefined index: REMOTE_ADDR' - fixes #17460
2015-07-16 16:40:57 +02:00
blizzz
bfb90d10ed
Merge pull request #17046 from nicolas-grekas/fix-16654
...
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
Nicolas Grekas
472d48f6e3
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:00:04 +02:00
Robin McCorkell
8efa23c895
Fix memcache factory unit tests
2015-07-16 03:53:18 +01:00
Robin McCorkell
e556d97b64
Fix memcache factory creation when not installed
...
Memcache factory expects a class name, not an instantiated object
2015-07-15 22:55:30 +01:00
Robin McCorkell
7830434d78
Missing memcache should not cause occ hard-fail
...
Warning is now printed to logs, but occ and cron will still work.
2015-07-15 22:53:14 +01:00
Robin Appelman
da951ba059
Use the new IteratorDirectory instead of the fakedir wrapper
2015-07-15 13:57:53 +02:00
Roeland Jago Douma
fea71a81fd
Cannot share the same file multiple times with remote user
...
Fix for #17183
It should not be possible to create multiple remote shares from user A
to user B of the same file/folder.
2015-07-15 12:42:40 +02:00
Morris Jobke
c601fb8181
Merge pull request #17620 from owncloud/s2s-hasupdated-catch405
...
Throw StorageNotAvailable if propfind on root failed
2015-07-14 08:56:53 +02:00
Jenkins for ownCloud
2d5ddb02fa
[tx-robot] updated from transifex
2015-07-14 01:54:45 -04:00
Vincent Petry
f62d94c4ff
Throw StorageNotAvailable if propfind on root failed
...
If PROPFIND fails with 404 or 405 on the remote share root, it means the
storage is not available. Throw StorageNotAvailable is such case.
2015-07-13 18:28:53 +02:00
Vincent Petry
b3b080e1c0
Strip public webdav info about sharing and mount points
...
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
2015-07-13 14:20:35 +02:00
Morris Jobke
1006ec56ce
Merge pull request #17481 from rullzer/mimetype-list
...
Move mimetypes.list.php to config/mimetypemapping.dist.json
2015-07-13 08:31:18 +02:00
Jenkins for ownCloud
7cf6badad5
[tx-robot] updated from transifex
2015-07-12 01:54:49 -04:00
Jenkins for ownCloud
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
Roeland Jago Douma
8cac236135
Move to OC::$configDif
2015-07-10 15:15:50 +02:00
Roeland Jago Douma
032ffc969e
Move mimetypealiases.json to mimetypealiases.dist.json
2015-07-10 10:17:49 +02:00
Jenkins for ownCloud
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
Morris Jobke
bceb38ce82
Merge pull request #17517 from RealRancor/fix_failed_login_syntax
...
Fixed "Remote IP:" syntax on failed logins
2015-07-10 02:34:09 +02:00
Morris Jobke
c86e742e67
Merge pull request #15586 from Egari/addThemeSupportToMimeIcon
...
Add theme support to mimetypeIcon through imagePath integration
2015-07-09 23:02:46 +02:00
Morris Jobke
d52e197b0d
Merge pull request #16965 from owncloud/getUserFolder-in-IRootFolder
...
Add getUserFolder to IRootFolder
2015-07-09 14:29:47 +02:00
Thomas Müller
d3b58d147f
Allow upgrade of not enabled apps
2015-07-09 12:37:57 +02:00
RealRancor
e62c375749
Fixed "Remote IP:" syntax on failed logins
2015-07-09 10:04:51 +02:00
Jenkins for ownCloud
6d9bb17360
[tx-robot] updated from transifex
2015-07-09 01:54:53 -04:00
tbartenstein
c48e00294c
Update fileinfo.php
...
Edits isMounted() to remove the check for 'local' prefix, so that folder icons are displayed correctly (see issue #10712 )
2015-07-08 18:48:11 +02:00
Morris Jobke
19f34bafa5
Merge pull request #17472 from RealRancor/add_is_dir
...
Add is_dir check to getAllApps() function
2015-07-08 18:30:45 +02:00
Roeland Jago Douma
895d29adf1
Move mimetypemapping.json to mimetypemapping.dist.json
...
This allows users to create their own mapping file to extend our current
mappings. This makes sure that custom mappings are not lost on OC
upgrades.
2015-07-08 17:16:12 +02:00
Roeland Jago Douma
35fba1ef9f
Move mimetypes.list.php to config/mimetypemapping.json
...
This allows users to add new mimetypemappings (extention -> mimetype)
themself. And not have to wait until a new release for updated
mimetypes.
Fixes : #15384
2015-07-08 13:18:58 +02:00
Morris Jobke
0fe81d2f21
Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions
...
Fix the path for users which have an exception for a group share
2015-07-08 10:33:42 +02:00
RealRancor
1300204586
Add is_dir check to getAllApps() function
2015-07-08 10:25:39 +02:00
Jenkins for ownCloud
2fd84607ee
[tx-robot] updated from transifex
2015-07-08 01:55:28 -04:00
stolter
1fc188fd29
Add theme support to mimetypeIcon through imagePath integration
2015-07-07 14:38:14 +02:00
Joas Schilling
6fb3a8d5f5
Add missing tunnel on new class
2015-07-07 11:18:24 +02:00
Joas Schilling
40eaf71a33
Make sure the owner always has the right path
2015-07-07 11:08:21 +02:00
Morris Jobke
87e10a7fb7
Merge pull request #17399 from rullzer/mimetype-php
...
PHP mimetype stuff should also use config/mimetypealiases.json
2015-07-07 11:05:50 +02:00
Roeland Jago Douma
d685327d5a
Make php also use config/mimetypealiases.json
2015-07-07 08:56:15 +02:00
Jenkins for ownCloud
ee5dd25290
[tx-robot] updated from transifex
2015-07-07 01:55:18 -04:00
Roeland Douma
b4f782b568
Merge pull request #16724 from owncloud/mimetype-js
...
Javascript to fetch mimetype icons
2015-07-06 20:59:56 +02:00
Bjoern Schiessle
058d910f5e
intproduce pre_addToGroup hook. we need to calculate the possible unique
...
targets before the user was added to the group otherwise we will always detect
a name collision
2015-07-06 17:24:05 +02:00
Thomas Müller
9120942bcf
Merge pull request #16924 from owncloud/copy-recursive-polyfill
...
add recursive copy polyfill for storage backends
2015-07-06 17:05:36 +02:00
Roeland Jago Douma
c8145cdbd6
Javascript mimetype icon resolver
...
This makes it possible to retrieve the icon for mimetypes in javascript.
It makes no additional queries to the server to retrieve the mimetype.
* config/mimetypealiases.json added
* mimetype.js: this is where the logic resides to convert from mimetype
to icon url
* mimetypelist.js: generated file with a list of mimetype mapping (aliases)
and the list of icon files
* ./occ maintenance:mimetypesjs : new command for occ to gernerate
mimetypes.js
* unit tests updated and still work
* javascript tests added
* theming support
* folder of the theme is now present in javascript (OC.theme.folder)
2015-07-06 16:32:10 +02:00
Vincent Petry
073e654692
Merge pull request #17304 from owncloud/fix-17265
...
Check if response could get generated
2015-07-06 12:29:07 +02:00
Jenkins for ownCloud
5734edfe20
[tx-robot] updated from transifex
2015-07-06 01:54:38 -04:00
Jenkins for ownCloud
55f4d0eea1
[tx-robot] updated from transifex
2015-07-05 01:54:50 -04:00
Jenkins for ownCloud
468871818d
[tx-robot] updated from transifex
2015-07-04 01:55:24 -04:00
Thomas Müller
403deb2a33
Fixing unit test execution
2015-07-03 18:00:16 +02:00
Thomas Müller
1385b1ec48
Remove OC_Appconfig
2015-07-03 18:00:16 +02:00
Thomas Müller
d3ac73c0c9
Remove OC_Log
2015-07-03 18:00:16 +02:00
Thomas Müller
68fd74963e
Remove legacy search classes
2015-07-03 17:56:14 +02:00
Vincent Petry
3df27a01be
Merge pull request #17379 from owncloud/kill-file-mapper
...
Remove file mapper - was only use in Windows and never worked properly
2015-07-03 17:53:47 +02:00
Thomas Müller
7b9daf84ee
Merge pull request #16923 from owncloud/flysystem-base
...
Flysystem base adapter
2015-07-03 17:48:10 +02:00
Vincent Petry
cc373ab89a
Merge pull request #15470 from rullzer/files_sharing_getUrlContent
...
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Robin Appelman
de4e4cb6ea
also dont download existing on fopen when using w+ and wb+
2015-07-03 15:53:02 +02:00
Robin Appelman
6cc65b53ab
add phpdoc
2015-07-03 15:53:02 +02:00
Robin Appelman
232872e401
add flysystem adapater
2015-07-03 15:53:02 +02:00
Thomas Müller
f55aa856ad
Remove file mapper - was only use in Windows and never worked properly
2015-07-03 15:41:29 +02:00
Morris Jobke
838ddc72c1
Merge pull request #17348 from owncloud/fix-lower-than
...
Correct lower than wording
2015-07-03 14:42:08 +02:00
Thomas Müller
7644c631e4
Merge pull request #15663 from owncloud/remove-ocp-app-register
...
Remove \OCP\App::register()
2015-07-03 13:44:58 +02:00
Robin Appelman
b849b7c7f2
better handling of folders
2015-07-03 13:43:22 +02:00
Morris Jobke
208985dc1c
fix wording
2015-07-03 12:54:49 +02:00
Morris Jobke
3e97ca3b96
Add getUserFolder to IRootFolder
...
* untangle DI of user specific folders
* allows to autodetect the dependency
2015-07-03 11:11:58 +02:00
Lukas Reschke
0b8ced1ab3
Merge pull request #17345 from owncloud/app-code-check-search
...
[app code check] add OC_Search_Provider and _Result
2015-07-03 09:44:18 +02:00
Vincent Petry
f70791653c
Merge pull request #17291 from owncloud/mount-manager-public
...
expose the mount manager in the public api
2015-07-03 07:57:31 +02:00
Jenkins for ownCloud
b8f5b2c47a
[tx-robot] updated from transifex
2015-07-03 01:54:57 -04:00
Vincent Petry
34043d4647
Throw lock exceptions if remote share returned 423 status code
2015-07-03 07:51:13 +02:00
Morris Jobke
fd8f6a18fd
Merge pull request #17327 from owncloud/fix_index
...
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 23:26:28 +02:00
Lukas Reschke
8335c7a4e9
Correct wording
...
If a max version of 8.0.1 has been specified the message should indicate that 8.0.1 is also supported.
2015-07-02 16:37:39 +02:00
Lukas Reschke
b21d4a55f2
Add missing type annotations
2015-07-02 16:36:40 +02:00
Bjoern Schiessle
f5a7aa2968
call post_addToGroup als for class OC_User because sharing and LDAP are using this class. Minimal approach to fix #16740
2015-07-02 16:25:11 +02:00
Morris Jobke
081264cb93
[app code check] add OC_Search_Provider and _Result
...
Thanks to @libasys for noticing this.
2015-07-02 16:20:20 +02:00
Joas Schilling
8294ad71fc
Fix the path for users which have an exception for a group share
2015-07-02 15:35:31 +02:00
Morris Jobke
f5c57e076e
Merge pull request #17077 from owncloud/files-scan-absolute-path
...
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Lukas Reschke
62e3de1bdb
Check if response could get generated
...
`json_encode` fails hard on PHP >= 5.5 if a non UTF-8 value is specified by returning false. Older PHP versions just nullify the value which makes it at least somewhat usable.
This leads to very confusing errors which are very hard to debug since developers are usually not aware of this. In this case I'd consider throwing a fatal exception – since it arguably is an error situation – is a fair solution since this makes developers and administrators aware of any occurence of the problem so that these bugs can get fixed.
Fixes https://github.com/owncloud/core/issues/17265
2015-07-02 11:42:51 +02:00
Bjoern Schiessle
f52eec765c
owner is stored as 'uid_owner', not as 'owner' in the oc_share table
2015-07-02 10:49:22 +02:00
Lukas Reschke
d67d4f36bd
Delete OCS ID from DB if none is specified
...
If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value.
Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
2015-07-02 09:16:00 +02:00
Jenkins for ownCloud
d2e1cae331
[tx-robot] updated from transifex
2015-07-02 01:59:26 -04:00
Robin Appelman
57945dbc4b
fix typehinting
2015-07-01 16:13:33 +02:00
Robin Appelman
207ce35ee9
phpdoc
2015-07-01 16:07:57 +02:00
Robin Appelman
faf642c31d
expose the mount manager in the public api
2015-07-01 15:57:04 +02:00
Morris Jobke
bad499baad
Merge pull request #17252 from owncloud/fix-php-errors-in-app-description
...
Only do the description kung-fu on strings
2015-07-01 15:44:21 +02:00
Vincent Petry
709eca2085
Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonce
...
Clean up part file only once, not twice on error
2015-07-01 15:20:53 +02:00
Michael Roth
78e02045c1
Changed broken links to php manual
2015-07-01 14:13:18 +02:00
Thomas Müller
aae55174f6
Only do the description kung-fu on strings - fixes #17028
2015-07-01 13:15:13 +02:00
Vincent Petry
cf245b80fe
Only delete part file on error if it is really a part file
2015-07-01 12:52:06 +02:00
Vincent Petry
fd4efdded9
Clean up part file only once, not twice on error
2015-07-01 09:47:05 +02:00
Morris Jobke
b5c9196ffc
Merge pull request #17088 from owncloud/add-verbosity-to-upgrade
...
[upgrade] add verbosity check and show repair info & steps
2015-07-01 08:56:06 +02:00
Morris Jobke
4e44cc49d9
Merge pull request #17093 from owncloud/upgrade-timestamp
...
[upgrade] show timestamp for output during upgrade
2015-07-01 08:55:32 +02:00
Morris Jobke
da45fad3eb
Merge pull request #17078 from owncloud/fix-initial-server-host
...
Fix undefined offset
2015-07-01 08:55:12 +02:00
Morris Jobke
1469177a3a
Merge pull request #16406 from owncloud/enc-strlenperffix
...
Small perf tweak in strlen loop
2015-07-01 08:54:33 +02:00
Morris Jobke
c703a3a63e
Merge pull request #15569 from owncloud/remove-getetag-properties
...
Remove unneeded getetag entries in properties table
2015-07-01 08:53:37 +02:00
Vincent Petry
b921748e61
Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableException
...
Adding exception handling for ServerNotAvailableException
2015-07-01 07:18:36 +02:00
Vincent Petry
f76773bd4c
Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlock
...
Do not try clearing locked files in cache folder
2015-07-01 07:08:47 +02:00
Lukas Reschke
aff55347f9
Use UTF-8 mode for preg_split and preg_replace
...
Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553
Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
2015-07-01 01:44:33 +02:00
Vincent Petry
16ff6cff54
Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendisabled
...
Do not set callback wrapper when locking is disabled
2015-06-30 18:28:28 +02:00
Vincent Petry
2fe677d0ed
Catch cache garbage collection exception on postLogin
...
Just log the exception instead of preventing access to OC.
2015-06-30 17:36:55 +02:00
Vincent Petry
dd4de48418
Do not try clearing locked files in cache folder
2015-06-30 17:00:46 +02:00
Björn Schießle
2c1b0f9a66
Merge pull request #17225 from owncloud/fix_12106
...
if it is a mount point we need to get the path from the mount manager
2015-06-30 16:40:57 +02:00
Bjoern Schiessle
44ec3dd110
if it is a mount point we need to get the path from the mount manager
2015-06-30 15:08:18 +02:00
Thomas Müller
134dc136e6
Avoid namespace clash
2015-06-30 15:07:48 +02:00
Thomas Müller
3f3c603922
Adding exception handling for ServerNotAvailableException - refs #17192
2015-06-30 15:05:59 +02:00
Vincent Petry
0118bf04dc
Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-in-log
...
Perform the filesize on the file that exists
2015-06-30 14:51:29 +02:00
Vincent Petry
afd83caf69
Do not set callback wrapper when locking is disabled
2015-06-30 13:45:41 +02:00
Morris Jobke
2bcd0af177
Merge pull request #17189 from owncloud/files-straypartfilesonexception
...
Cleanup part file after upload exception
2015-06-30 11:58:26 +02:00
Joas Schilling
9c533342fc
Perform the filesize only when the file exists
...
Regression from 95602d4069
and 9b336765b6
2015-06-30 11:47:58 +02:00
Joas Schilling
a1bfc26b88
Merge pull request #17249 from owncloud/file-cache-is-a-icache
...
Fixing "ImportController::__construct() must implement interface OCP\…
2015-06-30 09:46:09 +02:00
Thomas Müller
fc474de573
Fixing "ImportController::__construct() must implement interface OCP\\ICache, instance of OC\\Cache\\File given"
2015-06-29 22:43:18 +02:00
Vincent Petry
167f57c15e
Unlock first path on rename if second path is locked
2015-06-29 17:31:14 +02:00
Vincent Petry
3217d4dad1
Cleanup part file after upload exception
...
Added unit tests for checking for stray part files.
Convert exception to sabre exception in upload put method.
Also added unit test for exception mapping, which also indirectly tests
that the part file is being deleted on exception.
This applies to both chunking and non-chunking mode.
Added some unit tests for chunk upload.
2015-06-29 17:31:14 +02:00
Vincent Petry
2fa432dfb8
Fix class name conflict
...
Looks like PHP 5.6.x doesn't like name conflicts.
\Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
2015-06-29 17:11:14 +02:00
Morris Jobke
b88a0e7080
Merge pull request #17231 from owncloud/add-missing-version-field
...
Add missing version field
2015-06-29 16:41:47 +02:00
Joas Schilling
30f5fa42e5
Merge pull request #17229 from owncloud/maintenance-plugin-test
...
Unit tests added for MaintenancePlugin
2015-06-29 16:22:38 +02:00
Thomas Müller
372a9afabe
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
2015-06-29 15:54:05 +02:00
Lukas Reschke
ab4d5d20ea
Typehint $targetVersion
2015-06-29 15:10:40 +02:00
Lukas Reschke
b56af26199
Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
...
Send OC version to appstore so it can reply with the right links
2015-06-29 15:07:00 +02:00
Robin Appelman
8a2ef26b5e
handle invalid results from mount providers
2015-06-29 14:42:34 +02:00
Thomas Müller
f8127046ee
Unit tests added for MaintenancePlugin
2015-06-29 14:18:09 +02:00
Joas Schilling
70eb20e3a7
Merge pull request #17030 from owncloud/lock-posthooks
...
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
Morris Jobke
c57fb19b2f
Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance
...
In case of maintenance we should add a message to the exception
2015-06-29 14:11:36 +02:00
Robin Appelman
786ec82a61
add unit test
2015-06-29 14:06:29 +02:00
Robin Appelman
8ec7e9fac7
fix getting mount points when passing a path to the files:scan command
2015-06-29 14:03:23 +02:00
Lukas Reschke
5810e7ab87
Merge pull request #17050 from owncloud/request-status-from-ocs
...
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
Thomas Müller
e236e564af
In case of maintenance we should add a message to the exception
2015-06-29 12:31:01 +02:00
Joas Schilling
ae3d402dbc
Send OC version to appstore so it can reply with the right links
2015-06-29 12:14:07 +02:00
Thomas Müller
aa595392f6
Merge pull request #17217 from owncloud/use-new-updater-url
...
Use new updater URL + add unit tests
2015-06-29 11:27:23 +02:00
Jenkins for ownCloud
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
Lukas Reschke
04fe9e05f0
Use new updater URL + add unit tests
...
Uses the new updater url "https://updates.owncloud.com/server/ "
2015-06-28 11:25:28 +02:00
Jenkins for ownCloud
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04:00
Lukas Reschke
a793b98fd0
Fix indentation
2015-06-27 20:37:07 +02:00
Lukas Reschke
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Roeland Douma
708c6268ad
Merge pull request #17206 from oparoz/bpg-media-type
...
Adding BPG media type
2015-06-27 10:19:56 +02:00
Jenkins for ownCloud
28c223edc6
[tx-robot] updated from transifex
2015-06-27 01:55:58 -04:00
Olivier Paroz
158c5b5e47
Adding BPG media type
2015-06-26 19:22:12 +02:00
Vincent Petry
0684cc15dc
Merge pull request #17071 from owncloud/share-get-users-non-existing
...
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
Vincent Petry
271ef9dedb
Remove test-specific method to make Bjoern and Joas happy
2015-06-26 17:37:04 +02:00
Robin Appelman
c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
Thomas Müller
ac94126393
Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
...
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
Björn Schießle
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Joas Schilling
9b336765b6
Correctly check if the real file exists, otherwise try the part file
2015-06-26 13:17:23 +02:00
Thomas Müller
796aae4402
Merge pull request #17009 from owncloud/lock-downloadfile
...
Lock file during download
2015-06-26 13:04:34 +02:00
Thomas Müller
6c3a4282e5
Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book
...
Search address book for federated cloud id
2015-06-26 10:53:02 +02:00
Jenkins for ownCloud
b1e29c7dde
[tx-robot] updated from transifex
2015-06-26 01:55:35 -04:00
Vincent Petry
538e466c30
Keep shared locks in post hooks
...
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.
Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
2015-06-25 16:33:02 +02:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Bjoern Schiessle
a288d0eea3
ne need to check twice if $row['share_with'] is set
2015-06-25 12:14:46 +02:00
Bjoern Schiessle
dd9dfc4461
show nice display name for remote shares if possible
2015-06-25 12:14:03 +02:00
Morris Jobke
1601867c9d
Remove unneeded getetag entries in properties table
...
* fixes #13281
2015-06-25 08:44:26 +02:00
Jenkins for ownCloud
dddbfb903f
[tx-robot] updated from transifex
2015-06-25 01:55:15 -04:00
Vincent Petry
58439c337c
Merge pull request #17070 from owncloud/lock-movemountbug
...
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
Morris Jobke
5f59393b30
Merge pull request #17110 from owncloud/share-error-handling
...
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Lukas Reschke
004280e407
Merge pull request #17136 from rullzer/fix_remove_link_OCS
...
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
Vincent Petry
8859004a2b
Rollback folder scan if an entry was locked
2015-06-24 15:42:00 +02:00
Thomas Müller
161ca900e0
Merge pull request #17130 from owncloud/update-mime-types
...
Update wmv and add mts and mt2s
2015-06-24 13:35:58 +02:00
Roeland Jago Douma
6977eff106
set NULL correctly in password update
...
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
2015-06-24 12:37:59 +02:00
Morris Jobke
300d1c88d0
Merge pull request #17106 from owncloud/htaccess-update-only-once
...
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-24 12:20:22 +02:00
Vincent Petry
35047a2300
Fix locked paths in the moveMount case
...
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.
Other operations will still lock the attached storage root.
2015-06-24 11:33:28 +02:00
Thomas Müller
5c213539af
Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107
2015-06-24 11:06:29 +02:00
Morris Jobke
17ff77c4e7
[Repair] add repair info for changed collation
2015-06-24 10:25:07 +02:00
Morris Jobke
5ff536b45a
[upgrade] add verbosity check and show repair info & steps
2015-06-24 10:25:05 +02:00
Joas Schilling
dba5d5e205
Use a OutputFormatter instead of hacking into writeln()
2015-06-24 09:26:30 +02:00
Morris Jobke
4f2f8a6f28
[sharing] handle shares of users that aren't available anymore
...
* properly handle the case where an abandoned share is left and
simply skip it
2015-06-23 18:22:36 +02:00
Morris Jobke
02b2b60581
Merge pull request #17095 from owncloud/proper-error-handling
...
Proper error handling
2015-06-23 17:40:55 +02:00
Joas Schilling
0db311c9db
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-23 16:45:56 +02:00
Morris Jobke
c86e129ce9
[updater] keep maintenance active on failure and mark failure in red
2015-06-23 14:45:53 +02:00
Björn Schießle
cce841c665
Merge pull request #17045 from owncloud/enc_improvements
...
encryption improvements
2015-06-23 14:30:21 +02:00
Morris Jobke
1ba9fd3ada
[upgrade] print update message before running the update code
...
* otherwise you don't know during which app update something failed
2015-06-23 13:13:44 +02:00
Bjoern Schiessle
95602d4069
make sure that we always read the header from the original file
2015-06-23 11:41:21 +02:00
Morris Jobke
fe42553e8a
[updater] propagate error case properly
...
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
2015-06-23 10:03:27 +02:00
Morris Jobke
fdd01cf15c
Added error message on initMountpoints exception
2015-06-23 09:54:03 +02:00
Hendrik Leppelsack
8621d176db
moved tooltip.js to vendor scripts
2015-06-22 15:38:32 +02:00
Joas Schilling
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +02:00
Joas Schilling
2b7e5f841a
Merge spliteUserRemote with fixRemoteUrlInShareWith
2015-06-22 15:25:23 +02:00
Bjoern Schiessle
d38a378b8c
make sure that we split username and server address at the first '@' from the right to allow usernames containing '@'
2015-06-22 15:25:23 +02:00
Björn Schießle
a88b370dc8
Merge pull request #12546 from oparoz/patch-1
...
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
Hendrik Leppelsack
f66e9af9a0
replaced tipsy with bootstrap tooltip
2015-06-22 13:32:06 +02:00
Lukas Reschke
4d23e06097
Fix undefined offset
...
There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
2015-06-22 12:28:07 +02:00
Thomas Müller
c74c8eff3a
Enable x-sendfile only if we do not lock the file system
2015-06-22 12:07:53 +02:00
Thomas Müller
ced15c44b4
Merge pull request #16657 from owncloud/view-emit-path
...
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
Bernhard Posselt
7fe5ab4d4a
Merge pull request #17056 from owncloud/appframework-type-cast
...
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
Robin McCorkell
103f8ca6e8
Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm
...
Use proper type
2015-06-21 23:33:19 +01:00
Robin McCorkell
04b6f67f07
Allow multiple whitespace in type hints in AppFramework
...
Type hints such as `@param bool $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
2015-06-20 23:52:01 +01:00
Jenkins for ownCloud
183bd6dd49
[tx-robot] updated from transifex
2015-06-20 01:55:10 -04:00
Lukas Reschke
1ead0b6f95
Use proper type
...
This is a string
2015-06-19 21:00:42 +02:00
Lukas Reschke
00a65e30ce
Request approved state for disabled apps with ocsid
...
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.
With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.
Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
Olivier Paroz
ba3b6f9be4
Remove unneeded returns from private cropping methods
2015-06-19 15:07:49 +02:00
Morris Jobke
5ed9743570
Merge pull request #17041 from owncloud/ocp-since-checker
...
Add tool to check OCP for missing @since tag
2015-06-19 14:40:15 +02:00
Morris Jobke
eddbdb8f21
Fix missing @since tags in OCP
2015-06-19 10:51:36 +02:00
Morris Jobke
7e046d0595
Fix naming of param in private/server.php
2015-06-19 10:23:04 +02:00
Joas Schilling
6adddb3095
Merge pull request #16889 from owncloud/group-sorting-fixes
...
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00
Vincent Petry
6697f9524c
Merge pull request #16963 from owncloud/fileinfo-lock
...
Acquire read lock when getting file or directory info
2015-06-18 18:27:20 +02:00
Vincent Petry
0b34d888e6
Merge pull request #17017 from owncloud/cache-update-write-lock
...
update the file cache within the write lock
2015-06-18 18:27:02 +02:00
Robin Appelman
17be0993b4
remove unneeded normalize
2015-06-18 15:33:44 +02:00
Robin Appelman
6018567df2
unlock the file if the file doesnt exists
2015-06-18 15:26:17 +02:00
Robin Appelman
d7960d5db6
dont update the cache on rename fail
2015-06-18 14:45:13 +02:00
Robin Appelman
2a50dbd1a1
update noopscanner
2015-06-18 14:42:48 +02:00
Robin Appelman
3e54696f7f
extends phpdoc
2015-06-18 14:30:25 +02:00
Robin Appelman
3526b352dc
update the file cache within the write lock
2015-06-18 13:47:03 +02:00
Olivier Paroz
64f0fd0889
Remove unneeded returns from private cropping methods
2015-06-18 13:30:10 +02:00
Olivier Paroz
8193e1d7c1
Move media type icon preview creation to its own method
2015-06-18 13:24:15 +02:00
Vincent Petry
a9bca9e3aa
Lock file before download
...
This will throw a LockedException if a concurrent request is currently
touching that file.
2015-06-18 12:05:26 +02:00
Olivier Paroz
13617a0475
Send the mime icon if we can't generate a preview
2015-06-18 11:35:08 +02:00
Jenkins for ownCloud
c4cb34da9d
[tx-robot] updated from transifex
2015-06-18 01:55:14 -04:00
Morris Jobke
6856316122
Fix return value for OCP PHPDoc
2015-06-17 15:47:45 +02:00
Robin Appelman
72eedda16c
use old cache data when locked
2015-06-17 14:13:10 +02:00
Robin Appelman
24f0151f81
handle locked exceptions when getting file/directory info in sabre
2015-06-17 14:13:10 +02:00
Vincent Petry
a89bb1d383
Merge pull request #16988 from owncloud/fix-avatar-fail
...
Fix remaining avatar problems
2015-06-17 13:20:29 +02:00
Thomas Müller
e6e9370eb6
Merge pull request #16985 from owncloud/fix-public-api-phpdoc
...
Fix OCP PHPDoc
2015-06-17 12:04:08 +02:00
Lukas Reschke
70ca0102f5
Fix PHPDoc annotations
2015-06-17 11:57:12 +02:00
Thomas Müller
d2305f2527
Merge pull request #16729 from owncloud/scanner-read-lock
...
keep a read lock while scanning a file or folder
2015-06-17 11:52:54 +02:00
Morris Jobke
9e506abec3
Fix OCP PHPDoc
...
* was always a string instead of \OCP\IUser
2015-06-17 11:10:55 +02:00
Vincent Petry
102c6ffc41
Normalize path in View's lock methods
2015-06-16 17:03:12 +02:00
Vincent Petry
e5d34a2733
Merge pull request #16892 from owncloud/lock-returnfullpath
...
Rethrow LockedException with full path
2015-06-16 16:47:10 +02:00
Lukas Reschke
829f6474ff
Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-completion
...
Load the update information asyncroniously to fix the page load speed
2015-06-16 11:41:44 +02:00
Joas Schilling
497fe93b6c
Do not return backends but add a method to check for one
2015-06-16 11:31:04 +02:00
Joas Schilling
171f86ca2e
Only sort by group name when LDAP is involved
2015-06-16 11:10:00 +02:00
Joas Schilling
7d8b728066
Merge pull request #16832 from owncloud/memcache-fail
...
Throw exception if memcache misconfigured or missing
2015-06-16 11:00:18 +02:00
Joas Schilling
60005bea19
Merge pull request #16943 from owncloud/sabre-convertinvalidpath
...
Convert invalid path exception to sabre exception on MOVE
2015-06-16 10:49:22 +02:00
Vincent Petry
0e3a3dd5d7
Rethrow LockedException with full path
...
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
2015-06-16 10:48:31 +02:00
Jenkins for ownCloud
0a5d73b874
[tx-robot] updated from transifex
2015-06-16 01:55:41 -04:00
Lukas Reschke
34f5541088
Add `no-store` to AppFramework
2015-06-15 18:35:41 +02:00
Lukas Reschke
15ba2a4100
Reintroduce user cache
...
This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200
Fixes https://github.com/owncloud/core/issues/16942
2015-06-15 17:54:48 +02:00
Vincent Petry
1f91e9e65d
Convert invalid path exception to sabre exception on MOVE
2015-06-15 17:49:11 +02:00
Robin Appelman
4b181f73ca
phpdoc
2015-06-15 15:41:52 +02:00
Robin Appelman
567df226e5
fix check if hooks should be emited in runHooks
2015-06-15 15:07:48 +02:00
Robin Appelman
9c0d69a3b2
ensure normalized path form when changing locks
2015-06-15 14:32:29 +02:00
Robin Appelman
a4f808b11d
properly unlock in case of failed fopen
2015-06-15 14:32:29 +02:00
Robin Appelman
7d72f7d8ce
keep a read lock while scanning a file or folder
2015-06-15 14:32:29 +02:00
Thomas Müller
911c43e5f9
Merge pull request #16727 from owncloud/file-put-content-lock
...
add proper locking to file_put_contents when using streams
2015-06-15 14:22:06 +02:00
Thomas Müller
de3ed8e077
Merge pull request #16821 from owncloud/compare-and-delete-locking-watch
...
Compare and delete locking watch
2015-06-15 14:09:06 +02:00
Thomas Müller
b8ab6fb68d
Merge pull request #16915 from aidanamavi/add-opus-mimetype
...
Added Opus Mimetype Support
2015-06-15 13:27:44 +02:00
Thomas Müller
b6165b6865
Merge pull request #16912 from owncloud/webdav-smalltransferlockfix
...
Webdav PUT small file lock must be shared during hooks
2015-06-15 11:30:59 +02:00
Jenkins for ownCloud
2806c9476c
[tx-robot] updated from transifex
2015-06-15 01:54:58 -04:00
Robin Appelman
2fb8a76705
add recursive copy polyfill for storage backends
2015-06-14 15:15:21 +02:00
Jenkins for ownCloud
fe9b28a800
[tx-robot] updated from transifex
2015-06-14 01:54:49 -04:00
Aidan Amavi
89a7aefad5
Added Opus Mimetype Support
...
Added Opus audio mimetype support.
2015-06-13 04:39:37 -04:00
Jenkins for ownCloud
51d181f331
[tx-robot] updated from transifex
2015-06-13 01:55:04 -04:00
Vincent Petry
4497aa4c68
Webdav PUT small file lock must be shared during hooks
...
Fixed code path for Webdav PUT of small files to use shared locks during
hook execution, and exclusive during the file operation
This makes it possible for versions to be copied by accessing the file
in a post_write hook.
2015-06-12 18:52:18 +02:00
Robin Appelman
a9ff242f6a
switch to using watch to implement cas and cad on redis
2015-06-12 17:28:09 +02:00
Robin Appelman
520a741876
clear memcache keys in locking
2015-06-12 17:28:09 +02:00
Robin Appelman
ac9f998abd
add compare-and-delete to the memcache interface
2015-06-12 17:28:09 +02:00
Robin Appelman
1bc56a99e9
compare-and-set and compare-and-delete using lua scripts for redis
2015-06-12 17:28:09 +02:00
Vincent Petry
446f628136
Merge pull request #16886 from owncloud/webdav-verify-path-again
...
verify path when getting a node for sabredav
2015-06-12 16:45:20 +02:00
Jan-Christoph Borchardt
bb0ea6336d
Merge pull request #16888 from owncloud/feature/fix-titles
...
fixing setting page titles
2015-06-12 14:54:42 +02:00
Vincent Petry
3b08b26589
Throw exception if memcache misconfigured or missing
...
Instead of falling back to null memcache, throw exceptions.
Also throw file locking specific exceptions in case the class is not
available.
2015-06-12 12:33:06 +02:00
Joas Schilling
5586b2db09
Don't use limit on explode to have only 1 code path
2015-06-12 11:58:26 +02:00
Joas Schilling
a7d2b3b9ae
Add return value to lock methods and check it in tests
2015-06-12 11:41:05 +02:00
Joas Schilling
caf16b083e
Only lock files in data/username/files/
2015-06-12 11:09:38 +02:00
Clark Tomlinson
62286f00a1
fixing setting page titles
2015-06-11 11:39:34 -04:00
Robin Appelman
05cecb101d
verify path when getting a node for sabredav
2015-06-11 17:11:33 +02:00
Vincent Petry
f13a2d9251
Revert "verify path when getting a node for sabredav"
2015-06-11 15:25:06 +02:00
Robin Appelman
4d10dab813
verify path when getting a node for sabredav
2015-06-11 14:12:04 +02:00
Joas Schilling
4582d14832
Order all use statements correctly
2015-06-11 11:29:27 +02:00
Joas Schilling
05f1ff8715
Correctly import NullCache class
2015-06-11 10:48:30 +02:00
Morris Jobke
672b8752e4
Merge pull request #16869 from owncloud/php7
...
Null -> NullCache
2015-06-11 09:29:49 +02:00
Jenkins for ownCloud
88d3c9ad40
[tx-robot] updated from transifex
2015-06-11 01:55:05 -04:00
Thomas Müller
3090348bf7
Null -> NullCache
2015-06-11 00:44:13 +02:00
Thomas Müller
48e915c7be
Revert "Null -> NullCache"
...
This reverts commit ff24554e76
.
2015-06-11 00:40:26 +02:00
Thomas Müller
ff24554e76
Null -> NullCache
2015-06-11 00:34:03 +02:00
Morris Jobke
be6ba653ea
Merge pull request #16814 from owncloud/improve-repair
...
Reduce amount of rows to update
2015-06-10 15:57:21 +02:00
Joas Schilling
580155abe7
Load the update information asyncroniously to fix the page load speed
2015-06-10 12:11:05 +02:00
Jenkins for ownCloud
4d88302b3a
[tx-robot] updated from transifex
2015-06-10 01:54:55 -04:00
Joas Schilling
0235e5edd3
Fix fetching the mimetype id from the query
2015-06-09 16:35:11 +02:00
Thomas Müller
9d90421e62
Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys
...
Check if the part files has keys when the original file does not
2015-06-09 11:41:36 +02:00
Jenkins for ownCloud
75bd040f1c
[tx-robot] updated from transifex
2015-06-09 01:55:06 -04:00
Victor Dubiniuk
262d7e659d
Reduce amount of rows to update
2015-06-09 01:04:42 +03:00
Victor Dubiniuk
c7c6556187
Do not use digits in random index names
2015-06-08 19:02:07 +03:00
Thomas Müller
64c9c27f7e
Merge pull request #16382 from oparoz/providers-are-responsible-for-the-size-of-their-preview
...
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
2015-06-08 16:14:35 +02:00
Joas Schilling
e6681857d2
Check if the part files has keys when the original file does not
2015-06-08 15:42:38 +02:00
Olivier Paroz
3d0a523217
Make sure we have a resource before measuring its size
2015-06-08 15:10:29 +02:00
Thomas Müller
97a3d8c313
Fix login handler for file cache - fixes #16795
2015-06-08 14:13:38 +02:00
Thomas Müller
a968b8409d
Merge pull request #16158 from owncloud/mountprovider-after-setup
...
Call newly registered mount providers after the filesystem is setup
2015-06-08 13:42:02 +02:00
Thomas Müller
f051b7381b
Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount
...
Sort user groups by group name and hide the user count
2015-06-08 12:11:22 +02:00
Jenkins for ownCloud
2fb1b0864a
[tx-robot] updated from transifex
2015-06-08 01:55:01 -04:00
Jenkins for ownCloud
3542148761
[tx-robot] updated from transifex
2015-06-07 01:55:03 -04:00
Olivier Paroz
71d65cb713
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
...
* introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box
* adds the method to all key providers so that they can do their job, as expected by the Preview class
* improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space
* fixes some long standing issues
* **contains mostly tests**
2015-06-06 16:25:04 +02:00
Jenkins for ownCloud
16708ae187
[tx-robot] updated from transifex
2015-06-06 01:55:26 -04:00
Lukas Reschke
ca10ee4d0d
Merge pull request #16771 from owncloud/fix-storage-full-message
...
Add owner to the storage stats to enable better notifications
2015-06-05 20:09:55 +02:00
Morris Jobke
3b188d0b72
Merge pull request #16768 from owncloud/add-missing-mime-types
...
Adding mimetype x-h for header files
2015-06-05 20:08:34 +02:00
Lukas Reschke
cbb15f3cbd
Merge pull request #16767 from owncloud/webdav-preventdeleteroot
...
Prevent deleting Webdav root
2015-06-05 19:56:20 +02:00
Morris Jobke
62ae39208a
Add owner to the storage stats to enable better notifications
...
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
2015-06-05 18:21:41 +02:00
Morris Jobke
0c9604e3b2
[OCP] update PHPdoc to contain correct @since tags
2015-06-05 17:30:45 +02:00
Thomas Müller
5481a846c2
Adding mark down mime type mkd - fixes https://github.com/owncloud/files_texteditor/issues/45
2015-06-05 17:11:14 +02:00
Thomas Müller
5d93353a02
Adding mimetype x-h for header files - fixes https://github.com/owncloud/files_texteditor/issues/70
2015-06-05 16:57:01 +02:00
Vincent Petry
6ae5ae2e31
Prevent deleting Webdav root
2015-06-05 16:55:09 +02:00
Thomas Müller
85d1ca11d4
Merge pull request #16765 from owncloud/fix-chunked-upload-jenkins
...
Fix chunked upload jenkins
2015-06-05 16:20:33 +02:00
Thomas Müller
5e60795962
Bring back OC\Cache\File - fixes #16760
2015-06-05 14:21:17 +02:00
Joas Schilling
1df95ea1ca
Fix "@throws" tags on doc blocks
2015-06-05 13:55:59 +02:00
Vincent Petry
06dda427f3
Validate path in getChild
2015-06-05 12:08:18 +02:00
Jenkins for ownCloud
e544d5b2c6
[tx-robot] updated from transifex
2015-06-05 01:55:04 -04:00
Morris Jobke
ab5ecb3d22
Fix typo in PHPDoc
2015-06-04 15:19:04 +02:00
Jenkins for ownCloud
66a24ff479
[tx-robot] updated from transifex
2015-06-04 01:56:24 -04:00
Joas Schilling
bb0cb0aaec
Merge pull request #15895 from owncloud/dav-getremoteetag
...
Get etag from remote OC server
2015-06-03 17:20:25 +02:00
Robin Appelman
bcf13aff6f
change lock back to shared before updating the cache
2015-06-03 17:18:50 +02:00
Robin Appelman
6b0874203d
add proper locking to file_put_contents when using streams
2015-06-03 17:18:50 +02:00
Clark Tomlinson
00742a9d68
Merge pull request #16721 from owncloud/fix-grammar-enc-module
...
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t …
2015-06-03 09:54:50 -04:00
Thomas Müller
5dc5b7f86d
Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user.
2015-06-03 15:00:56 +02:00
Thomas Müller
259b6ac2c1
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746
2015-06-03 14:56:18 +02:00
Thomas Müller
739c3f01aa
Merge pull request #16434 from owncloud/persist-maintenance-state
...
Persist the state of the maintenance after an upgrade
2015-06-03 13:56:17 +02:00
Thomas Müller
69d1e7aaf4
Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version
...
Check for redis to be 2.2.5+
2015-06-03 13:55:26 +02:00
Morris Jobke
e3440863bc
Merge pull request #16708 from owncloud/enc_fix_move_to_trash
...
make sure that we always use the correct owner for both source and target
2015-06-03 13:49:46 +02:00
Vincent Petry
6ab38be40e
Translate invalid path exception to sabre exception for files
2015-06-03 12:22:31 +02:00
Bjoern Schiessle
7eb2b31e34
make sure that we always use the correct owner for both source and target
2015-06-03 11:59:06 +02:00
Jenkins for ownCloud
410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
Morris Jobke
259937680b
Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares
...
Add tests for the storage wrapper and fix the wrapping
2015-06-02 16:42:32 +02:00
Joas Schilling
bdc82dcfb9
Check for redis to be 2.2.5+
2015-06-02 15:42:48 +02:00
Robin Appelman
a9455be14a
more hints
2015-06-02 14:16:37 +02:00
Robin Appelman
0497534a6e
more type hints
2015-06-02 14:07:55 +02:00
Robin Appelman
8926bca0c7
phpdoc, strict and type hints
2015-06-02 14:07:55 +02:00
Robin Appelman
6f47a547d8
only use mount provider if we have a valid user
2015-06-02 14:07:54 +02:00
Robin Appelman
24131586d7
call mount providers that are registered after the filesystem is setup
2015-06-02 14:07:54 +02:00
Robin Appelman
c91b52d38c
move emitter implementation to a trait
2015-06-02 14:07:54 +02:00
Robin Appelman
4b48dd424f
emit hooks from a view as long as the path is inside the default root
2015-06-02 14:07:20 +02:00
Thomas Müller
3ebc8f0564
Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master
...
Fix get local file encryption master
2015-06-02 13:47:37 +02:00
Joas Schilling
be1f319511
Correctly ignore remote shares aswell
2015-06-02 12:33:51 +02:00
Joas Schilling
50a31fa8f9
Add unit tests for wrapStorage
2015-06-02 12:33:17 +02:00
Joas Schilling
9a4040c7ca
Move the storage wrapping into a testable method
2015-06-02 12:29:06 +02:00
Vincent Petry
30d7f92763
Get etag from remote OC server
2015-06-02 11:42:03 +02:00
Morris Jobke
cf2c599218
Merge pull request #16200 from owncloud/kill-globalfilecache
...
Drop file caching
2015-06-02 09:11:33 +02:00
Jenkins for ownCloud
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
Lukas Reschke
73875da4b0
Clean application identifier before processing
2015-06-01 17:03:51 +02:00
Thomas Müller
2104c2ffdd
Fixing undefined index 'foo'
2015-06-01 14:10:00 +02:00
Robin Appelman
8902e2be73
fix nooplockingprovider
2015-06-01 13:25:27 +02:00
Robin Appelman
ce04cf6610
shared lock around hooks
2015-06-01 13:24:02 +02:00
Robin Appelman
661c9e2444
add changeLock to the storage api
2015-06-01 13:24:02 +02:00
Robin Appelman
a1372b2fb5
add method to atomically change between shared and exclusive lock
2015-06-01 13:24:02 +02:00
Vincent Petry
270a10b754
Return 423 instead of 503 for locked files
2015-06-01 13:24:02 +02:00
Vincent Petry
0451a6652d
Move locking exceptions
2015-06-01 13:24:02 +02:00
Vincent Petry
ba174ac626
Convert LockedException to FileLocked in Sabre connector
...
For Sabre to be able to return the proper error code instead of 500, the
LockedException is now rethrown as FileLocked exception in the Sabre
connector
2015-06-01 13:22:57 +02:00
Robin Appelman
8665a98744
add locking for non-chunking webdav upload
2015-06-01 13:22:57 +02:00
Robin Appelman
72776b165f
use arraycache for locking in unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
6b965d71d1
add seperate config option for locking memcache backend
2015-06-01 13:22:56 +02:00
Robin Appelman
72847dbc77
always use locking in unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
437c0b55a6
unlock source file when we cant lock the target in a rename
2015-06-01 13:22:56 +02:00
Robin Appelman
668fafd4d2
close file handle after sending sabre response
2015-06-01 13:22:56 +02:00
Vincent Petry
2f4f468399
Added config switch for file locking
2015-06-01 13:22:56 +02:00
Vincent Petry
6df502a5aa
Fix Null memcache fallback to match interface
2015-06-01 13:22:56 +02:00
Robin Appelman
006eaa84aa
dont release shared lock if we dont have any
2015-06-01 13:22:56 +02:00
Robin Appelman
f0b8672729
fix locking root of a view
2015-06-01 13:22:56 +02:00
Robin Appelman
e08423f956
release all locks on shutdown
2015-06-01 13:22:56 +02:00
Robin Appelman
2d63fd77de
dont apply callback wrapper when fopen failed
2015-06-01 13:22:56 +02:00
Robin Appelman
1270c6800d
dont lock on meta data operations
2015-06-01 13:22:56 +02:00
Robin Appelman
35c377f7a9
phpdoc and minor issues
2015-06-01 13:22:56 +02:00
Vincent Petry
8d53dc803f
Use md5 + prefix for file locking keys in memcache
...
Also trim slashes from paths to make sure the locks are based on the
same paths.
2015-06-01 13:22:56 +02:00
Vincent Petry
0775e9c1ca
Use md5 for lock key
2015-06-01 13:22:56 +02:00
Vincent Petry
5edf294ce5
Add CAS methods to Null memcache
...
This prevents breaking ownCloud completely when memcache is not enabled
and the locking code is triggered
2015-06-01 13:22:56 +02:00
Robin Appelman
a1a25a9b5b
fix unlocking when moving mount points
2015-06-01 13:22:56 +02:00
Robin Appelman
7e418c7d69
high level locking wip
2015-06-01 13:22:56 +02:00
Robin Appelman
e64360e72d
always use arraycache for unit tests
2015-06-01 13:22:56 +02:00
Robin Appelman
bf7002bc65
add locking to the view apo
2015-06-01 13:22:56 +02:00
Robin Appelman
536e187e51
add locking to the storage api
2015-06-01 13:22:56 +02:00
Robin Appelman
cdf7f91259
expose locking provider in the server container
2015-06-01 13:22:55 +02:00
Thomas Müller
2c86cc821c
Merge pull request #16628 from owncloud/webdav-validatepath
...
Validate target file name for some webdav ops
2015-06-01 13:20:19 +02:00
Jenkins for ownCloud
8d23b34402
[tx-robot] updated from transifex
2015-05-31 01:54:44 -04:00
Jenkins for ownCloud
a3bc112412
[tx-robot] updated from transifex
2015-05-30 01:55:46 -04:00
Vincent Petry
06f8c80af6
Validate target file name for some webdav ops
2015-05-29 19:14:38 +02:00
Thomas Müller
67cef93fdd
Merge pull request #16578 from owncloud/fix_16556
...
show txt preview when file contains text
2015-05-28 20:48:16 +02:00
Morris Jobke
7f83829db3
Merge pull request #16592 from owncloud/fix-16574
...
Add type hint for OC_Channel
2015-05-28 20:36:44 +02:00
Vincent Petry
e114d00242
Only use quota stream wrapper on "files"
...
Prevent using the quota stream wrapper on trashbin folders and other
metadata folders
2015-05-28 18:31:20 +02:00
Vincent Petry
ded62ff693
Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages
...
[encryption] fix move versions between storages
2015-05-28 15:28:25 +02:00
Vincent Petry
474c99e19a
Merge pull request #16577 from owncloud/enc_improve_migration
...
only request encryption module for files which are not excluded
2015-05-28 11:31:33 +02:00
Björn Schießle
e1483f65c3
Merge pull request #16591 from owncloud/enc_improved_error_message
...
improved error message for various states
2015-05-28 10:55:53 +02:00
Jenkins for ownCloud
1726d84e73
[tx-robot] updated from transifex
2015-05-28 01:55:22 -04:00
Bjoern Schiessle
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
Victor Dubiniuk
4239054383
Add type hint for OC_Channel
2015-05-27 18:03:11 +03:00
Bjoern Schiessle
0de59acb49
only request encryption module for files which are not excluded
2015-05-27 15:47:40 +02:00
Lukas Reschke
ffd73ef2e4
Fix indentation
2015-05-27 14:57:19 +02:00
Georg Ehrke
bb676f2799
show txt preview when file contains text
2015-05-27 14:11:33 +02:00
Morris Jobke
3de945d13d
Merge pull request #16527 from owncloud/end-processing-when-404
...
End processing when file is not found
2015-05-27 09:36:05 +02:00
Thomas Müller
4513cf5967
Revert "Revert "Revert "FIX for webdav.mediencenter.t-online.de"""
2015-05-26 14:40:07 +02:00
Oliver Kohl D.Sc
f8938f004d
Revert "Revert "FIX for webdav.mediencenter.t-online.de""
2015-05-26 13:36:45 +02:00
Björn Schießle
f70c309c2d
Merge pull request #16561 from owncloud/add-default-timeout-back
...
Add connection timeout to default POST options
2015-05-26 12:23:57 +02:00
Vincent Petry
f1fc7b155c
Merge pull request #16515 from owncloud/deprecate-useless-helper-class
...
Deprecate useless helper class
2015-05-26 12:22:05 +02:00
Vincent Petry
39c6a36488
Merge pull request #16532 from owncloud/cors-no-cookie-auth
...
Disallow cookie auth for cors requests
2015-05-26 12:12:04 +02:00
Björn Schießle
ab0747113c
Merge pull request #16452 from owncloud/enc_ftp_upload
...
always write file, if fseek doesn't work we write the whole file
2015-05-26 12:02:41 +02:00
Thomas Müller
3babcd0344
Merge pull request #16339 from owncloud/master-override-channel
...
Allow change update channel via public API
2015-05-26 11:42:41 +02:00
Lukas Reschke
dff361dc5c
Add connection timeout to default POST options
...
Fixes https://github.com/owncloud/core/issues/16560
2015-05-26 11:22:50 +02:00
jknockaert
a577e723b0
flush() comments + perf opt
2015-05-26 10:22:52 +02:00
Jenkins for ownCloud
fe610a65d3
[tx-robot] updated from transifex
2015-05-25 01:55:06 -04:00
Jenkins for ownCloud
06934e7c00
[tx-robot] updated from transifex
2015-05-24 01:55:03 -04:00
Jenkins for ownCloud
e189435499
[tx-robot] updated from transifex
2015-05-23 01:55:05 -04:00
Vincent Petry
ce34edacfa
Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload
...
remove part file extension before we read a filekey
2015-05-22 16:42:52 +02:00
Bjoern Schiessle
c63f2286c0
copy keys before we move a file between storages to make sure that the new target file reuses the old file key, otherwise versions will break
2015-05-22 15:41:28 +02:00
Bernhard Posselt
c8e3599cad
disallow cookie auth for cors requests
...
testing ...
fixes
fix test
add php doc
fix small mistake
add another phpdoc
remove not working cors annotations from files app
2015-05-22 14:06:26 +02:00
Bjoern Schiessle
fef75e5417
remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break
2015-05-22 12:12:31 +02:00
Lukas Reschke
8ce3d6ea57
End processing when file is not found
...
We have to end the processing when a file is not found or otherwise the method is proceeding and even sending invalid file paths to the sendfile methods.
Due to nginx preventing directory traversals this is luckily not immediately exploitable. We should for hardening purposes however quit the script execution just as we do for 403 cases and others as well.
2015-05-22 11:53:02 +02:00
Vincent Petry
b82d902e18
Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype
...
Get correct mimetype when moving and changing extension
2015-05-22 11:37:11 +02:00
Joas Schilling
d7b2bc9e2f
Merge pull request #16516 from owncloud/fix-phpdoc-trait
...
Fix PHPDoc
2015-05-22 09:47:59 +02:00
Jenkins for ownCloud
156881efce
[tx-robot] updated from transifex
2015-05-22 01:55:04 -04:00
Lukas Reschke
3d8ea96e55
Fix PHPDoc
...
Use correct parameters
2015-05-22 00:17:38 +02:00
Lukas Reschke
c1f8829590
Deprecate useless helper class
...
The helper class has no real reason anymore with 8.1.0 as we now have better public APIs. No need for an `IHelper` class like that from my opinion.
2015-05-21 23:35:37 +02:00
jknockaert
bf6151e799
fix calculation of $count, $count is always 8129 so we need to check this
...
against the unencrypted file size
2015-05-21 14:15:26 +02:00
Bjoern Schiessle
5a20edac82
test to simulate a non-seekable stream wrapper
2015-05-21 14:15:26 +02:00
jknockaert
fb51880a4a
encrypted filesize calculation in flush()
2015-05-21 14:15:26 +02:00
Bjoern Schiessle
38bceb0d74
distinguish between source and target mount point to allow copy/rename between system wide mount points and user specific mountpoints
2015-05-21 14:06:45 +02:00
Lukas Reschke
94077caea9
Merge pull request #16499 from owncloud/fix-phpdoc-annotations
...
Fix PHPDoc 🙈
2015-05-21 13:54:01 +02:00
Lukas Reschke
694d639f94
Fix PHPDoc 🙈
...
*sigh*
2015-05-21 13:07:54 +02:00
Vincent Petry
22968e806c
Get correct mimetype when moving and changing extension
...
Fixes issue when restoring folders from trash cross-storage, as such
folders have an extension ".d12345678".
Fixes issue when moving folders between storages and at the same time
changing their extension.
2015-05-21 10:57:58 +02:00
Joas Schilling
896130b68d
Merge pull request #16473 from owncloud/occ_16221
...
occ option to update all third party apps without disable
2015-05-21 09:47:54 +02:00
Jenkins for ownCloud
42dd40ad80
[tx-robot] updated from transifex
2015-05-21 01:55:57 -04:00
Steffen Lindner
48040c46cb
Skip disable3rdParty Apps
2015-05-20 17:06:00 +02:00
Morris Jobke
39d1e99228
Merge pull request #16322 from owncloud/trash-view
...
dont go trough the view when moving to trash
2015-05-20 14:44:01 +02:00
Vincent Petry
7386257676
Merge pull request #16075 from owncloud/skeleton-copy-delay
...
wait with copying the skeleton untill login and setupfs are done
2015-05-20 13:52:08 +02:00
Jan-Christoph Borchardt
f978474577
Merge pull request #16463 from owncloud/add-support-to-disallow-domains
...
Add support for disallowing domains to the ContentSecurityPolicy
2015-05-20 13:08:11 +02:00
Lukas Reschke
a62190a72d
Add support for disallowing domains to the ContentSecurityPolicy
...
For enhanced security it is important that there is also a way to disallow domains, including the default ones.
With this commit every method gets added a new "disallow" function.
2015-05-20 11:44:37 +02:00
Morris Jobke
1e59be2d2d
Merge pull request #16453 from cmeh/patch-6
...
Clean-up of orthography, grammar
2015-05-20 10:26:42 +02:00
Jenkins for ownCloud
c49a06a684
[tx-robot] updated from transifex
2015-05-20 01:56:19 -04:00
Thomas Müller
f9d04f62a8
Merge pull request #16440 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
Christian Hoffmann
35207ae363
Clean-up of orthography, grammar
...
* Changed "instead to" to "instead of".
* Changed "setup" to "set up" (past participle).
2015-05-19 21:15:22 +02:00
Thomas Müller
f59576c3ca
Merge pull request #16447 from owncloud/fix-minor-code-problems
...
Fix unexisting class and broken doc
2015-05-19 16:23:36 +02:00
Joas Schilling
d832c4ae23
Fix unexisting class and broken doc
2015-05-19 15:27:50 +02:00
Thomas Müller
10d1fd1306
Merge pull request #16419 from owncloud/user-group-backend-performance
...
Reduce the complexity of the search queries in the user/group backends to a minimum
2015-05-19 14:51:13 +02:00
Robin Appelman
9c751f1d87
use copy when doing a crossStorageCopy on the same storage
2015-05-19 14:21:58 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-19 11:23:06 +00:00
Thomas Müller
ad88a7d53d
exception class will be logged as well - helps especially in cases where the message contained is empty - e.g. "message":"OCP\\Files\\NotFoundException: at \/home\/deepdiver\/Development\/ownCloud\/core-autotest\/apps\/provisioning_api\/lib\/users.php#354",
2015-05-19 12:35:22 +02:00
Thomas Müller
a52afb040a
Merge pull request #15965 from owncloud/conditional-logging
...
Conditional logging
2015-05-19 12:00:19 +02:00
Thomas Müller
d90b83725f
Merge pull request #16085 from owncloud/encryption-module-rename
...
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
Morris Jobke
064f5204cc
Persist the state of the maintenance after an upgrade
...
* if maintenance mode was enabled before an upgrade
it will be enabled afterwards too
* fixes #16429
2015-05-19 10:56:04 +02:00
Morris Jobke
aae9274210
Merge pull request #16293 from owncloud/xcache
...
Mute XCache error when trying to clear the opcode cache
2015-05-19 09:32:17 +02:00
Björn Schießle
1c411baf17
Merge pull request #16412 from owncloud/jknockaert-patch-1
...
fix #16356
2015-05-18 19:26:40 +02:00
Clark Tomlinson
f9b6ee86cd
Merge pull request #16399 from owncloud/enc_rmdir_fix
...
[encryption] only try to delete file keys if it is a valid path
2015-05-18 11:09:36 -04:00
Joas Schilling
8efc8c0a96
Reduce the complexity of the search queries in the backends to a minimum
2015-05-18 16:39:21 +02:00
Thomas Müller
c28cd03770
Merge pull request #16403 from owncloud/fix-command-loading
...
Only load commands of enabled apps
2015-05-18 16:16:04 +02:00
jknockaert
2834971a77
fix #16356
2015-05-18 15:06:55 +02:00
Björn Schießle
a1e60e7882
Merge pull request #15980 from owncloud/jknockaert-patch-1
...
fix bug #15973
2015-05-18 15:01:16 +02:00
Vincent Petry
9d3d7ec659
Small perf tweak in strlen loop
2015-05-18 13:27:22 +02:00
Joas Schilling
d683752b37
Sort user groups by group name and hide the user count
2015-05-18 12:55:19 +02:00
Joas Schilling
85f500f070
Merge pull request #16398 from owncloud/fix-php-doc
...
Fix PHPDoc of public interface ILockingProvider
2015-05-18 12:43:07 +02:00
Morris Jobke
ad3a32edf6
Only load commands of enabled apps
2015-05-18 12:33:56 +02:00
Robin Appelman
077d41a9ce
wait with copying the skeleton untill login and setupfs are done
2015-05-18 12:11:31 +02:00
Bjoern Schiessle
efa674f10d
only try to delete file keys if it is a valid path
2015-05-18 11:54:51 +02:00
Vincent Petry
7e271012b2
Merge pull request #16243 from owncloud/error_if_download_failed
...
redirect to error page if download failed
2015-05-18 11:42:55 +02:00
Morris Jobke
fc2c9e8f5f
Fix PHPDoc of public interface ILockingProvider
2015-05-18 11:37:16 +02:00
Morris Jobke
7ee3f99a4a
Merge pull request #16364 from owncloud/add-warning-webdav
...
Add notice that WebDAV interface is not intended for browsers
2015-05-18 11:28:47 +02:00
Roeland Jago Douma
9866066d3e
Depreatace OC_Util::getUrlContent
...
It is just a wrapper and the other functions are deprecated already
2015-05-18 11:03:48 +02:00
Bjoern Schiessle
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
Vincent Petry
246000f799
Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota
...
Validate the quota value to be a correct value
2015-05-15 18:07:13 +02:00
Joas Schilling
0991c0cc02
Merge pull request #16292 from owncloud/webdav-storage-fireprehooks
...
Fire prehooks when uploading directly to storage
2015-05-15 15:08:27 +02:00
Thomas Müller
937306b416
Merge pull request #16323 from owncloud/enc_webdav_fixes
...
some encryption fixes
2015-05-15 10:38:22 +02:00
Lukas Reschke
13778893d9
Add notice that WebDAV interface is not intended for browsers
...
Fixes https://github.com/owncloud/core/issues/16359
2015-05-15 09:07:39 +02:00
Lukas Reschke
8ae8600b1f
Merge pull request #16342 from owncloud/fix_16338
...
fix preview hooks, enable_previews default is true
2015-05-15 08:48:12 +02:00
Jenkins for ownCloud
49c4ee98b4
[tx-robot] updated from transifex
2015-05-15 01:54:49 -04:00
Georg Ehrke
745c3c64fa
fix preview hooks, enable_previews default is true
2015-05-13 19:59:41 +02:00
Victor Dubiniuk
af814ba270
Allow change update channel via public API
2015-05-13 20:29:33 +03:00
Bjoern Schiessle
ccbefb6e75
delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories
2015-05-13 19:06:23 +02:00
Vincent Petry
3cae0135ad
Fire prehooks when uploading directly to storage
2015-05-13 17:47:04 +02:00
Robin Appelman
4789e87a53
Merge pull request #16276 from owncloud/dav-quota-root
...
fix webdav quota check for the root of the dav endpoint
2015-05-13 14:43:02 +02:00
Arthur Schiwon
e5a91fc185
remove file cache remainings from server container
2015-05-13 12:26:36 +02:00
Jenkins for ownCloud
504586aec6
[tx-robot] updated from transifex
2015-05-13 01:55:14 -04:00
Lukas Reschke
cbfdbf96d2
Mute XCache error when trying to clear the opcode cache
...
From https://github.com/owncloud/core/issues/16287 :
> This is caused by XCache at 8e59d4c64b/lib/private/util.php (L1276)
where we are trying to reset the opcode cache with `XC_TYPE_PHP`.
> I suspect that while XCache is installed its opcode component is not used. Unfortunately, the XCache API is not really properly documented and thus I don't know what API we would have to call to check whether the `XC_TYPE_PHP` cache is populated. In fact, there is an [open XCache bug](http://xcache.lighttpd.net/ticket/176 ) since 7 years that discusses this problem and is likely to never get fixed since XCache is abandonware.
Fixes https://github.com/owncloud/core/issues/16287
2015-05-12 19:22:39 +02:00
Morris Jobke
dc362823e0
Merge pull request #16269 from owncloud/master-fix-16179
...
Check if cURL supports the desired features
2015-05-12 18:27:57 +02:00
Arthur Schiwon
d6becb8d82
add repair steps to get rid of old background jobs
2015-05-12 18:19:44 +02:00
Arthur Schiwon
e016ed55ff
also free joblist and base from file cache code
2015-05-12 17:44:31 +02:00
Robin Appelman
11e1acd8ec
fix webdav quota check for the root of the dav endpoint
2015-05-12 14:02:27 +02:00
Björn Schießle
fbe4b77c49
Merge pull request #16228 from owncloud/enc_fix_restore
...
use hooks to update encryption keys
2015-05-12 13:10:16 +02:00
Lukas Reschke
4613456a8a
Check if cURL supports the desired features
...
Older versions of cURL that are unfortunately still bundled by distributors don't support these features which will result in errors and other possibly unpredictable behaviour.
Fixes https://github.com/owncloud/core/issues/16179 for master – stable8 requires another patch.
2015-05-12 12:00:56 +02:00
Morris Jobke
b11c0c533e
Merge pull request #16233 from owncloud/enc_fix_check_if_file_is_excluded
...
fix check if a file is excluded from encryption
2015-05-12 09:12:38 +02:00
Morris Jobke
afcec88c6f
Merge pull request #16234 from owncloud/issue-16206-fix-app-config-parallel-insert
...
Issue 16206 fix app config parallel insert
2015-05-11 16:05:30 +02:00
Bjoern Schiessle
9dd517071e
fix check if file is excluded from encryption
2015-05-11 12:38:59 +02:00
Joas Schilling
dfed287dc0
Use insertIfNotExists to avoid problems with parallel calls
2015-05-11 12:38:33 +02:00
Bjoern Schiessle
0d5c7a11e2
use hooks to update encryption keys instead of the storage wrapper if a file gets renamed/restored, as long as we
...
are in the storage wrapper the file cache isn't up-to-date
2015-05-11 12:06:57 +02:00
Thomas Müller
7db994971e
Merge pull request #16208 from owncloud/fix-language-selection-sr-latin
...
Some locales need to be converted to be compliant with CLDR
2015-05-11 11:21:28 +02:00
Jenkins for ownCloud
a331f6b83e
[tx-robot] updated from transifex
2015-05-11 01:54:43 -04:00
Jenkins for ownCloud
52fc45e6e3
[tx-robot] updated from transifex
2015-05-10 01:56:13 -04:00
Jenkins for ownCloud
6f5854a8de
[tx-robot] updated from transifex
2015-05-09 01:55:35 -04:00
Thomas Müller
9c57ae89d9
Some locales need to be converted to be compliant with CLDR
2015-05-08 23:45:07 +02:00
Morris Jobke
e79c255cab
Conditional logging
...
* Log condition for log level increase based on conditions. Once one of these
conditions is met, the required log level is set to debug. This allows to
debug specific requests, users or apps
* Supported conditions (setting `log_condition` in `config.php`):
- `shared_secret`: if a request parameter with the name `log_secret` is set to
this value the condition is met
- `users`: if the current request is done by one of the specified users,
this condition is met
- `apps`: if the log message is invoked by one of the specified apps,
this condition is met
* fix unit test and add app log condition test
2015-05-08 15:58:33 +02:00
Morris Jobke
892b5ceeeb
Move log level check to logger parent class
...
* remove duplicate code from child classes
2015-05-08 15:14:45 +02:00
Arthur Schiwon
3de7f58321
remove file cache classes and its tests
2015-05-08 14:05:54 +02:00
Lukas Reschke
c9921ec127
Merge pull request #16124 from owncloud/issue-16109-fix-share-email-with-shared-folder
...
Fix the share mail notification when the item is in a folder
2015-05-08 13:03:28 +02:00
Lukas Reschke
16a0de6314
Merge pull request #16146 from owncloud/issue-16103-hide-module-already-exists-on-enable-app
...
Avoid the log entry with the ModuleAlreadyExists exception when enabl…
2015-05-08 11:55:02 +02:00
Thomas Müller
4659927d7a
Pure numbers are returned as bytes right away
2015-05-08 10:54:54 +02:00
Thomas Müller
15d134124b
Validate the quota value to be a correct value
2015-05-07 17:56:13 +02:00
Robin Appelman
06a65fab13
use cross storage move when renaming the part file during webdav put
2015-05-07 14:28:31 +02:00
Joas Schilling
49f94b17f7
Avoid the log entry with the ModuleAlreadyExists exception when enabling the app
2015-05-07 11:00:55 +02:00
Jenkins for ownCloud
3dee907b70
[tx-robot] updated from transifex
2015-05-07 01:56:44 -04:00
Thomas Müller
55eaa165f8
Merge pull request #16119 from owncloud/fix-16056
...
[HHVM] Throw RunTimeException from OC\AppFramework\App::buildAppNamespace()
2015-05-07 00:20:57 +02:00
Andreas Fischer
e418ced656
Check return value of OC_App::getAppPath() and verify info.xml exists.
2015-05-06 17:15:28 +02:00
Joas Schilling
b4471c2591
Fix the share mail notification when the item is in a folder
2015-05-06 15:44:19 +02:00
Jan-Christoph Borchardt
35292eb66c
rename to 'Default encryption module'
2015-05-06 15:31:05 +02:00
Björn Schießle
6633514a98
Merge pull request #15628 from owncloud/enc_fix_rename
...
Encryption - fix moving/copying files between storages
2015-05-06 15:03:59 +02:00
Joas Schilling
892e2a3321
Merge pull request #16099 from labkode/prevent-preview-hooks
...
Do not trigger preview hooks if enable_previews is false
2015-05-06 14:37:59 +02:00
Joas Schilling
aea734aaf1
Fix missing types on doc block and deduplicate the method name
2015-05-06 14:31:10 +02:00
Bjoern Schiessle
e4829a2358
update 'encrypted'-flag in file cache according to the storage settings
2015-05-06 14:20:05 +02:00
Bjoern Schiessle
dc39bda870
move/copy from storage
2015-05-06 14:20:02 +02:00
Bjoern Schiessle
83ed4ee5b6
unit tests
2015-05-06 12:28:15 +02:00
Bjoern Schiessle
e7a3911c83
check if encryption is enbaled before we start moving keys
2015-05-06 11:35:45 +02:00
Lukas Reschke
9a159372cb
Merge pull request #16067 from owncloud/verbosity-in-app-code-check
...
Add verbosity option to app:check-code
2015-05-06 11:21:23 +02:00
Thomas Müller
35a2fd3f89
Only return cached files if existing
2015-05-06 11:16:44 +02:00
Hugo Gonzalez Labrador
3e647afbd4
Do not trigger preview hooks if enable_previews is false
2015-05-06 10:39:48 +02:00
Morris Jobke
874d35b27a
Merge pull request #16070 from owncloud/enc_update_file_cache_on_copy
...
make sure that we keep the correct encrypted-flag and the (unencrypted)size
2015-05-06 10:28:10 +02:00
Hugo Gonzalez Labrador
3a3a58f248
Do not trigger preview hooks if enable_previews is false
2015-05-06 10:03:18 +02:00
Morris Jobke
f1903f61a1
Merge pull request #16072 from owncloud/phpdoc-cache
...
improve phpdoc of cache classes
2015-05-06 09:38:56 +02:00
Morris Jobke
c3fb021acf
Merge pull request #16017 from owncloud/proper-update-notification
...
Use OC.Notification for update notifications
2015-05-06 09:28:42 +02:00
Jörn Friedrich Dreyer
4c0d1b0460
Merge pull request #16050 from owncloud/add-workaround-for-populate-raw-post-data
...
Don't display errors and log them
2015-05-06 08:55:46 +02:00
Jenkins for ownCloud
910146824e
[tx-robot] updated from transifex
2015-05-06 01:55:19 -04:00
Thomas Müller
a96c2b8354
Only use cached files in case encryption is enabled - in any other case let the underlying storage handle this accordingly - refs #16061 #16062 and others
2015-05-05 16:19:24 +02:00
Bjoern Schiessle
7089af96f2
make sure that we keep the correct encrypted-flag and the (unencrypted)size if a file gets copied
2015-05-05 16:17:14 +02:00
Robin Appelman
e0d151505f
improve phpdoc of cache classes
2015-05-05 16:06:28 +02:00
Morris Jobke
56b1c93a79
Add verbosity option to app:check-code
...
* by default only lists files with errors
* option -v lists all files even if there are no errors
2015-05-05 13:57:23 +02:00
Thomas Müller
aae098c24a
Check usage of != and == - refs #16054
2015-05-05 12:59:33 +02:00
Lukas Reschke
11310355ed
Don't depend on always_populate_raw_post_data
2015-05-05 12:36:15 +02:00
Lukas Reschke
9530e819eb
Don't display errors and log them
...
Fixes https://github.com/owncloud/core/issues/16014
2015-05-05 12:34:22 +02:00
Jenkins for ownCloud
b60dcd91bb
[tx-robot] updated from transifex
2015-05-05 01:55:36 -04:00
Lukas Reschke
7c5558327d
Check `mbstring.func_overload` only if the mb module is installed.
...
Fixes https://github.com/owncloud/core/issues/14670
2015-05-04 17:13:25 +02:00
Lukas Reschke
64393b4c03
Remove PHP 5.4 warning in checkSetup
...
This is catched in index.php as older PHP versions will never execute the code path until there due to 5.4 syntax changes.
2015-05-04 17:11:17 +02:00
Thomas Müller
08b98a8ede
Merge pull request #16042 from owncloud/fix-output-buffering
...
Remove hard-dependency on disabled output_buffering
2015-05-04 16:43:32 +02:00
Lukas Reschke
5c7d15b941
Merge pull request #16043 from owncloud/activity-288-log-entry-when-no-favorite
...
Fix undefined variable $tagId
2015-05-04 16:22:21 +02:00
Joas Schilling
50f6386c63
Fix undefined variable $tagId
2015-05-04 16:19:26 +02:00
Joas Schilling
59c657da53
Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions-for-share-owner
...
Do not restrict permissions for the original owner
2015-05-04 15:07:37 +02:00
Lukas Reschke
4b9e034968
Remove hard-dependency on disabled output_buffering
...
This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`.
However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems.
Fixes https://github.com/owncloud/core/issues/16013
2015-05-04 14:15:15 +02:00
Thomas Müller
870ac88c85
Merge pull request #16020 from owncloud/set-charset-via-ini-set
...
Try to set required ini values in base.php
2015-05-04 09:35:32 +02:00
Thomas Müller
4de45b5e61
Merge pull request #15958 from owncloud/usage-of-public-log-interface
...
Use internally \OCP\ILogger instead of \OC\Log
2015-05-04 09:13:26 +02:00
Morris Jobke
cd516eedcd
Use OC.Notification for update notifications
...
* instead of a static rendering inside PHP use the
JS OC.Notification.showTemporary to hide the
notification after 7 seconds automatically
* fixes #14811
2015-05-03 17:26:03 +02:00
Lukas Reschke
8a85d8bc17
Try to set required ini values in base.php
...
Fixes https://github.com/owncloud/core/issues/16006
2015-05-03 13:23:29 +02:00
Lukas Reschke
6738c17cb5
Add proper versioning for doc URL
...
As per 8.1 we have docs for minor versions as well so we need to link to `8.1` here instead to `8.0`.
Fixes https://github.com/owncloud/core/issues/16002
2015-05-02 21:05:11 +02:00
Jenkins for ownCloud
aa0d439ed9
[tx-robot] updated from transifex
2015-05-02 01:54:49 -04:00
Thomas Müller
6b691e3840
Merge pull request #15937 from owncloud/file-locking
...
Add memcache based shared/exclusive locking
2015-05-01 17:47:23 +02:00
jknockaert
f5415653fd
fix #15973
...
Rework of stream_seek handling; there where basically two bugs: 1. seeking to the end of the current file would fail (with SEEK_SET); and 2. if seeking to an undefined position (outside 0,unencryptedSize) then newPosition was not defined. I used the opportunity to simplify the code.
2015-04-30 17:10:18 +02:00
Thomas Müller
41d7870d7b
Merge pull request #15964 from owncloud/fix-l10n-string-warn
...
Fix #15962
2015-04-30 15:55:40 +02:00
Robin Appelman
ba7d221cff
allow getting the path from the lockedexception
2015-04-30 14:48:42 +02:00
Robin Appelman
a40a237441
use trait for cas polyfill for xcache
2015-04-30 14:48:39 +02:00
Robin Appelman
96f9573a4b
add memcache based shared/exclusive locking
2015-04-30 14:48:39 +02:00
Robin Appelman
acf30ede95
add compare and swap to memcache
2015-04-30 14:48:39 +02:00
Robin Appelman
29213b6136
extends memcache with add, inc and dec
2015-04-30 14:48:36 +02:00
Robin Appelman
d0ad69aa9c
use the preSetup hook to ensure the encryption wrapper is applied correctly
2015-04-30 13:28:06 +02:00
Bernhard Posselt
360d0e3e5e
fix #15962
2015-04-30 12:44:45 +02:00
Morris Jobke
fbba7a61cb
Use internally \OCP\ILogger instead of \OC\Log
...
* this is the preparation for some upcoming logger related changes
* also fixes an issue in the public interface where we request
an internal class as parameter
2015-04-30 11:52:30 +02:00
Thomas Müller
d308ec4f0e
Merge pull request #15949 from owncloud/l10n-string-json
...
Implement json serialize for l10n string
2015-04-30 11:11:16 +02:00
Thomas Müller
08aef98e11
Merge pull request #15946 from owncloud/auto-controller-resolve
...
Make controller automatically assemblable
2015-04-30 10:12:17 +02:00
Jenkins for ownCloud
ae853445ef
[tx-robot] updated from transifex
2015-04-30 03:27:57 -04:00
Bernhard Posselt
1e58538f0e
add aliases to pascal case constructor paramters to make it possible to auto assemble controllers
2015-04-29 22:29:45 +02:00
Bernhard Posselt
5b857a6eab
implement json serialize for l10n string
2015-04-29 21:22:42 +02:00
Joas Schilling
f524ae261a
Ignore "parent" shares when the sharee is the owner of the reshare-source
2015-04-29 14:18:46 +02:00
Joas Schilling
3c37cbdfe7
Correctly select file cache values also when checking group shares
2015-04-29 14:12:12 +02:00
Morris Jobke
8c7db2536d
Merge pull request #15596 from owncloud/issue/15589
...
Correctly generate the feedback URL for remote share
2015-04-29 10:52:43 +02:00
Morris Jobke
7df7a3b360
Merge pull request #15906 from rullzer/fix_15777
...
Password set via OCS API should not be double escaped
2015-04-29 10:44:25 +02:00
Lukas Reschke
34d0e610cc
Filter potential dangerous filenames for avatars
...
We don't want to have users misusing this API resulting in a potential file disclosure of "avatar.(jpg|png)" files.
2015-04-28 16:57:23 +02:00
Joas Schilling
2eecfcbb80
Fix scrutinizer complains and return type doc
2015-04-28 11:28:55 +02:00
Joas Schilling
9fb7d0bca9
Correctly remove the protocol before prepeding it
2015-04-28 11:28:54 +02:00
Joas Schilling
8f7c64253e
Correctly generate the feedback URL for remote share
...
The trailing slash was added in c78e3c4a7f
to correctly generate the encryption keys
2015-04-28 11:28:54 +02:00
Morris Jobke
de8c15e1a4
Merge pull request #14764 from owncloud/shared-etag-propagate
...
Propagate etags across shared storages
2015-04-28 10:58:50 +02:00
Morris Jobke
b4a15db046
Merge pull request #15901 from owncloud/fix-share-docs
...
fix several issues with doc blocks on share.php
2015-04-28 10:41:04 +02:00
Roeland Jago Douma
73bb3a22f6
Password set via OCS API should not be double escaped
2015-04-28 10:33:19 +02:00
Joas Schilling
7c65448377
Fix return type of the getRootFolder() method
2015-04-28 09:36:29 +02:00
Joas Schilling
46083006e1
fix several issues with doc blocks on share.php
2015-04-28 08:40:47 +02:00
Thomas Müller
eb0e9e5646
Merge pull request #15890 from owncloud/fix-helper-docs
...
Fix several type(hint) errors in private/helper.php
2015-04-27 15:28:50 +02:00
Thomas Müller
7d0eba7a41
Merge pull request #15886 from owncloud/fix-15848-master
...
Adjust isLocal() on encryption wrapper
2015-04-27 15:06:26 +02:00
Joas Schilling
db6395ae20
Fix several type(hint) errors in private/helper.php
2015-04-27 14:45:05 +02:00
Thomas Müller
678b7d7e4d
Merge pull request #15860 from owncloud/enc_fallback_old_encryption
...
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
2015-04-27 14:32:19 +02:00
Thomas Müller
936d564058
fixes #15848
2015-04-27 14:26:05 +02:00
Morris Jobke
93c25a1f4a
Merge pull request #15882 from owncloud/fix-type-annotation
...
Fix type annotation
2015-04-27 14:17:59 +02:00
Robin Appelman
2e897f05b1
triger propagation for webdav uploads
...
use post hooks for share etag propagator
2015-04-27 14:07:16 +02:00
Robin Appelman
45784f213f
fix propagation when renaming a directly reshared folder
2015-04-27 14:07:16 +02:00
Robin Appelman
30ad56813a
propagate etags for all user of a share
2015-04-27 14:07:15 +02:00
Robin Appelman
518d5aadf5
Allow getting *all* share entries owned by a user
2015-04-27 14:07:15 +02:00
Robin Appelman
849e5521de
Make the change propagator an emitter
2015-04-27 14:07:15 +02:00
Thomas Müller
cc331609bf
Merge pull request #15411 from mmattel/fix_for_15375_better_message_text
...
Improve error messge text for app upgrade try (#15375 )
2015-04-27 13:38:16 +02:00
Lukas Reschke
d0363fe396
Fix type annotation
...
Obviously should be an int
2015-04-27 13:31:18 +02:00
Bjoern Schiessle
27683f9442
fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header
2015-04-27 13:01:18 +02:00
Joas Schilling
5855d23ff9
Make methods explicit public
2015-04-27 11:03:51 +02:00
Joas Schilling
d600955a51
Make getDefaultModuleId public and get module protected
2015-04-27 11:03:51 +02:00
Joas Schilling
a09df6d453
Verify that the encryption module exists before setting it
2015-04-27 11:03:50 +02:00
Jenkins for ownCloud
e58029f8ad
[tx-robot] updated from transifex
2015-04-27 01:54:46 -04:00
Lukas Reschke
4dfdaf741c
Merge pull request #15834 from owncloud/make-temporary-file-really-unique
...
Fix collision on temporary files + adjust permissions
2015-04-25 23:18:26 +02:00
Lukas Reschke
b9df932e3c
Merge pull request #15683 from owncloud/block-legacy-clients
...
Block old legacy clients
2015-04-24 18:21:10 +02:00
Bjoern Schiessle
9a5783b284
fix unit tests
2015-04-24 16:47:27 +02:00
jknockaert
49df8ef525
Update encryption.php
2015-04-24 16:44:00 +02:00
jknockaert
238302ee7d
fixed name
2015-04-24 16:44:00 +02:00
jknockaert
1756562501
Update encryption.php
2015-04-24 16:44:00 +02:00
jknockaert
735f6cc037
fix encryption header error
...
When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
2015-04-24 16:43:16 +02:00
Joas Schilling
4334e77035
Merge pull request #15839 from owncloud/enc_fix_moving_shared_files
...
[encryption] fix moving files to a shared folder
2015-04-24 15:07:36 +02:00
Joas Schilling
1592be117a
Use public interfaces for type hinting
2015-04-24 13:06:03 +02:00
Bjoern Schiessle
24128d1384
only update share keys if the file was encrypted
2015-04-24 10:19:09 +02:00
Bjoern Schiessle
2646bccb83
update share keys if file gets copied
2015-04-23 17:18:48 +02:00
Bjoern Schiessle
2990b0e07e
update share keys if a file is moved to a shared folder
2015-04-23 17:18:48 +02:00
Thomas Müller
b1bb6a3d36
Ignore test folders when checking the code for compliance
2015-04-23 16:59:26 +02:00
Lukas Reschke
ab9ea97d3a
Catch not existing User-Agent header
...
In case of an not sent UA header consider the client as valid
2015-04-23 16:33:51 +02:00
Lukas Reschke
155ae44bc6
Fix collision on temporary files + adjust permissions
...
This changeset hardens the temporary file and directory creation to address multiple problems that may lead to exposure of files to other users, data loss or other unexpected behaviour that is impossible to debug.
**[CWE-668: Exposure of Resource to Wrong Sphere](https://cwe.mitre.org/data/definitions/668.html )**
The temporary file and folder handling as implemented in ownCloud is performed using a MD5 hash over `time()` concatenated with `rand()`. This is insufficiently and leads to the following security problems:
The generated filename could already be used by another user. It is not verified whether the file is already used and thus temporary files might be used for another user as well resulting in all possible stuff such as "user has file of other user".
Effectively this leaves us with:
1. A timestamp based on seconds (no entropy at all)
2. `rand()` which returns usually a number between 0 and 2,147,483,647
Considering the birthday paradox and that we use this method quite often (especially when handling external storage) this is quite error prone and needs to get addressed.
This behaviour has been fixed by using `tempnam` instead for single temporary files. For creating temporary directories an additional postfix will be appended, the solution is for directories still not absolutely bulletproof but the best I can think about at the moment. Improvement suggestions are welcome.
**[CWE-378: Creation of Temporary File With Insecure Permissions](https://cwe.mitre.org/data/definitions/378.html )**
Files were created using `touch()` which defaults to a permission of 0644. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0600.
**[CWE-379: Creation of Temporary File in Directory with Incorrect Permissions](https://cwe.mitre.org/data/definitions/379.html )**
Files were created using `mkdir()` which defaults to a permission of 0777. Thus other users on the machine may read potentially sensitive information as `/tmp/` is world-readable. However, ownCloud always encourages users to use a dedicated machine to run the ownCloud instance and thus this is no a high severe issue. Permissions have been adjusted to 0700.Please enter the commit message for your changes.
2015-04-23 15:07:54 +02:00
Jenkins for ownCloud
f8f354b351
[tx-robot] updated from transifex
2015-04-23 01:54:51 -04:00
Martin
676e86b314
Improve error messge text for app upgrade try ( #15375 )
2015-04-22 13:24:11 +02:00
Morris Jobke
801d715907
Remove \OCP\App::register()
...
This method can be removed. This isn't used anymore since 4.5.0.
It's deprecated since mid 2012 e4679770c4
It doesn't do anything since mid 2012 8a92cd21d6
2015-04-21 11:51:29 +02:00
Björn Schießle
b0fcf0fa0e
Merge pull request #15636 from owncloud/enc2_performance_improvement
...
[encryption2] set size and unencrypted size to zero at the beginning of a write operation
2015-04-21 11:01:33 +02:00
Vincent Petry
a13088818a
Merge pull request #15748 from owncloud/fixing-enc-filesize-once-more
...
Introduce Storage::getData() to allow storage implementations more contr...
2015-04-20 18:36:23 +02:00
Lukas Reschke
fe2cbc3795
Merge pull request #15744 from owncloud/fix-inverted-path-in-resourcenotfound
...
Fix wrong path generation
2015-04-20 16:55:36 +02:00
Thomas Müller
32995ace1c
move permission related code into getMetaData()
2015-04-20 16:50:12 +02:00
Morris Jobke
3e8f6cdba9
Merge pull request #15635 from owncloud/issue/15634-empty-txt-previews
...
Scale up the font on larger previews
2015-04-20 15:55:32 +02:00
Thomas Müller
23f1bdc3d4
Introduce Storage::getMetaData() to allow storage implementations more control over the data array
2015-04-20 14:54:54 +02:00
Morris Jobke
ce2c8533d9
Merge pull request #15735 from owncloud/fix-visibility
...
Fix visibility of interfaces in \OCP
2015-04-20 14:39:15 +02:00
Thomas Müller
92b60e36de
Introduce Storage::getData() to allow storage implementations more control over the data array
2015-04-20 14:25:39 +02:00
Lukas Reschke
3959f8ac4e
Merge pull request #15637 from owncloud/migrate-certificate-stuff
...
Migrate personal certificate handling to AppFramework controllers
2015-04-20 13:56:35 +02:00
Lukas Reschke
e9d6807c5c
Merge pull request #15733 from owncloud/remove-oc_backgroundjob
...
Removed OC_BackgroundJob - reduce class overhead
2015-04-20 13:17:58 +02:00
Lukas Reschke
1cc2aefa46
Proper return types
2015-04-20 13:00:02 +02:00
Lukas Reschke
9f61cf60d4
Verify if returned object is an array
...
The error has to be thrown at this point as otherwise errors and notices are thrown since the time cannot be parsed in L60 and L61
2015-04-20 12:58:57 +02:00
Lukas Reschke
ed0b465cf9
Use 403 instead a 50x response
2015-04-20 12:53:40 +02:00
Joas Schilling
6da9e1a742
Fix visibility of public API methods
2015-04-20 12:52:40 +02:00
Lukas Reschke
4ea205e262
Block old legacy clients
...
This Pull Request introduces a SabreDAV plugin that will block all older clients than 1.6.1 to connect and sync with the ownCloud instance.
This has multiple reasons:
1. Old ownCloud client versions before 1.6.0 are not properly working with sticky cookies for load balancers and thus generating sessions en masse
2. Old ownCloud client versions tend to be horrible buggy
In some cases we had in 80minutes about 10'000 sessions created by a single user. While this change set does not really "fix" the problem as 3rdparty legacy clients are affected as well, it is a good work-around and hopefully should force users to update their client
2015-04-20 11:12:17 +02:00
Bjoern Schiessle
7fe0e09d14
set size and unencrypted size to zero on fopen
2015-04-20 11:06:13 +02:00
Morris Jobke
80be3b0c47
Fix wrong path generation
...
* fixes #15742
2015-04-20 11:01:33 +02:00
Lukas Reschke
a98b819366
Add version to deprecation notice
...
As requested by @MorrisJobke
2015-04-20 10:30:16 +02:00
Lukas Reschke
f672e120fc
Deprecate unused `\OCP\Response::sendFile`
...
This function is unused in our own code and can be better achieved using the AppFramework. Also very easy to do grave mistaked using this function.
2015-04-20 10:02:34 +02:00
Morris Jobke
9cb260d310
Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage
...
Fixing OCS API namespace usage
2015-04-20 09:43:19 +02:00
Jenkins for ownCloud
75bf03a605
[tx-robot] updated from transifex
2015-04-20 01:54:44 -04:00
Morris Jobke
d4ac7ac723
Merge pull request #15739 from DavidPrevot/symfony-2.7
...
Replace `_method` requirement by {g,s}etMethods()
2015-04-19 23:46:21 +02:00
Georg Ehrke
8f51efc49e
get rid of OC_Geo
2015-04-19 20:16:56 +02:00
David Prévot
7f2f92847b
Replace `_method` requirement by {g,s}etMethods()
...
Make the call compatible with future Symfony version, and avoid
E_USER_DEPRECATED as thrown by the current 2.7.0-beta1:
The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use getMethods() instead. at
…/Symfony/Component/Routing/Route.php#554
The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use the setMethods() method instead or the "methods"
option in the route definition. at
…/Symfony/Component/Routing/Route.php#662
2015-04-19 12:08:29 -04:00
Roeland Douma
d877c1f1e1
Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp
...
Reduce call of legacy wrapper by call the OCP directly
2015-04-19 15:42:07 +02:00
Roeland Douma
3cb5dd68e6
Merge pull request #15737 from owncloud/add-deprecated-version
...
Add version to @deprecated tags
2015-04-19 15:40:53 +02:00
Robin McCorkell
80b892e7ed
Merge pull request #15729 from owncloud/remove-unused-variables
...
Remove unused variables
2015-04-19 12:38:29 +01:00
Jenkins for ownCloud
fd3c1484ad
[tx-robot] updated from transifex
2015-04-19 01:54:41 -04:00
Morris Jobke
c056c52010
Add version to @deprecated tags
2015-04-19 01:04:59 +02:00
Morris Jobke
9b8ebdadf7
Reduce call of legacy wrapper by call the OCP directly
...
* ref #15734
* reduces the call depth, because the private methods just call OCP stuff
2015-04-19 00:29:09 +02:00
Morris Jobke
96a5b65484
Fix visibility of interfaces in \OCP
2015-04-19 00:26:17 +02:00
Morris Jobke
60b8aa2a83
Removed OC_BackgroundJob - reduce class overhead
...
* method code is now in the static public namespace (5 sloc)
2015-04-18 23:37:32 +02:00
Morris Jobke
f6807337a8
Add @since tag to public namespace constants
2015-04-18 23:19:35 +02:00
Thomas Müller
cdf82909b8
Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules
...
Issue/15694 display name of encryption modules
2015-04-18 22:51:15 +02:00
Thomas Müller
b7a4972218
Merge pull request #15728 from owncloud/update-iurlgenerator-doc
...
IUrlGenerator - document linkTo properly
2015-04-18 22:48:09 +02:00
Thomas Müller
d2a31bcd93
Merge pull request #15727 from owncloud/cleanup-db-interface
...
DB: remove unused parameter - was forgotten during the migration to doct...
2015-04-18 22:47:40 +02:00
Thomas Müller
c922b09f26
Merge pull request #15725 from owncloud/l10n-public-interface
...
IL10n - add PHPDoc for $options
2015-04-18 22:46:50 +02:00
Morris Jobke
e837927ad5
fix followup issues with unneeded parameters
2015-04-18 17:02:39 +02:00
Morris Jobke
ccf47f40aa
Remove unused variables
...
* should make scrutinizer a lot more happy
* reduces maybe memory footprint
2015-04-18 16:35:19 +02:00
Morris Jobke
eb62e7cc27
IUrlGenerator - document linkTo properly
...
* parameter $args was there since 6.0.0
* see 61a9098b7d
2015-04-18 16:03:37 +02:00
Morris Jobke
47ecfd98a3
DB: remove unused parameter - was forgotten during the migration to doctrine
...
* 377e9a8677
<- doctrine merge
2015-04-18 15:57:13 +02:00
Morris Jobke
9ffac12986
IL10n - add PHPDoc for $options
...
* added in #11549
* undocumented in the public interface
2015-04-18 15:50:17 +02:00
Morris Jobke
f72dabb4eb
fix wrong variable names in PHPDoc
2015-04-18 14:31:28 +02:00
Morris Jobke
11f29f6d95
add visibility of methods in server container and interface
2015-04-18 14:19:22 +02:00
Joas Schilling
3f3f8c2f99
Fix usage of deprecated private constants
2015-04-18 10:30:02 +02:00
Joas Schilling
4d238c3949
Fix display name of encryption modules
2015-04-18 10:18:58 +02:00
Joas Schilling
6ce1abfa5c
Deprecate the OC_API constants in favor of the OCP ones
2015-04-18 09:29:52 +02:00
Joas Schilling
4e58f4892a
Move constants to OCP\API so apps can use them
2015-04-18 09:29:51 +02:00
Joas Schilling
8cb0d97b10
Merge pull request #15692 from owncloud/log-exception-type-master
...
Write the type of exception to the log - really helpful for exceptions w...
2015-04-18 09:28:48 +02:00
Joas Schilling
5acda185bd
Correctly prefix OC_API with \ since its not in the namespace
2015-04-18 09:12:42 +02:00
Jenkins for ownCloud
37a871127b
[tx-robot] updated from transifex
2015-04-18 01:55:19 -04:00
Morris Jobke
7ab1f807fb
Merge pull request #15691 from owncloud/vobject-sabre2.1
...
Get rid of the obsolete OC_VObject class
2015-04-17 22:33:00 +02:00
Thomas Müller
d9990c2b4e
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager'
2015-04-17 13:55:31 +02:00
Thomas Müller
d671f13f26
Write the type of exception to the log - really helpful for exceptions which hold no message
2015-04-17 13:10:10 +02:00
Vincent Petry
b7e5884b54
Get rid of the obsolete OC_VObject class
...
The class isn't needed any more since the update to Sabre 2.1
2015-04-17 12:55:31 +02:00
Bjoern Schiessle
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
Thomas Müller
f32d97750c
Merge pull request #15679 from owncloud/fix-private-member-access
...
Fix private member access of parent class in ocsresponse
2015-04-17 09:13:54 +02:00
Thomas Müller
852cc6f2c6
Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace
...
Add @since tags to all methods in public namespace
2015-04-17 09:13:04 +02:00
Jenkins for ownCloud
da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
Morris Jobke
7644950b48
Add @since tags to all methods in public namespace
...
* enhance the app development experience - you can look up the
method introduction right inside the code without searching
via git blame
* easier to write apps for multiple versions
2015-04-16 17:00:08 +02:00
Morris Jobke
1d30efdd73
Fix private member access of parent class in ocsresponse
...
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02:00
Clark Tomlinson
1174ad0681
Merge pull request #15445 from owncloud/enc2_migration
...
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00
Joas Schilling
c7e5e30b86
Merge pull request #15674 from owncloud/fix-console-check-output
...
Convert error and hint to string before writing to the output
2015-04-16 14:51:29 +02:00
Bjoern Schiessle
b25c06f576
detect system wide mount points correctly
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
67500d5f2f
if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01
add migration script from old encryption to new one
2015-04-16 14:15:04 +02:00
Thomas Müller
07243f0482
Convert error and hint to string before writing to the output - fixes https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html
2015-04-16 12:32:17 +02:00
Thomas Müller
bcf65d9c13
Using TRANSACTION_READ_COMMITTED
2015-04-16 11:49:12 +02:00
Jörn Friedrich Dreyer
2e06cf49a5
Merge pull request #15623 from t3chguy/master
...
Redis DB Index via Select
2015-04-16 09:30:07 +02:00
Jenkins for ownCloud
8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
Vincent Petry
903d52d45f
Merge pull request #15809 from owncloud/view-null-root
...
dont allow using null as view root
2015-04-22 18:10:26 +02:00
Robin Appelman
bd57902d1d
typo
2015-04-22 16:24:37 +02:00
Thomas Müller
750f0bc489
Merge pull request #15799 from owncloud/fix-enc-folder-move
...
Fix enc folder move
2015-04-22 16:04:29 +02:00
Robin Appelman
f391f88d7f
dont allow using null as view root
2015-04-22 14:51:02 +02:00
Morris Jobke
42d9ba0f83
Merge pull request #15787 from owncloud/trash-partfiles
...
Do not trash part files, delete directly
2015-04-22 14:10:26 +02:00
Morris Jobke
a971fa8a90
Merge pull request #15549 from owncloud/jcf-fix-cache-update
...
don't update identical values
2015-04-22 13:34:08 +02:00
Thomas Müller
0042bdd2e7
fix PHPDoc
2015-04-22 13:12:52 +02:00
Thomas Müller
225cde2183
pass KeyStorage via ctor
2015-04-22 13:09:42 +02:00
Thomas Müller
987bc138df
calling renameKeys() on directory level as well - fixes #15778
2015-04-22 12:12:27 +02:00
Thomas Müller
fc4127dd62
add $encryptionModuleId to methods of Keys/IStorage
2015-04-22 11:53:05 +02:00
Björn Schießle
570718fb6b
Merge pull request #15757 from owncloud/enc-fixfeofforlastblock
...
Fix encryption feof to not return too early
2015-04-22 11:32:21 +02:00
Thomas Müller
40fcc7480c
Merge pull request #15734 from owncloud/add-deprecate-tags
...
Add @deprecated to all methods with a proper method in \OCP
2015-04-21 23:57:49 +02:00
Vincent Petry
ffc796edcb
Do not trash part files, delete directly
2015-04-21 18:28:15 +02:00
Bjoern Schiessle
19e8c4fcb1
get dirname from sharePath
2015-04-21 14:58:01 +02:00
Vincent Petry
76dad297ff
Fix encryption feof to not return too early
...
This is because stream_read will pre-cache the next block which causes
feof($this->source) to return true prematurely. So we cannot rely on it.
Fixed encryption stream wrapper unit tests to actually simulate 6k/8k
blocks to make sure we cover the matching logic.
Added two data files with 8192 and 8193 bytes.
2015-04-20 18:32:40 +02:00
Morris Jobke
0a594cd3a5
Add @deprecated to all methods with a proper method in \OCP
2015-04-20 13:15:45 +02:00
Michael Telatynski
8ebf9de3f8
Memcache\Redis Add DB Select Functionality
2015-04-15 21:24:38 +01:00
Joas Schilling
1592f25ed0
Scale up the font on larger previews
2015-04-15 14:03:40 +02:00
Morris Jobke
e33e5b425a
Merge pull request #12006 from owncloud/dav-put-storage
...
Work directly on the storage when uploading over webdav
2015-04-15 03:08:52 +02:00
Jenkins for ownCloud
7f3f191ee9
[tx-robot] updated from transifex
2015-04-14 18:19:31 -04:00
Thomas Müller
70480423ff
Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
...
Adding a final fallback for findBinaryPath
2015-04-15 00:16:56 +02:00
Thomas Müller
1aa368effe
Merge pull request #15592 from owncloud/fix-15590-master
...
Avoid php message "Invalid argument supplied for foreach()"
2015-04-15 00:14:08 +02:00
Björn Schießle
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
Robin Appelman
eeecca04e6
Keep phpdoc updated.
2015-04-14 16:25:52 +02:00
Robin Appelman
308af8b909
pass a stream to the tests
2015-04-14 15:25:52 +02:00
Morris Jobke
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
Olivier Paroz
bb0c09e994
Adding a final fallback for findBinaryPath
2015-04-14 14:06:58 +02:00
Thomas Müller
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
Thomas Müller
967e882757
return size from cache in case the cache entry is marked as encrypted
2015-04-14 13:08:59 +02:00
Thomas Müller
387984a0d5
preserve filesize on rename after upload
2015-04-14 12:27:12 +02:00
Thomas Müller
88cc52c408
Avoid php message "Invalid argument supplied for foreach()" - refs #15590
2015-04-14 11:00:20 +02:00
Morris Jobke
5f66f867b6
Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
...
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 21:51:38 +02:00
Morris Jobke
9eff199a17
Merge pull request #15360 from owncloud/cross-storage-move-cache
...
Preserve cache data when doing a cross storage move
2015-04-13 21:48:30 +02:00
Robin Appelman
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
Robin Appelman
addfafd9da
Fix moving mount points
2015-04-13 17:10:02 +02:00
Robin Appelman
caadc8cdd9
reuse cache move logic
2015-04-13 17:10:01 +02:00
Robin Appelman
d7b3a1a35a
preserve cache data when doing a cross storage move
2015-04-13 17:10:01 +02:00
Joas Schilling
71de1d58cd
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 16:34:10 +02:00
Thomas Müller
660aa7ff1e
Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
...
cach user folder for file search results
2015-04-13 15:16:07 +02:00
Robin Appelman
c29419e6d7
fix rebase issue
2015-04-13 15:13:03 +02:00
Robin Appelman
0772e3b4c1
Properly handle copy/move failures in cross storage copy/move
2015-04-13 15:13:03 +02:00
Robin Appelman
404773940d
Detect storage full when doing cross storage copy/move
2015-04-13 15:13:03 +02:00
Robin Appelman
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
Robin Appelman
c4ec8fbeff
Make getSourcePath accessible for storage wrappers
2015-04-13 15:13:03 +02:00
Robin Appelman
31e94708f8
Improve cross storage copy between local storages
2015-04-13 15:13:02 +02:00
Robin Appelman
8575bb2cb9
Move cross storage copy logic to the storage
2015-04-13 15:13:02 +02:00
Robin Appelman
b302592a64
Small cleanup of rename code
2015-04-13 15:11:03 +02:00
Robin Appelman
2fd44dbde4
rewind and update error message
2015-04-13 14:14:48 +02:00
Robin Appelman
dcfe014103
use our own stream copy instead
2015-04-13 14:13:21 +02:00
Vincent Petry
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
Jörn Friedrich Dreyer
b717681e3a
cach user folder for file search results
2015-04-13 11:29:10 +02:00
Morris Jobke
c3fbc2b6fd
Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
...
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
2015-04-13 10:30:31 +02:00
Thomas Müller
906b6b7337
Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282"
2015-04-13 09:43:45 +02:00
Thomas Müller
8450b6aa2d
Properly import used classes
2015-04-13 09:26:30 +02:00
Lukas Reschke
84041a4fa2
Merge pull request #15541 from owncloud/add-reply-to-support
...
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
Jens-Christian Fischer
9c95315a9e
clarify the duplication of the $params array
2015-04-12 14:49:18 +02:00
Jens-Christian Fischer
22c6216f5c
don't update identical values
...
The UPDATE oc_filecache statement blindly overwrites identical data.
Databases like Postgres that create a new row on an update
and mark the old one as dead will suffer from the previous
behaviour, as millions of "new" rows are created in the database.
This patch changes the WHERE clause to test for identical
values and not updating if the values in the DB are identical
to the ones being passed.
2015-04-11 18:06:21 +02:00
Lukas Reschke
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
Lukas Reschke
77afef328d
Merge pull request #15458 from owncloud/web-shell-master
...
Move console application to it's own class - allows reuse in the web shell
2015-04-10 16:33:01 +02:00
Vincent Petry
e512a69a59
Merge pull request #15395 from owncloud/fix-imagepath
...
Fix UrlGenerator::imagePath() for app paths
2015-04-10 16:11:57 +02:00
Thomas Müller
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Lukas Reschke
a881218fc2
Add "Reply-To" support for mails
2015-04-10 15:05:34 +02:00
Morris Jobke
25dd4ec767
Throw ServerNotAvailableException always
2015-04-10 14:51:21 +02:00
Thomas Müller
a163243e31
Merge pull request #15510 from owncloud/cron-singleuser
...
block cron when in single user mode
2015-04-10 14:38:50 +02:00
Vincent Petry
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
Thomas Müller
a33edcd2f0
Fix singe user mode on public.php - take two
2015-04-10 11:17:33 +02:00
Jörn Friedrich Dreyer
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
Jörn Friedrich Dreyer
b069f33a72
throw exception when backends don't provide a user instead of creating legacy local storages
2015-04-10 09:12:37 +02:00
Morris Jobke
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
8964c5068c
do not disclose information, show generic error on login page
...
Conflicts:
core/templates/login.php
lib/base.php
2015-04-10 09:12:37 +02:00
Thomas Müller
f05e19348d
Fix single user check in case no user is logged in
2015-04-09 23:47:24 +02:00
Thomas Müller
5abbf6d5b0
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
...
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
Lukas Reschke
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Morris Jobke
de4a81f462
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
...
fixes #15326
2015-04-09 18:41:18 +02:00
Thomas Müller
f7c906902a
Throw an exception in case checkServer() returns errors
2015-04-09 16:42:34 +02:00
Lukas Reschke
b60d5d3d6f
Merge pull request #14540 from owncloud/windows-setup-check
...
Disallow Windows Server in Server Check
2015-04-09 16:38:11 +02:00
Thomas Müller
890a18e1a6
Introduce own console application class
2015-04-09 16:28:53 +02:00
Robin Appelman
8af106cc75
block webdav in single user mode
2015-04-09 15:56:41 +02:00
Lukas Reschke
0abce86b31
Disallow Windows Server in Server Check
...
Will prevent users from use ownCloud on Windows Server 🙈
2015-04-09 15:56:37 +02:00
Jörn Friedrich Dreyer
8af52e3876
fixes #15326
2015-04-09 15:37:00 +02:00
Björn Schießle
0710db77bc
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
...
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
Robin Appelman
cbcee34eb0
update tests
2015-04-09 14:46:25 +02:00
Thomas Müller
1d9bd3d31e
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
...
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
Lukas Reschke
ec69f2838c
Fix typos and some other adjustments
2015-04-09 14:09:09 +02:00
Bjoern Schiessle
332ea77865
only create a db entry for the user in case of a name conflict on group share
2015-04-09 11:16:08 +02:00
Joas Schilling
45575d0135
Check if the key exists, before trying to delete it
2015-04-09 10:28:02 +02:00
Lukas Reschke
ba52f6f8fc
Merge pull request #15314 from owncloud/app-categories-15274
...
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
Morris Jobke
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke
84ae9532c8
Merge pull request #15448 from owncloud/occ-check-server-env-master
...
Adding check command to validate server environment
2015-04-09 00:07:08 +02:00
Morris Jobke
f3ef17a963
Merge pull request #15490 from owncloud/remove-debug-logging
...
remove unessesary logging of methods instantiation
2015-04-08 21:42:47 +02:00
Morris Jobke
4e60b81264
Merge pull request #14120 from owncloud/dav-statcache
...
Stat cache for DAV storage, improves s2s performance a little bit
2015-04-08 21:09:28 +02:00
Clark Tomlinson
3ffb2d8abd
remove unessesary logging of methods instantiation
2015-04-08 14:46:01 -04:00
Bjoern Schiessle
c379557e1d
don't throw exception if a file gets uploaded and encryption is disabled
2015-04-08 16:41:20 +02:00
Morris Jobke
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Robin Appelman
6a59502759
Work directly on the storage when uploading over webdav
2015-04-08 14:04:58 +02:00
Morris Jobke
59322a5037
Merge pull request #15333 from owncloud/copy-cross-device
...
fix copying folder across devices
2015-04-08 12:35:15 +02:00
Thomas Müller
f099c9883e
Adding check command to validate server environment - fixes #15429
2015-04-08 00:19:23 +02:00
Morris Jobke
6c327f8331
Merge pull request #14879 from oparoz/fix-preview-caching
...
Introducing the maximum size preview
2015-04-07 18:16:24 +02:00
Thomas Müller
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
Olivier Paroz
74bf9806b0
Introducing the maximum size preview
...
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.
One of the fixes required for #12465
2015-04-07 16:45:59 +02:00
Thomas Müller
161d80da5b
In case of encryption exceptions we return 503 - this will allow the client to retry
2015-04-07 14:17:42 +02:00
Lukas Reschke
dd7c491bff
Fix PHPDoc
2015-04-07 13:49:16 +02:00
Lukas Reschke
a2182cde90
Deduplicate code
2015-04-07 13:48:33 +02:00
Thomas Müller
4a70ca665c
respect mount option while encrypting
2015-04-07 13:30:31 +02:00
Thomas Müller
111fbabfb4
PHPDoc cleanup - clean code \o/
2015-04-07 13:30:31 +02:00
Thomas Müller
69e95531f8
comment change as it broke unit tests
2015-04-07 13:30:31 +02:00
Thomas Müller
ba9a797eaa
Encryption storage wrapper is enabled by default - necessary to detect encrypted files even if encryption was disabled after files have been encrypted - prevents data corruption
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
3d7404fe68
add unit tests to the keystorage
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
fe74a0cb4f
implement webdav copy
2015-04-07 13:30:31 +02:00
Thomas Müller
8991272269
Using stream_get_contents in file_get_contents implementation + close handle
2015-04-07 13:30:31 +02:00
jknockaert
ff16e3dbff
Adjusting count on read
2015-04-07 13:30:31 +02:00
jknockaert
02404a6a8c
Fixing encryption stream wrapper seek - thanks @jknockaert
2015-04-07 13:30:30 +02:00
Thomas Müller
104d11ec4c
Fixing encryption storage wrapper tests
2015-04-07 13:30:30 +02:00
Thomas Müller
d9c41b00ab
Introducing trait LocalTempFileTrait
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
fac7ec3fc4
fix re-shares with encryption
2015-04-07 13:30:30 +02:00
Thomas Müller
8ffa6db110
fixing unit tests for stream wrapper
2015-04-07 13:30:30 +02:00
Thomas Müller
9d8c07850d
fixing unencrypted file size
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
a74ee67476
don't wrap share storages
2015-04-07 13:30:30 +02:00
Thomas Müller
664b2bb7af
cleaning up exception mess
2015-04-07 13:30:30 +02:00
Thomas Müller
c9d6ed3d7d
in case the file exists we require the explicit module as specified in the file header - otherwise we need to fail hard to prevent data loss on client side
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
51302d5812
getUidAndFilename() always get uid from path
2015-04-07 13:30:30 +02:00
Thomas Müller
cac83642f2
Finally fixing encryption with public share
2015-04-07 13:30:30 +02:00
Thomas Müller
a57918fb10
Hook: fixing error message in exception case
2015-04-07 13:30:30 +02:00
Thomas Müller
137c135664
file_put_contents has to return the number of written bytes
2015-04-07 13:30:30 +02:00
Thomas Müller
f20844ac89
PHPDoc
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
83cb382b3f
pass file helper to encryption wrapper
2015-04-07 13:30:29 +02:00
Bjoern Schiessle
e4895bda01
add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files
2015-04-07 13:30:29 +02:00
Thomas Müller
a98b7dbf6f
Fix double registration of encryption module
2015-04-07 13:30:29 +02:00
Thomas Müller
35b97ed672
Adding renameKeys to IStorage
2015-04-07 13:30:29 +02:00
Thomas Müller
4db75e3407
Setting up the encryption wrapper in a setup hook - temporarily fixes the wrapping order
2015-04-07 13:30:29 +02:00
Thomas Müller
bf809ac85a
Removing left overs from old encryption app
2015-04-07 13:30:29 +02:00
Thomas Müller
6ccd3ffa23
adding function getSecureRandom(); to IServerContainer
2015-04-07 13:30:29 +02:00
Bjoern Schiessle
0f28d538a0
add session class to handle all session operations
2015-04-07 13:30:28 +02:00
Thomas Müller
1b42b492dc
kill OC_FileProxy 💥
2015-04-07 13:30:28 +02:00
Thomas Müller
dbdd754c3f
Further cleanup of files_encryption
2015-04-07 13:30:28 +02:00
Thomas Müller
00338f9dca
Removing files_encryption left overs
2015-04-07 13:30:28 +02:00
Thomas Müller
99255ff3a9
Fix - public sharing: in case on user is available - get it from the path
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
Thomas Müller
d185761d31
initializing some variables + update size after writing the headers
2015-04-07 13:30:28 +02:00
Thomas Müller
4441835d18
https://github.com/owncloud/core/pull/15305#discussion_r27382305
...
Conflicts:
lib/private/files/stream/encryption.php
2015-04-07 13:30:28 +02:00
Thomas Müller
90487384f7
initializing some variables
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
0c48b069ba
call end() before closing the file
2015-04-07 13:30:28 +02:00
Thomas Müller
498625ea3a
adding unit tests for stream wrapper
2015-04-07 13:30:28 +02:00
Thomas Müller
a905f641b3
various fixes & start to unit test the encryption storage wrapper
2015-04-07 13:30:28 +02:00
jknockaert
3e6eb28ee3
Applying diff as of https://github.com/owncloud/core/pull/15303
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
a85e2e0bfd
make recovery settings work
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
937efe856d
fix lib/private/encryption/util.php call
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
c266b3b5b7
remove debug code from core
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
c64e0af4fb
check if recovery key exists and encrypt the file with the recovery key if needed
2015-04-07 13:30:28 +02:00
Bjoern Schiessle
2244ea998d
core: documentation fixes
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
cb9980823d
core: small fixes
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
810ca9105c
implement rename and delete of encryption keys
2015-04-07 13:30:27 +02:00
Clark Tomlinson
0c2f9ca849
Updating keystorage movement and fixing hooks
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
506222567e
add deleteKey methods to key storage
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
e2f714263f
fix encryption manager to handle more than one encryption module
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
5bc9ababeb
fix keystorage and add unit tests
2015-04-07 13:30:27 +02:00
Clark Tomlinson
39733c8da1
Initial commit
2015-04-07 13:30:27 +02:00
Bjoern Schiessle
63e7fe608a
create basic interfaces and wrapper to make encryption more modular
2015-04-07 13:30:27 +02:00
Joas Schilling
3bde7c2f67
When guessing the timezone, the offset might only be valid on a given timestamp
2015-04-07 10:13:06 +02:00
Jenkins for ownCloud
95e55aa4ad
[tx-robot] updated from transifex
2015-04-07 01:54:47 -04:00
Jenkins for ownCloud
2bff92ade5
[tx-robot] updated from transifex
2015-04-05 01:54:51 -04:00
Thomas Müller
4996706078
Merge pull request #15338 from owncloud/encryption-mount-option
...
Add mount point to disable the encryption wrapper
2015-04-04 12:51:41 +02:00
Jenkins for ownCloud
9b250baf9e
[tx-robot] updated from transifex
2015-04-04 01:54:43 -04:00
Robin McCorkell
fbb84a518f
Fix UrlGenerator::imagePath() for app paths
2015-04-03 23:42:18 +01:00
Thomas Müller
3bf269e565
Merge pull request #15229 from owncloud/response-setContentLengthHeader
...
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
2015-04-03 22:51:36 +02:00
Thomas Müller
b2b3e1ac94
Merge pull request #15391 from owncloud/fix-language-caching
...
fix caching of preferred language
2015-04-03 22:51:13 +02:00
Thomas Müller
3d2116dfe7
Merge pull request #15386 from oparoz/yaml-cnf-mediatype
...
Introducing media types for yml, yaml, cnf, conf
2015-04-03 22:49:41 +02:00
Robin Appelman
712e478cb2
fix caching of preferred language
2015-04-03 15:36:24 +02:00
Lukas Reschke
25531bad88
Make user names clickable
2015-04-03 13:36:03 +02:00
Lukas Reschke
0816cf9142
Add experimental applications switch
...
Allows administrators to disable or enabled experimental applications as well as show the trust level.
2015-04-03 13:21:24 +02:00
Morris Jobke
a2087f30d1
Merge pull request #15383 from owncloud/fix-exception-message
...
Update exception messages to better reflect and describe the problem
2015-04-03 10:15:23 +02:00
Jenkins for ownCloud
23f1702f24
[tx-robot] updated from transifex
2015-04-03 01:54:53 -04:00
Olivier Paroz
70ec74e88b
Introducing media types for yml, yaml, cnf, conf
2015-04-02 21:37:57 +02:00
Lukas Reschke
fa079a5959
Merge pull request #12314 from oparoz/patch-3
...
Make findBinaryPath compatible with open_basedir
2015-04-02 18:54:03 +02:00
Joas Schilling
a8d1ede347
Fix the exception messages
2015-04-02 18:40:06 +02:00
Thomas Müller
9f58097e4d
Merge pull request #14113 from owncloud/chunking-chunkpartfiles
...
Added part files for when writing chunks
2015-04-02 18:15:27 +02:00
Thomas Müller
4082436419
Merge pull request #15367 from owncloud/pre-setup-hook
...
setup storage wrappers before setting up the filesystem
2015-04-02 17:40:23 +02:00
Morris Jobke
1720fdf5f4
Merge pull request #15346 from oparoz/split-image-provider
...
Split image provider in one sub-class per media type
2015-04-02 13:40:09 +02:00
Robin Appelman
f585994c4b
setup mount manager before wrappers
2015-04-02 13:28:36 +02:00
Olivier Paroz
8ec6dfdbf8
Split image provider in one sub-class per media type
2015-04-02 10:31:24 +02:00
Morris Jobke
82f91c50c7
Merge pull request #15349 from oparoz/limit-bitmap-previews-2
...
The bitmap preview class now takes maxX and maxY into consideration
2015-04-02 10:23:55 +02:00
Thomas Müller
9e5b319ed4
Merge pull request #15362 from owncloud/issue/15359-purge-memcache-console-app-disable
...
Correctly purge the cache when an app is disabled via cli
2015-04-02 09:26:15 +02:00
Joas Schilling
696c750cfe
Fix docs and line breaks
2015-04-02 08:28:42 +02:00
Jenkins for ownCloud
cc96105ebe
[tx-robot] updated from transifex
2015-04-02 01:54:47 -04:00
Robin Appelman
3cb53b7756
setup storage wrappers before setting up the filesystem
2015-04-01 17:12:06 +02:00
Olivier Paroz
1525ecd3dd
The bitmap preview class now takes maxX and maxY into consideration
...
This is a fix for owncloud#13607 and is part of the global programme: owncloud#13609
The image aspect ratio is kept intact.
2015-04-01 15:54:22 +02:00
Joas Schilling
d01cfde982
Correctly purge the cache when an app is disabled via cli
2015-04-01 15:43:38 +02:00
Roeland Jago Douma
288da619b1
Deprecate functions that only call the urlgenerator anyway
2015-04-01 14:32:49 +02:00
Joas Schilling
730efe25a4
Make scrutinizer happy
2015-04-01 12:13:49 +02:00
Pierre Jochem
a1828ff034
More secure proposal
2015-04-01 11:28:53 +02:00
Jenkins for ownCloud
f5c7ba6b81
[tx-robot] updated from transifex
2015-04-01 01:55:33 -04:00
Olivier Paroz
0f01de9f7e
Use getenv to get the paths for `find`
2015-03-31 23:49:21 +02:00
Olivier Paroz
7c41c0c13f
use ExecutableFinder and find in findBinaryPath
...
When using open_basedir, commands such as `which`or `command`can fail
because they might try to look outside of the restricted perimeter.
Symfony's ExecutableFinder can be used instead to look in standard
locations and we can use `find` as a last resort
A better solution would be to adopt a mechanism similar to what has
been done for office documents where a configuration parameter is used
to indicate the path where the executable is to be found.
2015-03-31 23:49:16 +02:00
Robin Appelman
bac9b54bef
Add mount point to disable the encryption wrapper
2015-03-31 16:25:33 +02:00
Robin Appelman
068c624b0d
fix copying folder across devices
2015-03-31 13:50:11 +02:00
Jenkins for ownCloud
1d06d93d27
[tx-robot] updated from transifex
2015-03-31 01:55:55 -04:00
Roeland Jago Douma
0bf06d6691
No injections
2015-03-30 20:07:12 +02:00
Morris Jobke
bf17ac929d
Merge pull request #15169 from rullzer/fix_displayNamesInGroup
...
Groupmanagers displayNamesInGroup should actually search in displaynames
2015-03-30 17:04:09 +02:00
Joas Schilling
b95d12700c
Add logic for getting the user from the rss token to the Manager
2015-03-30 15:23:09 +02:00
Roeland Jago Douma
b0aa17b13f
OCS Fixes to allow setting of password without removing additional settings
...
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
Robin McCorkell
4f0abd910c
Merge pull request #15269 from owncloud/migrate-checksetup-and-add-memcache
...
Add check for activated local memcache
2015-03-30 11:24:44 +01:00
Jenkins for ownCloud
da55ff630c
[tx-robot] updated from transifex
2015-03-30 01:54:41 -04:00
Lukas Reschke
65202d2a18
Add check for activated local memcache
...
Also used the opportunity to refactor it into an AppFramework controller so that we can unit test it.
Fixes https://github.com/owncloud/core/issues/14956
2015-03-28 13:59:22 +01:00
Vincent Petry
d3752ca1e9
Merge pull request #15289 from owncloud/min-upload-limit
...
Require minimum 1 MiB upload limit
2015-03-28 11:34:11 +01:00
Robin McCorkell
ab991458ad
Require minimum 1 MiB upload limit
2015-03-27 23:43:35 +00:00
Robin McCorkell
1511a42da7
Check for relative datadirectory path
2015-03-27 23:29:46 +00:00
Vincent Petry
a32c71d25e
Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig"
...
This reverts commit 012016d331
.
2015-03-27 18:50:11 +01:00
Morris Jobke
f4dc9e6bf3
Merge pull request #15155 from owncloud/share-donotreturntrashedfiles
...
Do not return shares for files outside "files"
2015-03-27 17:05:14 +01:00
Thomas Müller
4d12c4a38b
Merge pull request #13938 from owncloud/deprecate-iappconfig
...
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Thomas Müller
722e50a112
Merge pull request #15240 from owncloud/storage-wrapper-priority
...
add priority to storage wrappers
2015-03-27 15:18:44 +01:00
Thomas Müller
98bc1ad70a
Merge pull request #15265 from owncloud/enc2_fixes
...
core improvements for Encryption 2.0
2015-03-27 14:58:33 +01:00
Morris Jobke
e918bcf212
Merge pull request #15247 from owncloud/fix_group_share_master_backport
...
also call generateTarget for group shares
2015-03-27 14:40:52 +01:00
Vincent Petry
80f83ab5e0
Do not return shares for files outside "files"
2015-03-27 13:25:23 +01:00
Vincent Petry
7ad4dfa201
Merge pull request #15227 from owncloud/ocetag-header
...
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
Bjoern Schiessle
b5fad75e57
add deleteAllFileKeys to public interface and add "uid" as parameter for the
...
update call
2015-03-27 11:51:53 +01:00
Bjoern Schiessle
c6be1ba8d3
fix check if a file is excluded from encryption or not
2015-03-27 11:51:50 +01:00
Morris Jobke
a62f38a18b
Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure
...
Add some generic default headers as well via PHP
2015-03-27 09:54:40 +01:00
Jenkins for ownCloud
880b31c513
[tx-robot] updated from transifex
2015-03-27 01:56:21 -04:00
Lukas Reschke
9622fbdf29
Filter potential dangerous characters in path name
...
We should not allow / or \ in the postfix here.
2015-03-26 23:17:18 +01:00
Vincent Petry
670ca68453
Added stat cache for DAV storage
...
The stat cache stored known states of files/folders to avoid requerying
the DAV server multiple times.
2015-03-26 23:15:53 +01:00
Vincent Petry
746be98e03
Merge pull request #13654 from oparoz/tmpfile-with-extension
...
Keep the extension in temp files
2015-03-26 23:08:08 +01:00
Robin McCorkell
c2909355bf
Merge pull request #14925 from owncloud/ext-mountoptions-ui
...
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
Lukas Reschke
9d1ce53cb1
Add some generic default headers as well via PHP
2015-03-26 22:32:57 +01:00
Bjoern Schiessle
223cca2a07
also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
2015-03-26 22:31:45 +01:00
Morris Jobke
e8109f0bc3
Merge pull request #13802 from owncloud/share-partfilepermissions
...
Fix share permission checks
2015-03-26 22:01:05 +01:00
Morris Jobke
4c00be4961
Merge pull request #14488 from owncloud/enhancement/security/inline-disposition
...
Serve all files with a Content-Disposition of 'attachment' via WebDAV
2015-03-26 21:45:30 +01:00
Robin Appelman
cb9ead7dde
add priority to storage wrappers
2015-03-26 21:26:38 +01:00
Thomas Müller
232518ac54
Merge pull request #15234 from owncloud/encryption2_core
...
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
Bjoern Schiessle
ff9c85ce60
implement basic encryption functionallity in core to enable multiple encryption modules
2015-03-26 20:56:51 +01:00
Lukas Reschke
8ebe667202
Remove unneeded argument
2015-03-26 20:45:39 +01:00
Lukas Reschke
74a9fc29b4
Merge pull request #14399 from owncloud/ignore-empty-plurals
...
Ignore empty plurals just like with singulars
2015-03-26 20:15:33 +01:00
Lukas Reschke
55fd0082aa
Serve all files with a Content-Disposition of 'attachment' via WebDAV
...
As an additional security hardening it's sensible to serve these files with a Content-Disposition of 'attachment'. Currently they are served 'inline' and get a "secure mimetype" assigned in case of potential dangerous files.
To test this change ensure that:
- [ ] Syncing with the Desktop client still works
- [ ] Syncing with the Android client still works
- [ ] Syncing with the iOS client still works
I verified that the 1.8 OS X and iOS client still work with this change.
2015-03-26 20:01:05 +01:00
Lukas Reschke
c8c722bc6d
Merge pull request #15129 from owncloud/version-command-bus
...
expire versions in a background command
2015-03-26 19:55:13 +01:00
Lukas Reschke
3e57e9d3e5
Merge pull request #15232 from owncloud/remove-arg-separator-magic
...
Remove custom `arg_separator.output`
2015-03-26 19:41:22 +01:00
Morris Jobke
70e64822b9
Merge pull request #14665 from owncloud/fileid-increment
...
SQLite autoincrement test
2015-03-26 19:36:18 +01:00
Vincent Petry
58b4c2c0e5
Make sure mountOptions keep their data type
...
str_replace for $user substitution was converting the data type of
mountOptions to string. This fix prevents this to happen by making sure
only strings are processed by substitution.
Also added a int conversion when reading the watcher policy
2015-03-26 19:24:37 +01:00
Thomas Müller
a8b756154a
Merge pull request #14495 from owncloud/update-mailmap-01
...
Updating .mailmap
2015-03-26 17:17:18 +01:00
Lukas Reschke
73af302d39
Remove custom `arg_separator.output`
...
This seems unrequired nowadays and like a legacy fragment. It should be safe to remove.
Fixes https://github.com/owncloud/core/issues/14782
2015-03-26 17:07:26 +01:00
Robin Appelman
8c903c100f
check limit of serialized command in unit tests
2015-03-26 17:07:02 +01:00
Robin Appelman
268f249e8d
ensure commands can be serialized in unit tests
2015-03-26 17:07:02 +01:00
Robin Appelman
ddd6a67d2a
Handle exceptions thrown during hooks when running unit tests
2015-03-26 17:07:02 +01:00
Robin Appelman
3ed6ed3c36
Force test cases using background commands to handle setting up the filesystem
2015-03-26 17:07:02 +01:00
Andreas Fischer
0f58315543
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.
...
Do not send Content-Length headers with a value larger than PHP_INT_MAX
(2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647
instead.
When X-Sendfile is enabled, Apache will send a correct Content-Length header,
even for files larger than 2147483647 bytes. When X-Sendfile is not enabled,
ownCloud will not send a Content-Length header. This prevents progress bars
from working, but allows the actual transfer to work properly.
2015-03-26 16:37:38 +01:00
Joas Schilling
39dbf9509b
Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list
...
Correctly only send the errors of the current file to the event
2015-03-26 16:35:46 +01:00
Vincent Petry
70acd58336
Copy Etag header to OC-Etag for sabre calls
2015-03-26 16:06:43 +01:00
Joas Schilling
db763027bb
Correctly only send the errors of the current file to the event
2015-03-26 15:33:31 +01:00
Vincent Petry
a84ade5f32
Revert "adding OC-ETag header"
...
This reverts commit 30ee8b6f99
.
2015-03-26 15:04:41 +01:00
Vincent Petry
daceb1a9ac
Revert "adding unit tests"
...
This reverts commit 8d327c94a8
.
2015-03-26 15:04:36 +01:00
Vincent Petry
cda7f7fd61
Merge pull request #15168 from owncloud/oc-etag-master
...
adding OC-ETag header
2015-03-26 13:52:43 +01:00
Lukas Reschke
468456e168
Merge pull request #14125 from dratini0/master
...
[nginx] Extending X-Accel-Redirect support
2015-03-26 13:35:00 +01:00
Jenkins for ownCloud
b585d87d9d
Update license headers
2015-03-26 11:44:36 +01:00
Morris Jobke
20f5290462
Merge pull request #15195 from owncloud/reanimate-add-guzzle
...
Add wrapper for Guzzle
2015-03-26 11:06:48 +01:00
Thomas Müller
c8f0cbab5a
Merge pull request #15194 from owncloud/fix-15146
...
Do not use APCu when apc.enabled is Off.
2015-03-26 11:03:36 +01:00
Vincent Petry
f056558b72
Add repair step to fix SQLite autoincrement
...
Force Doctrine to generate alter table SQL statements for SQLite to make
sure the code from OCSqlitePlatform is triggered.
2015-03-26 11:00:22 +01:00
Thomas Müller
8d327c94a8
adding unit tests
2015-03-26 10:49:26 +01:00
Jenkins for ownCloud
40b77eb97a
[tx-robot] updated from transifex
2015-03-26 01:55:29 -04:00
Morris Jobke
24d0dfc727
Revert "FIX for webdav.mediencenter.t-online.de"
2015-03-26 00:56:06 +01:00
Oliver Kohl D.Sc.
9323285987
FIX for webdav.mediencenter.t-online.de
...
https://webdav.mediencenter.t-online.de returns invalid response code.
e.g.
{"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"}
e.g.
{"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"}
2015-03-25 21:29:29 +01:00
Robin Appelman
ac8254de6a
Rename platform
2015-03-25 18:33:21 +01:00
Robin Appelman
24a30c10d7
Add custom sqlite platform to set auto increment
2015-03-25 18:33:21 +01:00
Lukas Reschke
5f044ebf1b
Add wrapper for Guzzle
2015-03-25 16:04:41 +01:00
Andreas Fischer
630b7edc54
Do not use APCu when apc.enabled is Off.
2015-03-25 14:52:01 +01:00
Jenkins for ownCloud
fb61889490
[tx-robot] updated from transifex
2015-03-25 01:55:46 -04:00
Thomas Müller
43beaba0dc
Merge pull request #15171 from owncloud/sabre-logforbiddenasdebug
...
Log forbidden in debug level
2015-03-24 23:31:35 +01:00
Lukas Reschke
ec12f5e019
Merge pull request #14949 from owncloud/sabre-2.1.3
...
Update sabre-2.1.3 thirdparty submodule
2015-03-24 23:16:57 +01:00
Vincent Petry
72c1c89bcd
Log forbidden in debug level
2015-03-24 22:08:11 +01:00
Thomas Müller
30ee8b6f99
adding OC-ETag header
2015-03-24 21:36:46 +01:00
Roeland Jago Douma
abfb524b29
When searching for displayname then search for displayname
2015-03-24 21:35:44 +01:00
Lukas Reschke
5a9c9b86f8
Merge pull request #15153 from owncloud/uniquename-node
...
Add `getNonExistingName()` to the node api
2015-03-24 15:51:12 +01:00
Robin Appelman
d11f01fa0f
Add `getNonExistingName()` to the node api
2015-03-24 15:00:36 +01:00
Vincent Petry
331f0196e0
Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryption
...
Remove range header exception for encryption
2015-03-24 14:29:01 +01:00
Morris Jobke
92791bb8ba
Merge pull request #15126 from owncloud/sabre-storagenotavailable
...
Soft fail in CustomPropertiesBackend whenever storage not available
2015-03-24 14:01:47 +01:00
Joas Schilling
5e71d1558a
Merge pull request #15149 from owncloud/fix-enable-for-group
...
Correctly get array of groups and send OCP\IGroup objects to enable meth...
2015-03-24 13:50:56 +01:00
Vincent Petry
302c19067a
Merge pull request #15145 from owncloud/fix-15097-master
...
Properly catch whether a share is `null`
2015-03-24 13:37:47 +01:00
Vincent Petry
46475bf580
Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list
...
Do not walk over the users directory, but over the list of tagged objects
2015-03-24 13:26:59 +01:00
jknockaert
a1b68b5a48
Remove range header exception for encryption
...
revert #10422
2015-03-24 13:19:49 +01:00
Joas Schilling
b262c30fa9
Correctly get array of groups and send OCP\IGroup objects to enable method
2015-03-24 12:56:42 +01:00
Lukas Reschke
e2453d78c0
Properly catch whether a share is `null`
...
Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory.
To test this perform the following steps:
* Share file in owncloud 7 (7.0.4.2)
* Delete the parent folder of the shared file
* The share stays is in the DB and the share via the sharelink is inaccessible. (which is good)
* Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones)
* Optional Step: Logout, Reset Browser Session, etc.
* Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL.
* Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file)
* No exception is thrown and no error is logged.
This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8.
Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so.
Fixes https://github.com/owncloud/core/issues/15097
2015-03-24 11:21:58 +01:00
Jenkins for ownCloud
9cb07f126d
[tx-robot] updated from transifex
2015-03-24 01:55:24 -04:00
dratini0
d4e5ef4f38
Removed simplified X-accel-redirect even further
2015-03-23 17:51:12 +01:00
Vincent Petry
eb894e6625
Soft fail in CustomPropertiesBackend whenever storage not available
...
When a storage is not available, it will not fail the whole call any
more but still return a usable file list.
2015-03-23 17:41:32 +01:00
Morris Jobke
0adcb99110
Merge pull request #14862 from owncloud/introduce-shipped.json-master
...
shipped apps are now defined in core/shipped.json - the shipped tag in i...
2015-03-23 17:17:33 +01:00
dratini0
c432b52c74
Changed the disputed while loop to a single if.
2015-03-23 16:12:03 +01:00
Joas Schilling
1a26263123
Do not walk over the users directory, but over the list of tagged objects
...
Way quicker
2015-03-23 15:10:58 +01:00
Jenkins for ownCloud
a9b4f0d842
[tx-robot] updated from transifex
2015-03-23 01:54:48 -04:00
Morris Jobke
21bc8e0c81
Merge pull request #15088 from oparoz/3d-support
...
Introducing 3D images support (media type)
2015-03-22 23:14:02 +01:00
Jenkins for ownCloud
a79d973005
[tx-robot] updated from transifex
2015-03-22 01:55:21 -04:00
Jenkins for ownCloud
e36a33c89a
[tx-robot] updated from transifex
2015-03-21 01:56:09 -04:00
Olivier Paroz
f3fe46685b
Introducing 3D images support (media type)
...
So that people with 3D images can at least see a 2D picture
Full 3D support is possible via an app
2015-03-20 22:11:42 +01:00
Thomas Müller
afa8872955
Merge pull request #14857 from owncloud/preview-provider-registration-in-manager
...
Preview provider registration in manager
2015-03-20 16:34:22 +01:00
Morris Jobke
a45e45df1e
Merge pull request #14941 from AdamWill/pipeline-apps
...
fall back to absolute path for pipelined assets (#14940 )
2015-03-20 14:56:02 +01:00
Thomas Müller
0b1c4bfc3b
Merge pull request #15062 from owncloud/fix-15053-master
...
Handle session initialization errors and display error page
2015-03-20 14:07:15 +01:00
Vincent Petry
67160e0861
Do not automatically add "update" permission to shared mounts
...
In the past it seems the update permission was needed to be able to
rename shared mounts, but it doesn't seem to be the case any more.
Removing the "update" permission that used to be added automatically
fixes the read-only permission check when trying to overwrite a
read-only file over WebDAV.
2015-03-20 12:33:59 +01:00
Thomas Müller
843fef0490
Handle session initialization errors and display error page - fixes #15053
2015-03-20 12:21:03 +01:00
Thomas Müller
a87cc90d1e
Merge pull request #14993 from owncloud/stop-on-missing-deps
...
Stop executing, when 3rdparty is missing or apps directory is invalid
2015-03-20 11:36:02 +01:00
Thomas Müller
cce303ff5c
Merge pull request #15047 from owncloud/connect-failed-exception-message
...
be a little more verbose in the exception message when we cant connect to...
2015-03-20 10:06:06 +01:00
Robin McCorkell
b6676c32d6
Merge pull request #15046 from owncloud/exception-show-type
...
show exception type in debug mode
2015-03-20 08:48:22 +00:00
Morris Jobke
1de6fa19de
Merge pull request #15035 from owncloud/assocmapper
...
If the execute method on the mapper receives an assoc array, it binds by...
2015-03-20 08:53:14 +01:00
Robin Appelman
faa4918355
be a little more verbose in the exception message when we cant connect to the db
2015-03-20 03:56:38 +01:00
Robin Appelman
2df20aaffb
show exception type in debug mode
2015-03-20 03:51:21 +01:00
Vincent Petry
5ba508b346
Fix permission checks in Sabre connector
...
This fixes moving files in and out of shared folders with some exotic
permission combinations.
2015-03-19 21:18:48 +01:00
Morris Jobke
2a8c3798a8
Merge pull request #14947 from oparoz/repairmimetypes-sql
...
Make repairmimetypes compatible with case sensitive SQL backends
2015-03-19 17:22:25 +01:00
Bernhard Posselt
df24a014b8
If the execute method on the mapper receives an assoc array, it binds by value instead of index
2015-03-19 17:08:46 +01:00
Thomas Müller
857b22c61b
Merge pull request #15025 from rullzer/ocs_respect_enforced_date
...
Ocs respect enforced date
2015-03-19 17:06:04 +01:00
Thomas Müller
3765af4edf
Merge pull request #14986 from owncloud/fixmapperbackw
...
Fix backwards compatibility for mapper execute method
2015-03-19 17:04:01 +01:00
Robin Appelman
73874ca27f
Merge pull request #14704 from owncloud/storage-wrapper-mount
...
pass mountpoint to storage wrapper callback
2015-03-19 16:20:38 +01:00
Olivier Paroz
f890c3ffb1
Make the method compatible with all types of extensions
...
Fix existing tests
2015-03-19 16:09:16 +01:00
Olivier Paroz
60b1643f02
Fix the office class
...
The office converter already replaces the original extension with '.pdf', so we need to switch the extensions of the tmp file instead of appending '.pdf' to it
2015-03-19 16:09:09 +01:00
Olivier Paroz
8d6b2b8867
Keep the extension in temp files
...
The file extension helps some applications like ImageMagick to properly
process files
2015-03-19 16:09:02 +01:00
Thomas Müller
0868e49663
Merge pull request #14980 from owncloud/fix-fileglobalgc
...
Fix fileglobalgc unlink parameter warnings
2015-03-19 14:17:20 +01:00
Roeland Jago Douma
3c39658a1c
When the expiration date is enforced respect this
...
Make sure that we do not allow removing of the expiration date when this
is enforced in the settings.
2015-03-19 10:07:17 +01:00
Jenkins for ownCloud
e40b0701d7
[tx-robot] updated from transifex
2015-03-19 01:55:06 -04:00
Bernhard Posselt
f77ae37f23
also use backwards compatible method for mapper
2015-03-18 22:20:23 +01:00
Vincent Petry
fe8002a7db
Merge pull request #14995 from owncloud/remove-unrequired-backtick-removal
...
Remove unrequired backtick removal
2015-03-18 19:34:49 +01:00
Robin McCorkell
693ca9a92f
Add unit tests for gc() for \OC\Cache\FileGlobalGC
2015-03-18 16:19:04 +00:00
Robin Appelman
e2e16249a1
Merge pull request #14999 from owncloud/kill-fileoperations-proxy
...
kill fileoperations proxy
2015-03-18 15:42:00 +01:00
Lukas Reschke
7310575f07
Merge pull request #14994 from owncloud/sabre-customprops-softfail
...
Soft fail in custom properties backend
2015-03-18 15:39:35 +01:00
Robin Appelman
8f9ddef435
kill fileoperations proxy
...
check is now handled by storage backends
2015-03-18 15:04:28 +01:00
Morris Jobke
378eef7eb4
migrate share helper method to IConfig
2015-03-18 13:07:39 +01:00
Lukas Reschke
bb5c5a3691
Remove unreqired backtick removal
...
Without this files with a ` (backtick) in the beginning of the filenames where simply not correctly referenced as the ` got removed. This can lead to all possible havoc situations.
Should get backported to stable8 and in future we might consider if it is really worth to backport such changes when it is just for SQLite 🙈
Regression of https://github.com/owncloud/core/pull/14734
2015-03-18 12:38:19 +01:00
Vincent Petry
50194c31b4
Soft fail in custom properties backend
...
This makes it possible for clients to still receive a file list (minus
the broken files) instead of getting no list at all
2015-03-18 12:36:37 +01:00
Joas Schilling
0bed187613
Stop executing, when 3rdparty is missing or apps directory is invalid
2015-03-18 11:58:18 +01:00
Lukas Reschke
917cb66a5b
Use ArrayCache if ownCloud is not installed
...
If ownCloud has not been installed yet the prefix might otherwise change at this point quite some time and thus the cache runs havoc.
This made installing ownCloud impossible on systems where APCu or so was available. However, I was not able to reproduce the same problem for application upgrades so this patch seems to work fine for this situation as well.
Fixes itself.
2015-03-18 11:47:16 +01:00
Bernhard Posselt
c52bd10361
fix backwards compatibility for mapper execute method
2015-03-18 09:25:22 +01:00
Jenkins for ownCloud
8a95bf18b7
[tx-robot] updated from transifex
2015-03-18 01:55:22 -04:00
Robin McCorkell
42fcd0e8b7
Fix fileglobalgc unlink parameter warnings
2015-03-18 00:07:18 +00:00
Thomas Müller
c69cd28a73
Merge pull request #14968 from owncloud/files-reallowsinglequote
...
Reallow single quote in file names
2015-03-17 23:50:16 +01:00
Thomas Müller
a4d2c7810e
Merge pull request #14975 from owncloud/add-smtp-debug-mode
...
Add debug mode back to mailer
2015-03-17 23:49:19 +01:00
Lukas Reschke
f13216d275
Use `FILTER_UNSAFE_RAW` instead of `FILTER_SANITIZE_STRING`
...
`FILTER_SANITIZE_STRING` will still encode everything else.
2015-03-17 21:56:16 +01:00
Bernhard Posselt
087117d87d
Merge pull request #14961 from owncloud/onlyrequireinfo
...
Only hard depend on the info.xml and not the app.php
2015-03-17 21:27:51 +01:00
Robin McCorkell
760f5fc5e5
Merge pull request #14954 from owncloud/cache-image-path
...
Cache \OC\URLGenerator::imagePath
2015-03-17 19:36:23 +00:00
Lukas Reschke
aea4b3166b
Add debug mode back to mailer
...
This re-adds the debug mode for the mailer which will log the whole SMTP traffic within the log file if enabled.
2015-03-17 19:41:13 +01:00
Morris Jobke
012016d331
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-17 17:19:33 +01:00
Bernhard Posselt
57ceed590a
only hard depend on the info.xml and not the app.php
...
fix comment
2015-03-17 15:43:48 +01:00
Thomas Müller
6d5f52484e
Merge pull request #14948 from owncloud/prefix-memcache
...
Add version and path to cache prefix
2015-03-17 13:39:22 +01:00
Olivier Paroz
4256078017
Make repairmimetypes compatible with case sensitive SQL backends
...
Change for #14132
Just a word of warning, ILIKE seems to be a Doctrine only clause. The statements are thus not portable.
2015-03-17 13:18:14 +01:00
Lukas Reschke
1f4aa5350a
Reuse cache result
2015-03-17 13:15:52 +01:00
Lukas Reschke
4f9b76d821
Read theme only if required
2015-03-17 12:47:46 +01:00
Lukas Reschke
c233f2c90b
Add version and path to cache prefix
...
Prevents to have the cache reused by other instances on the server which have possible the same instance ID and also invalidates older cache entries after an upgrade which can cause unwanted side-effects.
Impact for deployment: The same cache will only get used if ownCloud is installed with the same version and under the same path. But this should be a basic requirement anyways.
2015-03-17 12:39:49 +01:00
Lukas Reschke
9e2ebf2dce
Cache \OC\URLGenerator::imagePath
...
\OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching.
2015-03-17 12:35:47 +01:00
Vincent Petry
5ea8ab3bb0
Fix Principal connector override
2015-03-17 12:22:29 +01:00
Joas Schilling
9c45ab49a1
Use a closure for the files app entry and deprecate old methods
2015-03-17 12:17:09 +01:00
Thomas Müller
98a42dbccc
Merge pull request #14927 from oparoz/raw-mimetypes
...
Introducing the Raw media types
2015-03-17 11:32:09 +01:00
Lukas Reschke
e4c6b0abf5
Merge pull request #14931 from owncloud/issue/14881-closures-for-navigation-entries
...
Issue/14881 closures for navigation entries
2015-03-17 11:28:27 +01:00
Lukas Reschke
b1c19f74a1
Merge pull request #12085 from owncloud/add-swift-mailer
...
Migrate OC_Mail to SwiftMailer
2015-03-17 11:15:39 +01:00
Jenkins for ownCloud
b51b4f0a2c
[tx-robot] updated from transifex
2015-03-17 01:55:43 -04:00
Adam Williamson
fa1be7d296
fall back to absolute path for pipelined assets ( #14940 )
...
If the asset is, for example, in an apps directory that is
outside the $SERVERROOT, we won't be able to get a relative
path. We shouldn't just fail hard in this case. Fall back to
using the absolute path instead (as we used to).
2015-03-16 19:08:11 -07:00
Vincent Petry
7bc09f8f06
Fix setup config
2015-03-16 17:57:34 +01:00
Vincent Petry
6f687fa6ae
Merge pull request #14923 from owncloud/fix-preference-key-definition
...
Fix user preference key definition for insertIfNotExists()
2015-03-16 17:14:09 +01:00
Thomas Müller
54e1edbf03
Merge pull request #13733 from mmattel/Try_to_write_logtimezone_during_installation
...
Write the parameter 'logtimezone' into config.php during setup
2015-03-16 17:04:06 +01:00
Olivier Paroz
bef12488c3
Introducing the Raw mimetypes
2015-03-16 16:25:04 +01:00
Joas Schilling
970846624f
Allow registering closures for navigation entries
...
This speeds up all pages that don't use the navigation by 0.04sec per app,
because we don't need to create the routing anymore, unless we really need to.
2015-03-16 16:17:43 +01:00
Joas Schilling
c2a5bd6a01
Also add a note that clob does not work in the compare array
2015-03-16 15:41:00 +01:00
Joas Schilling
06b2446269
The key is over configkey, user and app, not the value
...
stupid me :(
2015-03-16 15:37:12 +01:00
Lukas Reschke
7a70fffa6c
Don't fallback to Plaintext per default for legacy class
2015-03-16 14:10:03 +01:00
Lukas Reschke
d7c7808a5e
Add debug log message back
2015-03-16 13:01:17 +01:00
Joas Schilling
8f06353882
Remove load*() methods from public interface
...
We shall add a factory for that in the future
2015-03-16 12:57:15 +01:00
Lukas Reschke
e32f1582c7
Show more detailed error message
2015-03-16 12:47:06 +01:00
Lukas Reschke
f92f3a1a6e
Incorporate review changes
2015-03-16 12:47:05 +01:00
Lukas Reschke
13486a5ada
Migrate to SwiftMail
...
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.
Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014
Conflicts:
3rdparty
lib/private/server.php
lib/public/iservercontainer.php
tests/lib/mail.php
tests/settings/controller/mailsettingscontrollertest.php
Conflicts:
3rdparty
lib/private/mail.php
lib/private/server.php
lib/public/iservercontainer.php
settings/ajax/lostpassword.php
settings/application.php
2015-03-16 12:47:05 +01:00
Joas Schilling
2731b80f74
Only register the core providers when necessary
2015-03-16 12:45:18 +01:00
Joas Schilling
8ed27d2ce0
Create an interface for OC_Image and OCP\Image for the public API
2015-03-16 12:45:15 +01:00
Joas Schilling
3b7aec1b7d
Only sort the list when required
2015-03-16 12:44:12 +01:00
Joas Schilling
37b827f0b2
Order the providers alphabetically
2015-03-16 12:44:12 +01:00
Joas Schilling
9c86574acf
Only do all the "find path" magic when we need to register them
2015-03-16 12:44:11 +01:00
Joas Schilling
e38dea3542
Cache result for isMimeTypeSupported()
2015-03-16 12:44:11 +01:00
Joas Schilling
e518eacba6
Add more type hinting
2015-03-16 12:44:11 +01:00
Joas Schilling
1a1dc9b335
Use DI for the config
2015-03-16 12:44:11 +01:00
Joas Schilling
c1f266db88
Add an interface for the preview providers
2015-03-16 12:44:11 +01:00
Joas Schilling
227ff0a9e3
Clean up some docs
2015-03-16 12:44:11 +01:00
Joas Schilling
0b37d5aea3
Move default provider registration to preview manager
2015-03-16 12:44:11 +01:00
Joas Schilling
cae8529359
Register preview providers on the preview manager instead of OC\Preview
2015-03-16 12:44:11 +01:00
Thomas Müller
1075914f8a
Merge pull request #14883 from owncloud/imagepng_expects_resource_issue
...
validate resource's integrity before using it
2015-03-16 12:22:27 +01:00
Georg Ehrke
09b05373ed
validate resource's integrity before using it
2015-03-16 10:57:01 +01:00
Morris Jobke
17b10ef9b4
Add spaces
2015-03-16 10:52:29 +01:00
Morris Jobke
997a7a2668
Merge pull request #14766 from owncloud/fix-insertifnotexists-poc
...
Allow specifying the compare-array for insertIfNotExists()
2015-03-16 10:31:36 +01:00
Vincent Petry
b495ca4924
Added part files for when writing chunks
...
Whenever a chunk is being written, it is now written to a part file
first. This is to avoid a concurrent chunk upload to believe that the
former chunk already exists, even though it's not fully written.
This makes sure that the final file assembly is only done when all
chunks were successfully written.
Also added an extra unique id to chunk parts in case the same chunk is
uploaded twice concurrently.
2015-03-16 10:13:13 +01:00
Thomas Müller
bbaf97ca43
Merge pull request #14644 from owncloud/trash-expire-command
...
Expire files from the trash in the background
2015-03-16 10:04:05 +01:00
Thomas Müller
6927773648
Merge pull request #14776 from owncloud/fix-14629-master
...
verify the file name length not to exceed 255 characters + verify path d...
2015-03-16 09:58:41 +01:00
Thomas Müller
b159c7f274
Merge pull request #14848 from owncloud/kill-curl-fallback-master
...
drop any fallback code related to curl
2015-03-16 09:56:31 +01:00
Jenkins for ownCloud
c1a3394f48
[tx-robot] updated from transifex
2015-03-16 01:55:15 -04:00
Jenkins for ownCloud
84b6ca9b81
[tx-robot] updated from transifex
2015-03-15 01:54:38 -04:00
Thomas Müller
918b86a5bc
Merge pull request #14871 from owncloud/use-proper-error-type
...
Use proper error type and clean-up code
2015-03-13 23:30:49 +01:00
Lukas Reschke
e77d2ff2b4
Remove outdated comment
2015-03-13 16:19:52 +01:00
Lukas Reschke
bf9030e874
Drop example user backend
...
We already provide an interface for application developers, this file is outdated and thus should get removed.
Addresses No. 3 from https://github.com/owncloud/core/issues/14847
2015-03-13 16:12:32 +01:00
Morris Jobke
0d9f149dd9
Merge pull request #14867 from owncloud/drop-OC_User_HTTP
...
Remove OC_User_HTTP
2015-03-13 15:53:22 +01:00
Lukas Reschke
38fec9b095
Can also be null
...
If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
2015-03-13 14:01:24 +01:00
Lukas Reschke
4eb118dd33
Use proper error type and clean-up code
2015-03-13 13:21:09 +01:00
Lukas Reschke
93a303970f
Remove OC_User_HTTP
...
Addresses No. 1 from https://github.com/owncloud/core/issues/14847
2015-03-13 12:26:33 +01:00
Thomas Müller
0bd2b3cb0c
[WIP] upgrade app store apps during console upgrade
2015-03-13 12:16:16 +01:00
Thomas Müller
40b2889785
shipped apps are now defined in core/shipped.json - the shipped tag in info.xml is ignored from now on - never trust an app 🙊
2015-03-13 11:18:39 +01:00
Jenkins for ownCloud
d17630d6be
[tx-robot] updated from transifex
2015-03-13 01:54:55 -04:00
Thomas Müller
5855108e9b
drop any fallback code related to curl - refs https://github.com/owncloud/core/pull/14838#issuecomment-78586447
2015-03-12 21:43:41 +01:00
Lukas Reschke
00f5025ff1
Add cURL as hard-dependency
...
It is required by other functionalities such as S2S anyways and ownCloud will fail hard at a lot of places without it.
2015-03-12 18:39:54 +01:00
Thomas Müller
80ef53eff0
verify the file name length not to exceed 255 characters + verify path during rename
2015-03-12 10:47:47 +01:00
Joas Schilling
fefcbb966b
Also use all keys for an empty array, just in case
2015-03-12 09:18:43 +01:00
Jenkins for ownCloud
454a2563bc
[tx-robot] updated from transifex
2015-03-12 01:55:59 -04:00
Morris Jobke
dbd2bb66e9
Merge pull request #14357 from owncloud/fix/1373
...
Run `updateDataDirectory` after Update
2015-03-11 18:33:51 +01:00
Lukas Reschke
f9fd1629da
Merge pull request #14705 from rullzer/avatarcontroller
...
Move AvatarController to AppFramework
2015-03-11 17:15:42 +01:00
Morris Jobke
82254ad5ef
Merge pull request #13893 from owncloud/create-cachedir-on-user
...
Only make sure the cache directory exists when we use it
2015-03-11 16:49:24 +01:00
Roeland Jago Douma
1a0f9c375b
Avatar controller moved to AppFrameWork
...
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
2015-03-11 16:37:42 +01:00
Lukas Reschke
73dc02d42c
Merge pull request #14798 from owncloud/enable-oci-autotest-master
...
Setting oci as supported database
2015-03-11 16:14:54 +01:00
Morris Jobke
04eef93b25
Merge pull request #13648 from oparoz/sfnt-fonts-preview
...
Add support for font previews
2015-03-11 15:56:32 +01:00
Thomas Müller
96b223676d
Don't play with config values ...
2015-03-11 15:47:24 +01:00
Robin Appelman
169031d1c5
fix factory test
2015-03-11 15:07:59 +01:00
Robin Appelman
e1f2a6df94
Allow setting the watcher policy as mount option
2015-03-11 15:07:23 +01:00
Robin Appelman
7adda88786
Copy mount options to the storage
2015-03-11 15:06:48 +01:00
Robin Appelman
4f0f175f8b
Allow getting all mount options as array
2015-03-11 15:06:12 +01:00
Robin Appelman
e5c8fd37df
pass mountpoint to storage wrapper callback
2015-03-11 15:06:12 +01:00
Morris Jobke
dbade19362
Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown
...
Better finding the remote URL from user input in share dropdown
2015-03-11 14:38:41 +01:00
Morris Jobke
ad97ceb787
Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail
...
Do not abort when meeting unfixable legacy storages
2015-03-11 13:32:33 +01:00
Lukas Reschke
8154ed4d2c
Merge pull request #14791 from owncloud/fix-14516
...
Adding a more meaningful message for sabre dav exception
2015-03-11 12:52:18 +01:00
Thomas Müller
0d0f9a52d2
Merge pull request #14788 from cmeh/patch-3
...
Correct "one invalid characters" to "one invalid character"
2015-03-11 12:26:49 +01:00
Thomas Müller
0f3e36fdfd
Adding a more meaningful message for sabre dav exception - fixes #14516
2015-03-11 11:53:31 +01:00
Bernhard Posselt
abb726c994
Merge pull request #14789 from owncloud/better-app-install-error-messages
...
display app update error messages
2015-03-11 11:28:28 +01:00
Thomas Müller
ffe06ac5c7
display app update error messages - fixes #14611
2015-03-11 09:59:56 +01:00
cmeh
4a0c649c8a
Correct "one invalid characters" to "one invalid character"
...
Corrected "one invalid characters" to "one invalid character" in line 1575.
2015-03-11 09:59:42 +01:00
Joas Schilling
2af8fea2be
Throw a RuntimeException in the cache aswell
2015-03-11 09:33:50 +01:00
Thomas Müller
6c1a1234f8
Properly handle available databases at runtime and respect setup checks in command line as well
2015-03-11 09:27:12 +01:00
Thomas Müller
81fa9550a0
No need to restart the web server in cli mode
2015-03-11 09:27:12 +01:00
Thomas Müller
7181840665
Use occ to install ownCloud in autotest.sh
2015-03-11 09:27:12 +01:00
Joas Schilling
d1511cdbee
Fix doc blocks of insertIfNotExists() method
2015-03-11 09:05:30 +01:00
Jenkins for ownCloud
01ea056ac8
[tx-robot] updated from transifex
2015-03-11 01:55:38 -04:00
Lukas Reschke
284bd6647c
Merge pull request #14759 from owncloud/clean-up-code
...
Clean-up code and use proper exception types
2015-03-10 14:18:21 +01:00
Lukas Reschke
6dc59019af
Merge pull request #14346 from owncloud/storage-based-path-validation
...
adding storage specific filename verification
2015-03-10 11:02:47 +01:00
Thomas Müller
214fa44400
Merge pull request #14534 from owncloud/add-child-src
...
Add support for 'child-src' directive
2015-03-10 10:30:44 +01:00
Thomas Müller
c8ed88f4d6
Merge pull request #14689 from owncloud/better-missing-resource-handling
...
Log errors and create 404 in network list when a css or js is missing
2015-03-09 23:33:25 +01:00
Thomas Müller
89be55a672
let insertIfNotExist() throw the native DBALException - no need to hide the real exception
2015-03-09 22:37:49 +01:00
Joas Schilling
2747a83a49
Get the id before using it
2015-03-09 22:37:49 +01:00
Joas Schilling
3115d66d60
Better save then sorry
2015-03-09 22:37:49 +01:00
Joas Schilling
940163e16b
insertIfNotExists() for storage insertion
2015-03-09 22:37:49 +01:00
Joas Schilling
c917ea183c
Only check unique keys for the comparison on filecache insert & update otherwise
2015-03-09 22:37:49 +01:00
Joas Schilling
8fa692388b
Allow specifying the compare-array for insertIfNotExists()
2015-03-09 22:37:49 +01:00
Morris Jobke
d34662122d
Merge pull request #14429 from owncloud/issue/14176-validate-timezone-before-using
...
Etc timezones don't exist for .5 and .75 offsets
2015-03-09 16:16:16 +01:00
Joas Schilling
01cd83a902
Merge pull request #14713 from owncloud/issue/14671-preview-delete-check-for-valid-fileid
...
Check whether the file id is valid, before using it to delete the previews
2015-03-09 11:56:46 +01:00
Lukas Reschke
2ac6f3a4f5
Clean-up code and use proper exception types
2015-03-09 11:48:55 +01:00
Joas Schilling
a12e16e985
Check whether the file id is valid, before using it to delete the previews
2015-03-09 11:25:18 +01:00
Thomas Müller
3623f14e73
no translation service in common storage class
2015-03-09 10:38:38 +01:00
Thomas Müller
2367797c17
Respect http header 'Accept-Language' on ocs and remote.php calls
2015-03-09 10:38:38 +01:00
Thomas Müller
33b11682f9
translate error messages
2015-03-09 10:38:38 +01:00
Lukas Reschke
2f18a09a20
Optimize loop
2015-03-09 10:38:38 +01:00
Thomas Müller
e28d314b53
deprecate isValidFileName()
2015-03-09 10:38:38 +01:00
Thomas Müller
49e1a81eba
fixing namespaces and PHPDoc
2015-03-09 10:38:37 +01:00
Thomas Müller
4bac595068
adding storage specific filename verification - refs #13640
2015-03-09 10:38:37 +01:00
Morris Jobke
d550143ba0
proper filename for "require version.php"
2015-03-09 08:03:28 +01:00
Jenkins for ownCloud
174f8cef64
[tx-robot] updated from transifex
2015-03-09 01:54:36 -04:00
Jenkins for ownCloud
377165ae51
[tx-robot] updated from transifex
2015-03-08 01:54:36 -05:00
Jenkins for ownCloud
73c2157171
[tx-robot] updated from transifex
2015-03-07 01:54:37 -05:00
Lukas Reschke
60c507cd4e
Merge pull request #14722 from owncloud/master-14711
...
Fix totally broken AppStore code...
2015-03-06 18:52:12 +01:00
Thomas Müller
1b08b7c726
use insertIfNotExist() in cache put
2015-03-06 15:32:58 +01:00
Thomas Müller
4e37831d85
Fix PHPDoc on the way ....
2015-03-06 14:54:57 +01:00
Thomas Müller
987b683895
Use an atomic implementation on sqlite for insertIfNotExist()
2015-03-06 14:54:54 +01:00
Jenkins for ownCloud
d11f040720
[tx-robot] updated from transifex
2015-03-06 01:54:52 -05:00
Lukas Reschke
d5a8225c0e
Fix totally broken AppStore code...
...
As it turned out the AppStore code was completely broken when it came from apps delivered from the appstore, this meant:
1. You could not disable and then re-enable an application that was installed from the AppStore. It simply failed hard.
2. You could not disable apps from the categories but only from the "Activated" page
3. It did not show the activation state from any category page
This code is completely static and thus testing it is impossible. We really have to stop with "let's add yet another feature in already existing static code". Such stuff has to get refactored first.
That said, this code works from what I can say when clicking around in the AppStore page GUI. However, it may easily be that it does not work with updates or whatsever as I have no chance to test that since the AppStore code is not open-source and it is impossible to write unit-tests for that.
Fixes https://github.com/owncloud/core/issues/14711
2015-03-06 00:16:17 +01:00
Lukas Reschke
9f5433c0c3
Merge pull request #13368 from owncloud/memcache_lowlatency
...
Refactor \OC\Memcache\Factory
2015-03-05 13:05:17 +01:00
Robin McCorkell
78819da3bf
\OC\Memcache\Cache implements \OCP\ICache
2015-03-05 11:36:34 +00:00
Robin McCorkell
0e4933e6d2
Refactor \OC\Memcache\Factory
...
Caches divided up into two groups: distributed and local. 'Low latency' is an
alias for local caches, while the standard `create()` call tries to get
distributed caches first, then local caches.
Memcache backend is set in `config.php`, with the keys `memcache.local` and
`memcache.distributed`. If not set, `memcache.distributed` defaults to the value
of `memcache.local`.
2015-03-05 11:36:34 +00:00
Jenkins for ownCloud
7e0fd8fb50
[tx-robot] updated from transifex
2015-03-05 01:56:35 -05:00
Joas Schilling
716ba49a82
Log errors and create 404 in network list when a css or js is missing
2015-03-04 17:56:33 +01:00
Lukas Reschke
cdced56f2b
Fix PHPDoc
...
That apparently went lost when changing the signature.
2015-03-04 15:35:41 +01:00
Vincent Petry
aa11b83158
Merge pull request #14682 from owncloud/issue/14681-noop-scanner-outdated
...
Update scanFile() and scanChildren() to the new signature of the parent ...
2015-03-04 10:07:42 +01:00
Morris Jobke
ac10441600
Merge pull request #14326 from owncloud/remove-unnessary-backslashes-from-translation
...
Remove unnecessary backslashes from translations
2015-03-04 09:58:42 +01:00
Morris Jobke
f1d74e8803
Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins
...
Let users configure security headers in their Webserver
2015-03-04 09:36:01 +01:00
Joas Schilling
09ac2df1f8
Update scanFile() and scanChildren() to the new signature of the parent class
2015-03-04 09:22:53 +01:00
Jenkins for ownCloud
84785a6a39
[tx-robot] updated from transifex
2015-03-04 01:55:19 -05:00
Joas Schilling
e12c83e3dc
Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2
...
Jenkins #14650
2015-03-03 18:33:08 +01:00
Joas Schilling
b669bf26d6
Fix the behaviour of getLanguageCode() to match the expectation of the name
2015-03-03 16:47:31 +01:00
Joas Schilling
ed4c05c7b5
Use findLanguage() instead of creating the object first
2015-03-03 16:47:31 +01:00
Joas Schilling
1761b162e6
Merge pull request #14660 from metaworx/replace-static-dbtableprefix-with-config-dbtableprefix
...
use `dbtableprefix` for temp table and index names
2015-03-03 16:43:47 +01:00
Thomas Müller
be27188649
Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versions
...
Read from IRequest instead of reading twice
2015-03-03 14:22:56 +01:00
Thomas Müller
e30ca8198f
Merge pull request #14638 from owncloud/issue/14538-repairstep-drop-old-tables
...
Add a repair step to delete old tables
2015-03-03 13:37:54 +01:00
Thomas Müller
29ecbc8c6c
Merge pull request #14496 from owncloud/kill-substr-mssql-master
...
[Master] Remove hacky Substring support for MSSQL
2015-03-03 11:00:13 +01:00
Joas Schilling
276d678080
Etc timezones don't exist for .5 and .75 offsets
2015-03-03 09:08:47 +01:00
Jenkins for ownCloud
e271fa3ee8
[tx-robot] updated from transifex
2015-03-03 01:55:50 -05:00
martin-rueegg
6be8ab65a5
replace 'oc_' with dbtableprefix form config for temporary table names and indexes
2015-03-03 01:54:15 +01:00
Lukas Reschke
c3c993446e
Run `updateDataDirectory` after Update
...
Fixes https://github.com/owncloud/core/issues/13731
2015-03-02 19:39:17 +01:00
Lukas Reschke
bbd5f28415
Let users configure security headers in their Webserver
...
Doing this in the PHP code is not the right approach for multiple reasons:
1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.
This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
2015-03-02 19:07:46 +01:00
Robin Appelman
00568af74d
Allow running the async commands from unit tests
2015-03-02 15:25:31 +01:00
Vincent Petry
e61aa3723e
Merge pull request #14573 from owncloud/enc-migrate-disable-updater
...
Disable the cache updater when doing the encryption migration
2015-03-02 14:53:29 +01:00
Joas Schilling
195c577c77
Add a repair step to delete old tables
2015-03-02 12:02:14 +01:00
Morris Jobke
4009f15255
Merge pull request #14593 from owncloud/fix/13994
...
Add detection for invalid CLI configuration for settings page
2015-03-02 09:19:26 +01:00
Lukas Reschke
afb0d742b9
Simplify code
2015-03-01 12:35:41 +01:00
Morris Jobke
36a4ee27ba
Merge pull request #14605 from owncloud/checkserver-disable-hhvm
...
Disable some server checks when running on HHVM
2015-03-01 12:12:01 +01:00
Lukas Reschke
faddd1e256
Simplify code
2015-03-01 11:46:39 +01:00
Jenkins for ownCloud
ff85d38c2a
[tx-robot] updated from transifex
2015-03-01 01:54:38 -05:00
Lukas Reschke
b29940d956
Add support for 'child-src' directive
...
This is required when working with stuff such as PDF.js in the files_pdfviewer application. Opt-in only.
Master change only because the stable CSP policies has a failback that allows nearly anything 🙈
2015-02-28 12:27:46 +01:00
Lukas Reschke
4100610390
Disable some server checks when running on HHVM
...
Ref https://github.com/owncloud/core/issues/10837#issuecomment-76516839
2015-02-28 10:08:41 +01:00
Lukas Reschke
b6d8a48ce1
Add detection for invalid CLI configuration for settings page
...
This change will log all failures that prevent the CLI cronjob from happening to the database and display a warning to administrators when an error happened.
To test:
1. Configure some invalid CLI php.ini settings
2. Enable the CLI cronjob and run php cron.php
3. See the errors printed and also in the admin page
4. Configure the CLI settings correctly
5. Errors should be gone.
Fixes https://github.com/owncloud/core/issues/13994
2015-02-27 20:20:34 +01:00
Robin Appelman
f6182aa87e
Allow disabling the cache updater
2015-02-27 17:14:16 +01:00
Morris Jobke
b4dfd043d7
Merge pull request #14575 from owncloud/cache-rename-overwrite
...
Fix cache update when doing a rename that overwrites the target
2015-02-27 17:11:37 +01:00
Robin Appelman
fc027bceb7
Fix cache update when doing a rename that overwrites the target
2015-02-27 16:39:58 +01:00
Bernhard Posselt
970b14d297
Merge pull request #13616 from owncloud/streamresponse
...
AppFramework StreamResponse
2015-02-27 15:43:01 +01:00
Bernhard Posselt
95239ad21e
AppFramework StreamResponse
...
First stab at the StreamResponse, see #12988
The idea is to use an interface ICallbackResponse (I'm not 100% happy with the name yet, suggestions?) that allow the response to output things in its own way, for instance stream the file using readfile
Unittests are atm lacking, plan is to
check if a mock of ICallbackResponse will be used by calling its callback (also unhappy with this name) method
Usage is:
$response = new StreamResponse('path/to/file');
rename io to output, add additional methods and handle error and not modified cases when using StreamResponse
fix indention and uppercasing, also handle forbidden cases
fix indention
fix indention
no forbidden, figuring out if a file is really readable is too complicated to get to work across OSes and streams
remove useless import
remove useless import
fix intendation
2015-02-27 15:42:33 +01:00
Joas Schilling
c5a9bad919
Merge pull request #14567 from owncloud/node-check-fileinfo-interface
...
Add "throws" lines to calling methods and interface aswell
2015-02-27 15:15:09 +01:00
Lukas Reschke
5c2fafa05f
Read from IRequest instead of reading twice
...
Potentially fixes https://github.com/owncloud/core/issues/14541 and https://github.com/owncloud/core/issues/14506
2015-02-27 14:22:35 +01:00
Vincent Petry
22bc37cb82
Properly forward repair errors and warnings
...
This makes repair errors and warnings visible for the user when
upgrading on the command line or in the web UI.
2015-02-27 12:44:04 +01:00
Thomas Müller
8abb80c642
Merge pull request #14565 from owncloud/more-https
...
Add more HTTPS endpoints
2015-02-27 03:31:08 -08:00
Joas Schilling
3a6a0501c4
Add "throws" lines to calling methods and interface aswell
2015-02-27 12:16:53 +01:00
Vincent Petry
e6abe96374
Do not abort when meeting unfixable legacy storages
2015-02-27 12:03:22 +01:00
Thomas Müller
7fe07e93fe
Merge pull request #14437 from owncloud/node-check-fileinfo
...
Check if we have a proper fileinfo
2015-02-27 02:56:13 -08:00
Lukas Reschke
b048e7129a
Add more HTTPS endpoints
...
The doc server can now finally speak SSL...
2015-02-27 11:37:30 +01:00
Thomas Müller
1c6857d92c
Merge pull request #14529 from owncloud/intuitive-version-check
...
Make version check work on the lowest common version denominator
2015-02-27 02:16:23 -08:00
Lukas Reschke
b58455241b
Add notice about Travis Checks
...
Maybe it helps in the future so we won't forget it again 🙈
2015-02-27 10:23:20 +01:00
Thomas Müller
f72f9e0159
Merge pull request #14530 from owncloud/revert-14403
...
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
Robin Appelman
5bb1a131e4
fix warning in gc
2015-02-26 16:42:41 +01:00
Lukas Reschke
9baf758150
Merge pull request #14503 from owncloud/quota-preventdatalossforfailedmove
...
Fix file move/copy when storage space is not enough
2015-02-26 16:35:13 +01:00
Morris Jobke
18d43f7469
Merge pull request #14474 from owncloud/move-utf-8-check-to-setup
...
Move UTF-8 check to setup
2015-02-26 16:00:31 +01:00
Morris Jobke
522469614b
Merge pull request #14505 from owncloud/dav-copy-fix
...
Fixes WebDAV copy
2015-02-26 15:42:53 +01:00
Vincent Petry
232de3bdc0
Delete target file for unsuccessful copy/rename
2015-02-26 15:11:37 +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
Morris Jobke
27fde80ee6
fix exception message
2015-02-26 15:08:30 +01:00
Bernhard Posselt
876e8bcb55
add phpdoc
2015-02-26 11:49:51 +01:00
Bernhard Posselt
2987d4aec8
make version check work on the lowest common version denominator
2015-02-26 11:42:08 +01:00
Morris Jobke
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
.
2015-02-26 11:37:37 +01:00
Vincent Petry
ae2f37ac06
Removed unused $node variable
2015-02-26 11:16:42 +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
Jenkins for ownCloud
8a4fddeb4a
[tx-robot] updated from transifex
2015-02-26 01:55:50 -05:00
Bernhard Posselt
59bbf27253
remove IDb interface from core class usage
2015-02-25 22:21:24 +01:00
Thomas Müller
c62eb9d652
owncloud -> ownCloud
2015-02-25 22:21:24 +01:00
Bernhard Posselt
4e29a4d867
deprecate getters for deprecated class
2015-02-25 22:21:24 +01:00
Bernhard Posselt
7b2fdbfb0b
use IDBConnection and close cursors after insert/update/delete
2015-02-25 22:21:24 +01:00
Bernhard Posselt
fb84e7d282
migrate to IDBConnection
2015-02-25 22:21:24 +01:00
Lukas Reschke
0720cf0ad1
Merge pull request #14494 from owncloud/fix-oracle-master
...
using Doctrine\DBAL\Connection::executeUpdate()
2015-02-25 21:43:51 +01:00
Vincent Petry
64c333c44b
Merge pull request #14508 from owncloud/tagmanager-nouser
...
Return null when requesting tags for null user
2015-02-25 20:53:59 +01:00
Clark Tomlinson
e8c3e33154
Merge pull request #14490 from owncloud/remove-unused-deprecated-code
...
Remove unused and deprecated Code
2015-02-25 14:49:40 -05:00
Vincent Petry
9ee37169a6
Return null when requesting tags for null user
...
The TagManager->load() now returns null if the user is not authenticated
instead of failing with an error.
2015-02-25 17:20:26 +01:00
Vincent Petry
f39fcbc250
Fixes WebDAV copy
...
- added existence check for source argument
- removed extra logic for folders, as $view->copy() already supports
that internally
2015-02-25 16:35:13 +01:00
Vincent Petry
20738d287e
Properly detect streamCopy errors
...
Now checking whether the written bytes match the number of read bytes.
2015-02-25 16:03:15 +01:00
Joas Schilling
6e9f3b2f7e
Clear the local cache when we clear the backends
2015-02-25 16:03:12 +01:00
Robin Appelman
f5befbeac6
Check if we have a proper fileinfo
2015-02-25 16:02:08 +01:00
Thomas Müller
14c592fe86
Merge pull request #14500 from owncloud/fileglobalgc-cleanup
...
Cleanup garbage collection for global file cache
2015-02-25 06:41:57 -08:00
Robin Appelman
3cf237df67
set max argument length to 4000
2015-02-25 15:09:41 +01:00
Robin Appelman
bf65b1f18b
Rename getAsyncCommandBus to getCommandBus
2015-02-25 15:09:41 +01:00
Robin Appelman
a39c7bf464
Add FileAccess trait for commands
2015-02-25 15:09:41 +01:00
Robin Appelman
8213f8d67d
Allow apps to determine which commands should be run synchronous based on traints
2015-02-25 15:09:41 +01:00
Robin Appelman
c2a7fff4f6
throw an exception when trying to push a background job that wont fit in the table
...
otherwise it will lead to failures in json decode and unexpected and hard to debug issues when running the job
2015-02-25 15:08:40 +01:00
Robin Appelman
74ae7b8929
Add async command system to handle asynchronous operations
2015-02-25 15:08:40 +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
Robin Appelman
a848a6b1dd
Cleanup garbage collection for global file cache
2015-02-25 14:13:58 +01:00
Lukas Reschke
afe087a371
Remove hacky Substring support for MSSQL
...
Substring() is not required for the core functionality and this allows us to get rid of a huge hack...
2015-02-25 14:00:54 +01:00
Thomas Müller
e9d25e4fdb
using Doctrine\DBAL\Connection::executeUpdate()
2015-02-25 13:43:26 +01:00
Lukas Reschke
de44a2b2ab
Remove unused and deprecated Code
...
Function is not used anymore anywhere in the code base: https://github.com/search?q=user%3Aowncloud+secureRNGAvailable&type=Code&utf8=%E2%9C%93
2015-02-25 12:11:14 +01:00
Thomas Müller
bcf3704645
Merge pull request #14458 from owncloud/revive/11157
...
Get the real protocol behind several proxies
2015-02-25 02:51:46 -08: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
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
Vincent Petry
fb87b746f0
Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-sorting
...
Update naturalsort_defaultcollator.php. Fixes #13982
2015-02-25 10:30:14 +01:00
Thomas Müller
7e7e0c51fb
Merge pull request #14471 from owncloud/always-load-authentication-apps
...
Always load authentication apps
2015-02-24 23:31:40 -08:00
Jenkins for ownCloud
31f881415b
[tx-robot] updated from transifex
2015-02-25 01:55:51 -05:00
Lukas Reschke
06cf93e6ee
Move UTF-8 check to setup
...
Nobody reads the warnings anyways and so we should enforce it at installation time... Also allows us to get rid of some duplicated code.
To test change the `default_charset` to something other than `utf-8` or `UTF-8`, both should work fine with that change here. An error should then get shown.
We already set those default charsets in the shipped .user.ini and .htaccess
2015-02-24 23:51:36 +01:00
AW-UC
d57f5c70e9
Fix sorting for files that only differ in case.
2015-02-24 23:50:38 +01:00
Olivier Paroz
f49805eea5
Add support for font previews
2015-02-24 22:00:54 +01:00
Lukas Reschke
c1d7b22d08
Always load authentication apps
...
The current code path may trigger situations where the LDAP application is not yet loaded and thus problems with the authentication appeared.
In previous versions of ownCloud the authentication mechanism manually loaded these apps which is why this affects ownCloud 8 and master only for my knowledge. (certainly not 6, maybe 7)
Backport to 8 might be something to consider.
Fixes https://github.com/owncloud/core/issues/14469
2015-02-24 18:00:26 +01:00
Lukas Reschke
d43d34c93f
Merge pull request #14195 from owncloud/activity-manager-performance-improvements
...
Activity manager performance improvements
2015-02-24 15:19:15 +01:00
Thomas Müller
7325414481
Merge pull request #14282 from owncloud/disable-non-shipped-apps-master
...
3rd-party apps are disabled on upgrade
2015-02-24 14:39:45 +01:00
Joas Schilling
88cfe46906
Merge pull request #11555 from goodkiller/patch-1
...
Update group.php
2015-02-24 13:58:41 +01:00
Lukas Reschke
276824299c
Merge pull request #13340 from owncloud/use-http-only
...
Use "HTTPOnly" for cookies when logging out
2015-02-24 13:50:49 +01:00
Lukas Reschke
9adcd15cb3
Use [0] instead of current as HHVM might have problems with that
2015-02-24 13:37:34 +01:00
Bernhard Posselt
fd3663f563
Dont break code which relies on the cursor being open after insert/update/delete
2015-02-24 12:58:36 +01:00
Thomas Müller
80cafe29a8
3rd-party apps are only disabled in case core is upgraded
2015-02-24 12:51:55 +01:00
Lukas Reschke
1c6eae9017
Get the real protocol behind several proxies
...
X-Forwarded-Proto contains a list of protocols if ownCloud is behind multiple reverse proxies.
This is a revival of https://github.com/owncloud/core/pull/11157 using the new IRequest public API.
2015-02-24 12:24:55 +01:00
Thomas Müller
fe7e7677e9
shipped and 3rd-party apps of type authentication and session will remain enabled during update
2015-02-24 12:02:37 +01:00
Thomas Müller
bbf7f56f94
3rd-party apps are disabled on upgrade - refs #14026
2015-02-24 12:02:36 +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
Thomas Müller
da8e34cf7f
Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid
...
don't allow installation of already installed apps - fixes #14004
2015-02-24 10:34:06 +01:00
Lukas Reschke
8bd3d55517
Merge pull request #14442 from owncloud/fix-oracle-ci-master
...
Close the cursor after the affected count has been extracted.
2015-02-24 09:20:59 +01:00
Jenkins for ownCloud
cdb4cfd939
[tx-robot] updated from transifex
2015-02-24 01:54:58 -05:00
Thomas Müller
b40d4c9cbc
app store can be used with any edition
2015-02-23 23:16:28 +01:00
Thomas Müller
39d8406933
don't allow installation of already installed apps - fixes #14004
2015-02-23 23:16:28 +01:00
Thomas Müller
e87ada86d1
Merge pull request #14416 from owncloud/setup-command
...
Setup command
2015-02-23 22:41:10 +01: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
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
Thomas Müller
0a9b8242ee
properly initialize OC::$WEBROOT and host name
2015-02-23 21:49:35 +01:00
Thomas Müller
c350da1a28
Merge pull request #14119 from owncloud/dbal251
...
Update doctrine/dbal to 2.5.1 #13537
2015-02-23 20:59:51 +01:00
Thomas Müller
5bdf42a925
Close the cursor after the affected count has been extracted.
2015-02-23 17:17:20 +01:00
Thomas Müller
bcd10d3dc5
implement command maintenance:install
2015-02-23 16:47:47 +01:00
Thomas Müller
1fd1b355e4
Fix namespace of OC_Setup -> \OC\Setup
2015-02-23 16:44:40 +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
Bernhard Posselt
8176032176
Merge pull request #14427 from owncloud/fix-some-php-docs
...
Fix some PHPDocs
2015-02-23 14:04:35 +01: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
Lukas Reschke
c06a94ecc2
Fix some PHPDocs
2015-02-23 12:19:52 +01:00
Jenkins for ownCloud
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
Joas Schilling
b180724cd0
Extract the remote host from user input in share dropdown
...
Fix #13678
2015-02-23 11:28:41 +01:00
Thomas Müller
f693d439e2
Merge pull request #14422 from owncloud/use-off-and-off
...
Use "off" and "off" instead of true booleans
2015-02-23 11:12:53 +01:00
Lukas Reschke
9a08c7ecb9
Merge pull request #14275 from chris-se/master
...
DAV authentication: use Owncloud's internal user instead of HTTP auth one
2015-02-23 10:25:13 +01:00
Lukas Reschke
43641d917b
Use "off" and "off" instead of true booleans
...
Apparently a boolean in php.ini is according to the documentation "on" or "off"…
Fixes itself.
2015-02-23 09:40:15 +01:00
Thomas Müller
0751ee087f
Merge pull request #14414 from owncloud/add-ini-helper
...
Add helper to check for `ini` values in `OC_Util::checkServer`
2015-02-22 20:44:02 +01:00
Jenkins for ownCloud
ef09e5d395
[tx-robot] updated from transifex
2015-02-22 01:54:42 -05:00
Lukas Reschke
2f0f38761d
Add helper to check for `ini` values in `OC_Util::checkServer`
...
This allows to check for specific values in the PHP.ini that ownCloud requires for full compatibility.
`mbstring.func_overload`: https://github.com/owncloud/core/issues/14372
`output_buffering`: http://doc.owncloud.org/server/8.0/admin_manual/configuration/big_file_upload_configuration.html#configuring-php
Fixes https://github.com/owncloud/core/issues/14372 and https://github.com/owncloud/core/issues/14412
2015-02-21 12:12:34 +01:00
Lukas Reschke
fcc5f5a4f4
Merge pull request #13777 from owncloud/close-cursor
...
Close cursor for appframework and manipulation queries if applicable
2015-02-20 20:15:22 +01:00
Thomas Müller
3a6b11d018
Merge pull request #13767 from owncloud/issue/13764-mimetype-racecondition
...
Use insertIfNotExists() and reload mimetypes after inserting one
2015-02-20 17:39:17 +01:00
Lukas Reschke
50208308e3
Merge pull request #14359 from owncloud/add-satisfy-all
...
Add `Satisfy All`
2015-02-20 14:55:43 +01:00
AW-UC
bc668600cd
Add constructor to inject collator
...
Adding the possibility for instantiating \OC\NaturalSort with an
injected collator. This makes the use of a specific collator enforcable.
2015-02-20 14:03:34 +01:00
Joas Schilling
ae60108692
Revert "Correctly fallback to english, if the plural case is not translated"
...
This reverts commit cbad5c998b
.
2015-02-20 11:51:36 +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
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
Arthur Schiwon
7ada41259c
Port of #14041 to master
...
on ownCloud upgrade: upgrade all apps in order, load important ones
Fix "other" app update stack
2015-02-19 14:38:22 +01:00
Joas Schilling
e52a63eccb
Remove some old l10n files they arent loaded anymore
2015-02-19 11:58:40 +01:00
Thomas Müller
84eb00e428
Merge pull request #14342 from owncloud/disallow-path-traversals-in-file-view
...
Disallow path traversals in file view
2015-02-19 10:27:04 +01:00
Jenkins for ownCloud
294137dda6
[tx-robot] updated from transifex
2015-02-19 01:55:43 -05:00
Lukas Reschke
4decbc2efa
Add `Satisfy All`
...
Fixes https://github.com/owncloud/core/issues/14356
2015-02-19 02:16:44 +01:00
Thomas Müller
b32d31a2f1
Merge pull request #13836 from owncloud/part-no-cache-update
...
Dont update the cache when working with part files
2015-02-19 00:08:10 +01:00
Lukas Reschke
46ca0fa481
Add some basic PHPDoc to functions
2015-02-18 18:17:33 +01:00
Lukas Reschke
41e5850450
Prevent directory traversals in ctr of \OC\Files\View
...
This prevents a misusage of \OC\Files\View by calling it with user-supplied input. In such cases an exception is now thrown.
2015-02-18 18:17:33 +01:00
Clark Tomlinson
8d09cc3b91
Merge pull request #13989 from owncloud/enhancment/security/11857
...
Allow AppFramework applications to specify a custom CSP header
2015-02-18 10:27:29 -05:00
Clark Tomlinson
84cc90a0ee
Merge pull request #14335 from owncloud/enable-strict-mode-per-deafult
...
Fix invalid `ini_set` directives
2015-02-18 10:06:12 -05:00
AW-UC
097d455213
provide case-insensitive natural sorting
...
This makes OC's naturalsort_defaultcollator case-insensitive
2015-02-18 15:49:03 +01:00
Lukas Reschke
e4bf3fcb53
Merge pull request #14330 from owncloud/revert-13879-add_debug_log_for_memcache_instantiation
...
Revert "add debug log for memcache instantiation"
2015-02-18 15:45:38 +01:00
Lukas Reschke
593681a4a9
Fix invalid `ini_set` directives
...
Somehow they got messed up. Because PHP does automatic type juggling this has worked before as well however it's not guaranteed that this might work in the future as well.
2015-02-18 15:18:27 +01:00
Robin Appelman
5542fafd36
allow overwriting the appmanager in oc_util by subclassing
2015-02-18 14:24:50 +01:00
Joas Schilling
eaccd2a72a
Remove unnecessary backslashes from translations
2015-02-18 14:17:53 +01:00
Lukas Reschke
cd4c064ebf
Revert "add debug log for memcache instantiation"
2015-02-18 14:16:14 +01:00
Lukas Reschke
a666f804c7
Use the untrusted domain in the installer
2015-02-18 13:59:37 +01:00
Lukas Reschke
1a41f8f6f9
Check if instance is not yet installed
...
Due to a security hardening in 8.1 a missing value of empty trusted domains in the config would provoke an error as this was misused by a lot of users.
This caused a problem where the initial installation happened from another domain than 127.0.0.1 as in this case the domain was considered untrusted as no value was defined. However, this special case should not get intercepted.
To test:
- [ ] Installing ownCloud on 127.0.0.1 works
- [ ] Installing ownCloud on another domain / IP works
- [ ] When setting up ownCloud from 127.0.0.1 and accessing it from the domain above the trusted domain error should be shown if not specified in the config
Fixes https://github.com/owncloud/core/issues/14320
2015-02-18 13:06:46 +01:00
Thomas Müller
2b1f39cd6b
Merge pull request #14308 from owncloud/fix-14247
...
Add mapping for a broken varchar type.
2015-02-18 10:05:33 +01:00
Lukas Reschke
ceaa193df2
Merge pull request #14273 from owncloud/require-at-least-apcu-4-0-6
...
Use APCu only if available in version 4.0.6 and higher
2015-02-18 01:07:54 +01:00
Morris Jobke
5d7d2adcbf
Merge pull request #14207 from owncloud/propfind-optimize
...
Optimize quota calculation for propfind
2015-02-18 00:18:47 +01:00
Victor Dubiniuk
090db867d5
Add mapping for a broken varchar type. Fixes #14247
2015-02-17 23:22:57 +03:00
Robin Appelman
e672f8cc8f
Use appmanager in OC_App::enable/disable
2015-02-17 15:05:29 +01:00
Robin Appelman
04628cf368
better name for getAppsEnabledForUser
2015-02-17 15:05:29 +01:00
Robin Appelman
434835b326
also set user in UserSession when doing OC_User::setUserId
2015-02-17 15:05:29 +01:00
Robin Appelman
409453bc60
better user group caching
2015-02-17 15:05:29 +01:00
Robin Appelman
5c68c81d00
Update cache when enabling/disabling apps
2015-02-17 15:05:25 +01:00
Lukas Reschke
b701bbd8c5
Use APCu only if available in version 4.0.6 and higher
...
APCu before 4.0.6 is unbelievable buggy and tend to segfault the PHP process (i.e. the whole webserver)
This potentially fixes https://github.com/owncloud/core/issues/14175
Requires a backport to stable8
2015-02-17 13:28:02 +01:00
Lukas Reschke
76c511de92
Merge pull request #14056 from owncloud/refactor/13976
...
Refactor OC_Request into TrustedDomainHelper and IRequest
2015-02-17 13:17:04 +01:00
Jenkins for ownCloud
30ca14021c
[tx-robot] updated from transifex
2015-02-17 01:56:23 -05:00
Christian Seiler
535757bc42
DAV authentication: also use Owncloud's internal user for short-circuit
...
It still works otherwise, but without this, the performance optimization
of #13416 is defeated in these situations.
2015-02-16 23:47:39 +01:00
Christian Seiler
1377ebc7e9
DAV authentication: use Owncloud's internal user instead of HTTP-supplied one
...
Fixes : #14048 , #14104 , calendar#712
2015-02-16 23:34:49 +01:00
Lukas Reschke
cebf9f6a5a
Incorporate review changes
2015-02-16 22:13:03 +01:00
Lukas Reschke
992164446c
Add blackmagic due to cyclic dependency 🙈
2015-02-16 22:13:01 +01:00
Lukas Reschke
9f91d64918
Make scrutinizer happy
2015-02-16 22:13:00 +01:00
Lukas Reschke
886bda5f81
Refactor OC_Request into TrustedDomainHelper and IRequest
...
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed.
This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions.
Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though.
Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
2015-02-16 22:13:00 +01:00
Victor Dubiniuk
bdfc9b57bd
Skip primary index if the table has one
2015-02-16 20:30:28 +01:00
Thomas Müller
1a4b9b0c92
Merge pull request #14263 from owncloud/missing-visibility-activity-iextension
...
Add visibility to interface to make scrutinizer 1 step happier
2015-02-16 19:54:55 +01:00
Jörn Friedrich Dreyer
87db136508
add debug log for memcache instantiation
2015-02-16 18:05:43 +01:00
Joas Schilling
f808acd317
Add visibility to interface to make scrutinizer 1 step happier
2015-02-16 17:46:43 +01:00
Morris Jobke
5a5d6bf4db
Merge pull request #14128 from owncloud/drop-unused-methods
...
Remove unused function and correct PHPDoc
2015-02-16 17:37:36 +01:00
Thomas Müller
9271059195
Merge pull request #13750 from owncloud/enhanced-code-checker
...
Implement php code checker to detect usage of not allowed private ...
2015-02-16 16:55:57 +01:00
Joas Schilling
8eb804b1f6
Merge pull request #13269 from owncloud/issue/13211-cache-array-implementation
...
Add an array implementation of cache and use it if we are not debugging
2015-02-16 15:35:20 +01:00
Robin Appelman
23ab25e93a
Use the app manager from oc_app
2015-02-16 15:16:13 +01:00
Robin Appelman
2b58e8489f
Add getInstalledApps and getAppsForUser to the app manager
2015-02-16 15:15:35 +01:00
Thomas Müller
9c47ab91f2
Merge pull request #14194 from owncloud/url-encode-logout-attribute
...
URLEncode logout attribute
2015-02-16 15:04:20 +01:00
Joas Schilling
8848b5f067
Add an array implementation of cache and use it if we are not debugging
2015-02-16 14:55:50 +01:00
Lukas Reschke
c6705ab574
Merge pull request #13890 from owncloud/add-no-referrer
...
Add `rel="noreferrer"` where possible and switch to HTTPS
2015-02-16 14:36:44 +01:00
Lukas Reschke
7e45f5d27b
Remove unused function and correct PHPDoc
2015-02-16 13:46:45 +01:00
Lukas Reschke
8791f1992e
Add noreferrer to footer URI
2015-02-16 13:37:54 +01:00
Lukas Reschke
a9d1a01440
Rename to allowEval
2015-02-16 12:30:21 +01:00
Thomas Müller
78febb2ee5
Merge pull request #14201 from owncloud/propagator-dont-decrease-mtime
...
Dont lower the mtime of a folder when propagating changes
2015-02-16 11:32:17 +01:00
Lukas Reschke
b20174bdad
Allow AppFramework applications to specify a custom CSP header
...
This change allows AppFramework applications to specify a custom CSP header for example when the default policy is too strict. Furthermore this allows us to partially migrate away from CSS and allowed eval() in our JavaScript components.
Legacy ownCloud components will still use the previous policy. Application developers can use this as following in their controllers:
```php
$response = new TemplateResponse('activity', 'list', []);
$cspHelper = new ContentSecurityPolicyHelper();
$cspHelper->addAllowedScriptDomain('www.owncloud.org');
$response->addHeader('Content-Security-Policy', $cspHelper->getPolicy());
return $response;
```
Fixes https://github.com/owncloud/core/issues/11857 which is a pre-requisite for https://github.com/owncloud/core/issues/13458 and https://github.com/owncloud/core/issues/11925
2015-02-16 11:00:41 +01:00
Thomas Müller
09a33b11a4
Merge pull request #13809 from owncloud/fix-autoloader-message
...
Properly show the warning about the missing composer autoloader
2015-02-16 10:41:24 +01:00
Thomas Müller
d5ca5c7bcc
Merge pull request #14138 from owncloud/fix-image-flip-php53
...
Don't flip image in PHP 5.4
2015-02-16 10:26:56 +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
Robin Appelman
9abaa0cc61
pass fileinfo to getStorageInfo
2015-02-13 17:59:58 +01:00
Robin Appelman
fb2a3284df
Cache quota info for directories
2015-02-13 17:50:53 +01:00
Robin Appelman
134243d3e5
Dont lower the mtime of a folder when propagating changes
2015-02-13 14:30:05 +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
276bfe5f33
Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-always-a-string
...
Ensure that passed argument is always a string
2015-02-13 13:30:54 +01:00
Lukas Reschke
95860d8113
Merge pull request #14086 from hlop/master
...
App install behind a Proxy
2015-02-13 12:56:01 +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
Lukas Reschke
025110821f
URLEncode logout attribute
...
Otherwise logout can fail if the requesttoken contains a +
2015-02-13 12:08:23 +01:00
Joas Schilling
6c349c00bb
Order methods to by grouped by their task
2015-02-13 11:55:06 +01:00
Joas Schilling
be63e18b0a
Check whether filter is valid, before doing stuff for it
2015-02-13 11:50:55 +01:00
Joas Schilling
c02de748e5
Cache some values from the extensions
2015-02-13 11:36:34 +01:00
Lukas Reschke
8e8acad550
Merge pull request #14145 from owncloud/no-whitespace-from-themes-master
...
catch any whitespaces which might get written to the output buffer while...
2015-02-12 17:23:28 +01:00
Thomas Müller
fc7f279d90
catch any whitespaces which might get written to the output buffer while loading a theme
2015-02-12 16:42:17 +01:00
Lukas Reschke
2f80be45b0
Remove internal annotation
...
PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API.
2015-02-12 16:35:47 +01:00
Björn Schießle
780024e252
Merge pull request #14071 from owncloud/add_timeout_for_post_requests
...
add timeout to curl request
2015-02-12 11:38:35 +01:00
Morris Jobke
f4182d2dc9
Merge pull request #10993 from owncloud/scanner-reuse-fileid
...
Reuse known fileids and cache data in the scanner
2015-02-12 10:53:00 +01:00
Bjoern Schiessle
4155252379
add timeout to curl request
2015-02-12 10:51:39 +01:00
Morris Jobke
a496c34aea
Check if imageflip is available
...
* imageflip() isn't available in PHP < 5.5
* fixes #14130
2015-02-12 10:21:20 +01:00
Morris Jobke
64216971d4
Merge pull request #14129 from owncloud/deprecate-oc-json
...
Deprecate `OC_JSON` and `OCP\JSON`
2015-02-12 10:05:30 +01:00
Jenkins for ownCloud
e929d43bb6
[tx-robot] updated from transifex
2015-02-12 01:54:41 -05:00
Lukas Reschke
86139fcce8
Deprecate `OC_JSON` and `OCP\JSON`
...
This deprecates – but not removes – those two classes and all functions in it. There is no reason that new developments should use those methods as with the AppFramework there is a replacement that allows testable code.
With the `@deprecated` annotation IDEs like PHPStorm will point out to the developer that a functionality is deprecated and that there is a better suited replacement.
2015-02-12 00:56:13 +01:00
Thomas Müller
9ecb36e81f
integrate code checker in the installer
2015-02-11 23:37:51 +01:00
dratini0
10e13b172a
Extending the X-accel redirect functionality with a more scalable approach.
2015-02-11 22:19:22 +01:00
dratini0
b1594ad1df
Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts"
...
This reverts commit f2075f803f
.
2015-02-11 22:19:22 +01:00
dratini0
80032ec301
Revert "removed a little duplication"
...
This reverts commit 31970ee740
.
2015-02-11 22:19:22 +01:00
Thomas Müller
99a97649f2
Merge pull request #14097 from yanntech/fix/utf8-check
...
in some case charset can be in lower case.
2015-02-11 18:04:54 +01:00
Vincent Petry
fbbb9fe0fd
Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-post-hook
...
Do not overwrite the shareType so the post hook is still correct
2015-02-11 15:23:13 +01:00
Robin Appelman
9df18ffe75
only read permissions once
2015-02-11 13:11:31 +01:00
Robin Appelman
9bbfeada6b
Only try to scan the children of directories
2015-02-11 13:11:31 +01:00
Robin Appelman
dc6468c2aa
Cast mtimes and size to int
2015-02-11 13:11:28 +01:00
Robin Appelman
4242dd0d9d
Reuse cache data of existing files during scan
2015-02-11 13:08:28 +01:00
Yann VERRY
1fcea6f1bd
in some case charset can be in lower case.
...
Add strtoupper() in UTF-8 check to avoid error message
2015-02-11 11:59:33 +01:00
Jenkins for ownCloud
9baf7a0a3f
[tx-robot] updated from transifex
2015-02-11 01:55:07 -05:00
Witali Rott
531c89a610
App install behind a Proxy
2015-02-11 07:47:50 +01:00
Thomas Müller
45dcca2fcb
Merge pull request #13861 from owncloud/remove-disabled-files-repair-step
...
Revert "enabled disabled files app in repair step"
2015-02-10 22:46:53 +01:00
Morris Jobke
11283c57d9
Merge pull request #11056 from AdamWill/9885-opcode
...
add function to invalidate one opcache file, use it if possible #9885
2015-02-10 17:21:15 +01:00
Thomas Müller
d74662df7d
implement php code checker to detect usage of not allowed private APIs - including console command to check local code to be used by developers
2015-02-10 11:51:24 +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
068f6107c6
Merge pull request #13842 from owncloud/is_file_2_is_readable
...
check if cache files are readable
2015-02-09 23:45:32 +01:00
Lukas Reschke
74de345c7f
Merge pull request #13511 from owncloud/naturalsort_speeeeeed
...
NaturalSort performance improvements
2015-02-09 18:39:52 +01:00
Vincent Petry
c4d9ae8af4
Merge pull request #13928 from owncloud/prevent_ghost_files_master
...
prevent creation of ghost directories
2015-02-09 18:15:45 +01:00
Vincent Petry
5296767393
Merge pull request #13921 from owncloud/ocs-af
...
Add a controller and reponse for ocs
2015-02-09 18:11:47 +01:00
Vincent Petry
605e2357a1
Merge pull request #13852 from owncloud/cache-app-versions
...
Cache app versions
2015-02-09 18:03:19 +01:00
Vincent Petry
c7fcd42edb
Merge pull request #13870 from owncloud/drop-oc-preferences-2
...
drop OC\Preferences
2015-02-09 17:49:05 +01:00
Vincent Petry
b7b8c0c2e5
Merge pull request #13869 from owncloud/drop-oc-preferences
...
drop OC_Preferences
2015-02-09 17:48:36 +01:00
Lukas Reschke
47c7eb4e70
Merge pull request #13973 from owncloud/enhancement/security/13366
...
Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
2015-02-09 17:35:19 +01:00
Robin McCorkell
a79757bc37
Store FileInfo::getType() result for future use
2015-02-09 16:34:11 +00:00
Robin McCorkell
44c330aa5d
Performance improvements for NaturalSort
...
A combination of using isset() instead of count() or strlen(), caching the
chunkify function, and replacing is_numeric() with some comparisons
2015-02-09 16:32:43 +00:00
Vincent Petry
5d8f1a1de3
Merge pull request #13854 from owncloud/avatar-exists
...
Add a better way to check if an avatar exists for the user
2015-02-09 17:06:24 +01:00
Joas Schilling
31b93ac19a
Do not overwrite the shareType so the post hook is still correct
2015-02-09 12:59:29 +01:00
Robin Appelman
45e3cbefc9
Check directory handle before we use it
2015-02-09 12:36:18 +01:00
Lukas Reschke
770fa761b8
Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
...
When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs.
Testplan:
- [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`.
- [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string
- [ ] The generated Id is stable over the lifespan of one request
Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI.
Fixes https://github.com/owncloud/core/issues/13366
2015-02-09 11:53:11 +01:00
Jenkins for ownCloud
e2d4b3c123
[tx-robot] updated from transifex
2015-02-09 01:54:53 -05:00
Lukas Reschke
0e604aa875
Merge pull request #13948 from owncloud/cache-move-transaction
...
Use transactions when renaming directory contents
2015-02-08 19:08:52 +01:00
Jenkins for ownCloud
60e771685e
[tx-robot] updated from transifex
2015-02-08 01:54:53 -05:00
Morris Jobke
90556cb70b
Merge pull request #12283 from oparoz/sfnt-fonts
...
Updated the media type of some font types
2015-02-07 13:33:49 +01:00
Morris Jobke
11ded92a73
Merge pull request #13830 from owncloud/fix-redirect-404
...
Don't encode url unecessary twice
2015-02-07 13:24:47 +01:00
Jenkins for ownCloud
4bf7b2c130
[tx-robot] updated from transifex
2015-02-07 01:54:35 -05:00
Robin Appelman
6c00521e8b
Use transactions when renaming directory contents
2015-02-06 15:20:53 +01:00
Thomas Müller
bc56fef619
Merge pull request #13932 from owncloud/revert-sabredav-etag-master
...
Revert "adding OC-ETag header"
2015-02-06 12:05:32 +01:00
Lukas Reschke
4d91fa4c93
Normalize before processing
2015-02-06 15:03:29 +01:00
Jenkins for ownCloud
bd60abbefc
[tx-robot] updated from transifex
2015-02-06 01:57:07 -05:00
Vincent Petry
8210200770
Revert "adding OC-ETag header"
...
This reverts commit 96a931929e
.
2015-02-05 20:43:37 +01:00
Bjoern Schiessle
1448f281b7
for password protected link shares the password is stored in shareWith, so we need to set this manually to null for the hooks
2015-02-05 17:23:59 +01:00
Bernhard Posselt
b89ddcfe41
fix license email
2015-02-05 14:09:01 +01:00
Bernhard Posselt
fdc64e370c
add a controller and reponse for ocs
2015-02-05 14:02:17 +01:00
Robin Appelman
adf9a4e4eb
Dont bother updating the cache when working with part files
2015-02-05 13:59:50 +01:00
Robin Appelman
842d0e227c
Dont update the cache after fopen
2015-02-05 13:47:32 +01:00
Robin Appelman
2e34db2bb3
Dont create exclude list for generating the share target
2015-02-04 17:08:03 +01:00
Robin Appelman
4a9c64e96b
Only make sure the cache directory exists when we use it
2015-02-04 16:52:50 +01:00
Björn Schießle
486f49ed72
Merge pull request #13881 from owncloud/upload_to_root_of_mountpoint
...
detect root of mountpoint also if the trailing slash is missed
2015-02-04 14:44:02 +01:00
Bjoern Schiessle
21c45925fe
detect root of mountpoint also if the trailing slash is missed
2015-02-04 12:47:04 +01:00
Jenkins for ownCloud
77e9c212ed
[tx-robot] updated from transifex
2015-02-04 01:55:49 -05:00
Morris Jobke
4df7c0a1ed
drop OC\Preferences
2015-02-04 00:31:09 +01:00
Morris Jobke
909a53e087
drop OC_Preferences
2015-02-04 00:06:29 +01:00
Morris Jobke
b168c191bc
Revert "enabled disabled files app in repair step"
...
This reverts commit d70160c607
.
2015-02-03 17:06:57 +01:00
Thomas Müller
23c6a0cf99
Merge pull request #13843 from owncloud/fix-files-disabled
...
Fix disabled files app
2015-02-03 16:13:15 +01:00
Robin Appelman
6f118d7f8d
clear app version cache on upgrade
2015-02-03 15:23:51 +01:00
Robin Appelman
c644ed89a7
Add a better way to check if an avatar exists for the user
2015-02-03 14:54:06 +01:00
Robin Appelman
70fd3a267f
Cache app versions
2015-02-03 14:13:44 +01:00
Morris Jobke
d70160c607
enabled disabled files app in repair step
2015-02-03 14:03:43 +01:00
Thomas Müller
9e222ec841
Merge pull request #13791 from owncloud/extstorage-fixdavexceptions
...
Fix DAV exceptions, some will still return false now
2015-02-03 13:31:32 +01:00
Jörn Friedrich Dreyer
86935fab17
readd is_file
2015-02-03 10:13:25 +01:00
Jenkins for ownCloud
6aef13fb07
[tx-robot] updated from transifex
2015-02-03 01:54:50 -05:00
Morris Jobke
a7eedf0149
Disallow disabling of files app
2015-02-03 00:39:01 +01:00
Arthur Schiwon
ded8cc47cf
🐫 case
2015-02-02 23:47:59 +01:00
Jörn Friedrich Dreyer
2d8f57a1ea
check if cache files are readable
2015-02-02 23:19:54 +01:00
Lukas Reschke
2bd1c17345
Don't encode url unecessary twice
...
The URL was previously encoded twice which leads to getting redirected to a 404 page when the password has been entered incorrect at least once.
Testplan:
- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin ` redirects to the admin page when providing the correct credentials
- [ ] Opening `http://localhost/core/index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fadmin ` redirects to the admin page when providing the invalid credentials and then providing valid ones.
- [ ] Logging in as admin then going to the admin page and clearing the cookies and refreshing will show the login and when repeating the above test steps you're redirected correctly.
Fixes https://github.com/owncloud/core/issues/9804
2015-02-02 15:09:59 +01:00
Thomas Müller
92bc1b44d5
Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag
...
include core version into js/css version tag
2015-02-02 15:02:11 +01:00
Joas Schilling
a575dcf78f
Use insertIfNotExists() and reload mimetypes after inserting one
2015-02-02 13:20:16 +01:00
Thomas Müller
24daee836a
include core version into js/css version tag - fixes #13702
2015-02-02 13:02:11 +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
Thomas Müller
82b271855c
add libs which have no version number
2015-02-02 10:49:46 +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
Morris Jobke
573aa196d4
Properly show the warning about the missing composer autoloader
2015-01-31 20:48:58 +01:00
Jenkins for ownCloud
c877fbdac8
[tx-robot] updated from transifex
2015-01-31 01:54:39 -05: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
Vincent Petry
5ade2854ee
Fix DAV exceptions, some will still return false now
...
Since the Storage interface isn't ready to work directly with exceptions
like Forbidden and NotFound, the DAV storage has been adapted to still
return false when expected.
2015-01-30 12:02:23 +01:00
Jenkins for ownCloud
f4d20dc1f3
[tx-robot] updated from transifex
2015-01-30 01:55:06 -05:00
Vincent Petry
790622e9fd
Merge pull request #13772 from owncloud/closecursor-allconfig
...
Close cursor after checking for existing config values
2015-01-29 19:31:21 +01:00
Bernhard Posselt
37e8969d34
ignore cursorclosing
2015-01-29 19:16:28 +01: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
Robin Appelman
ce0aa02aac
Dont do a cache rename if we cant delete the source file
2015-01-29 15:52:40 +01:00
Robin Appelman
2124540d1d
Dont remove a file from cache if the delete operation failed
2015-01-29 15:39:56 +01:00
Lukas Reschke
65ec950b27
Merge pull request #13757 from owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces
...
Scroll to file in folder, when using "search in other places" link
2015-01-29 15:36:25 +01:00
Björn Schießle
2c1bacadca
Merge pull request #13762 from owncloud/ignore_trailing_slash
...
ignore trailing slash for remote URL
2015-01-29 15:00:44 +01:00
Morris Jobke
acf0582029
Merge pull request #13752 from owncloud/closecursor1
...
Close cursor early in calculateFolderSize
2015-01-29 14:23:16 +01:00
Bjoern Schiessle
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01:00
Bjoern Schiessle
82de50d5b9
remove trailing slash
2015-01-29 14:03:09 +01:00
Robin Appelman
05035ef4af
Fix webdav put for single file webdav shares
2015-01-29 12:47:12 +01:00
Robin Appelman
ddee63fa00
Fix resolving paths for views rooted in a file
2015-01-29 12:47:11 +01:00
Joas Schilling
54303484eb
Scroll to file in folder, when using "search in other places" link
2015-01-29 12:21:20 +01:00
Robin Appelman
41382ef7fc
Merge pull request #13667 from owncloud/rename-always-update-cache
...
Update the cache when renaming even if we dont emit hooks
2015-01-28 17:15:11 +01:00
Martin
21e3cd38ae
Write the parameter 'logtimezone' into config.php during setup
2015-01-28 13:45:13 +01:00
Robin Appelman
8c9f1a982c
Update the cache when renaming even if we dont emit hooks
2015-01-28 13:44:39 +01:00
Lukas Reschke
20199dd168
Reference module with `.c`
...
Fixes https://github.com/owncloud/core/issues/13657
2015-01-28 13:15:32 +01:00
Jenkins for ownCloud
55142186de
[tx-robot] updated from transifex
2015-01-28 01:55:53 -05:00
Morris Jobke
1efb1fee11
Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection
...
let init() take a ICollection or an INode - fixes PHP message
2015-01-28 01:14:47 +01:00
Morris Jobke
752b94d363
Merge pull request #13717 from owncloud/storage-donotwrapnullstorage
...
Prevent wrapping null storage
2015-01-28 01:00:20 +01:00
Morris Jobke
87b39e8f03
Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
...
Catch storage exception in scanner for remote shares
2015-01-28 00:31:37 +01:00
Vincent Petry
6d8985b671
Prevent wrapping null storage
...
Can happen when trying to instantiate external storages that have
incomplete config, where the constructor throws an exception (the
exception is caught in createStorage())
2015-01-27 17:40:08 +01:00
Bernhard Posselt
3fa6e0f4dc
Merge pull request #13718 from owncloud/use-proper-namespace
...
Use proper namespace
2015-01-27 17:39:35 +01:00
Lukas Reschke
bedf358b40
Use proper namespace
...
IAppManager lives in OCP\App and not in OCP.
Fixes https://github.com/owncloud/core/issues/13710
2015-01-27 17:34:25 +01:00
Vincent Petry
acec40fe5a
Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix
...
Call final unlink in trash wrapper's storage
2015-01-27 17:05:38 +01:00
Vincent Petry
12867b9c78
Fix return type of addStorageWrapper in PHPDoc
2015-01-27 16:41:43 +01:00
Morris Jobke
4d90fd933f
Merge pull request #13699 from owncloud/check-if-file-exists
...
Use `file_exists` to verify that config file exists
2015-01-27 14:16:40 +01:00
Lukas Reschke
9771ead7dd
Merge pull request #13701 from owncloud/disable-appcode-checker
...
disable the app code checker - some previous shipped apps cannot be inst...
2015-01-27 11:53:03 +01:00
Thomas Müller
b7cf4d551e
let init() take an INode - fixes PHP message
2015-01-27 11:31:37 +01:00
Thomas Müller
956de27e94
Merge pull request #13676 from owncloud/fix-node-iface
...
Fix node interface
2015-01-27 09:34:59 +01:00
Thomas Müller
9a75304b02
disable the app code checker - some previous shipped apps cannot be installed from the appstore now 👊
2015-01-27 09:27:38 +01:00
Thomas Müller
f248ee013b
Merge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-error
...
Make error more descriptive
2015-01-27 09:15:57 +01:00
Jenkins for ownCloud
c8f58054b0
[tx-robot] updated from transifex
2015-01-27 01:54:34 -05:00
Lukas Reschke
17f2cfbb9c
Use `file_exists` to verify that config file exists
...
There might be the case that `fopen($file, 'r')` returns false and thus ownCloud might believe that the config file is empty and thus potentially leading to an overwrite of the config file.
This changeset introduces `file_exists` again which was used in ownCloud 5 where no such problems where reported and should not be affected by such problems.
Ref https://github.com/owncloud/core/issues/12785#issuecomment-71548720
2015-01-27 00:50:14 +01:00
Lukas Reschke
d8559dc78f
Make error more descriptive
...
Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767
2015-01-26 23:00:15 +01:00
Bjoern Schiessle
5ba19ba7fc
certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages
2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a
certificate manager only needs the user-id, no need to pass on the complete user object
2015-01-26 16:58:52 +01:00
Bernhard Posselt
b8769802df
fix node interface
2015-01-26 15:58:41 +01:00
Vincent Petry
87ce64c24e
Replace OC_Log::ERROR with OCP\Util::ERROR
2015-01-26 15:51:31 +01:00
Vincent Petry
f6e644b43f
Catch storage exception in scanner for remote shares
...
Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.
Also, getDirectoryContent() will now skip unavailable storages.
2015-01-26 13:59:49 +01:00
Thomas Müller
5da4071c45
Merge pull request #13621 from owncloud/system-config-multiset
...
Add a method to set/unset multiple config values with one write
2015-01-26 13:36:22 +01:00
Thomas Müller
9ad9d7bfbb
naming fixes while reviewing
2015-01-26 12:59:25 +01:00
Jenkins for ownCloud
810d5a6a67
[tx-robot] updated from transifex
2015-01-26 01:54:29 -05:00
Jenkins for ownCloud
a698637e91
[tx-robot] updated from transifex
2015-01-25 01:54:38 -05:00
Jenkins for ownCloud
b8e1dd9c87
[tx-robot] updated from transifex
2015-01-24 01:54:51 -05:00
Olivier Paroz
7fbf1a20d7
Updated the media type of some font types
...
TTF and TTF have now the same media type
Official since 2013 and supported by Firefox and Chrome
https://www.iana.org/assignments/media-types/application/font-sfnt
Introducing support for Type1 fonts
2015-01-24 01:49:13 +01:00
Clark Tomlinson
f8b1fde2c0
Merge pull request #13626 from owncloud/check-for-hhvm
...
Don't check for `always_populate_raw_post_data` on HHVM
2015-01-23 10:28:47 -05:00
Robin Appelman
87a1b2bdc4
Preserve mtime when doing cross storage move
2015-01-23 15:11:27 +01:00
Vincent Petry
8fa3e7a6bf
Do not retrieve shares through group if user has no group
2015-01-23 15:11:06 +01:00
Joas Schilling
039397bd31
Use setConfigs() instead of calling setConfig() multiple times
2015-01-23 14:52:21 +01:00
Lukas Reschke
30a5758a95
Don't check for `always_populate_raw_post_data` on HHVM
...
HHVM seems to have problems with this at the moment (even setting those values in the php.ini of HHVM doesn't have helped much) and thus the unit test execution failed.
So it's better if we disable this check for now for HHVM.
2015-01-23 13:54:34 +01:00
Robin Appelman
960ff4f136
Apply wrappers to existing mounts before registering it
2015-01-23 13:48:35 +01:00
Vincent Petry
5fb8a4715d
removeStorageWrapper to unregister a storage wrapper
2015-01-23 12:20:54 +01:00
Joas Schilling
c61e9f3912
Add a method to set/unset multiple config values in one call
...
This reduces the number of file writes we do for config.php and therefor
hopefully helps lowering the chances for empty config.php files
2015-01-23 11:00:53 +01:00
Morris Jobke
7e4afa3f25
Merge pull request #13593 from owncloud/add-check-for-raw-post-data
...
Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
2015-01-22 23:59:52 +01:00
Morris Jobke
254a1fa12a
Merge pull request #13314 from owncloud/login-hook-logout
...
Return false if the login is canceled in a hook
2015-01-22 23:34:19 +01:00
Thomas Müller
5776bfec05
Merge pull request #13449 from owncloud/image_preview_limit
...
add config-option for an image's maximum filesize when generating previews
2015-01-22 23:02:38 +01:00
Georg Ehrke
3af8bde949
add config-option for an image's maximum filesize when generating previews
2015-01-22 20:21:37 +01:00
Georg Ehrke
6b33481652
remove insane debug-log from OC_Image
2015-01-22 20:17:25 +01:00
Thomas Müller
8f06bf7bc6
Merge pull request #13598 from owncloud/fix-undefined-offset
...
Fix undefined offset 1 for wrong user mail address
2015-01-22 17:16:23 +01:00
Vincent Petry
6fb553e92c
Do not call wrapStorage if storate with same name added twice
2015-01-22 16:24:24 +01:00
Morris Jobke
3d42ecea37
Fix undefined offset 1 for wrong user mail address
...
* fixes Undefined offset: 1 at lib/private/mail.php#143
2015-01-22 16:23:50 +01:00
Thomas Müller
f4a9164660
Merge pull request #13600 from owncloud/server-warning
...
Get rid of log warning when using servercontainer
2015-01-22 16:03:54 +01:00
Bernhard Posselt
9df297324f
get rid of log warning when using servercontainer
2015-01-22 15:33:09 +01:00
Morris Jobke
55c28608c9
translate error messages
2015-01-22 14:52:47 +01:00
Robin Appelman
8eda661761
Throw an exception when login is canceled by an app
2015-01-22 14:13:17 +01:00
Robin Appelman
8a9acc5083
Allow custom error messages for the login page
2015-01-22 14:13:02 +01:00
Lukas Reschke
bb80cf4eca
Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
...
PHP 5.6 otherwise throws notices for perfectly valid code which results in broken endpoints.
Fixes https://github.com/owncloud/core/issues/13592
2015-01-22 13:50:38 +01:00
Morris Jobke
b5b491d1bb
Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroup
...
Fix reshare permission change to not impair other deletion code
2015-01-22 10:40:29 +01:00
Vincent Petry
9f137ac259
Fix reshare permission change to not impair other deletion code
...
A recent change that prevents reshare permission changes to delete group
share children had the side-effect of also preventing group share
children deletion when it needed to be done.
This fix adds an extra flag to isolate the "reshare permission change"
deletion case and keep the other ones as they were before, not only to
fix the regression but also fix other potential regressions in code that
uses this method.
Also updated the comment because now Helper::delete() is no longer
limited to reshares but also applies to group share children.
2015-01-22 10:12:47 +01:00
Thomas Müller
c13bf8d820
Merge pull request #13552 from owncloud/request-uri-double-slash
...
Remove duplicated slashes from the requested url
2015-01-21 21:56:09 +01:00
Joas Schilling
d4657aa592
Set the debugoutput channel to error_log instead of echoing it
2015-01-21 15:32:31 +01:00
Robin Appelman
04075eba6b
Remove duplicated slashes from the requested url
2015-01-21 15:04:18 +01:00
Jenkins for ownCloud
b8ab21d3ad
[tx-robot] updated from transifex
2015-01-21 01:55:15 -05:00
Thomas Müller
84bb4cc2e9
Merge pull request #13499 from owncloud/issue/13451-redis-json-encode
...
Issue/13451 redis json encode
2015-01-20 14:53:33 +01:00
Joas Schilling
e25998df0f
Json_(en|de)code values on redis to be able to cache arrays
2015-01-20 10:51:27 +01:00
Lukas Reschke
476579b9c6
Fix WebDAV auth for session authentication only
...
\Sabre\DAV\Auth\Backend\AbstractBasic::authenticate was only calling \OC_Connector_Sabre_Auth::validateUserPass when the response of \Sabre\HTTP\BasicAuth::getUserPass was not null.
However, there is a case where the value can be null and the user could be authenticated anyways: The authentication via ownCloud web-interface and then accessing WebDAV resources. This was not possible anymore with this patch because it never reached the code path in this scenario.
This patchs allows authenticating with a session without isDavAuthenticated value stored (this is for ugly WebDAV clients that send the cookie in any case) and thus the functionality should work again.
To test this go to the admin settings and test if the WebDAV check works fine. Furthermore all the usual stuff (WebDAV / Shibboleth / etc...) needs testing as well.
2015-01-20 10:03:14 +01:00
Jenkins for ownCloud
2ac015256f
[tx-robot] updated from transifex
2015-01-20 01:54:37 -05:00
Morris Jobke
870bc429b2
Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth
...
Prioritise Basic Auth header over Cookie
2015-01-19 22:23:02 +01:00
Lukas Reschke
cbffaff7a0
Merge pull request #13480 from owncloud/mysql-autocommit
...
set MySQL autocommit on connection setup
2015-01-19 19:39:26 +01:00
Thomas Müller
baefefbbc8
set MySQL autocommit on connection setup
2015-01-19 17:20:49 +01:00
Vincent Petry
ef8d38ca27
Fix chunked query for tags + unit test
2015-01-19 17:05:44 +01:00
Lukas Reschke
730460c9fa
Close session properly
2015-01-19 16:25:44 +01:00
Thomas Müller
65041440de
check is mimetype is set - fixed #13452
2015-01-19 15:04:53 +01:00
Morris Jobke
a28d3b594b
Fix exif orientation for flipped images
...
fixes #13363
Links:
* http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/
* Example data: https://github.com/recurser/exif-orientation-examples
2015-01-18 23:15:52 +01:00
Thomas Müller
d2d6472e39
Merge pull request #13423 from owncloud/share-fixfindshareforuserwithmultiplegroups
...
Fix getItemSharedWithUser for groups
2015-01-19 12:34:28 +01:00
Thomas Müller
4fcfedb03c
Merge pull request #13438 from owncloud/cache-the-array
...
Reuse the array key of mimetypes
2015-01-19 08:40:25 +01:00
Lukas Reschke
309cc9a6ca
Reuse the array key of mimetypes
...
This function is called a lot of times and was really slow before due to not reusing the same array.
Previously when it was called 500'000 times it took about 2seconds, now we're down to 0.2 seconds on my local machine.
Ref https://github.com/owncloud/core/issues/13434
2015-01-18 14:50:34 +01:00
Lukas Reschke
dfbc405a45
Prioritise Basic Auth header over Cookie
...
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header.
This patch adds a workaround the following way:
1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF)
2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth
Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well.
This requires proper testing also considering LDAP / Shibboleth and whatever instances.
2015-01-17 13:29:07 +01:00
Jenkins for ownCloud
60c4cb1dd6
[tx-robot] updated from transifex
2015-01-17 01:54:40 -05:00
Lukas Reschke
744cf713f7
Merge pull request #13319 from owncloud/replace-line-breaks-in-app-description
...
replace line breaks in the app description by spaces - fixes #13315
2015-01-17 01:03:41 +01:00
Robin McCorkell
2b99fc76ec
Cleanup of PHPDoc return types
2015-01-16 20:30:43 +00:00
Vincent Petry
40931a8b0d
Fix getItemSharedWithUser for groups
...
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.
2015-01-16 18:11:13 +01:00
Morris Jobke
0f0204ee35
Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfile
...
Disable part files for OC ext storage backend + s2s backend
2015-01-16 13:38:59 +01:00
Frank Karlitschek
696d9dc98e
Merge pull request #13406 from owncloud/fix-php-doc
...
Fix PHPDoc
2015-01-15 20:35:30 -05:00
Lukas Reschke
a1e92d61b3
Fix PHPDoc
2015-01-15 22:50:42 +01:00
Thomas Müller
051f626617
Merge pull request #13389 from owncloud/issue/13372-failing-oracle-tests-jenkins
...
Mask table and column names with backticks and add lastInsertID() workar...
2015-01-15 22:41:57 +01:00
Robin Appelman
2248e465af
Remove children from the cache in one query
2015-01-15 17:26:12 +01:00
Morris Jobke
36ced1f002
Merge pull request #13388 from owncloud/type-hint-url-params
...
Add PHPDoc for `urlParams`
2015-01-15 16:00:48 +01:00
Bernhard Posselt
bb0c88a577
always set url parameters when they are available in the app dispatch
...
prefer url parameters passed into the main method. If they are not present, use the containers urlParameters
add space
2015-01-15 15:22:52 +01:00
Joas Schilling
6769adcd0d
Mask table and column names with backticks and add lastInsertID() workaround
2015-01-15 14:43:06 +01:00
Lukas Reschke
0da08bdb2c
Add PHPDoc for `urlParams`
2015-01-15 14:42:44 +01:00
Thomas Müller
337c43ce92
Merge pull request #13317 from owncloud/partfile-fileinfo
...
Return valid fileinfo objects for part files
2015-01-14 22:39:19 +01:00
Morris Jobke
64d7463ca3
Merge pull request #13344 from owncloud/issue/13334-cleanup-tags-repairstep
...
Add a repair step to clean up orphan tags and tag entries
2015-01-14 20:43:23 +01:00
Morris Jobke
34d6a1596c
Merge pull request #13367 from owncloud/type-hint-server-method-from-request
...
Add PHPDoc for magic property 'server'
2015-01-14 20:23:52 +01:00
Lukas Reschke
04ae8d2ea0
Add PHPDoc for magic property 'server'
2015-01-14 19:36:22 +01:00
Morris Jobke
455ad005a0
Merge pull request #13350 from owncloud/autoload-translations
...
Autoload app's js translations
2015-01-14 18:12:05 +01:00
Joas Schilling
a22068cce3
Add a repair step to clean up orphan tags and tag entries
2015-01-14 16:49:25 +01:00
Bernhard Posselt
6737dd111d
ignore core
2015-01-14 15:27:37 +01:00
Bernhard Posselt
4ec4914bb4
move check into addTranslation method
2015-01-14 14:57:56 +01:00
Bernhard Posselt
1cce1f0e6b
dont load core scritps
2015-01-14 14:43:11 +01:00
Morris Jobke
520d8ec53b
OC_App::parseAppInfo
...
* replace line breaks (on non empty lines) in the app description by spaces
* fixes #13315
* includes unit tests
2015-01-14 13:58:31 +01:00
Bernhard Posselt
d6f1ff7993
only load translsations for apps
2015-01-14 13:48:21 +01:00
Bernhard Posselt
8cb60b2366
make translation lookup faster (O(n) -> O(1))
2015-01-14 13:39:29 +01:00
Bernhard Posselt
717e3acd9b
autoload app's js translations
2015-01-14 13:34:52 +01:00
Joas Schilling
4b3a3dc0bb
Check new and old ways of required oC version for app compatibility
2015-01-14 13:02:02 +01:00
Björn Schießle
5745b68fa9
Merge pull request #13311 from owncloud/fix_restore_keys
...
adapt decrypt all to the new folder structure
2015-01-14 11:40:22 +01:00
Lukas Reschke
a2e355a7fe
Use "HTTPOnly" for cookies when logging out
...
This has no other reason than preventing some insane automated scanners from reporting this as security bug (which it obviously isn't as the cookie contains nothing of value)
Thus it generally results in an happier Lukas and hopefully less reports to our support and security mail addresses...
2015-01-14 11:20:53 +01:00
Jenkins for ownCloud
f367bbb49d
[tx-robot] updated from transifex
2015-01-14 01:55:16 -05:00
Morris Jobke
c8fa85451c
Merge pull request #13320 from owncloud/fix-php-doc-for-files-view
...
Fix annotations in file view
2015-01-13 18:05:00 +01:00
Morris Jobke
0a400b4577
drop unused parameter
2015-01-13 18:04:20 +01:00
Lukas Reschke
d66facc762
Fix annotations in file view
2015-01-13 14:53:00 +01:00
Robin Appelman
96dff341e2
Return valid fileinfo objects for part files
2015-01-13 13:59:28 +01:00
Morris Jobke
7746ac519f
drop dead code - ref #13301
2015-01-13 13:52:25 +01:00
Bernhard Posselt
ba8c050d2b
Merge pull request #13217 from owncloud/make-basic-auth-work-again
...
Fix Basic Auth in master for applications
2015-01-13 13:35:54 +01:00
Thomas Müller
543fa0d45b
Merge pull request #13291 from owncloud/node-searchcommonbasepathfix
...
Fix searchCommon to properly match path name
2015-01-13 13:25:51 +01:00
Robin Appelman
857695ec87
Return false if the login is canceled in a hook
2015-01-13 13:25:20 +01:00
Bjoern Schiessle
89f17ef6fe
adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8
2015-01-13 12:45:33 +01:00
Vincent Petry
a2a7a60293
Merge pull request #13301 from owncloud/drop-etag-message
...
drop useless "!!! No reuse of etag" - fixes #13187
2015-01-13 12:24:24 +01:00
Robin McCorkell
79804166f1
Merge pull request #13305 from owncloud/remove-stray-minus-and-use-json-encode
...
Use json_encode on string
2015-01-13 10:39:14 +00:00
Lukas Reschke
f0ac8a278a
Use json_encode on string
...
It's better to encode the string to prevent possible (yet unknown) bugs in combination with PHP's type juggling.
Previously the boolean statements evaluated to either an empty string (false) or a not empty one (true, then it was 1). Not it always evaluates to false or true.
This also removes a stray - that was not intended there but shouldn't have produced any bugs. Just to increase readability.
Thanks @nickvergessen for spotting.
Addresses https://github.com/owncloud/core/pull/13235/files#r22852319
2015-01-13 11:08:18 +01:00
Morris Jobke
dc86cbd1e2
Merge pull request #13271 from owncloud/fix-table-prefix-oracle-master
...
Use a special filter expression for Oracle to filter the prefix - fixes ...
2015-01-13 10:31:04 +01:00
Morris Jobke
9b49b52fc6
drop useless "!!! No reuse of etag" - fixes #13187
2015-01-13 09:54:48 +01:00
Thomas Müller
7966eee007
Adding repair step to fix missing etags - fixes #12172
2015-01-12 20:20:19 +01:00
Vincent Petry
fcc3b3d5f7
Fix searchCommon to properly match path name
...
The internal path was matched without the last "/" which caused
"files_trashbin" to also match when the internal path was "files".
This adds the missing slash for the comparison.
2015-01-12 19:33:00 +01:00
Thomas Müller
1d2bef0a01
Use a special filter expression for Oracle to filter the prefix - fixes #13220
2015-01-12 16:28:11 +01:00
Jenkins for ownCloud
9e550ab844
[tx-robot] updated from transifex
2015-01-12 01:55:52 -05:00
Jenkins for ownCloud
3425c73815
[tx-robot] updated from transifex
2015-01-11 01:54:32 -05:00
Morris Jobke
c91d47e5b3
Merge pull request #13224 from owncloud/simplify-is-valid-path-and-add-unit-tests
...
Simplify isValidPath and add unit tests
2015-01-10 17:35:40 +01:00
Morris Jobke
c259733b88
Merge pull request #13223 from owncloud/optimize-normalize-unicode
...
Verify whether value is already normalized
2015-01-10 16:33:54 +01:00
Morris Jobke
8057bc6646
Merge pull request #13236 from owncloud/use-isset-for-performance
...
Use isset() instead of strlen()
2015-01-10 16:32:50 +01:00
Lukas Reschke
e80ece9a2b
Verify whether value is already normalized
...
Apparently `normalizer_normalize` is not verifying itself whether the string needs to be converted or not. Or does it at least not very performantly.
This simple change leads to a 4% performance gain on the processing of normalizeUnicode. Since this method is called quite often (i.e. for every file path) this has actually a measurable impact. For examples searches are now 200ms faster on my machine. Still not perfect but way to go.
Part of https://github.com/owncloud/core/issues/13221
2015-01-10 12:12:40 +01:00
Lukas Reschke
310424db5d
Use isset() instead of strlen()
...
Isset is a native language construct and thus A LOT faster than using strlen()
On my local machine this leads to a 1s performance gain for about 1 million paths. Considering that this function will be called a lot for every file operation this makes a noticable difference.
2015-01-10 12:06:51 +01:00
Lukas Reschke
7e11ca06f6
Cache results of `normalizePath`
...
`normalizePath` is a rather expensive operation and called multiple times for a single path for every file related operation.
In my development installation with about 9GB of data and 60k files this leads to a performance boost of 24% - in seconds that are 1.86s (!) - for simple searches. With more files the impact will be even more noticeable. Obviously this affects every operation that has in any regard something to do with using OC\Files\Filesystem.
Part of https://github.com/owncloud/core/issues/13221
2015-01-10 11:10:38 +01:00
Morris Jobke
ae3483299c
Merge pull request #13212 from owncloud/cache-appstore-response
...
Cache responses from the AppStore server
2015-01-10 09:56:00 +01:00
Jenkins for ownCloud
22e5220c1f
[tx-robot] updated from transifex
2015-01-10 01:54:35 -05:00
Lukas Reschke
05615bfd47
Simplify isValidPath and add unit tests
...
The check for invalid paths is actually over-complicated and performed twice resulting in a performance penalty. Additionally, I decided to add unit-tests to that function.
Part of https://github.com/owncloud/core/issues/13221
2015-01-10 00:40:21 +01:00
Lukas Reschke
5f31207e84
Add some more sanity checks for maintenance mode
2015-01-09 21:52:16 +01:00
Lukas Reschke
1c75b73239
Verify authentication before initializing apps and routing
...
The current behaviour of the authenticion logic in base.php prevents REST APIs in ownCloud applications to work.
Because `!self::$CLI` is usually always a true statement the previously above block was entered which returned, thus the authentication logic for this part does not trigger in.
This can be reproduced by installing apps such as the News app and issuing the following command:
`curl -u admin:admin http://localhost/index.php/apps/news/api/v1-2/feeds `
The following parts needs to get throughly tested:
- [ ] OCS
- [ ] remote.php's DAV features
- [ ] Regular login features
This bug affects master and stable7. I'd propose that we merge this for 8.0 since this has the potential to break every component that relies on Basic Auth features. A backport would also be very nice.
Remark to myself: We really need to move out the authentication code for 8.1 out of base.php - I already have a local branch that does that somewhere which I will get in shape for 8.1... - This untested code is a night-mare.
Fixes itself.
2015-01-09 21:07:29 +01:00
Lukas Reschke
b8b4df5425
Cache responses from the AppStore server
...
Otherwise every time the AppStore was opened a lot of connections to the AppStore server were made which resulted in a terrible performance.
This changeset will cache the response for a sensible time so that only the first request will be somewhat slow.
Performance changes:
- Loading a category took previously more than 3 seconds on my machine. Now for every follow-up request it takes less than 200ms, resulting in a performance gain of 1950%
- Loading the category list took previously about 750ms - now it takes 154ms, a total performance gain of 395%
2015-01-09 19:49:59 +01:00
Thomas Müller
d4355cafc6
Merge pull request #13192 from owncloud/cache_binary_path
...
Use memcache for findBinaryPath
2015-01-09 17:46:36 +01:00
Robin McCorkell
631d6571fd
Merge pull request #13181 from owncloud/filecache-preventleadingslash
...
Trim leading or trailing slashes in file cache paths
2015-01-09 13:54:17 +00:00
Morris Jobke
800738f51a
Merge pull request #12011 from owncloud/reuse-etag-default
...
Default to reusing etags in the scanner
2015-01-09 14:38:45 +01:00
Robin McCorkell
c291383116
Memcache binary executable searching
...
It's slow, this makes it fast!
2015-01-09 13:18:00 +00:00
Robin McCorkell
17dd5d0816
Add Null memcacher
2015-01-09 13:18:00 +00:00
Thomas Müller
1f1643b35f
Merge pull request #12995 from owncloud/tbelau666-master
...
Use Doctrines filter by table name
2015-01-09 14:17:14 +01:00
Vincent Petry
888ce4d4f9
Fix cache jail to not duplicate slashes
2015-01-09 10:18:32 +01:00
Jenkins for ownCloud
d4fc2f555b
[tx-robot] updated from transifex
2015-01-09 01:55:22 -05:00
Lukas Reschke
6c59253978
Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files
...
Verify whether type is correct
2015-01-09 02:27:51 +01:00
Morris Jobke
6a5f12beca
Merge pull request #12988 from owncloud/logfile_download
...
Logfile download
2015-01-09 00:33:22 +01:00
Vincent Petry
aa821ecc00
Trim leading or trailing slashes in file cache paths
2015-01-08 19:43:02 +01:00
Lukas Reschke
ceaaab6295
Verify whether type is correct
...
`$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
2015-01-08 18:38:17 +01:00
Lukas Reschke
7fbb7f4dc4
Add version to .htaccess
...
Currently if a user does not replace the .htaccess file with the new update this can lead to serious problems in case Apache is used as webserver.
This commit adds the version to the .htaccess file and the update routine fails in case not the newest version is specified in there. This obviously means that every release has to update the version specified in .htaccess as well. But I see no better solution for it.
Conflicts:
lib/private/updater.php
2015-01-08 12:49:02 +01:00
Thomas Müller
5f171618fd
remove unused variable and fix undefined variable
2015-01-08 09:46:40 +01:00
Thomas Müller
296a852063
check for working htaccess will result in a dead lock because the server is blocking the request to itself - fixes #13153
2015-01-08 09:13:18 +01:00
Jenkins for ownCloud
6bda95037f
[tx-robot] updated from transifex
2015-01-08 01:56:00 -05:00
Vincent Petry
2e57fe93e4
Disable part files for OC ext storage backend + s2s backend
...
When uploading files to an OC ext storage backend or when using server
to server sharing storage, part files aren't needed because the backend
already has its own part files and takes care of the final atomic rename
operation.
This also fixes issues when using two encrypted ownCloud instances where
one mounts the other either as external storage (ownCloud backend) or
through server to server sharing.
2015-01-07 21:21:51 +01:00
Morris Jobke
bfb6e350d5
Merge pull request #13016 from owncloud/sharing_fixes
...
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 18:14:53 +01:00
Bjoern Schiessle
b6f63e9b3d
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 16:36:13 +01:00
Georg Ehrke
f579f2bd94
add Download logfile button to admin settings
...
add logSettingsController
add download logfile button
move getEntries to LogSettingsController
move set log level to logsettingscontroller.php
add warning if logfile is bigger than 100MB
add unit test for set log level
fix typecasting, add new line at EoF
show log and logfile download only if log_type is set to owncloud
add unit test for getFilenameForDownload
2015-01-07 14:55:53 +01:00
Morris Jobke
fd57820708
Merge pull request #13132 from aptivate/improve_debug_logging_messages
...
Improve debugging for ServiceUnavailable exceptions
2015-01-07 10:36:27 +01:00
Thomas Müller
4628e98cfc
Merge pull request #13063 from AdamWill/assets-relocate
...
allow css/js asset directory to be relocated ('assetdirectory')
2015-01-07 09:36:26 +01:00
Jenkins for ownCloud
2daf90dae6
[tx-robot] updated from transifex
2015-01-07 01:55:42 -05:00
Morris Jobke
a8d82b7091
Merge pull request #13131 from owncloud/db-connect-stacktrace
...
Prevent leaking db connection info in the stacktrace
2015-01-07 01:17:27 +01:00
Lukas Reschke
7528a1a475
Merge pull request #13130 from owncloud/getstoragestats-error-handling
...
Add error handling to getstoragestats.php
2015-01-06 18:35:09 +01:00
Chris Wilson
402a3ed146
Improve debugging for ServiceUnavailable exceptions
...
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}
In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
2015-01-06 15:59:38 +00:00
Robin Appelman
3356308594
Prevent leaking db connection info in the stacktrace
2015-01-06 16:54:41 +01:00
Morris Jobke
fe4592937a
Merge pull request #12653 from owncloud/full_content_search_results
...
Full content width search results
2015-01-06 16:44:58 +01:00
Robin Appelman
64e3ebae74
Add error handling to getstoragestats.php
2015-01-06 15:56:06 +01:00
Thomas Müller
68efeba343
Merge pull request #13125 from owncloud/lower-deprecation-warning-level
...
degraded logging policy for server container in AppFramework
2015-01-06 14:38:50 +01:00
Thomas Müller
20886d8151
Merge pull request #13116 from owncloud/fix_assets
...
Fix JS asset generation
2015-01-06 14:36:51 +01:00
Morris Jobke
4ffe7ddb75
degraded logging policy for server container in AppFramework
2015-01-06 13:43:40 +01:00
Jenkins for ownCloud
6a3f69c2d0
[tx-robot] updated from transifex
2015-01-06 01:54:59 -05:00
Adam Williamson
bb79aac78a
allow css/js asset directory to be relocated ( #13053 )
...
This allows the directory where CSS/JS asset collections are
written to be changed, in case SERVERROOT is not writeable. Note
it does *not* allow the expected URL to be changed: whatever
directory is used, the server must be configured to serve it
at WEBROOT/assets. It may be possible to add another config
parameter to allow the admin to specify a custom asset URL,
but I thought I'd keep the first implementation simple.
2015-01-05 15:24:23 -08:00
Thomas Müller
c0ad6e818b
Merge pull request #13101 from owncloud/variable-is-undefined-please-use-a-proper-ide-in-the-future-whoever-did-that
...
Fix undefined variable and write unit tests for OC_Principal connector
2015-01-05 20:09:10 +01:00
Robin McCorkell
2c44bc1768
Fix JS asset generation
...
At some point SeparatorFilter should be included upstream
(kriswallsmith/assetic), then lib/private/assetic/separatorfilter.php can be
removed and the `use` in lib/private/templatelayout.php rewritten.
SeparatorFilter inserts a separator between assets, preventing issues when
files are incorrectly terminated. For JS this is a semicolon.
2015-01-05 15:48:04 +00:00
Lukas Reschke
8689605999
Use info instead of warning log level
...
Otherwise the log is flooded as can be seen at https://github.com/owncloud/core/issues/13106
Fixes https://github.com/owncloud/core/issues/13106
2015-01-05 11:18:54 +01:00
Lukas Reschke
0ed00bca43
Use namespace
2015-01-05 09:54:14 +01:00
Lukas Reschke
556c9b6f46
Write unit-tests and use DI
2015-01-05 09:54:12 +01:00
Lukas Reschke
f2ddd565e8
Fix code-style
2015-01-05 09:53:01 +01:00
Morris Jobke
f2e759b533
Merge pull request #13095 from derkostka/master
...
fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
2015-01-05 09:47:44 +01:00
Jenkins for ownCloud
8776271103
[tx-robot] updated from transifex
2015-01-05 01:54:36 -05:00
derkostka
deedfad050
fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
...
changed variable #user to #name
2015-01-04 17:07:33 +01:00
Morris Jobke
298eae9c86
Merge pull request #13060 from dratini0/master
...
Fix: X-Accel-Redirect did not support custom data dir and local mounts
2015-01-04 10:09:30 +01:00
Jenkins for ownCloud
84ed1034b4
[tx-robot] updated from transifex
2015-01-04 01:54:53 -05:00
Jenkins for ownCloud
05ffa3ab7a
[tx-robot] updated from transifex
2015-01-03 01:54:29 -05:00
Jörn Friedrich Dreyer
79e790c55d
add SIZE_ALL const
2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
a8edb2124d
fix visibility
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
606f802b7b
move search results below filelist, show hint when results are off screen, use js plugin mechanism
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
0e9b05b701
ajax paging, some js cleanups
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
c738359a11
add paged provider
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
088323aad5
move code from js.js to search.js in the search app
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
d3662722f6
new OC.Search, add search result formatters and handlers, use full content width for results
2015-01-02 10:28:41 +01:00
Jenkins for ownCloud
4b357274bb
[tx-robot] updated from transifex
2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a
[tx-robot] updated from transifex
2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d
[tx-robot] updated from transifex
2014-12-31 01:54:33 -05:00
dratini0
31970ee740
removed a little duplication
2014-12-30 22:36:13 +01:00
dratini0
f2075f803f
Fix: X-Accel-Redirect did not support custom data dir and local mounts
2014-12-30 22:07:04 +01:00
Frank Karlitschek
cd53da43c0
Merge pull request #12854 from owncloud/add-direct-download-link
...
Adding foundation for the direct download url
2014-12-29 18:47:39 +01:00
Jenkins for ownCloud
c8e946f633
[tx-robot] updated from transifex
2014-12-29 01:54:27 -05:00
Thomas Müller
81243b0f5d
adding getDirectDownload() to Wrapper
2014-12-28 17:17:14 +01:00
Thomas Müller
5b00bc1d6e
Adding basement for the direct download url
2014-12-28 17:17:14 +01:00
Thomas Müller
aec79b0c0e
Merge pull request #13043 from owncloud/check-for-hash
...
Check for hash
2014-12-28 14:12:57 +01:00
Lukas Reschke
2711863220
Merge pull request #13035 from owncloud/new_edition_detection
...
Automatically detect the edition based on the enterprise_key app.
2014-12-28 13:36:59 +01:00
Lukas Reschke
222e4a0762
Check for hash
...
See https://github.com/owncloud/core/pull/13042
2014-12-28 13:23:34 +01:00
Jenkins for ownCloud
d2e53d1022
[tx-robot] updated from transifex
2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8
[tx-robot] updated from transifex
2014-12-26 01:54:28 -05:00
Frank Karlitschek
4a40e5699c
remove Edition
2014-12-25 11:36:41 +01:00
Frank Karlitschek
3dea2b95c6
Automatically detect the edition based on the enterprise_key app.
2014-12-25 09:48:15 +01:00
Jenkins for ownCloud
e0fc26a5cb
[tx-robot] updated from transifex
2014-12-25 01:54:29 -05:00
Jenkins for ownCloud
801b9e0494
[tx-robot] updated from transifex
2014-12-24 01:54:33 -05:00
Morris Jobke
95374e1404
add default for dbtableprefix
2014-12-23 13:32:25 +01:00
Bernhard Posselt
f195123765
Intelligent container
...
* resolves dependencies by type hint or variable name
* simpler route.php
* implementation of https://github.com/owncloud/core/issues/12829
Generates and injects parameters automatically. You can now build full classes like
$c->query('MyClassName')
without having to register it as a service. The resolved object's instance will be saved by using registerService. If a constructor parameter is not type hinted, the parameter name will be taken.
Therefore the following two implementations are identical:
class Class1 { function __construct(MyClassName $class)
class Class1 { function __construct($MyClassName)
This makes it possible to also inject primitive values such as strings, arrays etc.
In addition if the query could not be resolved, a `QueryException` is now thrown
Routes can now be returned as an array from `routes.php` and an `appinfo/application.php` is optional
Old commit messages:
make it possible to return the routes instead of having to intialize the application
try to get the controller by convention
add first implementation of automatic resolve
add another test just to be sure
store the resolved object
more tests
add phpdoc to public app.php method
use the same variable for the public app.php method
deprecate old methods and add services for public interfaces
deprecated getServer method
disallow private api injection for apps other than core or settings (settings should be an app goddamnit :D)
register userid because its such an often used variable
fix indention and leading slash
use test namespace
add deprecation reasons, remove private api usage checks and remove deprecation from getServer()
add additional public interfaces
add public interface for rootfolder
fix syntax error
remove deprecation from methods where no alternative is there yet
remove deprecated from method which has no alternative
add timezone public service for #12881
add another deprecation hint
move deprecation into separate branch
remove dead comment
first try to get the namespace from the info.xml, if it does not exist, just uppercase the first letter
also trim the namespace name
add an interface for timefactory
move timefactory to public and add icontrollermethodreflector
keep core interface
fix copyright date in headers
2014-12-23 09:50:42 +01:00
Jenkins for ownCloud
d8f04f5a97
[tx-robot] updated from transifex
2014-12-23 01:55:23 -05:00
Morris Jobke
dbc465de97
use injected config object and fix typos
2014-12-22 10:55:52 +01:00
Morris Jobke
de25084def
inject \OCP\IConfig instance in migrator
2014-12-22 10:47:10 +01:00
tbelau666
ad8d55c327
Use Doctrines filter by table name
...
Doctrine's SchemaManager can filter table names by regular expression.
On this way it picks up only ownClouds's tables in a database.
by tbelau666
2014-12-22 10:45:32 +01:00
Morris Jobke
5d296aa6b1
Merge pull request #12969 from owncloud/clarify-docs
...
Clarify return values
2014-12-22 10:01:39 +01:00
Morris Jobke
c17b9ec068
Merge pull request #12983 from owncloud/root-iface
...
Add an interface for the root folder so apps have an interface to deal with storage
2014-12-22 09:05:23 +01:00
Jenkins for ownCloud
92c8cd3933
[tx-robot] updated from transifex
2014-12-22 01:54:49 -05:00
Bernhard Posselt
8e37214346
add an interface for the root folder so apps have an interface to deal with storage
...
fix comments and newline
add newline
2014-12-21 20:52:34 +01:00
Thomas Müller
dc12f5d9af
Merge pull request #12978 from owncloud/fix-support-claim
...
Change support message to be more explicit about the enterprise edition
2014-12-21 20:30:43 +01:00
Thomas Müller
c3544bd27e
Merge pull request #12982 from owncloud/timefac-iface
...
Add an interface for the timefactory class
2014-12-21 20:27:53 +01:00
Jenkins for ownCloud
312891c603
[tx-robot] updated from transifex
2014-12-21 01:54:36 -05:00
Bernhard Posselt
ba03b0b843
add an interface for the timefactory class
...
fix indention
2014-12-20 15:53:31 +01:00
Morris Jobke
5383d83f9e
Change support message to be more explicit about the enterprise edition
2014-12-20 11:57:15 +01:00
Jenkins for ownCloud
5a54ca380d
[tx-robot] updated from transifex
2014-12-20 01:56:24 -05:00
derkostka
1c22b1f626
Fix Undefined variable: result at tags.php#231
...
Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop
Adjust indentation
Do it right - indentation
sorry, this is my first one
2014-12-19 19:44:43 +01:00
Björn Schießle
8164415b45
Merge pull request #12749 from owncloud/server2server-sharing-ng
...
server to server sharing next generation
2014-12-19 19:04:44 +01:00
blizzz
ad6814f920
Merge pull request #12101 from owncloud/ldap_split_mapping
...
Ldap split mapping from Access superclass
2014-12-19 18:52:30 +01:00
Arthur Schiwon
ec0f80fee9
Split mapping from Access and Helper classes into it's own. Fully test them, too.
...
remove unused methods
split mapping methods off from Access class
fix DB query handling
move 'clear mapping' methods from static helper to new mapping class
add tests
test directly with DB
finishing tests and fix return value from setDNbyUUID
add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class.
add missing info to PHPDoc
add unmap method
fix namespaces
fix test inheritance
PHPDoc and a small code restructure for scrutinizer, no effective changes
PostgreSQL does not accept LIMIT in DELETE queries
phpdoc fixes, no code changes
2014-12-19 18:26:12 +01:00
Bjoern Schiessle
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Lukas Reschke
f671b232cc
Merge pull request #12923 from owncloud/ultra-slim-version-of-incognito-mode
...
Add ultra-slim hack for incognito mode
2014-12-19 14:54:11 +01:00
Lukas Reschke
dbbf568192
Fix typo
2014-12-19 14:36:00 +01:00
Lukas Reschke
a022e65285
Clarify return values
...
This function returns `null` when no user is logged-in.
2014-12-19 14:17:40 +01:00
Thomas Müller
2d64797320
Merge pull request #12956 from owncloud/jenkins-user-backend-names
...
[jenkins only] introduce names for user backends - IUserBackend
2014-12-19 13:15:50 +01:00
Lukas Reschke
157ff1219a
Merge pull request #12954 from owncloud/hhvm-apc-clear
...
HHVM: In APC cache clear, only request the cache key in APCIterator.
2014-12-19 10:46:20 +01:00
Morris Jobke
6b3600d2bf
Merge pull request #12918 from owncloud/use-uid-instead-of-login-name
...
Return UID instead of login name
2014-12-19 10:24:52 +01:00
Morris Jobke
6da33e1ea7
introduce names for user backends - IUserBackend
...
* LDAP with multiple servers also proved backendName
2014-12-19 10:17:17 +01:00
Morris Jobke
39d6ddd38a
Merge pull request #12865 from owncloud/files-tags-webdav
...
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Jenkins for ownCloud
028b0efd5c
[tx-robot] updated from transifex
2014-12-19 01:56:51 -05:00
Andreas Fischer
0ba5c182f0
HHVM: In APC cache clear, only request the cache key in APCIterator.
...
The default value of the $format parameter of the APCIterator constructur is
APC_ITER_ALL which instructs the iterator to provide all available information
on cache values being iterated over. Only the key value is necessary for
matching and deletion via apc_delete(), though.
This prevents a "Format values FILENAME, DEVICE, INODE, MD5, NUM_HITS, MTIME,
CTIME, DTIME, ATIME, REFCOUNT not supported yet." notice on HHVM.
2014-12-19 03:24:00 +01:00
Morris Jobke
114a6464e8
Merge pull request #12748 from owncloud/redis_cache
...
Add Redis cache implementation, prefer over memcached, tests & config sample doc
2014-12-19 00:26:25 +01:00
Morris Jobke
75e8b39826
Merge pull request #12879 from owncloud/mountconfig
...
Add mount specific options
2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer
891474b0d6
Merge pull request #12759 from owncloud/core-reduce-js-and-css
...
make sure styles and scripts are only loaded once
2014-12-18 23:18:37 +01:00
Morris Jobke
609e10238f
Merge pull request #12945 from owncloud/hhvm-image
...
HHVM: Do not call filesize(null), this function expects a string.
2014-12-18 22:20:56 +01:00
Andreas Fischer
3ebb69944b
Do not call filesize(null), this function expects a string.
...
filesize(null) yields an int on HHVM and thus exif_imagetype(null) is called.
2014-12-18 20:57:19 +01:00
Morris Jobke
85301c8b85
Merge pull request #12940 from drarko/master
...
Fix extra quotes in custom tags in header
2014-12-18 18:44:44 +01:00
Vincent Petry
6224e29f25
Fix code style issues for tags plugin
2014-12-18 16:43:00 +01:00
drarko
faaa1a89cb
Fix extra quotes in custom tags in header
...
Fix #12939
2014-12-18 12:40:08 -03:00
Robin Appelman
1ef01de402
Merge pull request #12907 from owncloud/delete-invalid-external-share
...
Fix deleting invalid s2s shares
2014-12-18 16:38:13 +01:00
Vincent Petry
3c67900421
Remove obsolete method
2014-12-18 16:04:36 +01:00
Jenkins for ownCloud
5c6e08213e
[tx-robot] updated from transifex
2014-12-18 01:56:40 -05:00
Robin McCorkell
619dcae7af
Merge pull request #12901 from owncloud/move-ldap-check-to-manager
...
Move the Null-Byte LDAP check to the user manager
2014-12-18 00:28:00 +00:00
Robin McCorkell
d83fdd7f9d
Merge pull request #12913 from owncloud/hhvm-memcached-clear
...
HHVM: Add workaround for missing Memcached::deleteMulti()
2014-12-18 00:27:07 +00:00
Morris Jobke
232d4385f4
Merge pull request #12917 from owncloud/fix-ocs-12915-api
...
Move basic auth login out of `isLoggedIn`
2014-12-18 00:57:22 +01:00
Lukas Reschke
e3230b5bc2
Add ultra-slim hack for incognito mode
...
As discussed at https://github.com/owncloud/core/pull/12912#issuecomment-67391155
2014-12-17 21:53:43 +01:00
Lukas Reschke
058324b80e
Check basic auth header only for not-logged-in users
2014-12-17 21:42:07 +01:00
Morris Jobke
3d006207d1
Merge pull request #12892 from owncloud/is-addmin
...
Add isAdmin and isInGroup methods for the group manager
2014-12-17 21:40:26 +01:00
Lukas Reschke
9031d79597
Return UID instead of login name
...
Without this OCS on LDAP is broken for API requests coming via Basic Authentication...
2014-12-17 20:33:22 +01:00
Lukas Reschke
a02b00445e
Store result of authentication
2014-12-17 20:22:51 +01:00
Lukas Reschke
b91a435ed4
Move basic auth login out of `isLoggedIn`
...
Potentially fixes https://github.com/owncloud/core/issues/12915 and opens the door for potential other bugs...
Please test very carefully, this includes:
- Testing from OCS via cURL (as in #12915 )
- Testing from OCS via browser (Open the "Von Dir geteilt" shares overview)
- WebDAV
- CalDAV
- CardDAV
2014-12-17 20:12:14 +01:00
Andreas Fischer
fcf3c5197f
HHVM: Add workaround for missing Memcached::deleteMulti()
2014-12-17 18:10:11 +01:00
Bernhard Posselt
6779bf113d
add isAdmin and isInGroup methods for the group manager
2014-12-17 17:41:57 +01:00
Bernhard Posselt
236632702c
add a isLoggedIn method to the usersession and deprecate the isLoggedIn method on the api
2014-12-17 17:40:52 +01:00
Andreas Fischer
8c509c3437
HHVM: Call libxml_use_internal_errors() instead of surpressing errors.
...
In contrast to the previous solution, this also works on HHVM.
2014-12-17 17:00:10 +01:00
Vincent Petry
0b3f0716fc
Returns and update tags through WebDAV PROPFIND and PROPPATCH
...
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
2014-12-17 16:50:35 +01:00
Robin Appelman
9ddd5033d4
Movable mountpoints are always deletable
2014-12-17 16:09:28 +01:00
Robin Appelman
2eab0f2121
Allow disabling previews per mount
2014-12-17 14:03:50 +01:00
Robin Appelman
fd85424742
Add getMountPoint to FileInfo
2014-12-17 14:03:50 +01:00
Robin Appelman
95a145f67f
Load mount specific options from the mount config
2014-12-17 14:03:50 +01:00
Lukas Reschke
f6820406b6
Move the Null-Byte LDAP check to the user manager
...
The existing method is deprecated and just a wrapper around the manager method. Since in the future other code paths might call this function instead we need to perform that check here.
Related to http://owncloud.org/security/advisory/?id=oc-sa-2014-020
2014-12-17 12:47:00 +01:00
Thomas Müller
77c4c2856a
Merge pull request #12889 from owncloud/deprecation-time
...
Deprecate old and replaced appframework apis
2014-12-17 11:28:01 +01:00
Jenkins for ownCloud
6d80524e67
[tx-robot] updated from transifex
2014-12-17 01:56:41 -05:00
Bernhard Posselt
d59c4e832f
first round of deprecation
2014-12-16 19:50:31 +01:00
Thomas Müller
51a22431ee
load showpassord.js conditionally in the template only if needed
2014-12-16 18:45:37 +01:00
Thomas Müller
775f6a1354
make sure styles and scripts are only loaded once
2014-12-16 18:26:43 +01:00
Joas Schilling
26100a6dfb
Move timezone logic out of server.php
2014-12-16 16:16:22 +01:00
Jenkins for ownCloud
5b9c453071
[tx-robot] updated from transifex
2014-12-16 01:55:32 -05:00
Lukas Reschke
be3d4fd303
Merge pull request #12360 from owncloud/files-tags
...
Add favorites to files app
2014-12-15 19:55:18 +01:00
Lukas Reschke
76357af2d5
Merge pull request #11946 from owncloud/load-vendor-from-core-json
...
Implement method that reads vendor libs from core.json
2014-12-15 16:18:38 +01:00
Jörn Friedrich Dreyer
6602d3ac77
Merge pull request #12555 from owncloud/app_specific_search
...
introduce inApps[] filter for search via ajax query
2014-12-15 16:14:40 +01:00
Morris Jobke
9f30d3529a
Implement method that reads vendor libs from core.json
...
* includes them at the beginning of initTemplate()
2014-12-15 14:30:03 +01:00
Morris Jobke
d367d1b06a
Merge pull request #12839 from oparoz/ControllerMethodReflector
...
\OCP\AppFramework\Utility\IControllerMethodReflector
2014-12-15 14:20:26 +01:00
Bernhard Posselt
be45366013
Merge pull request #12625 from owncloud/app-dependencies-libs-and-commands
...
adding dependencies for command line tools and php libraries
2014-12-15 12:34:46 +01:00
Thomas Müller
e58b9d3eb7
fixing owncloud version
2014-12-15 12:23:56 +01:00
Vincent Petry
c6be491a89
Return file info from Node API
2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6
Merge pull request #11991 from owncloud/bower-jquery-ui
...
bower jquery-ui - exported changes to a separate css file
2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16
[tx-robot] updated from transifex
2014-12-15 01:54:30 -05:00
Olivier Paroz
469fd3b3a3
Olivier Paroz \OCP\AppFramework\Utility\IControllerMethodReflector
2014-12-14 23:54:31 +01:00
Philipp Knechtges
768aea57d3
make regex in controllermethodreflector.php compatible with PCRE 6.x
...
The syntax ?<...> seems to be only supported from PCRE 7.0 on. For
backwards-compability ?P<...> is used.
2014-12-14 10:52:21 +01:00
Jenkins for ownCloud
6ae0217326
[tx-robot] updated from transifex
2014-12-14 01:54:56 -05:00
Morris Jobke
5b3971f002
Merge pull request #12639 from owncloud/bad_mtime_format
...
Fix formatting of bad dates from external storages
2014-12-13 10:07:10 +01:00
Morris Jobke
edcd2f2706
bower jquery-ui - exported changes to a separate css file
2014-12-13 09:47:34 +01:00
Morris Jobke
efb495b09f
Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-index
...
Add filter for backend to rest index
2014-12-13 08:50:15 +01:00
Jenkins for ownCloud
416e21d902
[tx-robot] updated from transifex
2014-12-13 01:55:24 -05:00
Robin McCorkell
fdbb68a3c3
Return ? if mtime is 0 or -1
...
Tooltip contains 'Unable to determine date'. Fixes #6395
2014-12-12 23:54:18 +00:00
Vincent Petry
4b57892c4e
Merge pull request #12778 from owncloud/searchbytags2
...
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
Joas Schilling
4f92e4a233
Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager
...
Add special parameterlist to manager
2014-12-12 13:03:26 +01:00
Thomas Müller
dcb88e395b
rework api of DependencyAnalyzer
2014-12-12 12:34:53 +01:00
Vincent Petry
b1bef5cc15
Merge pull request #12587 from owncloud/dav-logerrors
...
Log exceptions in DAV storage
2014-12-12 11:58:04 +01:00
Joas Schilling
7542883bf8
Merge pull request #12807 from owncloud/fix-timespan-language
...
Correctly inject the language into the subcall
2014-12-12 11:57:22 +01:00
Vincent Petry
3878c3782f
Added searchByTag in cache jail wrapper
2014-12-12 11:48:42 +01:00
Vincent Petry
15ecb28d50
Make $userId mandatory for searchByTags
...
$userId is now a mandatory parameter for searchByTags.
Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
Joas Schilling
811f9251d6
Correctly inject the language into the subcall
2014-12-12 11:00:07 +01:00
Jenkins for ownCloud
527dd8cdf4
[tx-robot] updated from transifex
2014-12-12 04:19:09 -05:00
Morris Jobke
e969fe6b12
Merge pull request #12698 from owncloud/handle_readonly_shared_files
...
Handle readonly shared files
2014-12-12 08:34:28 +01:00
Jenkins for ownCloud
68932b30fd
[tx-robot] updated from transifex
2014-12-12 01:55:24 -05:00
Morris Jobke
c56fa64801
Merge pull request #12786 from owncloud/userfolder-setup
...
Ensure user mountpoints are setup when using getUserFolder
2014-12-11 23:51:49 +01:00
Vincent Petry
25dde7e93b
Added searchByTags to view, storage and cache
2014-12-11 17:38:50 +01:00
Thomas Müller
d94c1731d7
check app dependencies on installation as well
2014-12-11 17:02:07 +01:00
Thomas Müller
6566dc83e7
single dependencies will not be represented as an array + fix unit tests
2014-12-11 15:37:45 +01:00
Joas Schilling
1b18554aa7
Allow extensions to specify the list of special parameters
2014-12-11 14:56:46 +01:00
Robin Appelman
802c1b0b3a
Ensure user mountpoints are setup when using getUserFolder
2014-12-11 14:34:30 +01:00
Morris Jobke
8fd90e04b6
Merge pull request #12781 from owncloud/jenkins-curl-open-basedir
...
[Jenkins only] curl open basedir
2014-12-11 14:15:24 +01:00
Joas Schilling
cbad5c998b
Correctly fallback to english, if the plural case is not translated
2014-12-11 12:42:21 +01:00
Lukas Reschke
d0716d2c7d
Use public interface
2014-12-11 12:29:58 +01:00
Vincent Petry
745d8706b9
Add user parameter to tag manager
2014-12-11 12:22:28 +01:00
Thomas Müller
5a03e0a5cf
adding dependency to owncloud version - with fallback to requiremin and requiremax
2014-12-11 12:02:12 +01:00
Thomas Müller
ee46548f57
adding dependencies for supported platforms
2014-12-11 12:02:12 +01:00
Thomas Müller
770f987659
adding supported libraries - including min and max version
2014-12-11 12:02:11 +01:00
Thomas Müller
08f1db4451
adding dependencies for command line tools
2014-12-11 12:02:11 +01:00
Thomas Müller
c5e279e416
year go -> year ago
2014-12-11 11:30:00 +01:00
Jenkins for ownCloud
dc506dcfbf
[tx-robot] updated from transifex
2014-12-11 01:55:27 -05:00
Lukas Reschke
9ea205dc3d
Check if open_basedir is set
...
The file:// protocol does not work with curl when an open_basedir is set.
This fixes https://github.com/owncloud/core/issues/12016
2014-12-11 00:09:55 +01:00
Lukas Reschke
d84a1f6f3a
Add IniGetWrapper to public interface
2014-12-11 00:09:55 +01:00
Morris Jobke
e2c51308df
Merge pull request #12758 from owncloud/fix-config-doc-block
...
Add type of the variables to the docs
2014-12-10 17:22:36 +01:00
Thomas Müller
80ae311329
Merge pull request #11892 from owncloud/remove_triggerupdate
...
Remove triggerupdate.php & add quiet option for CLI scanner
2014-12-10 16:17:29 +01:00
Jörn Friedrich Dreyer
1d490b559c
introduce inApps[] filter for search via ajax query, make file results show up in files app only
...
use more flexible return type
check array with !empty instead of count
2014-12-10 15:51:59 +01:00
Joas Schilling
bef7392c4c
Add type of the variables to the docs
2014-12-10 15:18:06 +01:00
Robin Appelman
3898fbc0d2
Merge pull request #12750 from owncloud/cache-numericstorageidfix
...
Fix numeric storage id for cache wrapper
2014-12-10 15:03:41 +01:00
Joas Schilling
fd2599cfc2
Merge pull request #12485 from owncloud/jenkins-12383
...
New DateTimeFormatter class for dates in other timezones and languages
2014-12-10 14:48:59 +01:00
Vincent Petry
ebba54d490
Fix numeric storage id for cache wrapper
2014-12-10 13:05:31 +01:00
Jörn Friedrich Dreyer
363e9667ec
Add Redis cache implementation, prefer over memcached, tests & config sample
2014-12-10 12:24:20 +01:00
Lukas Reschke
5dc6406b70
Add filter for 'backend' to user REST route
...
This adds a "backend" type filter to the index REST route which is a pre-requisite for https://github.com/owncloud/core/issues/12620
For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well)
Depends upon https://github.com/owncloud/core/pull/12711
2014-12-10 12:07:34 +01:00
Joas Schilling
67335ccddf
Require the interface and return a string instead of private classes
2014-12-10 11:58:56 +01:00
Joas Schilling
4d232e536e
Deprecate Util::formatDate()
...
Make DateTimeFormatter a service and adjust tests that have been inaccurate
2014-12-10 11:58:56 +01:00
Lukas Reschke
5398bbdc00
Merge pull request #12711 from owncloud/add-backend-to-rest-index
...
Expose backend type via REST API
2014-12-10 11:56:45 +01:00
Jörn Friedrich Dreyer
0f17486c1d
make path absolute
2014-12-10 11:04:17 +01:00
Jenkins for ownCloud
ea95bb0189
[tx-robot] updated from transifex
2014-12-10 01:55:34 -05:00
Thomas Müller
7028c7150d
Merge pull request #12664 from owncloud/fix-12164
...
Use httphelper and cache response even when it is empty
2014-12-10 05:42:08 +01:00
Victor Dubiniuk
c9fd3c9d29
Inject config
2014-12-10 01:13:38 +03:00
Morris Jobke
263e008d7b
Merge pull request #12695 from owncloud/db-drop-table
...
Add dropTable to IDBConnection
2014-12-09 18:40:56 +01:00
Robin Appelman
6984fa8a19
Quote identifiers for oracle
2014-12-09 17:26:53 +01:00
Robin Appelman
778d8dbafd
Add tableExists to public db api
2014-12-09 17:26:53 +01:00
Robin Appelman
8af3991d0c
Add dropTable to IDBConnection
2014-12-09 17:26:53 +01:00
Joas Schilling
d69ea30097
Add a DateTimeFormatter class which allows overwriting the language and timezone
...
Fix #12227
2014-12-09 16:10:24 +01:00
Joas Schilling
f53f25eafe
Merge pull request #12409 from owncloud/tags-getTagsForObjectIds
...
Add getTagsForObjects in ITags
2014-12-09 13:27:38 +01:00
Joas Schilling
26861a98c5
Merge pull request #12568 from owncloud/autoload-encryption-classes
...
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
Lukas Reschke
4c13918bd8
Expose backend type via REST API
...
This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620 .
For example:
````json
[{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}]
```
2014-12-09 12:04:19 +01:00
Thomas Müller
5609d421cd
Merge pull request #12672 from LEDfan/cm-per-unit
...
Fix Contactsmanager permission + unit test
2014-12-09 10:57:22 +01:00
Joas Schilling
78a307995c
Fix namespace of Files_Encryption outside of the app
2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd
Merge pull request #12406 from owncloud/drop-getApps-getUsers
...
Config cleanup - OC_Preferences refactoring
2014-12-09 09:36:38 +01:00
Lukas Reschke
25a87d4058
Merge pull request #12577 from owncloud/public-mount-api
...
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
Morris Jobke
9a7362dd0d
drop unused isDebugMode and setDebugMode of OC_Config
2014-12-08 22:42:44 +01:00
Morris Jobke
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
Morris Jobke
2d5fc9c1a6
Workaround to fix the too early init dilemma
...
* this needs to be properly fixed by a proper organisation of the base.php
* introduced fixDIInit() in AllConfig that moves the injection
of DatabaseConnection to a later point in time
* problems mostly because of the autoconfig setup
2014-12-08 22:33:36 +01:00
Morris Jobke
af91ee97c9
introduce preCondition for setUserValue to provide atomic check-and-update
2014-12-08 22:33:36 +01:00
Morris Jobke
f0b10324ca
Refactoring of OC_Preferences to AllConfig
...
* keep old static methods - mapped to new ones and deprecated
* removed deleteApp, getUsers, getApps because they are unused
* make AllConfig unit tests more robust against not cleaned up environments
2014-12-08 22:33:29 +01:00
Morris Jobke
f164161f69
fix base.php for not installed systems
2014-12-08 22:29:43 +01:00
Morris Jobke
a9e411e076
migrate \OC\AllConfig to \OCP\IConfig
2014-12-08 22:29:43 +01:00
Morris Jobke
719008836d
introduce deleteAllUserValues
2014-12-08 22:29:42 +01:00
Morris Jobke
985b15f770
introduce proper interface for deleteAppValue
2014-12-08 22:29:42 +01:00
Morris Jobke
b01c59b224
use old methods and redirect in deprecated methods
2014-12-08 22:29:42 +01:00
Morris Jobke
d6da627eb4
@deprecated messages for \OCP\Config and \OCP\AppConfig
2014-12-08 22:29:42 +01:00
Morris Jobke
50c2a819a0
Extract interaction with config.php into SystemConfig
...
* introduce SystemConfig to avoid DI circle (used by database connection which is itself needed by AllConfig that itself contains the methods to access the config.php which then would need the database connection - did you get it? ;))
* use DI container and use that method in legacy code paths (for easier refactoring later)
* create and use getSystemConfig instead of query() in DI container
2014-12-08 22:29:42 +01:00
Vincent Petry
cae600722e
Add getTagsForObjects in ITags
...
Returns the list of tags that are set on the given object ids.
2014-12-08 22:02:00 +01:00
Lukas Reschke
f219f5a7a6
Merge pull request #12618 from owncloud/initial-work-migrate-to-appframework
...
Add REST route for managing groups and users
2014-12-08 21:37:41 +01:00
Victor Dubiniuk
81d5712419
Fix tests. Add two more test cases
2014-12-08 22:16:47 +03:00
Jörn Friedrich Dreyer
85176ec072
return correct result
2014-12-08 15:25:21 +01:00
Morris Jobke
1362c0b67a
Merge pull request #12452 from owncloud/server2server-ng-ocs
...
OCS API for server-to-server sharing
2014-12-08 14:12:03 +01:00
Lukas Reschke
fe7d9a7ca0
Add REST route for user & group management
...
First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.
2014-12-08 12:11:01 +01:00
Jenkins for ownCloud
2784d580bd
[tx-robot] updated from transifex
2014-12-08 01:54:57 -05:00
Olivier Paroz
7917d3b068
Remove changes which were inadvertently pushed to master
2014-12-08 04:03:02 +01:00
Olivier Paroz
d9c0be8785
Dump Arrays, Objects and Exceptions to the log
...
This is a first draft. It has only been tested with the ownlcloud logger.
Some internal fields are JSON encoded several times which makes it harder to read.
Most of the normalizer is borrowed from Monolog
https://github.com/Seldaek/monolog/blob/master/src/Monolog/Formatter/NormalizerFormatter.php
2014-12-08 03:53:07 +01:00
Lukas Reschke
e4255e9d54
Merge pull request #12644 from owncloud/add-hack-for-config
...
Create config if it does not exists
2014-12-07 22:33:16 +01:00
Jenkins for ownCloud
8ee9ee29ea
[tx-robot] updated from transifex
2014-12-07 01:54:32 -05:00
Victor Dubiniuk
303fce44f4
Use httphelper and cache response even when it empty
2014-12-06 20:17:47 +03:00
Lukas Reschke
bd520d2e53
Create config if it does not exists
...
The codepath that is executed when executing ownCloud via CLI is different than via browser. Specifically, the config is created by the user session already in `OC_Util::getInstanceId()` by a call to `setValue`. That said, this seems to be quite a bad side-effect, but for the sake of "not breaking whatever might break if we touch this" let's keep it that way for now.
When executing the autoconfig via `php -f index.php` the said session was not setup and thus no `config/config.php` file was created resulting in an installation error.
To reproduce this try to setup ownCloud via `php -f index.php` with and without that patch. (ensure to delete all existing configs before and don't access ownCloud with a browser in the meantime)
Fixes itself.
2014-12-06 14:00:14 +01:00
LEDfan
b412e59c26
Fix permissions
2014-12-06 13:58:10 +01:00
Jenkins for ownCloud
94eb2e782f
[tx-robot] updated from transifex
2014-12-06 01:54:56 -05:00
Lukas Reschke
ddcf2b84ec
Remove checks for safe mode and magic quotes
...
Both are removed from 5.4.0
Safe Mode: http://php.net/manual/en/features.safe-mode.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.
Magic Quotes: http://php.net/manual/en/security.magicquotes.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.
2014-12-05 19:14:47 +01:00
Morris Jobke
5f66cb3250
Merge pull request #12561 from oparoz/vectoricon
...
Improve the bitmap and vector mime icons
2014-12-05 14:51:03 +01:00
Morris Jobke
4ec1da3014
Merge pull request #12583 from owncloud/trim-port
...
Trim port from domain
2014-12-05 11:27:20 +01:00
Jenkins for ownCloud
4d53f163fd
[tx-robot] updated from transifex
2014-12-05 01:55:52 -05:00
Morris Jobke
b6975143ff
Merge pull request #12619 from owncloud/use-also-original-hea
...
Merge headers
2014-12-04 16:59:42 +01:00
Robin Appelman
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
Morris Jobke
f3213571bb
Merge pull request #12616 from owncloud/node-fileinfo
...
make \OC\Files\Node\Node implement the FileInfo interface
2014-12-04 16:34:30 +01:00
Clark Tomlinson
b8a2fdaa21
Merge pull request #12607 from owncloud/this-is-an-awesome-day
...
PHP 5.4 is now required for master
2014-12-04 10:33:04 -05:00
Lukas Reschke
db9765b4d5
Merge headers
...
Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.
2014-12-04 14:45:15 +01:00
Thomas Müller
e9f0b30023
Merge pull request #12609 from owncloud/remove-53-fixme
...
Remove workaround for 5.3
2014-12-04 14:25:47 +01:00
Jörn Friedrich Dreyer
7ef6df04da
remove triggerupdate, ref #11872
2014-12-04 13:44:30 +01:00
Robin Appelman
672495a1a3
make \OC\Files\Node\Node implement the FileInfo interface
2014-12-04 13:27:08 +01:00
Bjoern Schiessle
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
Thomas Müller
b55ac514ac
no nested xml tags on dependencies
2014-12-04 11:40:33 +01:00
Thomas Müller
eb81c52b95
fix an issue where the types tag holds an empty string
2014-12-04 11:40:33 +01:00
Thomas Müller
b028a6afac
adjust dependency analyzer to use attributes properly
2014-12-04 11:40:33 +01:00
Thomas Müller
c80ec91f28
switch to different parsing implementation to get xml attributes properly handled
2014-12-04 11:40:33 +01:00
Thomas Müller
ba52c996cf
adding supported databases
2014-12-04 11:40:33 +01:00
Thomas Müller
b469e9f6fb
introduce dependency analyzer to take care of app dependencies
...
some more unit tests on xml info parser
2014-12-04 11:40:33 +01:00
Thomas Müller
40e03ba314
adding default key value pair for 'types'
2014-12-04 11:40:33 +01:00
Thomas Müller
1354cee18e
translate labels properly
2014-12-04 11:40:33 +01:00
Lukas Reschke
ee1f8b0242
Remove workaround for 5.3
...
Function is natively available with 5.4
2014-12-04 11:17:33 +01:00
Lukas Reschke
1b0bc2e099
PHP 5.4 is now required for master
...
🍻
2014-12-04 10:46:38 +01:00
Vincent Petry
bc12d28f23
Log exceptions in DAV storage
...
In some cases a "NotFound" might be expected, so just return false as
before. But for other exceptions, the exception is now logged.
2014-12-03 22:20:00 +01:00
Lukas Reschke
b3515a98e9
Add workaround for older instances
...
To be removed with oCAdd workaround for older instances
To be removed with oC99
2014-12-03 21:13:27 +01:00
Lukas Reschke
69f5f6649e
Trim port from domain
...
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)
To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
2014-12-03 19:59:50 +01:00
Lukas Reschke
8700ffe698
Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood
...
Stop flooding the log, when previews are disabled
2014-12-03 14:51:03 +01:00
Thomas Müller
7291b915b8
Merge pull request #12553 from owncloud/default-iosid
...
add missing public interface for iOS client app id
2014-12-03 14:05:27 +01:00
Joas Schilling
69a5a0c1a0
Stop flooding the log, when previews are disabled
2014-12-03 12:52:42 +01:00
Robin Appelman
2bbb11fb63
Merge pull request #10881 from owncloud/touch-statcache
...
Clear statcache before getting the mtime from local storage backends
2014-12-02 23:29:24 +01:00
Olivier Paroz
5990293331
Improve the bitmap and vector mime icons
...
* Vector files such as Illustrator files currently show the "image"
icon. I propose to add a new type to mimetypeIcon() called
"image/vector" and which would be used by SVG as well
* We can use the current image-svg+xml icon, but would simply rename it
to image-vector
* The black and white "image" icon looks too much like a settings icon.
A simple picture representation pasted over the file icon should work
2014-12-02 21:11:56 +01:00
Robin Appelman
1bbb18fe87
also clear statcache in mapped local
2014-12-02 16:39:03 +01:00
Morris Jobke
a16d1a85ef
Merge pull request #11975 from owncloud/Combustible-combustible_dev
...
Check imagecreate*() return before using and use logger in \OC_Image
2014-12-02 16:18:00 +01:00
Morris Jobke
5b3dbb4ef8
add missing public interface for iOS client app id
2014-12-02 16:10:07 +01:00
Robin Appelman
db3f7238dd
Clear statcache before getting the mtime from local storage backends
2014-12-02 14:25:49 +01:00
Thomas Müller
e9029f94cb
Merge pull request #12310 from kampka/master
...
Implement a logger to log to error_log
2014-12-02 09:19:12 +01:00
Christian Kampka
553ce946d3
Implement a logger to log to error_log
2014-12-01 21:20:57 +01:00
Thomas Müller
0769556989
Merge pull request #12419 from owncloud/read-only-config
...
Allow read-only configuration
2014-12-01 16:37:29 +01:00
Thomas Müller
b2175f0e25
Use \OCP\ILogger
2014-12-01 16:21:54 +01:00
Byron Marohn
fa9b36b726
Added error check to lib/private/image.php
...
This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.
Signed-off-by: Byron Marohn <combustible@live.com>
2014-12-01 16:20:17 +01:00
Vincent Petry
8db4dd7585
Merge pull request #12469 from owncloud/issue/12460-port-local-changes2mapped
...
Issue/12460 port local changes2mapped
2014-12-01 10:42:39 +01:00
Lukas Reschke
ffd1fc42e7
Merge pull request #12427 from owncloud/issue/6101-deprecate-namespaced-functions
...
Depcrate namespaced functions, since they can not be autoloaded
2014-12-01 09:38:15 +01:00
Morris Jobke
6fa748621f
Merge pull request #12398 from oparoz/patch-5
...
You can only change the oritentation of a JPEG
2014-11-30 10:32:51 +01:00
Jenkins for ownCloud
83d097c524
[tx-robot] updated from transifex
2014-11-29 01:54:28 -05:00
Lukas Reschke
ebb243344a
Merge pull request #12499 from owncloud/disableMSSQL
...
Disable MSSQL and OCI for new CE installations
2014-11-28 18:38:34 +01:00
Lukas Reschke
f0e6876f2e
Merge pull request #12488 from owncloud/activity_group_multiple_conditions
...
activitymanager: concatenate queries with 'or'
2014-11-28 17:35:05 +01:00
Lukas Reschke
9a8dc4a832
Disable OCI as it is unsupported by most CE apps
2014-11-28 16:23:03 +01:00
Lukas Reschke
f3e75c085c
Disable MSSQL for new CE installations
...
Since automatic schema migrations are not yet possible let's disable this for now.
2014-11-28 16:08:38 +01:00
Vincent Petry
219a129cd6
Close cursor after checking for existing config values
2014-11-28 15:33:21 +01:00
Bjoern Schiessle
bf2c9be066
concatenate queries with 'or'
2014-11-28 14:46:27 +01:00
Lukas Reschke
2c157da1c2
Merge pull request #12486 from owncloud/activity_priorities
...
add activity priorities to core so that other apps can reuse it
2014-11-28 14:40:27 +01:00
Lukas Reschke
b3afc98f82
Merge pull request #12483 from owncloud/issue/6101-preview-providers
...
Issue/6101 Autoload preview providers
2014-11-28 13:43:41 +01:00
Bjoern Schiessle
00ad7d48c7
add activity priorities to core so that other apps can reuse it
2014-11-28 10:37:16 +01:00
Morris Jobke
b188710af3
Merge pull request #12472 from owncloud/modifyCookies
...
Add functions to modify cookies to response class
2014-11-28 10:16:22 +01:00
Morris Jobke
7a9af8c40c
Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadable
...
Issue/6101 Make all interfaces/classes autoloadable
2014-11-28 09:40:27 +01:00
Vincent Petry
35ab770b11
Close cursor early in calculateFolderSize
...
This method triggers additional queries in $this->update() so to avoid
potential database locks or delays, we close the cursor as soon as it is not needed any more
2014-11-28 09:35:31 +01:00
Morris Jobke
99d0e7e92d
Merge pull request #12479 from rclarkson/master
...
Limit blacklist to php files
2014-11-28 09:29:15 +01:00
Joas Schilling
ec7b55f5be
Split bitmap providers into one per file
2014-11-28 09:28:33 +01:00
Joas Schilling
3ec42ad598
Split office providers into one class per file
2014-11-28 09:28:30 +01:00
Joas Schilling
9cb54e3809
Fix intendation and doc blocks of preview providers
2014-11-28 09:28:28 +01:00
Jenkins for ownCloud
96b0328d39
[tx-robot] updated from transifex
2014-11-28 01:55:29 -05:00
Richard Clarkson
0d98329cac
Limit blacklist to php files
...
During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect.
I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively
This contribution is MIT licensed
2014-11-27 20:26:45 +01:00
Joas Schilling
fca9d32545
Move registration of core preview providers to preview
...
So the class files only have class code and don't execute code
2014-11-27 19:40:23 +01:00
Joas Schilling
7bbc27708a
Move NaturalSort_DefaultCollator to its own file
2014-11-27 17:47:21 +01:00
Joas Schilling
7b8824a4e3
Move iHomeStorage to own file
2014-11-27 17:47:20 +01:00
Joas Schilling
dfde04291e
Move share interfaces to own files so they can be autoloaded
2014-11-27 17:47:19 +01:00
Robin Appelman
05a069c101
Merge pull request #12426 from owncloud/jail-mask-wrappers
...
Add Jail and PermissionsMask storage wrappers
2014-11-27 16:00:14 +01:00
Robin Appelman
33b64868d7
Add storage and cache wrappers to apply a permissions mask to a storage
2014-11-27 15:25:57 +01:00
Robin Appelman
abb6e89c5d
Add storage and cache wrappers to jail a storage to a subfolder
2014-11-27 15:25:53 +01:00
Lukas Reschke
af56429a9a
Merge pull request #12470 from owncloud/jenkins-12447
...
Jenkins 12447
2014-11-27 15:16:14 +01:00
Joas Schilling
7761f0288e
Also clearstatcache() in MappedLocal before using the stats
...
Local change 283c10f010
2014-11-27 14:59:10 +01:00
Joas Schilling
50f85bfd1f
Check whether file exists before trying to touch() it
...
Local changes from d069ee8a8b
and 258ad38fd3
2014-11-27 14:59:09 +01:00
Joas Schilling
c5427da76d
Check return of disk_free_space before returning it
...
Local changes copied from ed83597371
and 25370fcb82
2014-11-27 14:59:08 +01:00
Joas Schilling
1062f4fe44
Check file existance in MappedLocal in hasUpdated()
...
Only fixed in Local by eeee9eacea
2014-11-27 14:59:07 +01:00
Joas Schilling
b886d3d645
Make MappedLocal::isLocal() true like for Local
...
Missed in 788c8540aa
2014-11-27 14:59:07 +01:00
Vincent Petry
e733d32eec
Merge pull request #12462 from owncloud/issue/12460-localstorage-buildpath
...
Introduce buildPath() in Storage\Local to reduce the difference to MappedLocal
2014-11-27 14:57:08 +01:00
Lukas Reschke
e35feadac2
Pass \OC::$WEBROOT to the ctr
2014-11-27 14:50:14 +01:00
Lukas Reschke
fef32e63dd
Remove redundant code
2014-11-27 14:38:38 +01:00
Lukas Reschke
d197f43475
Use server container
2014-11-27 14:36:11 +01:00
Lukas Reschke
048139074d
Add functions to modify cookies to response class
...
Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code.
This PR adds some basic functionalities to add and invalidate cookies.
Usage:
```php
$response = new TemplateResponse(...);
$response->addCookie('foo', 'bar');
$response->invalidateCookie('foo');
$response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00'));
```
Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`.
2014-11-27 14:19:00 +01:00
Joas Schilling
0ed86c0993
Move OC_USER_BACKEND_* constants to OC_User_Backend class
2014-11-27 13:47:32 +01:00
Joas Schilling
24511c6f00
Move OC_GROUP_BACKEND_* constants to OC_Group_Backend class
2014-11-27 13:47:30 +01:00
Joas Schilling
a2172786a8
Merge pull request #12449 from owncloud/issue/12444-namespace-exceptions
...
Issue/12444 namespace exceptions
2014-11-27 12:14:06 +01:00
Morris Jobke
f52ba9c73c
Merge pull request #12418 from owncloud/delete_previews
...
delete old previews
2014-11-27 12:09:39 +01:00
Joas Schilling
4f1bbc4fd5
Remove unused 2nd parameter of buildPath() and rename to getSourcePath()
2014-11-27 11:19:20 +01:00
Joas Schilling
20237fba47
Introduce getSourcePath() in Storage\Local to reduce the difference to MappedLocal
2014-11-27 11:19:18 +01:00
Vincent Petry
a74822279c
Merge pull request #12464 from owncloud/cache-available-languages
...
Cache results of available languages
2014-11-27 11:12:18 +01:00
Joas Schilling
ea3780f911
Replace exception with standard exception
2014-11-27 11:10:05 +01:00
Joas Schilling
e1f3abf7a5
Correctly namespace and autoload DatabaseException
2014-11-27 11:10:04 +01:00
Vincent Petry
51190f711d
Merge pull request #12451 from owncloud/issue/6101-remove-gettype-class
...
Move constants from GET_TYPE to OC\Files so they can be autoloaded
2014-11-27 11:03:55 +01:00
Lukas Reschke
b20d698ebd
Cache results of available languages
...
This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof
Surely, this is no gigantic gain but if we would do that for every function out there...
2014-11-27 00:01:55 +01:00
Thomas Müller
5097d4dc05
remove deprecated \OC:$session
2014-11-26 15:32:47 +01:00
Joas Schilling
8e28bf012c
Move constants from GET_TYPE to OC\Files so they can be autoloaded
2014-11-26 12:56:54 +01:00
Joas Schilling
3338eede3c
Correctly namespace DatabaseSetupException
2014-11-26 12:30:07 +01:00
Joas Schilling
a109f94fee
Depcrate namespaced functions, since they can not be autoloaded
2014-11-26 11:01:24 +01:00
Lukas Reschke
c749570a06
Merge pull request #12411 from owncloud/unknown-command-windows
...
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
Morris Jobke
1da46b1a58
Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api
...
because OC_User::login will create a new session we shall only try to lo...
2014-11-26 10:22:16 +01:00
Morris Jobke
60e4aa120f
Merge pull request #12350 from mprokop/link_expiration
...
fix calculation of expiration date if there is a default expiration date...
2014-11-26 10:19:12 +01:00
Thomas Müller
320a3c3784
because OC_User::login will create a new session we shall only try to login if user and pass are set
...
ensure to never destroy an existing session
2014-11-26 09:19:10 +01:00
Morris Jobke
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Morris Jobke
e9696a8c9a
Merge pull request #12420 from owncloud/sqlite-wal-2
...
adding new config parameter for sqlite to specify the journal mode
2014-11-26 00:47:22 +01:00
Joas Schilling
0274dcba57
Replace some more "command -v" calls with the Helper method
2014-11-25 18:10:03 +01:00
Joas Schilling
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
Thomas Müller
a6c088a1ef
adding new config parameter for sqlite to specify the journal mode
2014-11-25 16:29:06 +01:00
Joas Schilling
711912a7b3
Move namespaced constants to namespaced class
2014-11-25 16:27:27 +01:00
Lukas Reschke
fc116f563f
Allow read-only configuration
...
Workaround required for IIS setups running ownCloud to prevent dataloss.
Long-term solution would be to move some configuration settings to the database
2014-11-25 16:26:47 +01:00
Thomas Müller
0f18274ca5
Merge pull request #12416 from owncloud/app-info-xml-parser-2
...
App info xml parser 2
2014-11-25 15:56:52 +01:00
Georg Ehrke
1a1b459ae8
delete old previews
2014-11-25 15:42:02 +01:00
Thomas Müller
5ce34fbaf6
handle invalid xml file
2014-11-25 11:53:28 +01:00
Thomas Müller
d4f107d4dd
simplify xml parser code
2014-11-25 11:53:28 +01:00
Thomas Müller
c503ecd544
Introduce app info xml parser including basic unit test - necessary for #10777
2014-11-25 11:53:28 +01:00
Olivier Paroz
93a6cc17a5
The class name is Movie NOT Movies
2014-11-25 11:35:38 +01:00
Morris Jobke
53b2d85709
Merge pull request #12402 from owncloud/fix-phpdoc
...
Fix PHPDoc and deprecated code
2014-11-25 09:20:36 +01:00
Lukas Reschke
eb1dcb87c1
Merge pull request #12380 from owncloud/remove-oc-migrate
...
Remove OC_Migrate
2014-11-25 00:25:37 +01:00
Lukas Reschke
b947b65e5b
Fix PHPDoc and deprecated code
...
Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
2014-11-24 23:09:49 +01:00
Olivier Paroz
e2a9bd7838
You can only change the oritentation of a JPEG
...
TIFFs also have EXIF headers, but they're not supported by the Image class
PHP doc
http://php.net/manual/en/function.exif-read-data.php
2014-11-24 17:32:53 +01:00
Thomas Müller
ddacd7f900
Merge pull request #12294 from owncloud/route-postfix
...
Add route postfix to allow url versioning when only the http method changed
2014-11-24 16:32:54 +01:00
Morris Jobke
168fce0b18
Merge pull request #12303 from owncloud/windows-unknown-command-command
...
Deduplicate findBinaryPath() and do not try "command -v" on windows
2014-11-24 14:03:07 +01:00
Morris Jobke
1b17429c1d
Merge pull request #12142 from owncloud/DeprecateOldIAPICalls
...
Deprecate older API wrappers and calls
2014-11-24 14:01:49 +01:00
Morris Jobke
8782b2237c
Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
...
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Lukas Reschke
216d617938
Remove OC_Migrate
...
This is unused legacy code. Let it die with ~~~honor~~ fire.
Fixes https://github.com/owncloud/core/issues/12346
2014-11-24 10:53:45 +01:00
Jenkins for ownCloud
0edcfc1dc1
[tx-robot] updated from transifex
2014-11-24 01:54:35 -05:00
Georg Ehrke
45d985f2d8
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
2014-11-23 19:11:03 +01:00
Jenkins for ownCloud
fa3f7ad9e9
[tx-robot] updated from transifex
2014-11-22 01:55:21 -05:00
Bjoern Schiessle
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
Miguel Prokop
397f14ed86
Consolidate if statement, and update unit test
2014-11-21 13:31:56 +01:00
Miguel Prokop
1d4d308a6c
fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire.
2014-11-21 11:01:39 +01:00
Jenkins for ownCloud
f8421958b3
[tx-robot] updated from transifex
2014-11-21 02:54:26 -05:00
Morris Jobke
593ef76e36
Revert "drop OC_Preferences::getUsers and getApps"
...
This reverts commit 09fd34eed9
.
2014-11-20 22:02:26 +01:00
Morris Jobke
09fd34eed9
drop OC_Preferences::getUsers and getApps
2014-11-20 17:56:05 +01:00
Morris Jobke
985f8c3f69
Merge pull request #12330 from owncloud/jenkins-eat-that
...
drop dependency of some commands on old config object
2014-11-20 17:11:08 +01:00
Thomas Müller
7fa4c6d0bc
Merge pull request #12321 from owncloud/checkForXMLWriter
...
Check for XMLWriter class
2014-11-20 17:04:27 +01:00
Morris Jobke
604bf61e10
Merge pull request #12299 from owncloud/clean-lib-base-config
...
replace all static calls to OC_Config and OC_Preferences to calls to OCP...
2014-11-20 16:24:37 +01:00
Lukas Reschke
713c8e0dac
Merge pull request #12325 from owncloud/removeunneccessarylang
...
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Morris Jobke
8ae8eb4734
drop dependency of some commands on old config object
2014-11-20 15:03:16 +01:00
Thomas Müller
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
Morris Jobke
46e6104795
Merge pull request #12297 from owncloud/issue/10991-all-testcase
...
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Volkan Gezer
995fe4a176
cleanup languages. closes #11274
2014-11-20 14:46:17 +01:00
Lukas Reschke
9a1673c79d
Check for XMLWriter class
...
This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507
2014-11-20 13:13:14 +01:00
Vincent Petry
6a08fca363
Merge pull request #12253 from owncloud/port-12154
...
Port 12154
2014-11-20 12:47:27 +01:00
Joas Schilling
d15f1882f9
Simplify the binary finding code in the movie preview class
2014-11-20 12:41:55 +01:00
Joas Schilling
64421d76fd
Deduplicate function by moving it to the OC_Helper
2014-11-20 12:37:59 +01:00
Jenkins for ownCloud
fffc5bc002
[tx-robot] updated from transifex
2014-11-20 01:55:06 -05:00
Joas Schilling
bb540722cd
Use base class to reset the file mapper
2014-11-19 14:52:07 +01:00
Morris Jobke
980dd4d22a
replace double quotes with single quotes
2014-11-19 13:15:04 +01:00
Morris Jobke
fef9d4218c
replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig
2014-11-19 13:06:22 +01:00
Bernhard Posselt
4e90c44301
add postfix
...
add postfix
2014-11-19 12:01:42 +01:00
Jenkins for ownCloud
705976ba0a
[tx-robot] updated from transifex
2014-11-19 01:54:59 -05:00
Morris Jobke
d40bdfb35e
drop unneeded var_dump - fixes #9997
2014-11-18 22:36:42 +01:00
Morris Jobke
81d112fb42
Merge pull request #12261 from oparoz/patch-1
...
Replace deprecated switches
2014-11-18 18:59:34 +01:00
Björn Schießle
106d0f9c75
Merge pull request #12224 from owncloud/fix_12211
...
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 17:26:02 +01:00
Olivier Paroz
cb118ce371
Replace deprecated switches
...
Warning: -convert-to is deprecated. Use --convert-to instead.
Warning: -outdir is deprecated. Use --outdir instead.
2014-11-18 15:04:01 +01:00
Lukas Reschke
309788003d
Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager
...
Fix type hinting for app manager
2014-11-18 13:56:40 +01:00
Lukas Reschke
8d4e63dd7c
Merge pull request #12242 from owncloud/fix-undefined-size
...
Check if the size field is available
2014-11-18 12:37:16 +01:00
Lukas Reschke
260a084d27
Add repair steps for legacy config files
...
Remove all ports from the trusted domains
Conflicts:
lib/private/repair.php
lib/repair/repairconfig.php
2014-11-18 12:36:03 +01:00
Lukas Reschke
d0a30b0e55
Ignore port for trusted domains
...
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)
Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.
Conflicts:
lib/private/request.php
2014-11-18 12:36:03 +01:00
Robin Appelman
0b630a37ab
Fix type hinting for app manager
2014-11-18 12:22:13 +01:00
Bjoern Schiessle
ea4eedd35a
only users can have a display name different from the id
2014-11-18 11:46:28 +01:00
Bjoern Schiessle
367468ff1f
make sure that we only find the shares from the correct share type if users and groups with the same ID exists
2014-11-18 11:11:49 +01:00
Bjoern Schiessle
5192641447
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 11:03:08 +01:00
Morris Jobke
36ba935381
Merge pull request #12237 from owncloud/fix-12236
...
Make declaration compatible
2014-11-18 10:30:17 +01:00
Lukas Reschke
944cd327b1
Merge pull request #9962 from owncloud/app-group-enable-remote
...
Fix remote.php routes for apps that are enabled for specific groups
2014-11-18 10:08:20 +01:00
Jenkins for ownCloud
91f7c0af6e
[tx-robot] updated from transifex
2014-11-18 01:54:31 -05:00
Lukas Reschke
6535540dcd
Check if the size field is available
...
In some cases the 'size' field is not available resulting in some PHP errors such as:
```json
{"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```
This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
2014-11-17 22:39:40 +01:00
Lukas Reschke
e8f90133e0
Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse
...
Move CSRF check
2014-11-17 18:34:55 +01:00
Lukas Reschke
0b9dffa828
Make declaration compatible
...
Fixes #12236
2014-11-17 18:30:17 +01:00
Vincent Petry
af7688ec17
Merge pull request #11741 from owncloud/delete_all_children_preview_2
...
delete all children's previews when deleting a folder
2014-11-17 16:45:54 +01:00
Morris Jobke
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Robin Appelman
7cb12d4bff
Add sabredav plugin to check if a user has access to an app
2014-11-17 15:50:24 +01:00
Robin Appelman
36528c6ef6
Merge pull request #12031 from owncloud/app-manager
...
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-17 15:49:15 +01:00
Lukas Reschke
07f0d76fc6
Move CSRF check
...
Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
2014-11-17 15:10:53 +01:00
Lukas Reschke
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
Joas Schilling
0ab973a3a6
Make it possible to cleanPath() absolute Windows paths
2014-11-17 10:48:15 +01:00
Joas Schilling
39ae569c5c
Correctly close handle of directory when listing certificates
2014-11-17 10:48:14 +01:00
Jenkins for ownCloud
9df50c7be6
[tx-robot] updated from transifex
2014-11-17 01:54:33 -05:00
Morris Jobke
b9e86b0951
Merge pull request #12186 from owncloud/fix-12182
...
eliminate OC_Template::printErrorPage in database classes, fixes #12182
2014-11-15 16:50:15 +01:00
Lukas Reschke
cd5925036a
Check if app is enabled for user
...
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
2014-11-15 11:13:55 +01:00
Arthur Schiwon
74ffda8261
do not output DB information, and do not set header
2014-11-14 17:43:22 +01:00
Arthur Schiwon
08205c63f9
errors are already logged
2014-11-14 16:59:54 +01:00
Arthur Schiwon
7ed678b04d
eliminate OC_Template::printErrorPage in database classes, fixes #12182
2014-11-14 15:48:55 +01:00
Jenkins for ownCloud
0811b39e5f
[tx-robot] updated from transifex
2014-11-14 01:54:47 -05:00
Morris Jobke
c0d63680ed
Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup
...
cleanup group admin(s) on deleteGroup
2014-11-13 22:39:40 +01:00
Morris Jobke
e5d46d0d94
Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name
...
removal of wrong/double implemented check
2014-11-13 15:39:07 +01:00
michag86
7e70c4ee95
removal of wrong/double implemented check
...
Check already implemented in core/settings/ajax/changedisplayname.php
2014-11-13 13:02:02 +01:00
Lukas Reschke
5f8fb8d1ee
Run preupdate before an update
...
The update routine tries to test the database migration before actually performing the update.
However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.
This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
2014-11-13 12:07:49 +01:00
Jenkins for ownCloud
a069171cda
[tx-robot] updated from transifex
2014-11-13 01:54:36 -05:00
Morris Jobke
97a8fa418d
Merge pull request #12141 from owncloud/kill-dav-client
...
OC_DAVClient is not longer used - no need to carry it around anymore
2014-11-12 21:20:52 +01:00
Lukas Reschke
4302a78b27
Deprecate older API wrappers and calls
...
Those old classes have now non-static pendants and can be deprecated IMHO.
2014-11-12 17:39:25 +01:00
Thomas Müller
6e3a841652
Merge pull request #12139 from owncloud/DoNotTouchMe
...
Try to read the file only instead of trying to touch
2014-11-12 17:29:56 +01:00
Thomas Müller
fede6b93e5
OC_DAVClient is not longer used - no need to carry it around anymore
2014-11-12 17:07:34 +01:00
Jan-Christoph Borchardt
d5796bbaf9
Merge pull request #12128 from owncloud/drop-formfactor
...
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 16:23:19 +01:00
Lukas Reschke
49ddaf9489
Try to read the file only instead of trying to touch
...
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.
Fixes https://github.com/owncloud/core/issues/12135
2014-11-12 15:57:19 +01:00
Morris Jobke
952abdc51a
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 13:07:23 +01:00
Lukas Reschke
da31177a8f
Remove debug statement
...
Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
2014-11-12 11:32:48 +01:00
Thomas Müller
c998f620d0
Merge pull request #12105 from owncloud/dav-fixcleanpath
...
Fix root path handling for WebDAV ext storage
2014-11-12 09:16:55 +01:00
Thomas Müller
9aef0421cf
Merge pull request #12107 from owncloud/dav-propfindmimetype
...
Return real mime type on PROPFIND
2014-11-12 09:16:26 +01:00
Jenkins for ownCloud
1846fb0285
[tx-robot] updated from transifex
2014-11-12 01:55:24 -05:00
Bernhard Posselt
6d5a239abf
Fix Pimple unset
2014-11-11 22:04:46 +01:00
Thomas Müller
4c1244f50c
Merge pull request #11917 from owncloud/fix-11909
...
Add checkbox to enforce SSL for subdomains
2014-11-11 20:37:50 +01:00
Vincent Petry
0b2c24081f
Return real mime type on PROPFIND
...
Return the real (insecure) mime type on PROPFIND
2014-11-11 15:42:50 +01:00
Vincent Petry
4b943a4810
Fix root path handling for WebDAV ext storage
...
Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
2014-11-11 15:20:36 +01:00
Robin Appelman
43eb375ace
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-10 13:52:52 +01:00
Vincent Petry
9b99c1d6f0
Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry
...
Convert StorageNotAvailableException to SabreDAV exception
2014-11-10 12:52:52 +01:00
Vincent Petry
676b911b22
Merge pull request #12027 from owncloud/cleanup_exceptions
...
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
Vincent Petry
cccedf6f30
Convert StorageNotAvailableException to SabreDAV exception
...
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.
This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
2014-11-10 12:01:24 +01:00
Jenkins for ownCloud
c3e3432662
[tx-robot] updated from transifex
2014-11-10 01:54:30 -05:00
Craig Morrissey
541344d880
logging changes
2014-11-07 12:45:42 -05:00
Bjoern Schiessle
f27b6b0ab8
don't scan part files
2014-11-07 15:20:51 +01:00
Bjoern Schiessle
a10ae2816e
clean up encryption exceptions
2014-11-07 13:48:31 +01:00
Robin Appelman
d26a427f92
Also propagate etag changes when the watcher finds a changed file
2014-11-07 12:56:09 +01:00
Lukas Reschke
e345697cab
Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
...
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Thomas Müller
88c329b394
Merge pull request #12019 from owncloud/fix-template-shortcuts
...
second parameter in template shortcuts script() and style() is optional
2014-11-07 11:01:10 +01:00
Jenkins for ownCloud
7d47d50724
[tx-robot] updated from transifex
2014-11-07 01:55:10 -05:00
Adam Williamson
013feb8da0
writeData(): correct variable name for config file path
...
It changed since we wrote this patch.
2014-11-06 18:10:43 -08:00
Adam Williamson
8b2b0aae31
deleteFromOpcodeCache: make parameter mandatory, document parameter
...
Both pointed out in submission review by @bantu, thanks.
2014-11-06 18:05:20 -08:00
Adam Williamson
3b4823d89c
add function to invalidate one opcache file, use it if possible #9885
...
Issue #9885 appears to be triggered by ownCloud invalidating the entire
PHP opcache. Testing indicates it can be avoided by only invalidating the
single file that was written from the opcache, instead of clearing the
whole thing. In general it is more efficient to invalidate only the single
file that was changed, rather than the whole cache.
This adds a deleteFromOpcodeCache() function which invalidates a single
file from the opcache if possible, returning true if the underlying
function returns true (which may mean 'success', or 'file does not exist',
or 'file exists but is not in opcache', all of which are OK to treat as
good for our purposes). It also changes writeData() in config.php to try
using deleteFromOpcodeCache() and only fall back on clearOpcodeCache() if
that fails.
2014-11-06 17:58:58 -08:00
Lukas Reschke
d383c45c13
Merge pull request #12003 from owncloud/password-migration
...
Use new hashing API for OC_User_Database
2014-11-06 22:43:57 +01:00
Morris Jobke
81e6329c04
second parameter in template shortcuts script() and style() is optional
2014-11-06 21:26:50 +01:00
Morris Jobke
e53354bfd7
Merge pull request #12009 from owncloud/make-optional
...
Make second argument optional
2014-11-06 19:43:11 +01:00
Robin Appelman
0c230fb57e
Merge pull request #11945 from owncloud/share-setup-other-user
...
Setup shared mounts for the correct user when setting up the filesystem
2014-11-06 19:24:24 +01:00
Robin Appelman
16b0d52031
Default to reusing etags in the scanner
2014-11-06 18:34:10 +01:00
Robin Appelman
c21d1da01a
Support displaynames for dummy user backend
2014-11-06 18:31:40 +01:00
Lukas Reschke
20cd9a134f
Make second argument optional
...
Equivalent to addVendorScript und addScript from OC_Util
2014-11-06 18:17:21 +01:00
Lukas Reschke
5b8a6b66b5
Load PHPAss via autoloader
2014-11-06 16:32:53 +01:00
Lukas Reschke
8f1fa32e1f
Merge pull request #11998 from owncloud/add-get-logger-to-interface
...
Add getLogger() to IServerContainer
2014-11-06 16:04:54 +01:00
Lukas Reschke
c4d7483a0a
Use new hashing API for OC_User_Database
...
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
2014-11-06 15:42:06 +01:00
Lukas Reschke
24ca2d858f
Add OCP\Security\IHasher
...
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.
Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
Lukas Reschke
5f2a083686
Merge pull request #11883 from owncloud/clear-session-for-setup
...
Clear session before setup
2014-11-06 14:39:51 +01:00
Lukas Reschke
f73d653036
Merge pull request #11972 from owncloud/usermanager-remove-delete
...
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
2014-11-06 13:52:25 +01:00
Lukas Reschke
0e3e1e3563
Add getLogger() to IServerContainer
...
Makes my IDE complaining less ;-)
2014-11-06 13:36:36 +01:00
Morris Jobke
73569b29bc
md5 now handled via bower
2014-11-06 13:22:16 +01:00
Morris Jobke
e49b9022a1
bower snapjs
2014-11-06 12:03:57 +01:00
Vincent Petry
afa14d571c
Merge pull request #11982 from owncloud/bower-underscore
...
bower underscore
2014-11-06 08:42:29 +01:00
Jenkins for ownCloud
fa4018d36c
[tx-robot] updated from transifex
2014-11-06 01:55:04 -05:00
Morris Jobke
957dee5af1
bower underscore
2014-11-05 23:23:03 +01:00
Lukas Reschke
4659b0e6a0
Merge pull request #11936 from owncloud/bower-jquery
...
Bower jquery
2014-11-05 16:43:24 +01:00
Robin Appelman
1eefc21329
Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead
2014-11-05 15:45:58 +01:00
Thomas Müller
e624e9064c
Merge pull request #11965 from owncloud/fix-jsonresponse
...
fix typo in content type for JSONResponse
2014-11-05 14:03:12 +01:00
Thomas Müller
06267fec8f
Merge pull request #11928 from owncloud/support-HTML-in-logo
...
Support HTML in logo
2014-11-05 13:54:29 +01:00
Bjoern Schiessle
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
Bernhard Posselt
91a23bfa9c
fix typo in content type
2014-11-05 12:04:56 +01:00
Jenkins for ownCloud
c8f55e7f87
[tx-robot] updated from transifex
2014-11-05 01:54:36 -05:00
Morris Jobke
74d375d8ea
migrate jQuery to bower
2014-11-04 14:28:29 +01:00
Morris Jobke
7f4e447a5f
fix shortcuts - underline instead of camelCase
2014-11-04 13:57:38 +01:00
Morris Jobke
fde8ef0655
Merge pull request #11916 from owncloud/introduce-bower
...
Introduce bower dependency managment for frontend libraries
2014-11-04 11:59:33 +01:00
Jenkins for ownCloud
287faf9923
[tx-robot] updated from transifex
2014-11-04 01:55:05 -05:00
Morris Jobke
7f1d974796
Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig
...
First check whether it is the default config before touching
2014-11-03 21:20:42 +01:00
Lukas Reschke
be5ae6c44f
Support HTML in logo claim
2014-11-03 21:14:27 +01:00
Morris Jobke
1a405e56f5
replace moment.js with bower version
...
* fix JS unit tests
2014-11-03 20:54:50 +01:00
Morris Jobke
d763b32048
ability to add bower resources
...
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
2014-11-03 20:54:40 +01:00
Thomas Müller
994768d99f
Update Pimple to V3.0
2014-11-03 16:57:16 +01:00
Lukas Reschke
e73ccbd4ca
Migrate "setsecurity.php" to the AppFramework
...
Add switch to enforce SSL for subdomains
Add unit tests
Add test for boolean values
Camel-case
Fix ugly JS
2014-11-03 16:53:03 +01:00
Lukas Reschke
9790801268
First check whether it is the default config before touchign
...
Potentially fixes https://github.com/owncloud/core/issues/11678
2014-11-03 16:37:04 +01:00
Thomas Müller
a4f0483f56
Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5
2014-11-03 13:52:47 +01:00
Morris Jobke
56cf1d9d27
fix odd behaviour
2014-10-31 18:46:47 +01:00
Vincent Petry
fd4b97d758
Merge pull request #9044 from owncloud/add-missing-email-principal
...
adding missing email address for principal
2014-10-31 13:24:42 +01:00
Lukas Reschke
d30fd23544
Clear session before setup
...
Fixes https://github.com/owncloud/core/issues/11861
2014-10-31 11:21:00 +01:00
Vincent Petry
55658e7bb2
Merge pull request #11539 from owncloud/mount-setup-once
...
Only mount the storages for the user once
2014-10-31 10:42:29 +01:00
Jenkins for ownCloud
e00f25e5b0
[tx-robot] updated from transifex
2014-10-31 01:55:39 -04:00
Morris Jobke
1c7f1a8787
Merge pull request #11877 from owncloud/fix-11875-master
...
prevent PHP notice
2014-10-30 21:43:38 +01:00
Vincent Petry
bed81ea854
Merge pull request #11080 from owncloud/addheader-text-2
...
Fix the addHeader tag attributes text methods to not ignore the text parameter
2014-10-30 18:13:46 +01:00
Thomas Müller
99921489cf
prevent PHP notice
2014-10-30 17:24:25 +01:00
Georg Ehrke
33186957c8
delete all children's previews when deleting a folder
...
add phpdoc
2014-10-30 17:15:42 +01:00
Thomas Müller
9b293537a6
Merge pull request #11740 from owncloud/update-archive-tar
...
Update pear/archive_tar to 1.3.13
2014-10-30 17:14:07 +01:00
Lukas Reschke
6db69c5d05
Merge pull request #11864 from owncloud/clear-session-after-logout
...
Clear session after logout
2014-10-30 16:47:46 +01:00
Morris Jobke
90e523ead0
Merge pull request #11858 from owncloud/fix-11064
...
Allow any outgoing XHR connections
2014-10-30 16:19:39 +01:00
Thomas Müller
08b46ccc17
Update pear/archive_tar to 1.3.13
2014-10-30 16:10:00 +01:00
Thomas Müller
18f7f582ac
Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro
...
Fix stupid copy paste fail
2014-10-30 14:45:58 +01:00
Morris Jobke
e2001c6d31
Merge pull request #11821 from owncloud/generic-response
...
Add a generic data response
2014-10-30 14:05:25 +01:00
Lukas Reschke
770c62c5d8
Clear session after logout
...
Fixes https://github.com/owncloud/core/issues/8420
2014-10-30 12:10:39 +01:00
Lukas Reschke
e219d72619
Fix stupid copy paste fail
...
...
2014-10-30 10:37:59 +01:00
Jenkins for ownCloud
ea55848fa1
[tx-robot] updated from transifex
2014-10-30 01:55:14 -04:00
Lukas Reschke
b3f881748d
Allow any outgoing XHR connections
...
Quickfix for https://github.com/owncloud/core/issues/11064
2014-10-30 00:00:40 +01:00
Vincent Petry
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Thomas Müller
105940b9dc
Merge pull request #11638 from owncloud/oc8-translations
...
[OC8] Load javascript translations using standard web technologies
2014-10-29 13:09:02 +01:00
Thomas Müller
c353cbe633
Merge pull request #11689 from owncloud/doctrine-2.5
...
Update doctrine/dbal to 2.5
2014-10-29 11:34:23 +01:00
Thomas Müller
fb4f993336
Fix implementation of translation short cut
2014-10-29 10:58:10 +01:00
Vincent Petry
c682b1f0c1
Fix language file detection
2014-10-29 10:13:51 +01:00
Thomas Müller
9f7c571e40
update all translation files to js and json
2014-10-29 10:13:50 +01:00
Thomas Müller
2f19de11e4
adding console command to generate javascript translation files based on existing php translation files
...
read server side translations from json files
2014-10-29 10:09:12 +01:00
Vincent Petry
d71cd680dd
Include core translations
...
Moved search result type translations to search.js
Load JS translations earlier
Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.
This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
2014-10-29 10:09:12 +01:00
Thomas Müller
a589d61b78
in case a translation javascript is not found we no longer bail out
...
remove translation.php
2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Bernhard Posselt
0696099bad
add dataresponse
...
fix docstrings
adjust copyright date
another copyright date update
another header update
implement third headers argument, fix indention, fix docstrings
fix docstrings
2014-10-29 09:43:47 +01:00
Jenkins for ownCloud
cb944814d9
[tx-robot] updated from transifex
2014-10-29 01:54:45 -04:00
Thomas Müller
46c2909c78
Update doctrine/dbal to 2.5
2014-10-28 15:39:37 +01:00
Robin Appelman
2974d4d380
Reset the users setup after clearing mounts
2014-10-28 15:13:29 +01:00
Thomas Müller
c93ddf77b9
Use composer autoloader to load Patchwork
2014-10-28 13:42:28 +01:00
Adam Williamson
0e3f2055d2
use Composer autoloader not OC for non-Composer 3rdparty ( #9643 )
...
Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.
With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.
Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.
drop unneeded registerPrefix() and registerClass() from autoloader
Now we're not handling anything but OC's own classes, these are
unnecessary.
error out if composer autoloader is not found (thanks bantu)
We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
2014-10-28 11:32:20 +01:00
Lukas Reschke
510d0b2cf3
Fix the "addHeader($tag, $attributes, $text)" methods to not ignore the $text parameter
...
Also support closing tags with no text content given
Conflicts:
lib/private/template.php
2014-10-28 11:15:58 +01:00
Morris Jobke
4461e69873
Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling
...
Properly catch 503 storage not available in getQuotaInfo
2014-10-28 09:33:54 +01:00
Jenkins for ownCloud
23873d80fe
[tx-robot] updated from transifex
2014-10-28 01:55:38 -04:00
Lukas Reschke
d6380a5395
Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
...
Make supported DBs configurable within config.php
2014-10-27 22:24:16 +01:00
Thomas Müller
79778d6a51
code cleanup during review 👍
2014-10-27 21:39:35 +01:00
Lukas Reschke
233c49f4b9
Make supported DBs configurable within config.php
...
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.
To test this play around with the new configuration parameter "supportedDatabases".
2014-10-27 21:39:34 +01:00
Robin Appelman
3f63f4b6b1
Only mount the storages for the user once
2014-10-27 18:50:28 +01:00
Vincent Petry
21d825ed6c
Properly catch 503 storage not available in getQuotaInfo
...
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.
This fix prevents the expected exception to make the whole call fail.
2014-10-27 16:27:12 +01:00
Morris Jobke
a00712aa65
Merge pull request #11783 from owncloud/allow_passing_driver_options
...
allow passing db driver options
2014-10-27 16:00:13 +01:00
Robin Appelman
8de287f2ef
Merge pull request #11763 from owncloud/stable-etags
...
Generate stable etags for local files
2014-10-27 15:30:30 +01:00
Morris Jobke
290e9cd5b2
Merge pull request #11787 from owncloud/fix-php-docs
...
Fix PHPDoc
2014-10-27 14:46:41 +01:00
Lukas Reschke
f7c393fa9f
Fix PHPDoc
...
Stop my IDE and Scrutinizer from complaining.
2014-10-27 13:38:40 +01:00
Jörn Friedrich Dreyer
e16a58220d
allow passing driver options, fixes #11718
2014-10-27 12:30:29 +01:00
Vincent Petry
aee1edf6b5
Merge pull request #11708 from owncloud/fix-momentjs
...
Setting moment locale based on user selection
2014-10-27 10:30:47 +01:00
Jenkins for ownCloud
5d391910c5
[tx-robot] updated from transifex
2014-10-27 01:54:28 -04:00
Jenkins for ownCloud
214af9523a
[tx-robot] updated from transifex
2014-10-26 01:54:32 -04:00
Lukas Reschke
acec1afe17
Merge pull request #11760 from owncloud/add-type-hints-where-sensible
...
Add type hinting to functions
2014-10-25 14:09:48 +02:00
Morris Jobke
be32e562e3
drop unneeded hint
2014-10-25 12:00:56 +02:00
Jenkins for ownCloud
3652f02e48
[tx-robot] updated from transifex
2014-10-25 01:54:35 -04:00
Morris Jobke
63f2b1f460
Merge pull request #11767 from danbartram/add_db_rollback
...
Add missing DB rollback functionality
2014-10-24 19:52:56 +02:00
Thomas Müller
9fa5483111
Merge pull request #11709 from owncloud/temp-handling
...
Cleanup handling of temporary files
2014-10-24 19:29:05 +02:00
Dan Bartram
9c1015b790
Add missing DB rollback functionality
2014-10-24 17:44:06 +01:00
Robin Appelman
283c10f010
Generate stable etags for local files
2014-10-24 16:47:58 +02:00
Lukas Reschke
f901c5ff08
Fix PHPDoc and remove explicit type hint
2014-10-24 15:49:55 +02:00
Lukas Reschke
b3a04840b5
Add type hinting to functions
...
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
Robin Appelman
16cfca6a5f
Better reuse of cache data for getFolderContents
2014-10-24 12:33:54 +02:00
Robin Appelman
0a3f57f832
Pass the cached data to the filesystem watcher
2014-10-24 12:32:55 +02:00
Lukas Reschke
d060180140
Use function outside of loop
...
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
Robin Appelman
0b96297783
Use the TempManager to handle temporary files
2014-10-24 12:18:49 +02:00
Robin Appelman
83c74b80ad
Add \OC\TempManager to handle creating and cleaning temporary files
2014-10-24 12:18:46 +02:00
Lukas Reschke
2d2a4741ce
Make files non executable
...
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
libasys
cbd130bed0
adding missing email address for principal
...
* fix #8515
* add mail only if it exists
2014-10-24 11:12:23 +02:00
Jenkins for ownCloud
9babcfb9e2
[tx-robot] updated from transifex
2014-10-24 01:55:11 -04:00
Morris Jobke
4b5a3876ac
Merge pull request #7749 from owncloud/load_avatar_header_via_php
...
Load avatar in header via PHP
2014-10-24 01:27:25 +02:00
kondou
729dffed5e
Load avatar in header via PHP
...
* fix #7484
* use UID, css, and div instead of span
2014-10-23 23:17:18 +02:00
Lukas Reschke
c30b7f8197
Remove unreachable statement
2014-10-23 23:03:14 +02:00
Clark Tomlinson
ca5abe5744
Setting moment locale based on user selection
2014-10-23 10:32:47 -04:00
Thomas Müller
e26a16afea
Merge pull request #11549 from owncloud/add-more-localizations-master
...
implement localizations based on punic
2014-10-23 16:09:47 +02:00
Thomas Müller
6c1871da06
Merge pull request #10985 from owncloud/db-cleanup
...
Cleanup database handling
2014-10-23 13:48:33 +02:00
Morris Jobke
b82e44b448
Merge pull request #10689 from owncloud/load_classfile_once
...
make sure class file is loaded once
2014-10-23 11:41:00 +02:00
Jenkins for ownCloud
e75c2edba6
[tx-robot] updated from transifex
2014-10-23 01:55:51 -04:00
Lukas Reschke
e9ec45ddd1
Merge pull request #11704 from owncloud/fix-type-for-query
...
Use mixed as type
2014-10-22 18:13:31 +02:00
blizzz
44a7a3690a
Merge pull request #11702 from owncloud/fix-11637
...
setup filesystem by username, not login name, fixes #11637
2014-10-22 17:56:30 +02:00
Lukas Reschke
be06937e65
Use mixed as type
...
Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier.
2014-10-22 15:09:33 +02:00
Jörn Friedrich Dreyer
b7fa644a54
Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-master
...
Special treatment for Oracle
2014-10-22 14:54:42 +02:00
Lukas Reschke
31e489b44d
Merge pull request #11687 from owncloud/appframework-session-annotation
...
introduce SessionMiddleWare to control session handling via an annotatio...
2014-10-22 14:45:28 +02:00
Arthur Schiwon
993376fb6f
better variable name
2014-10-22 13:36:57 +02:00
Arthur Schiwon
e0342db47c
set up FS by username, not login name\!
2014-10-22 13:28:08 +02:00
Thomas Müller
02c5933af8
introduce SessionMiddleWare to control session handling via an annotation
2014-10-22 12:44:19 +02:00
Robin Appelman
d83b11d34a
Use statements wrapper in \OCP\IDB
2014-10-22 12:29:53 +02:00
Robin Appelman
e6f6cdd19f
Bit more cleanup
2014-10-22 12:29:53 +02:00
Robin Appelman
2ae6a0d96d
Move creating the database connection to the server container
2014-10-22 12:29:53 +02:00
Robin Appelman
d4e929c37a
Remove implicit prepared statement cache and get the connection from the server container in \OC_DB
2014-10-22 12:26:43 +02:00
Robin Appelman
97a6f5c46b
Extend \OCP\IDBConnection to cover more use cases
2014-10-22 12:26:43 +02:00
Robin Appelman
72f99f5041
Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection directly instead
2014-10-22 12:26:43 +02:00
Bjoern Schiessle
b7718bc212
always use the correct share type
2014-10-22 11:48:29 +02:00
Morris Jobke
e2ff180521
Merge pull request #11416 from owncloud/eventlogger
...
Allow apps to gather performance diagnistics
2014-10-22 11:18:26 +02:00
Jenkins for ownCloud
916e710ece
[tx-robot] updated from transifex
2014-10-22 01:55:22 -04:00
Thomas Müller
2814a294c8
call initPaths() right before the server is instantiated
2014-10-21 14:10:57 +02:00
Lukas Reschke
cb36666600
Merge pull request #11630 from owncloud/kill-some-legacy
...
remove legacy class OC_Updater
2014-10-21 14:01:49 +02:00
Jenkins for ownCloud
8485743e33
[tx-robot] updated from transifex
2014-10-21 01:55:45 -04:00
Lukas Reschke
8f8abdbaee
Add unit tests for convertToRelativePath
2014-10-20 15:09:43 +02:00
Lukas Reschke
7b94c7f9c1
Refer to relative path instead of absolute path
...
There is no need to refer to the absolute path here if we can use the relative one.
Conflicts:
lib/private/templatelayout.php
2014-10-20 15:09:43 +02:00
Thomas Müller
c8e8945efb
implement localizations based on punic
2014-10-20 15:04:42 +02:00
Thomas Müller
d9907b6fa3
move some deprecated usage of OC_Config and OC_AppConfig to \OC::server
2014-10-20 14:44:44 +02:00
Thomas Müller
6af0e76a03
remove legacy class OC_Updater
2014-10-20 14:44:42 +02:00
Robin Appelman
9fd234f63f
Log some additional events
2014-10-20 13:38:38 +02:00
Robin Appelman
beb1c6ad74
Allow adding events that hapend before the event logger was loaded
2014-10-20 13:38:38 +02:00
Robin Appelman
4a8358bc50
Rename to NullQueryLogger
2014-10-20 13:38:38 +02:00
Robin Appelman
1e69f5e7ac
Log some basic events
2014-10-20 13:38:38 +02:00
Robin Appelman
6e08014781
Rename namespace to Diagnostics
2014-10-20 13:38:38 +02:00
Robin Appelman
2790bda4f8
Activate the query logger on connect
2014-10-20 13:38:37 +02:00
Robin Appelman
b71d1d3616
Add QueryLogger interface to allow apps to get a list of used queries
2014-10-20 13:38:37 +02:00
Robin Appelman
d38050cf52
Add an EventLogger interface to allow apps to get a log of the request timeline
2014-10-20 13:38:37 +02:00
Jörn Friedrich Dreyer
ca0e3fdfea
throw exception in writeBack, the returned boolean is checked nowhere
2014-10-20 11:29:05 +02:00
Jörn Friedrich Dreyer
9b0f0df7f5
make skeleton compatible with objectstore
...
suspend encryption proxy when copying skeleton
2014-10-20 11:28:36 +02:00
Jenkins for ownCloud
87da62072b
[tx-robot] updated from transifex
2014-10-20 01:54:34 -04:00
Jenkins for ownCloud
68dd1edbfe
[tx-robot] updated from transifex
2014-10-18 01:55:30 -04:00
Arthur Schiwon
4e8c7570d4
make performance less bad. Still far from good, but at least it works
2014-10-17 20:16:04 +02:00
Arthur Schiwon
a7a532f58a
with several backends, more than limit can be returned
2014-10-17 20:16:04 +02:00
Morris Jobke
7bf401e48a
Merge pull request #11430 from owncloud/minify-js-css-master
...
adding cssmin and jssmin(minify)
2014-10-17 15:05:59 +02:00
Lukas Reschke
439b33ec38
Merge pull request #11634 from owncloud/loadapps-encapsulaterequire
...
Encapsulate require_once to avoid name space bleedind
2014-10-17 14:32:10 +02:00
Vincent Petry
27c22f071d
Encapsulate require_once to avoid name space bleedind
...
The script required by require_once might use variable names like $app
which will conflict with the code that follows.
This fix encapsulates require_once into its own function to avoid such
issues.
2014-10-17 12:45:45 +02:00
Thomas Müller
93b0f1a3bf
adding cssmin and jssmin(minify)
...
adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content
adding repair step to clean the asset cache after upgrade + coding style adjustments
2014-10-17 12:22:26 +02:00
blizzz
688a141586
Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup
...
drastic ldap speedup (update)
2014-10-17 12:07:27 +02:00
Morris Jobke
f1a5ebd59d
Merge pull request #11611 from owncloud/fix-svg-master
...
Fix SVG icons
2014-10-17 12:01:27 +02:00
Lukas Reschke
af335a39f1
Add PHPDoc about sanitization of "insertIfNotExist"
...
Let's document this potential pitfall properly.
2014-10-17 11:06:49 +02:00
Jenkins for ownCloud
92f2914335
[tx-robot] updated from transifex
2014-10-17 01:58:25 -04:00
Lukas Reschke
53e0cf2f74
Add a try catch block
...
This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
2014-10-16 21:45:09 +02:00
Thomas Müller
f7097faf82
Special treatment for Oracle
2014-10-16 17:02:15 +02:00
Lukas Reschke
a37dcf94fd
Merge pull request #11591 from owncloud/addAppVersionToCSSandJS
...
Add app version to JS and CSS
2014-10-16 15:54:57 +02:00
Lukas Reschke
5f3ddf5c80
Merge pull request #11383 from ockham/share-tags2
...
Share tags
2014-10-16 15:36:04 +02:00
Thomas Müller
a04159090f
include the apps' versions hash to invalidate the cached assets
2014-10-16 13:29:51 +02:00
Lukas Reschke
4deb57bfae
Remove insane comment
2014-10-16 12:42:00 +02:00
Lukas Reschke
9cfbf7ed1c
Fix SVG icons
...
FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.
Conflicts:
lib/private/preview.php
2014-10-16 12:35:51 +02:00
blizzz
756f64d728
Merge pull request #11595 from owncloud/make_get_display_name_more_robust
...
strip whitespace from the beginning and end of the display name
2014-10-16 11:33:12 +02:00
Jörn Friedrich Dreyer
0254a3c406
make trashbin compatible with objectstore, replace glob with search in cache, make unknown free space work like unlimited free space
2014-10-16 10:15:43 +02:00
Jenkins for ownCloud
c8d8578d1a
[tx-robot] updated from transifex
2014-10-16 01:56:30 -04:00
Lukas Reschke
63e0599218
Merge pull request #11565 from owncloud/fix-behaviourOnOSX
...
Add darwin to if block
2014-10-15 21:12:50 +02:00
Lukas Reschke
f82b996f57
Merge pull request #11528 from owncloud/use-raw-url
...
Use `rawurlencode` since this seems to be expected by cURL
2014-10-15 19:58:27 +02:00
Jörn Friedrich Dreyer
c27fd94ec8
in cli mode return true for isHtaccessWorking
2014-10-15 16:59:28 +02:00
Thomas Müller
b091394a90
introduce new app page layout
...
filter installed and not-installed apps properly
kill unneeded file
load category 'Installed' on page load
adding documentation links
new apps mgmt: first style adjustment
apps mgmt: only show license and preview if they exist
adding buttons
new apps mgmt: fix for mobile
use app icon if available
new apps mgmt: position enable/disable toggle to the right
new apps mgmt: proper display of icons or previews
new apps mgmt: fix loading spinner
reenable group selection for apps
new apps mgmt: position enable button normally again
new apps mgmt: clarify wording from 'Installed' to 'Enabled'
reintroduce enable/disable
Move rating image path generation to client-side
Move expression outside of l10n
fix group handling
add buttons for 'More apps' and 'Add your app' again
disable changed date of app for now
adding recommended label
style 'Recommended' app tag
fixing php warning
sort by rating
adding meta-category 'Recommended'
Only show existing documentation links
lacy loading of screenshots
making group based app activation work again
adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'
adding app.svg for all core apps
query string '?installed' is not longer needed
update and uninstall is back + error feedback
remove unneeded parameter
fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
Bjoern Schiessle
239bff5766
strip whitespace from the beginning and end of the display name to avoid empty display names
2014-10-15 14:54:35 +02:00
Vincent Petry
6824a5ce7f
Merge pull request #11538 from owncloud/webdav-creatable-info
...
Use the cached fileinfo to get creatable permissions
2014-10-15 14:39:07 +02:00
Lukas Reschke
6ccda2ae98
Add app version to JS and CSS
...
This leads to the regeneration of the hash in case a single application is updated.
Fixes https://github.com/owncloud/core/issues/11374
2014-10-15 14:00:20 +02:00
Vincent Petry
6fa03870e9
Merge pull request #11541 from owncloud/usersession-activeuser-setsession
...
Unset the cached active user when using a different session object
2014-10-15 13:31:05 +02:00
Vincent Petry
4650101674
Merge pull request #11548 from owncloud/extstorage-ocfields
...
Allow specifying protocol in ext storage OC config
2014-10-15 13:27:23 +02:00
Lukas Reschke
1b3feb710d
Use `rawurlencode` since this seems to be expected by cURL
...
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
2014-10-14 13:16:23 +02:00
Lukas Reschke
bf84cd4bcc
Add darwin to if block
...
Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
2014-10-14 12:58:00 +02:00
Joas Schilling
0407bc0978
Set overwritemailurl* configs on setup
...
Correctly use overwritemailurl value when generating absolute urls in CLI
Fix #11500
Rename the config to *cli
Add overwrite.cli.url to the sample config
Revert separator fix, fixes unit test
2014-10-14 05:07:09 +02:00
goodkiller
9f0b99cd17
Update group.php
...
Here is fox for my LDAP users OW 7.0.2
2014-10-14 01:18:45 +03:00
Bernhard Reiter
b416f7d8ac
PHPDoc fixes as suggested by @MorrisJobke.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
1770179648
Add getTag() function for accessing of a single tag.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
bc265e8b52
Make loading of tags from DB more explicit.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
226d7233e1
In Tags::rename($from, $to), check if there already is a tag named $to.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
7e9baafc53
Add option to include tags for shared items.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
7963125c41
Remove two obsolete try...catch blocks.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
5471189fe6
Implement Tag and TagMapper classes.
...
Subclassed from \OCP\AppFramework\Db\Entity and Mapper,
respectively. This will allow us to also deal with shared tags.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
cf6fb2c2e4
Remove redundant null initializations.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
3e5d725502
Test addMultiple() with $sync=true.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
b33cb0e342
Fix a comment.
2014-10-14 00:06:07 +02:00
Vincent Petry
e95372bf01
Merge pull request #11546 from owncloud/users-deletewithfilecache
...
Retrieve storage numeric id earlier when still available
2014-10-13 17:27:13 +02:00
Vincent Petry
ab5149f5df
Allow specifying protocol in ext storage OC config
...
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-13 17:15:58 +02:00
Vincent Petry
d485c0098d
Retrieve storage numeric id earlier when still available
...
The numeric id is only available before the storage entry is deleted, so
get it at that time.
2014-10-13 15:52:48 +02:00
Bjoern Schiessle
c6c9a51b11
distinguish between file dependent shares and other shares
2014-10-13 15:04:54 +02:00
Robin Appelman
912fbfab01
Unset the cached active user when using a different session object
2014-10-13 13:11:48 +02:00
Robin Appelman
19de425a50
Use the cached fileinfo to get creatable permissions
2014-10-13 13:09:05 +02:00
Lukas Reschke
bf674487aa
Merge pull request #11367 from owncloud/removeIsMimeSupported
...
Remove uneeded slicing of element
2014-10-12 19:45:00 +02:00
Jenkins for ownCloud
a3635fedbb
[tx-robot] updated from transifex
2014-10-12 01:54:39 -04:00
Björn Schießle
87899db204
Merge pull request #11380 from owncloud/fix_performance_issue_sharing
...
[sharing] fix performance issues
2014-10-10 15:56:30 +02:00
Bjoern Schiessle
3431d547a9
fix performance issues
2014-10-10 12:16:26 +02:00
Vincent Petry
660e9c4012
Merge pull request #11501 from Ansud/master
...
Urlencode file name before passing it to cURL
2014-10-10 10:57:59 +02:00
Jenkins for ownCloud
2cc26c9022
[tx-robot] updated from transifex
2014-10-10 01:55:10 -04:00
Vincent Petry
9dea79e341
Merge pull request #11305 from owncloud/ext-updateetagonmount
...
Update etag of parent dir when adding/removing ext storage mount points
2014-10-09 18:18:36 +02:00
Vincent Petry
c82e310e20
Merge pull request #11495 from owncloud/apps-clearenableappscacheafterloadingauthapp
...
Clear enabled apps cache after loading authentication app
2014-10-09 17:20:05 +02:00
Lukas Reschke
16cd749065
Add support for keys in the info.xml
...
This allows to have links to different doc base URLs
a.
2014-10-09 15:48:30 +02:00
Tony Zelenoff
2d03019c91
Urlencode file name before passing it to cURL
...
Large file helper use cURL to determine file sizes. Thus filenames must be
urlencoded in case special symbols like '#' can cause BadRequest errors.
Signed-off-by: Tony Zelenoff <antonz@parallels.com>
2014-10-09 17:15:12 +04:00
Vincent Petry
36d22825e0
Clear enabled apps cache after loading authentication app
...
Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.
2014-10-09 14:34:41 +02:00
Jenkins for ownCloud
295c46ccb5
[tx-robot] updated from transifex
2014-10-09 01:55:33 -04:00
Jörn Friedrich Dreyer
3427976bb6
strict comparison
2014-10-08 18:49:55 +02:00
Jörn Friedrich Dreyer
aa3ad898a9
fix amazon s3 issues
...
folder size and mtime is always unknown in s3
more s3 fixes
make rescanDelay of root dir configurable, add on the fly update of legacy storage ids, !isset -> empty when checking strings
reduce number of http calls on remove and rmdir
fix typo
2014-10-08 18:49:47 +02:00
Robin Appelman
12ac3a800d
Expose getAppKeys trough \OCP\IConfig
2014-10-08 14:22:17 +02:00
Vincent Petry
6585eaa5df
Added failing unit tests for mount config hooks
2014-10-08 14:22:17 +02:00
michag86
8abe441d4a
cleanup group admin(s) on deleteGroup
2014-10-08 14:05:06 +02:00
michag86
ca58ac50a2
fix for issue #10880
2014-10-07 16:07:48 +02:00
Vincent Petry
d7db006315
Revert "fix for issue #10880"
...
This reverts commit 0df070a8e4
.
2014-10-07 15:54:25 +02:00
michag86
0df070a8e4
fix for issue #10880
2014-10-07 14:30:14 +02:00
Morris Jobke
6323d5fb3a
Merge pull request #11437 from owncloud/add-import-filter
...
Add CssImportFilter. More elegant fix for documents#348
2014-10-07 08:28:08 +02:00
Jenkins for ownCloud
01be0af209
[tx-robot] updated from transifex
2014-10-07 01:54:46 -04:00
Victor Dubiniuk
b6087ea79b
Add CssImportFilter. More elegant fix for documents#348
2014-10-06 19:39:02 +03:00
Morris Jobke
a6293a38f2
Merge pull request #11390 from Nemesiz/master
...
Preview large TXT files fix
2014-10-06 14:25:27 +02:00
Jenkins for ownCloud
6e991a53ec
[tx-robot] updated from transifex
2014-10-06 01:54:57 -04:00
Olivier Paroz
b0000800e1
New generic class for Imagemagick conversions
2014-10-04 17:50:12 +02:00
Nmz
83c2829ca8
Preview large TXT files fix
...
Limit the size of the string generating the preview image for TXT files
2014-10-02 12:47:39 +03:00
Jenkins for ownCloud
553274b28f
[tx-robot] updated from transifex
2014-10-01 06:56:17 -04:00
Lukas Reschke
e762ff2bbd
Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain
...
Redirect only to absolute URL
2014-10-01 12:47:43 +02:00
Lukas Reschke
cbecd62287
Merge pull request #11303 from owncloud/addFilelockToConfig
...
Add flock to config
2014-10-01 10:43:18 +02:00
Morris Jobke
5beeb923e6
Merge pull request #11365 from owncloud/fix-phpdoc
...
Fix PHPDoc
2014-09-30 16:15:37 +02:00
Morris Jobke
e881be7926
Merge pull request #11366 from owncloud/invalid-doc
...
Remove invalid PHPDoc
2014-09-30 16:12:58 +02:00
Lukas Reschke
68cf6681e5
Add flock to config
...
This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070
Testplan:
- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation
Only skip the main config
Otherwise read only additional configs might not be processed
Test on tmpdir
2014-09-30 15:53:27 +02:00
Lukas Reschke
96d9e0eb5b
Remove uneeded slicing of element
...
The "*/*" provider has been removed. This is therefore not needed anymore and leads to unexpected bugs.
Please notice that this is only relevant for master.
2014-09-30 14:08:43 +02:00
Lukas Reschke
67f8875f47
Remove invalid PHPDoc
...
Despite the documentation this function does not read values from the cookie
2014-09-30 13:46:43 +02:00
Lukas Reschke
b4944ffcc5
Fix PHPDoc
2014-09-30 13:34:50 +02:00
Jenkins for ownCloud
5292a14cdf
[tx-robot] updated from transifex
2014-09-30 01:55:11 -04:00
Lukas Reschke
8c8e5c168e
Merge pull request #10107 from owncloud/sharing_group_shares
...
[sharing] group shares
2014-09-29 20:26:41 +02:00
Lukas Reschke
41374986d3
Remove dead code
2014-09-29 17:20:29 +02:00
Lukas Reschke
6e7365fc17
Redirect only to absolute URL
...
We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
2014-09-29 17:07:43 +02:00
Bjoern Schiessle
6e7acb8ae0
some small fixed, suggested by scrutinizer
2014-09-29 11:23:18 +02:00
Jenkins for ownCloud
63726ea9e2
[tx-robot] updated from transifex
2014-09-29 01:54:33 -04:00
Jenkins for ownCloud
84923475c0
[tx-robot] updated from transifex
2014-09-28 01:55:09 -04:00
Jenkins for ownCloud
3a16b1bb68
[tx-robot] updated from transifex
2014-09-27 01:54:48 -04:00
Bjoern Schiessle
2a4da7fe09
on unshare only unshare childrens if there is no other parent available
2014-09-26 16:58:47 +02:00
Lukas Reschke
53f6d74938
Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master
...
catch and log exception in OC_Helper::cleanTmp()
2014-09-26 14:31:31 +02:00
Bjoern Schiessle
e115a7043f
only create a new share entry, if the user needs a different target name than the group share
2014-09-26 13:19:15 +02:00
Bjoern Schiessle
ed85055d31
for group shares we don't need a extra db entry of groupTarget equals itemTarget
2014-09-26 13:10:31 +02:00
Bjoern Schiessle
d242e518f9
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
2014-09-26 13:01:54 +02:00
Thomas Müller
4c08215e66
catch and log exception in OC_Helper::cleanTmp()
2014-09-26 11:36:53 +02:00
Thomas Müller
e5a111b80e
Merge pull request #11285 from owncloud/dav-permissions-create
...
Fix dav permissions for folders
2014-09-26 09:21:32 +02:00
Jenkins for ownCloud
1631937990
[tx-robot] updated from transifex
2014-09-26 01:54:59 -04:00
Robin Appelman
6365c57b04
Merge pull request #11282 from owncloud/scanner-memory-stable7
...
Don't keep the full info of all children in memory
2014-09-25 15:53:33 +02:00
Vincent Petry
9fc23e1967
Merge pull request #10934 from owncloud/datadir-write-setup
...
Don't complain about non-writable datadirs before we're installed
2014-09-25 14:32:32 +02:00
Bjoern Schiessle
52b6469b0c
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible
2014-09-25 14:26:31 +02:00
Robin Appelman
10c350b895
Fix dav permissions for folders without create permissions
2014-09-25 14:01:19 +02:00
Robin Appelman
ccb4475a8d
Expose creatable permissions trough fileinfo
2014-09-25 14:00:13 +02:00
Bjoern Schiessle
968152113e
always select permissions, used in getItems()
2014-09-25 12:35:11 +02:00
Bjoern Schiessle
d5fc011c90
some small fixes
2014-09-25 11:29:57 +02:00
Jenkins for ownCloud
f46e49529f
[tx-robot] updated from transifex
2014-09-25 01:55:32 -04:00
Lukas Reschke
cb002c1f6b
Clarify possible preview providers for type Office
...
a
2014-09-24 21:21:39 +02:00
Thomas Müller
17f97ea2ca
Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON
...
Show login again instead of JSON if CSRF check fails
2014-09-24 17:51:12 +02:00
Robin Appelman
f88021dbbc
Don't keep the full info of all children in memory
2014-09-24 15:44:56 +02:00
Lukas Reschke
3da6b3b533
Merge pull request #11229 from kofemann/for-upstream
...
user/backed: use pow of two for backed action constants
2014-09-24 15:19:11 +02:00
Bjoern Schiessle
07d43df713
only add a new row if it isn't a unique share, otherwise update the existing row
2014-09-24 14:02:02 +02:00
Bjoern Schiessle
a6cc810349
mark exclude list as deprecated. It neither used by the files app nor by the
...
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
2014-09-24 14:02:02 +02:00
Bjoern Schiessle
9f7b15582a
fix add user to group to work with grouped shares
2014-09-24 14:02:01 +02:00
Bjoern Schiessle
bd268c35f5
generateTarget() will always find a unique target
2014-09-24 14:02:01 +02:00
Jenkins for ownCloud
5ff5b7386f
[tx-robot] updated from transifex
2014-09-24 01:56:46 -04:00
Lukas Reschke
75e45ac786
Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
...
Do not show exception to the end-user - use a proper error page instead
2014-09-23 18:36:40 +02:00
Vincent Petry
89e02e89d4
Merge pull request #7051 from owncloud/postsetupajaxcheck
...
Moved WebDAV check to client side JS
2014-09-23 16:55:16 +02:00
Tigran Mkrtchyan
276f50a1ba
user/backed: use pow of two for backed action constants
...
the current implementation limits number of possible backed actions
to 8 as it uses pow of 16 for constants. This change introduces pow
of two and allows up-to 32 actions to be defined.
The old values are preserved for backward compatibility.
2014-09-23 15:18:01 +02:00
Lukas Reschke
4893d2c0ed
Show login again instead of JSON if CSRF check fails
...
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.
With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.
This can be tested by opening the login page, then clearing the cookies, and trying to login.
2014-09-23 14:55:08 +02:00
Thomas Müller
c587a4aaa2
Merge pull request #11222 from owncloud/store-users-timezone-master
...
send browsers timezone back tp the server on login
2014-09-23 13:45:21 +02:00
Thomas Müller
42fe0b9e08
Merge pull request #11241 from owncloud/use-lower-case
...
Use only lower-case letters
2014-09-23 12:16:58 +02:00
Lukas Reschke
5d977f97b0
Merge pull request #11032 from owncloud/harden-redirect
...
Do only follow HTTP and HTTPS redirects
2014-09-23 11:34:44 +02:00
Vincent Petry
e65ceb08fc
Moved WebDAV and internet checks to client side JS
...
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
server
2014-09-23 11:16:14 +02:00
Vincent Petry
fc42a64e6c
Merge pull request #11226 from owncloud/kill-postsetupcheck-master
...
remove post setup check
2014-09-23 10:33:50 +02:00
Jenkins for ownCloud
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -04:00
Thomas Müller
37a5bff155
Merge pull request #11227 from owncloud/fix-windows-path
...
fixing directory seperators
2014-09-23 07:38:23 +02:00
Morris Jobke
f970c81b1e
Merge pull request #11215 from owncloud/dav-throwwhendeletefailed
...
WebDAV now throws 403 when deletion did not work
2014-09-23 00:49:30 +02:00
Morris Jobke
051ed93e24
Merge pull request #11211 from owncloud/previewProviderSwitch
...
Add a configuration switch for enabled preview mimetypes
2014-09-23 00:45:59 +02:00
Lukas Reschke
1565d82b81
Use only lower-case letters
...
Fixes https://github.com/owncloud/core/issues/11239
2014-09-22 21:29:03 +02:00
Lukas Reschke
6eeb905871
Do only follow HTTP and HTTPS redirects
...
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)
Get final redirect manually using get_headers()
Migrate to HTTPHelper class and add unit tests
2014-09-22 20:02:32 +02:00
Thomas Müller
21412559df
remove post setup check
2014-09-22 19:43:55 +02:00
Bjoern Schiessle
9105e17307
unit tests for grouping of shares pointing to the same source
2014-09-22 17:54:47 +02:00
Bjoern Schiessle
89c3b650e6
group shares and combine permissions
2014-09-22 17:25:15 +02:00
Morris Jobke
9e8d2907e2
Merge pull request #11204 from owncloud/fix_oc_stream_seek
...
Fix oc stream seek
2014-09-22 16:25:07 +02:00
Clark Tomlinson
db72270acc
fixing directory seperators
2014-09-22 10:13:46 -04:00
Lukas Reschke
ca3447fcde
Add a configuration switch for enabled preview mimetypes
2014-09-22 16:09:08 +02:00
Thomas Müller
814114ab8e
enhance formatDate function to accept an optional argument containing the time zone
2014-09-22 15:03:28 +02:00
Morris Jobke
831d34f084
Merge pull request #11210 from owncloud/issue/11209
...
Also match routes without trailing slash for files app
2014-09-22 14:04:20 +02:00
Thomas Müller
bb18fe1384
send browsers timezone back tp the server on login
2014-09-22 14:01:45 +02:00
Vincent Petry
470c25eff4
WebDAV now throws 403 when deletion did not work
...
Assume a permission issue whenever a file could not be deleted.
This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.
2014-09-22 13:15:17 +02:00
blizzz
b8a1340538
Merge pull request #9225 from voxsim/fix_displayNamesInGroup
...
fix in displayNamesInGroup
2014-09-22 12:13:15 +02:00
Jörn Friedrich Dreyer
f83689e1be
in quota wrapper use === instead of ! for better readability and as in other wrappers
2014-09-22 11:35:42 +02:00
Jörn Friedrich Dreyer
561a7e47cd
return boolean in Ciose::stream_seek
2014-09-22 11:33:55 +02:00
Joas Schilling
71bec60b92
Also match routes without trailing slash
...
Fix #11209
2014-09-22 11:22:33 +02:00
Jörn Friedrich Dreyer
b752cb98d8
return boolean in OC::stream_seek
2014-09-22 11:20:15 +02:00
Thomas Müller
b1d0a0f3bf
Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard
...
Append port to trusted domain in case it's not 80 or 443
2014-09-22 10:04:02 +02:00
Thomas Müller
8abf786af9
Merge pull request #10499 from owncloud/mkcol-headers-afterbind
...
Use afterBind to send fileId header for files and directories
2014-09-22 10:02:03 +02:00
Jenkins for ownCloud
5aaf8dcc01
[tx-robot] updated from transifex
2014-09-22 01:54:36 -04:00
Morris Jobke
154e848ce2
Merge pull request #11199 from owncloud/delete_bogus_previews
...
Delete bogus cached previews while updating
2014-09-21 22:48:21 +02:00
Georg Ehrke
071e4bfc06
make sure preview prop is instanceof OC_Image before using it in showPreview
2014-09-21 17:30:29 +02:00
Georg Ehrke
ab2554e013
delete old previews
2014-09-21 17:16:21 +02:00
Morris Jobke
69726d951e
Merge pull request #11196 from owncloud/sqlite-migration-smallint-master
...
adding 'smallint unsigned' to type mapping for sqlite
2014-09-21 11:13:58 +02:00
Jenkins for ownCloud
a1c39f74b7
[tx-robot] updated from transifex
2014-09-21 01:54:29 -04:00
Thomas Müller
7537d405e3
adding 'smallint unsigned' to type mapping for sqlite
2014-09-20 20:06:44 +02:00
Jenkins for ownCloud
e55c4bb807
[tx-robot] updated from transifex
2014-09-20 01:54:34 -04:00
Morris Jobke
463dd44d6d
Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor
...
Throw error in showPreview instead the constructor
2014-09-19 21:39:30 +02:00
Lukas Reschke
4c6bad7f71
Merge pull request #11158 from owncloud/fix_basic_auth
...
Move BasicAuth check to isLoggedIn
2014-09-19 13:39:13 +02:00
Lukas Reschke
6869d2e82a
Throw error in showPreview instead the constructor
...
This function is also used in a way such as:
```
$preview = new \OC\Preview(\OC_User::getUser(), 'files');
$info = \OC\Files\Filesystem::getFileInfo($file);
if (!$always and !$preview->isAvailable($info)) {
\OC_Response::setStatus(404);
} else {
$preview->setFile($file);
$preview->setMaxX($maxX);
$preview->setMaxY($maxY);
$preview->setScalingUp($scalingUp);
$preview->setKeepAspect($keepAspect);
}
```
Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.
2014-09-19 13:26:41 +02:00
Vincent Petry
437f8c3cd5
Merge pull request #11119 from owncloud/removeOldUpgradeRoutines
...
Remove old upgrade routines
2014-09-19 12:23:42 +02:00
Vincent Petry
f0186d99d2
Merge pull request #11163 from owncloud/check-for-updates-between-major-versions
...
Prevent updates between multiple major versions
2014-09-19 12:20:22 +02:00
Robin Appelman
33f7af9207
Merge pull request #10958 from owncloud/db-ilike
...
Introduce cross-db ILIKE
2014-09-19 12:07:56 +02:00
Jenkins for ownCloud
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
Lukas Reschke
a71af58535
Prevent updates between multiple major versions
...
Ref https://github.com/owncloud/core/issues/11078
2014-09-18 17:56:06 +02:00
voxsim
7a14f94ae5
1. remove sizeof($filteredUsers) > 0 as condition
...
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;
2014-09-18 17:50:19 +02:00
Lukas Reschke
d0d3b7457b
Move BasicAuth check to "isLoggedIn()"
...
Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.
2014-09-18 16:14:07 +02:00
Lukas Reschke
a543807d85
Merge pull request #11151 from owncloud/removeOverflowingFunction
...
Remove unused and overflowing function
2014-09-18 15:42:36 +02:00
Robin Appelman
a85f0ae2da
Fix ILIKE without wildcards for oracle
2014-09-18 15:09:57 +02:00
Lukas Reschke
f0bf46b080
Merge pull request #11130 from owncloud/moveBasicAuthCheck
...
Move basic auth check
2014-09-18 14:40:42 +02:00
Robin Appelman
c8dbdc29d0
Check for writable datadir during setup
2014-09-18 14:15:52 +02:00
Robin Appelman
23dd7cb51d
Don't complain about non-writable datadirs before we're installed
2014-09-18 13:33:13 +02:00
Robin Appelman
6fa3280c2a
Inject config into checkserver and cleanup tests
2014-09-18 13:33:13 +02:00
Lukas Reschke
d07d5915c9
Remove unused and overflowing function
...
Resolves https://github.com/owncloud/core/issues/10991 failure 4
2014-09-18 10:21:28 +02:00
Morris Jobke
c89c6ed21d
Merge pull request #11143 from owncloud/improve-404
...
Make 404 page easier to understand
2014-09-18 09:10:16 +02:00
Jenkins for ownCloud
dd6b0b1319
[tx-robot] updated from transifex
2014-09-18 01:54:39 -04:00
Lukas Reschke
8fc1a9f5a9
Make 404 page easier to understand
...
Fixes https://github.com/owncloud/core/issues/11133
2014-09-17 22:57:32 +02:00
Remco Brenninkmeijer
f930b356e6
Error needs to push body-id for new guest layout
2014-09-17 18:02:18 +02:00
Lukas Reschke
ef0a0f5f87
Merge pull request #9554 from owncloud/fix_preview_orientation
...
fix orientation in image-backend, not in preview system itself
2014-09-17 17:05:47 +02:00
Robin Appelman
0c03b2bdd5
Use ILIKE in cache search
2014-09-17 16:12:54 +02:00
Lukas Reschke
c19bc1917b
Move basic auth check
...
At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.
Fixes https://github.com/owncloud/core/issues/11129
2014-09-17 16:04:12 +02:00
Lukas Reschke
c88d517e88
Merge pull request #10622 from owncloud/recursive-delete-forbidden
...
Fix isDeletable
2014-09-17 15:36:41 +02:00
Robin Appelman
67b1ec1faf
Implement ILIKE for sqlite
2014-09-17 13:47:55 +02:00
Robin Appelman
60587e9dcd
Make sqlite LIKE case sensitive on default
2014-09-17 13:47:33 +02:00
Morris Jobke
c6eab9aaba
fix error message template
2014-09-17 13:25:50 +02:00
Lukas Reschke
6d3757f864
Do not show exception to the end-user
...
Log the error instead of potentially leaking sensitive information
2014-09-17 13:17:52 +02:00
Morris Jobke
b644e8a5e7
Merge pull request #10932 from owncloud/issue/10926
...
Add a method to get the absolute url for a route
2014-09-17 13:05:26 +02:00
Lukas Reschke
33c0d2f743
Fix mapping of relative paths
2014-09-17 11:38:10 +02:00
Robin Appelman
2f22e67570
Also check if the file itself is updatable
2014-09-17 11:35:16 +02:00
Robin Appelman
d25a9a118f
Check if a folder is deletable before we try to recursively delete it
2014-09-17 11:35:16 +02:00
Robin Appelman
ab79caf29b
Check if the parent is writable to check if a file is deletable
2014-09-17 11:35:16 +02:00
Lukas Reschke
0d37e16499
Merge pull request #11092 from owncloud/conceal_sabredav_version
...
Conceal or display SabreDAV version number.
2014-09-17 10:35:50 +02:00
Lukas Reschke
2cfa07049f
Remove old upgrade routines
...
We do not support updates from 6 to 8 directly, therefore we can remove those upgrade routines.
2014-09-16 20:27:52 +02:00
Lukas Reschke
368391e401
Merge pull request #11009 from owncloud/tobiasKaminsky-route
...
REST API for thumbnails
2014-09-16 19:31:51 +02:00
Lukas Reschke
4ebc11aa8d
Merge pull request #11102 from owncloud/visit1985-issue_108
...
mysql setup: if dbuser exists try a different one (owncloud/core#108 )
2014-09-16 18:54:37 +02:00
Lukas Reschke
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Thomas Müller
ba445e85b2
Merge pull request #11082 from owncloud/deduplicateDependencyCheck
...
Deduplicate dependency checks
2014-09-16 16:33:02 +02:00
Lukas Reschke
2f10b60c9e
Merge pull request #10754 from cetra3/master
...
Refactor internal session handler to write directly to $_SESSION
2014-09-16 15:48:19 +02:00
Thomas Müller
ca35d86c5a
adding ILIKE to AdapterSQLSrv
2014-09-16 15:44:21 +02:00
Robin Appelman
1771bfc2f2
Introduce cross-db ILIKE
2014-09-16 15:32:34 +02:00
tobiasKaminsky
e62d5b7e55
Route for thumbnail generation
...
Thumbnail generation
Removed Log
Added requested changes
Added requested changes.
- Fix code style
- Add exception if file does not exist
- Switch route styling
Replaces https://github.com/owncloud/core/pull/10805
Fix codestyle
Fix codestyle
Migrate to appframework
Fix typo
2014-09-16 15:00:58 +02:00
Lukas Reschke
261d07c95c
Merge pull request #11084 from owncloud/no-migration-for-mssql-master
...
Disable database migrations for MSSQL - scripts have to be applied manua...
2014-09-16 14:00:24 +02:00
scolebrook
f31e4066de
Conceal or display SabreDAV version number in browser and http response headers.
2014-09-16 13:25:44 +02:00
Lukas Reschke
5813cf32dc
Deduplicate dependency checks
...
Some code that I also used for https://github.com/owncloud/administration/pull/11
2014-09-16 13:07:47 +02:00
Michael Göhler
e6609d0970
simplify mysql user creation flow
...
if dbuser exists try a different one, owncloud/core#108
changed outdated comment
corrected length calculation
changed indentation for else clauses
2014-09-16 11:53:54 +02:00
Morris Jobke
dd70d1b88c
Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc
...
Fix unexisting class and PHPDoc
2014-09-16 10:29:01 +02:00
Morris Jobke
af52ffc5d5
Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect
...
add y to with-aspect naming schema
2014-09-16 08:36:33 +02:00
Morris Jobke
245a0e2ad8
Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
...
Preserve transparency when loading from a file
2014-09-16 08:33:56 +02:00
voxsim
1366133d2b
add more logic in displayNamesInGroup for big user bases
2014-09-15 18:37:54 +02:00
Lukas Reschke
627252fe81
Merge pull request #11060 from owncloud/rmobslang
...
remove obsolete language files
2014-09-15 17:31:10 +02:00
Lukas Reschke
4f0f7e35ca
Fix unexisting class and PHPDoc
...
You can't add int here as hint...
2014-09-15 17:08:56 +02:00
Morris Jobke
06eb3b62c6
Merge pull request #10109 from owncloud/issue_#9793_guestlayout
...
Step one, open guest layout for different styles.
2014-09-15 15:15:41 +02:00
Georg Ehrke
cf76933b76
add phpdoc
2014-09-15 15:10:03 +02:00
Georg Ehrke
3157d307f7
add y to with-aspect naming schema
2014-09-15 15:10:03 +02:00
Thomas Müller
d824d03fe1
Disable database migrations for MSSQL - scripts have to be applied manually
2014-09-15 15:00:32 +02:00
Lukas Reschke
07b14bcd4f
Merge pull request #10960 from owncloud/use-intl-module-master
...
use intl's native normalizer_normalize() in case the module is available
2014-09-15 14:13:30 +02:00
Volkan Gezer
5d1fa60e0d
remove obsolete language files
2014-09-13 15:29:11 +02:00
Raghu Nayyar
1145529584
Merge pull request #11041 from owncloud/no-size-check-on-lock-master
...
content size checks are not valid for LOCK
2014-09-13 00:48:52 +05:30
Clark Tomlinson
cfd8b3f976
Merge pull request #11043 from owncloud/test-againstNull
...
Return false in case the passed values are not of type string
2014-09-12 09:42:42 -04:00
Lukas Reschke
5ff999d69d
Return false in case one of the values is null
2014-09-12 13:34:45 +02:00
Thomas Müller
27cd30aa94
content size checks are not valid for LOCK
2014-09-12 09:42:32 +02:00
Jenkins for ownCloud
d6834b6389
[tx-robot] updated from transifex
2014-09-12 03:28:56 -04:00
Thomas Müller
4878f7a416
Merge pull request #11006 from owncloud/addCustomHex2BinImplementationBecauseSupporting53IsSomethingReallyReallyCoolAndWeAreObviouslySomeOfTheCoolGuys
...
Add custom hex2bin implementation for 5.3
2014-09-11 15:05:36 +02:00
Lukas Reschke
7d2c521b46
Step one, open guest layout for different styles.
...
Conflicts:
core/templates/layout.guest.php
Step one, open guest layout for different styles.
2014-09-11 11:41:02 +02:00
Lukas Reschke
8d7926543b
Merge pull request #3937 from owncloud/refresh_if_maintenance_is_over
...
Refresh if maintenance mode is over
2014-09-11 11:34:39 +02:00
Thomas Müller
59209e0f2b
use intl's native normalizer_normalize() in case the module is available
2014-09-11 10:24:31 +02:00
Lukas Reschke
bfebbe47de
Merge pull request #10962 from owncloud/repair_search_lucene
...
repair search lucene before installing
2014-09-11 10:09:43 +02:00
Lukas Reschke
1973275adc
Add custom hex2bin implementation for 5.3
...
Fixes https://github.com/owncloud/core/issues/11004
2014-09-11 09:51:45 +02:00
Jenkins for ownCloud
0dcd8079dc
[tx-robot] updated from transifex
2014-09-11 01:54:41 -04:00
kondou
18ef7bf1ed
Preserve transparency when loading from a file
...
Fix #7148 - again :)
2014-09-10 23:49:21 +02:00
Thomas Müller
2a382a87d5
Merge pull request #10988 from owncloud/usetransactions-wrong-name
...
Fix method name useTransactions
2014-09-10 17:27:23 +02:00
Robin Appelman
fa2b385d33
Fix method name
2014-09-10 15:59:24 +02:00
Vincent Petry
70ebe86e60
Merge pull request #10929 from owncloud/issue/10514
...
Set overwritewebroot when installing owncloud to avoid problems
2014-09-10 15:07:57 +02:00
Jörn Friedrich Dreyer
8e2acb1482
repair search lucene before installing
2014-09-10 10:22:40 +02:00
Bernhard Posselt
ba698a4942
Merge pull request #10972 from ppaysant/routes-defaults
...
Allow default values for route parameters.
2014-09-09 23:40:46 +02:00
Lukas Reschke
c3d90b96c8
Merge pull request #10922 from owncloud/explicit-scan-transactions
...
Use bigger transactions when doing explicit file system scans
2014-09-09 23:32:32 +02:00
Patrick Paysant
cb5416b798
Allow default values for route parameters.
2014-09-09 23:00:29 +02:00
kondou
69f2c0544e
Refresh if maintenance mode is over
...
Using status.php for this.
I modified status.php to also show, whether we're in maintenance.
Checks every 20 seconds if maintenance is over, if yes: reload.
2014-09-09 17:26:11 +02:00
Bernhard Posselt
023e066971
more sugar for including lists of templates
2014-09-09 15:47:42 +02:00
Bernhard Posselt
d02f6c7ebe
Merge pull request #10947 from owncloud/html-imports
...
add template functions for html imports
2014-09-09 14:07:46 +02:00
Jörn Friedrich Dreyer
3d4f77c8f1
Merge pull request #10949 from owncloud/allow_prefilling_login
...
allow prefilling login
2014-09-09 11:42:14 +02:00
Lukas Reschke
353155b516
Merge pull request #7323 from owncloud/Jonny007-MKD-master
...
Update adapter.php
2014-09-09 11:31:50 +02:00
Jörn Friedrich Dreyer
ed2414fd0d
Merge pull request #10886 from owncloud/keep_fileid_on_move_in_objectstore
...
Keep fileid on move in objectstore, fixes #10848
2014-09-09 10:25:10 +02:00
Jenkins for ownCloud
317e6d03b4
[tx-robot] updated from transifex
2014-09-09 01:55:47 -04:00
VicDeo
efd485acda
Merge pull request #10858 from owncloud/issue/10847
...
Use correct language package so the subject is correctly translated
2014-09-09 01:11:34 +03:00
Vincent Petry
a9a3f17b35
Merge pull request #10927 from owncloud/update-nosetupbackends
...
Do not load extra user backends when an upgrade is due
2014-09-08 22:57:15 +02:00
Jörn Friedrich Dreyer
0aad7fa1b1
allow prefilling login
2014-09-08 21:44:13 +02:00
Bernhard Posselt
f685d03674
append .html since componets always use html files
2014-09-08 21:37:18 +02:00
Bernhard Posselt
4aff85cd0c
add template functions for html imports
2014-09-08 21:19:44 +02:00
Lukas Reschke
70abce0482
Merge pull request #10739 from owncloud/eventsource-public
...
Add EventSource to the public API
2014-09-08 18:46:27 +02:00
Lukas Reschke
c79c894dbb
Merge pull request #10755 from owncloud/shorter_sharing_links
...
Shorter sharing links
2014-09-08 17:26:20 +02:00
Lukas Reschke
2d847934ed
Merge pull request #10938 from owncloud/useSecureMimetype
...
Use secure mimetype for content delivery
2014-09-08 17:13:54 +02:00
Lukas Reschke
5de404eb92
Merge pull request #10827 from oparoz/patch-2
...
Libreoffice config folder needs to be set
2014-09-08 16:41:26 +02:00
Lukas Reschke
fa718d2e2c
Fix typo
2014-09-08 16:34:03 +02:00
Lukas Reschke
0cdfe4f8c2
Merge pull request #10911 from owncloud/template-funcs
...
Add template shortcut functions for style and script
2014-09-08 16:32:05 +02:00
Lukas Reschke
2590a4dc85
Append port to trusted domain in case it's not 80 or 443
...
Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059
2014-09-08 16:15:31 +02:00
Lukas Reschke
312ed18d15
Use secure mimetype for content delivery
...
Adds some hardening against potential CSP bypassed.
2014-09-08 15:57:39 +02:00
Joas Schilling
c5b5378558
Add a method to get the absolute url for a route
...
Fix #10926
2014-09-08 14:43:14 +02:00
Joas Schilling
249558966e
Set overwritewebroot when installing owncloud to avoid problems
...
Fix #10514
2014-09-08 14:30:13 +02:00
Robin Appelman
644755df66
Use bigger transactions when doing explicit file system scans
2014-09-08 14:15:41 +02:00
Vincent Petry
d6bfd90bf8
Do not load extra user backends when an upgrade is due
...
Whenever an upgrade is due, do not load extra user backends
2014-09-08 12:30:04 +02:00
Vincent Petry
637cff68ac
Merge pull request #10862 from chli1/master
...
fix BadRequest error if CONTENT_LENGTH not set
2014-09-08 10:00:15 +02:00
cetra3
459ead69f6
Merge branch 'master' of https://github.com/owncloud/core
2014-09-08 15:05:49 +09:30
Bernhard Posselt
7e4d244200
add shortcut functions for style and script
2014-09-06 14:25:28 +02:00
Lukas Reschke
f5951b2254
Merge pull request #10889 from owncloud/moveTrustedDomainCheck
...
Move trusted domain check to init()
2014-09-05 17:39:37 +02:00
Lukas Reschke
c9afa60f62
Move trusted domain check to init()
...
handleRequest() is not called from remote.php or public.php which made these files party available but all included apps in there produced errors.
As the expected behaviour is anyways that a trusted domain warning is shown I moved this to init()
Fixes https://github.com/owncloud/core/issues/10064
2014-09-05 14:10:35 +02:00
Jörn Friedrich Dreyer
8488be4d03
Keep fileid on move in objectstore, fixes #10848
2014-09-05 13:25:59 +02:00
Robin Appelman
e29b7e9335
Remove explicit propagate calls
2014-09-05 11:53:24 +02:00
Robin Appelman
d0e83a71aa
Update cache before post hooks
2014-09-05 11:53:24 +02:00
Robin Appelman
1d8a88dd1b
Fix warning in homecache
2014-09-05 11:53:23 +02:00
Robin Appelman
850542c5d6
Refactor Cache\Updater to work outside of the users home
2014-09-05 11:53:23 +02:00
Jenkins for ownCloud
0736a6695e
[tx-robot] updated from transifex
2014-09-05 01:54:39 -04:00
kondou
ecc9b42e41
Match \OC_Helper::linkToPublic() to new links and fit unittests
2014-09-04 20:44:50 +02:00
kondou
a10411d2bc
Readd TOKEN_LENGTH
2014-09-04 19:09:26 +02:00
Jesus Macias Portela
523680cef2
Merge pull request #10840 from owncloud/issue_10674
...
Solve bug with touch always return true on /lib/private/files/view.php
2014-09-04 17:29:08 +02:00
kondou
226b203e20
Use base62 and remove configuration options for link length
2014-09-04 16:20:20 +02:00
kondou
c2d8eabd71
Change config.sample entry and use MediumSecurity
2014-09-04 15:52:23 +02:00
kondou
3bf725d7e0
Adapt token size to new generation and add an option for free length specification
...
Minimum size is 3 = 46656 tokens, maximum size is 64, which is what our DB allows.
2014-09-04 15:24:33 +02:00
kondou
2a4c51389c
Use a route instead of s.php and convert tokens asap
2014-09-04 15:23:55 +02:00
kondou
0f2ad9862e
Initial work on shorter links
2014-09-04 15:23:53 +02:00
Lukas Reschke
1a7df33233
Merge pull request #10818 from owncloud/enableappforgroupfix
...
Fix upgrade process when apps enabled for specific groups
2014-09-04 13:56:41 +02:00
chli1
712487c861
fix BadRequest error if CONTENT_LENGTH not set
...
If client does not send content length header on webdav upload (e.g. because the content comes from a stream and its length is not predictable) the put() method should not try to compare the content length value with the actually amount of received data, because this will always fail and results in a BadRequest exception. So the check will only be performed if $_SERVER['CONTENT_LENGTH'] is set.
2014-09-04 13:49:15 +02:00
Robin Appelman
fa3393674c
Better phpdoc and method naming
2014-09-04 13:26:51 +02:00
Robin Appelman
8605e2e6a5
Explicitly cast id and validate type
2014-09-04 13:26:47 +02:00
Olivier Paroz
bbc2d7cf4f
Typ in whichOpenOffice test
2014-09-04 12:54:20 +02:00
Joas Schilling
a0e8e88bc6
Use correct language package so the subject is correctly translated
...
Fix #10847
2014-09-04 11:23:23 +02:00
Lukas Reschke
8fec19a872
Merge pull request #10790 from cbhp/master
...
added missing User-Agents
2014-09-03 22:40:12 +02:00
Jesus Macias
91c8174013
Fix code with previous comments
2014-09-03 18:21:24 +02:00
Jesus Macias
883649b69c
Reset changes on 3rdparty submodule
2014-09-03 18:20:09 +02:00
cbhp
c00450b2c7
always use a user-agent constant
...
Some providers block connections with missing user-agents. Also
user-agents are useful for analyzing requests. I've added a USER_AGENT
constant that is used in cURL and in file_get_contents.
2014-09-03 18:00:05 +02:00
Lukas Reschke
63a90a129b
Use proper RNG generator
...
OC_Util::generateRandomBytes() only returns lowercase alphanumeric values.
We should use the new RNG which has a broader characterset.
2014-09-03 17:46:48 +02:00
Lukas Reschke
26f337d523
Only return lowercase letters and digits for backwards compatbility
2014-09-03 17:18:00 +02:00
Thomas Müller
954925eaa0
Merge pull request #10667 from pmjdebruijn/itunes-appid
...
defaults: add customizable defaultiTunesAppId
2014-09-03 16:26:20 +02:00
Olivier Paroz
eaab067716
env:UserInstallation was already there in master
...
My changes were made against stable7 and I merged them to the file in master, so this version is now the properly merged file for master.
I'm just adding `owncloud-<instanceid>` to the path where temp files are stored.
2014-09-03 16:08:40 +02:00
Lukas Reschke
373d1c5e9f
Merge pull request #10642 from owncloud/securityutils
...
Add some security utilities
2014-09-03 15:28:42 +02:00
Clark Tomlinson
d64cacec43
Merge pull request #10826 from oparoz/master
...
Adding TIFF support to the files app
2014-09-03 09:14:35 -04:00
Clark Tomlinson
0400f7845c
Merge pull request #10723 from owncloud/webdav-folder-size
...
adding new webdav property containing the folder size
2014-09-03 09:07:23 -04:00
Lukas Reschke
dcea6de26a
Fix quoting
2014-09-03 14:16:55 +02:00
Lukas Reschke
a54af89d8a
Add test for the second argument
2014-09-03 14:13:12 +02:00
Robin Appelman
65608d7c92
Use the public api to get event sources
2014-09-03 13:36:15 +02:00
Robin Appelman
dad53180bc
Add event source to the public api
2014-09-03 13:36:15 +02:00
Robin Appelman
54c918fe48
Initialize an event source when we start using it, not in the constructor
2014-09-03 13:35:04 +02:00
Olivier Paroz
3bf155e138
This is not a PDF, there are no pages
2014-09-03 12:32:59 +02:00
Lukas Reschke
20a7fb0334
Fix CHAR_SYMBOLS
2014-09-03 12:22:21 +02:00
Thomas Müller
6cdb1d89ae
Merge pull request #10761 from canadaduane/fix_occ_upgrade
...
Ensure db connection before changing cache state
2014-09-03 11:27:16 +02:00
Thomas Müller
52dc31e13c
Merge pull request #10725 from owncloud/sabredav-etag-master
...
adding OC-ETag header
2014-09-03 11:21:47 +02:00
Lukas Reschke
77c0adb520
Merge branch 'securityutils' of https://github.com/owncloud/core into securityutils
2014-09-03 11:04:49 +02:00
Lukas Reschke
50b430ee7c
Add char consts, hash the specified password for the HMAC
2014-09-03 11:03:27 +02:00
Jenkins for ownCloud
8787162ec9
[tx-robot] updated from transifex
2014-09-03 01:54:34 -04:00
Olivier Paroz
0c3c72aec0
Libreoffice config folder needs to be set
...
In order to avoid conflicts between multiple instances installed on one server, it's required to define a LibreOffice configuration folder per instance.
Just like with my PR for the documents app (https://github.com/owncloud/documents/pull/353 ), I propose to use /tmp/owncloud-instanceid
2014-09-03 03:12:35 +02:00
Olivier Paroz
b559b21dc3
Converts TIFF files to PNG
2014-09-02 22:56:39 +02:00
Olivier Paroz
1e600a0d36
Adding support for tiff files
2014-09-02 22:53:41 +02:00
Vincent Petry
e05b95636b
Fix upgrade process when apps enabled for specific groups
...
Fix issue where the currently logged user was causing side-effects when
upgrading.
Now setting incognito mode (no user) on update to make sure the whole
apps list is taken into account with getEnabledApps() or isEnabled().
2014-09-02 17:16:14 +02:00
Robin Appelman
3c618a0252
Also setup the filesystem when matching routes
2014-09-02 16:15:42 +02:00
Robin Appelman
a9a37b5363
Don't automatically setup the filesystem the moment we load OC\Files\FileSystem
2014-09-02 16:15:42 +02:00
Jenkins for ownCloud
689bbbe937
[tx-robot] updated from transifex
2014-09-02 01:56:07 -04:00
Jenkins for ownCloud
e6e04bde4f
[tx-robot] updated from transifex
2014-09-01 01:59:19 -04:00
cbhp
969b41c1c9
added missing User-Agents
...
header "User-Agent" was missed
2014-08-31 19:44:06 +02:00
Morris Jobke
4024960a0e
Merge pull request #10780 from owncloud/config-public
...
Extend public config interface
2014-08-31 15:54:35 +02:00
Lukas Reschke
8009df0b60
Merge pull request #10420 from owncloud/external-share-self-signed
...
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Robin Appelman
0a1e5aebf1
Extend public config interface
2014-08-31 15:27:36 +02:00
Lukas Reschke
ae3425d2da
Merge branch 'master' into securityutils
...
Conflicts:
lib/private/util.php
2014-08-31 15:21:09 +02:00
Morris Jobke
73685892ed
Merge pull request #10770 from owncloud/getUserFolder
...
update public interface for getUserFolder
2014-08-31 13:26:32 +02:00
Lukas Reschke
a197ef0f6c
Merge pull request #10768 from owncloud/l10n-use-public
...
Use public api for getting l10n
2014-08-31 11:58:59 +02:00
Morris Jobke
ac6324a5d0
update public interface for getUserFolder
2014-08-31 11:16:40 +02:00
Robin Appelman
bfa0c4b78a
Explicitly set the timezones
2014-08-31 11:06:18 +02:00
Lukas Reschke
4efe6f6240
Add unit tests and fix rootcerts creation bug
2014-08-31 10:47:50 +02:00
Robin Appelman
e64aa330fd
check for blacklisted file certificate filenames
2014-08-31 10:47:50 +02:00
Robin Appelman
79d896e830
Rename namespace
2014-08-31 10:47:50 +02:00
Robin Appelman
6044ad0e17
Cleanup certificate code
2014-08-31 10:47:50 +02:00
Robin Appelman
ba8416a04f
move certificate classes to their own namespace
2014-08-31 10:47:50 +02:00
Robin Appelman
c158db7200
Add certificate class
2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea
Move certificate management interface from files_external to core
2014-08-31 10:47:50 +02:00
Robin Appelman
4efdbff6df
No need for this folder to be world accessible
2014-08-31 10:45:11 +02:00
Robin Appelman
dcc4f96d3e
Verify names of certificates
2014-08-31 10:45:11 +02:00
Robin Appelman
ecdbf00628
Move certificate management code to core
2014-08-31 10:45:10 +02:00
Robin Appelman
a58e670ae5
Also extend public server interface
2014-08-31 10:20:00 +02:00
Robin Appelman
d0266c0bf8
Use public api for getting l10n
2014-08-31 10:08:22 +02:00
Morris Jobke
06e6f10ce4
Add optional user ID parameter for getUseFolder
2014-08-31 09:49:19 +02:00
Jenkins for ownCloud
23137f4798
[tx-robot] updated from transifex
2014-08-31 01:56:20 -04:00
Duane Johnson
ccf440495e
Ensure db connection before changing cache state
...
When trying to upgrade from 7.0.0 to 7.0.2, the manual upgrade path
(e.g. ` sudo -u www-data /usr/bin/php5 ./occ upgrade`) exits with the
following fatal error:
```
/var/www/owncloud# php occ upgrade
PHP Fatal error: Call to a member function
disableQueryStatementCaching() on a non-object in
/var/www/owncloud/lib/private/db.php on line 423
```
This is caused by the self::$connection static variable having not
been initialized at the point of call. Adding a self::connect() fixes
the issue.
See https://forum.owncloud.org/viewtopic.php?f=29&t=23398&p=68556#p68556
2014-08-30 15:46:56 -06:00
cetra3
6b24aa5224
Refactor internal session to write directly to $_SESSION
2014-08-30 08:48:13 +00:00
Jenkins for ownCloud
53f3b7ab52
[tx-robot] updated from transifex
2014-08-30 01:57:04 -04:00
Robin Appelman
0b88355368
Merge pull request #10721 from owncloud/kill-rand
...
Kill insecure random number generation
2014-08-29 19:48:00 +02:00
Morris Jobke
3a4b71ffb4
Merge pull request #10734 from owncloud/fix-10268
...
retrieve local users, groups and group members in a sorted way
2014-08-29 19:35:32 +02:00
Lukas Reschke
35276def1c
Merge pull request #10614 from owncloud/remove-ee-hack
...
Remove different URL for EE
2014-08-29 18:23:15 +02:00
Jörn Friedrich Dreyer
10382ef2f0
allow empty hostname and dots in service name for oracle autosetup
2014-08-29 17:09:17 +02:00
Robin Appelman
3de69ff81b
Don't register the call when rendering error pages
2014-08-29 15:44:39 +02:00
Robin Appelman
dd7b8e4555
Remove insecure fallback random number generation
2014-08-29 15:44:09 +02:00
Arthur Schiwon
0bb460c9b5
retrieve local users, groups and group members in a sorted way
2014-08-29 15:17:37 +02:00
Thomas Müller
96a931929e
adding OC-ETag header
2014-08-29 12:09:33 +02:00
Thomas Müller
647120fb36
adding new webdav property containing the folder size
2014-08-29 11:39:02 +02:00
Jörn Friedrich Dreyer
f687794a4a
be correct in deprecation documentation
2014-08-29 10:22:21 +02:00
Jörn Friedrich Dreyer
f551917a3c
kill OC::$session
...
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession
restore order os OC::$session and OC::$CLI
remove unneded initialization of dummy session
write back session when $useCustomSession is true
log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Jenkins for ownCloud
359590d576
[tx-robot] updated from transifex
2014-08-29 01:56:59 -04:00
voxsim
a49610e18a
change logic in displayNamesInGroup and add some unit tests
2014-08-28 13:51:48 +02:00
Arthur Schiwon
aeb9cfc6c9
make sure class file is loaded once
2014-08-28 12:34:29 +02:00
Lukas Reschke
2f76117cb8
Merge pull request #10670 from owncloud/encodeExceptions
...
Escape error messages
2014-08-28 09:36:18 +02:00
Jenkins for ownCloud
1b342a70d6
[tx-robot] updated from transifex
2014-08-28 01:56:36 -04:00
Lukas Reschke
9ab62ad5b7
Escape error messages
2014-08-27 17:01:51 +02:00
Clark Tomlinson
cb0da1178b
Merge pull request #10653 from owncloud/x-forwarded-for
...
Add support for getting the real client IP behind proxies
2014-08-27 10:32:34 -04:00
Pascal de Bruijn
49da0a7943
defaults: add customizable defaultiTunesAppId
2014-08-27 14:07:39 +02:00
Björn Schießle
c35d60f6d8
Merge pull request #9915 from suraia/unsharefromself-source
...
Allow specifying the item source in unshareFromSelf().
2014-08-27 10:31:35 +02:00
Jenkins for ownCloud
2740908a5b
[tx-robot] updated from transifex
2014-08-27 01:54:40 -04:00
Lukas Reschke
3329e0f2b2
Use DI
2014-08-27 00:49:53 +02:00
Lukas Reschke
d26a9c3c58
Add some security utilities
...
This adds some security utilities to core including:
- A library for basic crypto operations (e.g. to encrypt passwords)
- A better library for cryptographic actions which allows you to specify the charset
- A library for secure string comparisions
Remove .htaccess
Remove .htaccess
Fix typo
Add public API
Use timing constant comparision
Remove CBC constant
Adjust code
Remove confusing $this
2014-08-27 00:18:04 +02:00
Lukas Reschke
7acdd018a1
Add support for getting the real client IP behind proxies
...
Fixes https://github.com/owncloud/core/issues/10624
Fix copy paste fail
Add unittest for comma separated headers
Revert 3rdparty
2014-08-27 00:05:04 +02:00
Clark Tomlinson
c0bc41ff1e
Merge pull request #10640 from owncloud/add_moment_js
...
add moment.js
2014-08-26 13:32:47 -04:00
Georg Ehrke
f82b788ba5
add moment.js
2014-08-26 17:39:15 +02:00
Thomas Müller
2e8026a7b5
Merge pull request #10619 from owncloud/issue/6722
...
Add a test to break the slugifyPath() with folder and file afterwards
2014-08-26 10:33:18 +02:00
Lukas Reschke
ca7e4c8c67
Add isAppstoreEnabled instead of hijacking the URL
2014-08-26 10:20:51 +02:00
Jenkins for ownCloud
c733842a9a
[tx-robot] updated from transifex
2014-08-26 01:56:33 -04:00
Clark Tomlinson
6523c575f3
Merge pull request #10623 from owncloud/not-a-valid-resource-log-entries
...
Do not try to close the same resource multiple times
2014-08-25 12:52:06 -04:00
Vincent Petry
c86824fa09
Merge pull request #10023 from owncloud/tmp-file-created-status
...
Log unsuccessful temp file creation and return false
2014-08-25 17:24:46 +02:00
Joas Schilling
989da69cff
Do not try to close the same resource multiple times
2014-08-25 15:31:43 +02:00
Joas Schilling
1846aebfff
Use md5() of the original name instead of uniqid() for slugifying
...
Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.
If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.
Fix #6722
2014-08-25 15:06:12 +02:00
Joas Schilling
b861e1d696
Fix code layout before fixing the function
2014-08-25 15:06:10 +02:00
Jörn Friedrich Dreyer
ebf7758d10
Merge pull request #10595 from owncloud/swift-stream
...
Stream downloads from Swift object stores without downloading it first
2014-08-25 11:26:39 +02:00
Jenkins for ownCloud
adca48aa93
[tx-robot] updated from transifex
2014-08-25 01:56:07 -04:00
Lukas Reschke
104d1eaed2
Merge pull request #10528 from owncloud/fix-htaccess-check-error
...
Fix htaccess check error
2014-08-24 20:40:06 +02:00
Lukas Reschke
4bc72cc4e0
Remove different URL for EE
...
This can now be achieved by setting `appstoreenabled` to `false` in config.php
2014-08-24 20:22:15 +02:00
Jenkins for ownCloud
70db496b58
[tx-robot] updated from transifex
2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0
[tx-robot] updated from transifex
2014-08-23 01:57:00 -04:00
Clark Tomlinson
2ad0d3f1be
Throw exception if file cannot be accessed via http
...
Format file
Removing calls to deprecated classes and using internal method to get via http
Missed a character
Fix inverted logic
2014-08-22 19:41:30 -04:00
Thomas Müller
a77d468d35
Merge pull request #10584 from owncloud/simple-wizard-trusted-domains
...
Add a trusted domain wizard
2014-08-22 17:12:17 +02:00
Lukas Reschke
88c3a4a31a
Expose setSystemValue
2014-08-22 15:53:23 +02:00
Thomas Müller
0e8916b147
Merge pull request #7539 from owncloud/repair-legacystorageid
...
Added repair script to upgrade the legacy home storage ids
2014-08-22 14:22:39 +02:00
Robin Appelman
191a82e768
Stream downloads from Swift object stores without downloading it first
2014-08-22 14:11:36 +02:00
Thomas Müller
b8b2ef8748
no statement caching for Oracle
2014-08-22 12:06:36 +02:00
Jenkins for ownCloud
8c94153d3e
[tx-robot] updated from transifex
2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df
Add a trusted domain wizard
...
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.
By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-21 22:22:35 +02:00
blizzz
52d5429768
Merge pull request #10522 from owncloud/removeLoadAppScript
...
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Robin Appelman
63570df75f
Add files as string to tar archives
2014-08-21 08:49:57 +02:00
Robin Appelman
88c32861bc
reformat
2014-08-21 08:49:57 +02:00
Jenkins for ownCloud
952fac8493
[tx-robot] updated from transifex
2014-08-21 01:56:31 -04:00
Vincent Petry
8f201c7383
Explicily close the statement cursors
...
Fixes the issue that makes SQLite freeze on later tests.
2014-08-20 23:49:15 +02:00
Lukas Reschke
92c80dd946
Merge pull request #10518 from owncloud/fix_storage_const_autoload
...
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Vincent Petry
068f9d10f1
Added repair step for legacy storages
2014-08-20 23:14:05 +02:00
Vincent Petry
36c88e2830
Merge pull request #10422 from owncloud/dav-disablerangerequestwhennotsupported
...
Return whole file if range request cannot be granted due to encryption
2014-08-20 18:14:09 +02:00
Jenkins for ownCloud
ea8c0bce08
[tx-robot] updated from transifex
2014-08-20 01:56:58 -04:00
Morris Jobke
ab6ee6a600
Add doc for \OCP\Files\FileInfo space constants
2014-08-19 16:49:51 +02:00
Morris Jobke
9a5e745a64
fix typo
2014-08-19 16:45:22 +02:00
Lukas Reschke
ea2a45f19d
Remove loadAppScriptFile
2014-08-19 15:16:49 +02:00
Morris Jobke
b3b3354809
move to public namespace
2014-08-19 14:05:08 +02:00
Stephan Peijnik
5d7deefd95
Use tabs for indentation.
...
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:43 +02:00
Stephan Peijnik
2df52e54d7
Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
...
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
Robin Appelman
fdfc5c67f8
Merge pull request #9866 from owncloud/app-upgrade
...
Don't do app upgrades in the background
2014-08-19 13:33:38 +02:00
Lukas Reschke
fdb203ff1e
Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinking
...
Add a copied_sample_config switch
2014-08-19 11:03:57 +02:00
Thomas Müller
1c23f54d42
Merge pull request #10341 from owncloud/issue/9928
...
[Issue/9928] Problems with filemtime in MappedLocal Storage
2014-08-19 10:10:09 +02:00
Lukas Reschke
c33d1cacd4
Add a copied_sample_config switch
...
Hopefully this will stop people from copying the sample config. I'm so annoyed by all those wrong bug reports...
Add some explanation about this switch
Move check to init
2014-08-19 09:57:03 +02:00
Jenkins for ownCloud
77cfddff0f
[tx-robot] updated from transifex
2014-08-19 01:57:09 -04:00
Vincent Petry
ec274ad40b
Use afterBind to send fileId header for files and directories
...
afterBind is called for both files and directories and is now used to
send the OC-FileId headers.
2014-08-18 18:40:58 +02:00
helix84
722a119e46
fix typo in util.php
2014-08-18 15:59:36 +02:00
Robin Appelman
ab590ce9a0
fix undefined variable
2014-08-18 15:30:46 +02:00
Thomas Müller
62e06cb0ba
Merge pull request #10472 from owncloud/fix_undefined_index_ocsid
...
check if array index ocsid is set before accessing it
2014-08-18 10:43:21 +02:00
Thomas Müller
c933848c55
Merge pull request #10156 from owncloud/issue/9968
...
Check return of fopen() before using it
2014-08-18 10:35:04 +02:00
Jenkins for ownCloud
4dd07f572c
[tx-robot] updated from transifex
2014-08-18 01:56:30 -04:00
Frank Karlitschek
ddeb301ad6
Merge pull request #10456 from kroimon/skeleton_dir_config
...
Make skeleton directory configurable.
2014-08-17 20:01:02 -04:00
Thomas Müller
c08a1e6455
according to PHPDoc this function shall return the entity
2014-08-17 22:27:55 +02:00
Georg Ehrke
7347174636
check if array index ocsid is set before accessing it
2014-08-17 22:26:14 +02:00
Thomas Müller
4c79d34980
Merge pull request #10469 from owncloud/remove-xmailer-header
...
Remove X-Mailer header from mails
2014-08-17 21:46:11 +02:00
Lukas Reschke
69e0e23789
Merge pull request #10407 from owncloud/rm-obsolete-japanese
...
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Lukas Reschke
a2677c14c8
Remove X-Mailer header from mails
2014-08-17 18:55:13 +02:00
Jenkins for ownCloud
b1415fc4fc
[tx-robot] updated from transifex
2014-08-17 01:56:22 -04:00
Jenkins for ownCloud
c132dd6357
[tx-robot] updated from transifex
2014-08-16 01:56:44 -04:00
Stefan Rado
ccc46be740
Make skeleton directory configurable.
2014-08-16 01:07:42 +02:00
Lukas Reschke
a822a31ce3
Merge pull request #10442 from owncloud/move-failed-logins
...
Move authentication failed logging to checkPassword
2014-08-15 16:50:28 +02:00
Clark Tomlinson
1fff77f5de
Merge pull request #10440 from owncloud/enforce-debug
...
Remove ability to trigger DEBUG mode via cookie
2014-08-15 09:03:29 -04:00
Lukas Reschke
98fc56831d
Merge pull request #9275 from NormalRa/master
...
Add .apk mimetype.
2014-08-15 14:41:53 +02:00
Lukas Reschke
a82cd1ff67
Fix unit test
2014-08-15 14:15:27 +02:00
Lukas Reschke
5bb4772858
Move authentication failed logging to checkPassword
...
Fixes https://github.com/owncloud/core/issues/10366
2014-08-15 12:13:00 +02:00
Lukas Reschke
a4a897d26d
Remove ability to trigger DEBUG mode via cookie
...
Users should not be able to enable debug mode on their own by setting a cookie. Using debug mode might leak too much information about the environment or have other unexpected behaviour.
We should backport this.
2014-08-15 11:21:56 +02:00
Jenkins for ownCloud
93f5e90c9f
[tx-robot] updated from transifex
2014-08-15 01:56:14 -04:00
Jörn Friedrich Dreyer
799fb46927
add missing @deprecated annotation to legacy classes
2014-08-14 22:18:12 +02:00
Thomas Müller
c1102b1671
Merge pull request #10417 from owncloud/update_deprecation_doc
...
update deprecation docs
2014-08-14 17:54:23 +02:00
Björn Schießle
64c3fe670c
Merge pull request #10399 from owncloud/fix_setSendMailStatus
...
[sharing] fix mail notification
2014-08-14 17:45:39 +02:00
Joas Schilling
4d32e3548b
Ensure that filename is prefixed with a slash
2014-08-14 16:48:30 +02:00
Clark Tomlinson
4502eaf9f8
Merge pull request #10414 from owncloud/relax-code-checker
...
in order to prevent false-positives on the code checker - exec and eval ...
2014-08-14 09:35:20 -04:00
Vincent Petry
cc8c1d8e07
Return whole file if range request cannot be granted due to encryption
...
Whenenver range headers are set and encryption is enabled, it is not
possible to automatically fseek() to the proper position.
To avoid returning corrupt/invalid data or causing a decryption error,
the range headers are stripped so that the SabreDAV code in httpGet()
returns the whole file.
2014-08-14 15:18:49 +02:00
Jörn Friedrich Dreyer
fd798fd982
update deprecation docs
2014-08-14 12:22:34 +02:00
Morris Jobke
987a0565fb
Merge pull request #10395 from owncloud/close-filehandle-lib-files
...
Close open file handles in files library
2014-08-14 10:57:54 +02:00
Thomas Müller
a4932dc5e2
in order to prevent false-positives on the code checker - exec and eval will not longer be grepped for
2014-08-14 10:48:42 +02:00
Thomas Müller
6d94fc846d
Merge pull request #10394 from owncloud/close-filehandle-lib-image
...
Close file handle if exception occurs in image class
2014-08-13 22:41:33 +02:00
Volkan Gezer
d1f483c9ed
remove obsolete japanese lang code
2014-08-13 22:35:08 +02:00
Robin Appelman
bba59bf815
Cast file id's to int so we can compare them properly
2014-08-13 19:18:34 +02:00
Bjoern Schiessle
d9f35d8c15
we need the recipient as a additional parameter to know for which share the notification was send
2014-08-13 17:02:51 +02:00
blizzz
54491e8c68
Merge pull request #10323 from gekmihesg/master
...
Load authentication backends before tryBasicAuth
2014-08-13 16:08:48 +02:00
Morris Jobke
c6bf51c457
Close open file handles in files library
...
ref #10392
2014-08-13 15:48:32 +02:00
Morris Jobke
f61658945f
Close file handle if exception occurs in image class
...
ref #10392
2014-08-13 15:19:58 +02:00
Normal Ra
1c1fc0870a
Remove stray tab characters.
2014-08-13 11:24:02 +02:00
Jenkins for ownCloud
609a52ebe2
[tx-robot] updated from transifex
2014-08-13 01:54:44 -04:00
Robin Appelman
174805f5e3
Merge pull request #9762 from owncloud/owner-public
...
Return the proper owner for home storages
2014-08-12 14:29:17 +02:00
Normal Ra
1633ec5c87
APK mimetype icon to be a generic package icon.
2014-08-12 14:10:49 +02:00
Normal Ra
38498af171
Add APK mimetype repair scenario.
2014-08-12 14:07:10 +02:00
Clark Tomlinson
e63853a353
Merge pull request #10335 from owncloud/fix-emptyapplist
...
Fix issue when no apps are enabled
2014-08-11 16:16:18 -04:00
Thomas Müller
3e493501da
Merge pull request #9890 from owncloud/check-php-charset-master
...
setting and checking default_charset in php.ini to be UTF-8
2014-08-11 22:11:11 +02:00
Vincent Petry
a32eac1477
Fix issue when no apps are enabled
...
Properly initialize $apps array
2014-08-11 20:36:51 +02:00
Clark Tomlinson
691306cf4e
Removing ini charset override due to shared hosting issues
2014-08-11 12:15:36 -04:00
Joas Schilling
564bf23c1b
Do not filemtime() on "." directory. Use empty string instead
...
Fix #9928
2014-08-11 17:39:37 +02:00
Joas Schilling
d7666d9d3d
Remove doubled slash between folder and path
2014-08-11 16:50:52 +02:00
Clark Tomlinson
7bc313a0cd
Merge pull request #10066 from marc0s/issues/10065-fix-null-check
...
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
2014-08-11 10:44:47 -04:00
Thomas Müller
13d44f8f7f
Merge pull request #10251 from owncloud/fix-dav-attributes-master
...
shared files/folders are not mounted
2014-08-11 14:40:47 +02:00
Vincent Petry
79fa2bc391
Merge pull request #10301 from owncloud/fix-internal-mail-share-links
...
Don't use /Shared as a base for links in share email
2014-08-11 13:33:39 +02:00
Vincent Petry
f2001a48a4
Fixed sort algo for additional cases
2014-08-11 13:28:53 +02:00
Vincent Petry
173059f6d0
Fixed file list sorting
...
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)
- added OC.Util.naturalSortComparator that uses the same algo that was
used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
Thomas Müller
b83d00f847
Merge pull request #10249 from mroi/patch-1
...
file size on non-(Linux/BSD/Windows)-installations
2014-08-11 13:02:01 +02:00
Jenkins for ownCloud
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
gekmihesg
578a57f0fb
Load authentication backends before tryBasicAuth
2014-08-10 13:29:32 +02:00
Jenkins for ownCloud
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
Jenkins for ownCloud
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
Tom Needham
aeef10eb47
Add scrollto to the url if sharing a file for long file lists
2014-08-09 00:21:29 +01:00
Tom Needham
16dafa9cac
Fix link to files and folders in internal share emails
2014-08-09 00:08:45 +01:00
Bjoern Schiessle
6dda30b5a2
remove share permissions if user is excluded from sharing
2014-08-08 12:16:54 +02:00
Jenkins for ownCloud
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
Morris Jobke
b6a2a85bb8
Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf
...
implement a txt preview fallback for the case that ttf is not support
2014-08-07 22:55:06 +02:00
Thomas Müller
520f6422ac
Merge pull request #10079 from owncloud/Improve_scanner_message
...
Improved scanner error message
2014-08-07 16:09:52 +02:00
Thomas Müller
9d2cff50ed
shared files/folders are not mounted
2014-08-07 16:01:13 +02:00
Michael Roitzsch
cde1a9241d
file size on non-(Linux/BSD/Windows)-installations
...
Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
2014-08-07 15:41:58 +02:00
Thomas Müller
e33fc2807c
Merge pull request #10142 from owncloud/fix-#9283-gzip_support
...
Removed broken tar cutter, added tar and fixed extension switch.
2014-08-07 14:53:31 +02:00
Robin Appelman
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Thomas Müller
d2365afad6
Merge pull request #8915 from owncloud/MorrisJobke-travis
...
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
Jenkins for ownCloud
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
Volkan Gezer
173538befb
typo fix from transifex suggestion
2014-08-06 20:48:26 +02:00
Robin Appelman
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
Robin Appelman
1deb6aadd3
return null instead of throwing an exception
2014-08-06 12:06:41 +02:00
Thomas Müller
a72dae6842
Merge pull request #10144 from owncloud/issue/9972
...
Issue/9972 Fix issues with group and username `0`
2014-08-06 09:53:13 +02:00
Jenkins for ownCloud
e902e3f659
[tx-robot] updated from transifex
2014-08-06 01:54:43 -04:00
Morris Jobke
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
Bjoern Schiessle
48c57b80e3
remove trailing slash from path
2014-08-05 20:34:32 +02:00
Björn Schießle
d35bfc9a4c
Merge pull request #9520 from owncloud/theme_urls
...
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 17:53:18 +02:00
Robin Appelman
bf8f910a32
Fix Folder::getById
2014-08-05 16:58:10 +02:00
Morris Jobke
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
Robin Appelman
244d4e1399
Make View->shouldEmitHooks more robust
2014-08-05 16:53:28 +02:00
Morris Jobke
8561d0dfca
remove escaping because it's unneeded
2014-08-05 13:18:38 +02:00
Morris Jobke
7b222c4ab5
fix uppercase issue
2014-08-05 13:16:51 +02:00
scolebrook
2e127d2c5e
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 13:16:51 +02:00
Bjoern Schiessle
41cca70a63
don't display share permission if resharing was disabled by the admin
2014-08-05 10:57:51 +02:00
Morris Jobke
c0e78d9841
Merge pull request #10151 from owncloud/issue/9912
...
Increase word wrap limit for emails to 78 characters
2014-08-05 08:20:57 +02:00
Jenkins for ownCloud
5ecbc27753
[tx-robot] updated from transifex
2014-08-05 02:05:17 -04:00
Joas Schilling
303f6da76f
Check return of fopen() before using it
...
Fix #9968
2014-08-04 17:53:06 +02:00
Joas Schilling
f4c7e3c1e9
Merge pull request #10083 from th3fallen/fix-9969-take-two
...
Fix 9969
2014-08-04 17:41:03 +02:00
Thomas Müller
66a3a641b9
Merge pull request #10138 from owncloud/innodb-repair-non-oc
...
Dont touch non-oc tables when doing the InnoDB repair step
2014-08-04 16:23:46 +02:00
Joas Schilling
c1b8d93cb0
Increase word wrap limit for emails to 78 characters
2014-08-04 16:05:09 +02:00
Joas Schilling
4865c52aa6
Fix isLoggedIn() check for user '0'
...
Fix #9972
2014-08-04 15:53:55 +02:00
Joas Schilling
f80baf03d4
Fix getting group '0' from database backend
...
Fix #9972
2014-08-04 15:53:55 +02:00
Remco Brenninkmeijer
cb842ba793
Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.
2014-08-04 14:10:09 +02:00
Robin Appelman
8b4d3c065c
only set core version at the end
2014-08-04 13:42:16 +02:00
Robin Appelman
ae263da69a
Also set the app version when updating from app store
2014-08-04 13:41:05 +02:00
Robin Appelman
776cc45a5a
Allow loading app without checking the upgrade
2014-08-04 13:41:05 +02:00
Robin Appelman
4602d1f2a6
extract upgrade parts to their own methods
2014-08-04 13:41:05 +02:00
Robin Appelman
4608f8a3b5
Throw an exception when we try to load an app that needs to be upgraded
2014-08-04 13:41:04 +02:00
Robin Appelman
43d790239d
Extend OC_Util::needUpgrade to also catch app upgrades
2014-08-04 13:41:04 +02:00
Robin Appelman
ca463f9c10
Dont touch non-oc tables when doing the InnoDB repair step
2014-08-04 13:14:12 +02:00
Thomas Müller
65903a012a
Merge pull request #10025 from owncloud/l10n-typo
...
typo fix from transifex suggestion
2014-08-04 11:03:50 +02:00
Jenkins for ownCloud
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
Volkan Gezer
7a07690b25
expire -> expiration
2014-08-02 04:02:39 +02:00
Jörn Friedrich Dreyer
a0ab4c2434
fix return documentation
2014-08-01 13:42:35 +02:00
Thomas Müller
378f35f0ec
prevent PHP errors and enhance logging
2014-08-01 09:54:32 +02:00
Jenkins for ownCloud
86cdfa3db3
[tx-robot] updated from transifex
2014-08-01 01:54:28 -04:00
Volkan Gezer
5f015067f4
suggestions by deepdiver
2014-08-01 01:39:52 +02:00
Clark Tomlinson
26af116fcd
Removing unnecessary switch statements in fopen methods.
2014-07-31 09:34:27 -04:00
Martin
d975012ae6
Improved scanner error message
2014-07-31 13:12:35 +02:00
Thomas Müller
4eb2b4e1b0
Merge pull request #10051 from owncloud/preview-empty-text
...
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
Jenkins for ownCloud
c1562057e8
[tx-robot] updated from transifex
2014-07-31 01:55:01 -04:00
marc0s
f2e20757f6
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
...
Fixes #10065
2014-07-30 23:24:55 +02:00
Jan-Christoph Borchardt
5b11a18dea
Merge pull request #10044 from owncloud/transparency_fix
...
extract transparency fix from #8050
2014-07-30 18:36:51 +02:00
Morris Jobke
521934ee0d
Merge pull request #10029 from owncloud/fix-thirdparty
...
Fix silent crash if 3rdparty dir is not available
2014-07-30 18:34:55 +02:00
Morris Jobke
62b37fbb99
Merge pull request #10024 from owncloud/preview-restrict-height
...
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 17:22:20 +02:00
Jörn Friedrich Dreyer
dd9347fdd2
Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload
...
Cache factory needs to use globalPrefix in createLowLatency()
2014-07-30 16:56:45 +02:00
Robin Appelman
4a9b0d5465
Use svg mimeicons for empty text files
2014-07-30 16:31:37 +02:00
Georg Ehrke
fa461befbc
extract transparency fix from #8050
2014-07-30 16:13:33 +02:00
Morris Jobke
38e309b0fe
Merge pull request #9970 from owncloud/sharing_set_expire_date
...
Sharing set expire date
2014-07-30 14:37:16 +02:00
Volkan Gezer
90d8f42d7c
typo fix from transifex suggestion
2014-07-30 14:07:32 +02:00
Victor Dubiniuk
eb9bd200fa
Replace exit with return
2014-07-30 14:03:31 +02:00
Victor Dubiniuk
31e7fdb9bf
Fix silent crash if 3rdparty dir is not available
2014-07-30 14:03:31 +02:00
Robin Appelman
c066320208
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 13:52:40 +02:00
Victor Dubiniuk
0113ad0b33
Log unsuccessful temp file creation and return false
2014-07-30 13:50:41 +02:00
Thomas Müller
54d5d03271
Merge pull request #9888 from owncloud/mysql-tinyint-master
...
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-30 11:48:10 +02:00
Thomas Müller
7d6221d25d
Merge pull request #9914 from owncloud/fix-appframework-blank-template
...
Fix template rendering for 'blank' templates
2014-07-30 10:31:15 +02:00
Jenkins for ownCloud
47e72917e5
[tx-robot] updated from transifex
2014-07-30 01:55:32 -04:00
Morris Jobke
889088f72d
Fix template rendering for 'blank' templates
2014-07-29 16:49:50 +02:00
Björn Schießle
a36c4402f5
Merge pull request #9988 from owncloud/sharing_remove_share_permission
...
remove share permission if user is excluded from sharing
2014-07-29 14:05:13 +02:00
Andreas Fischer
a8fbc709ce
Add registerAutoloaderCache().
2014-07-29 11:18:40 +02:00
Andreas Fischer
9be8ac5867
Memcache\Factory: Remove static, use globalPrefix.
2014-07-29 11:14:36 +02:00
Andreas Fischer
da391b8932
InstanceId is properly injected into factory. Remove comment.
2014-07-29 11:03:10 +02:00
Bjoern Schiessle
67e302885c
remove share permission if user is excluded from sharing
2014-07-29 10:08:08 +02:00
Thomas Müller
58472a2660
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-29 09:18:37 +02:00
Jenkins for ownCloud
29a3f1e2af
[tx-robot] updated from transifex
2014-07-29 09:16:02 +02:00
Bjoern Schiessle
4e87ac2bb9
make sure that we set the expire date if a date is adefault date is set
2014-07-28 22:45:03 +02:00
Björn Schießle
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Morris Jobke
1fbbaed261
Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster
...
generate copy of sqlite database file in data directory
2014-07-28 16:54:52 +02:00
Robin Appelman
cb0ff19dc4
Merge pull request #9924 from owncloud/eventsource-nginx-buffering
...
Prevent nginx from buffering event source events
2014-07-28 16:17:35 +02:00
Georg Ehrke
4e8e69dc81
implement a txt preview fallback for the case that ttf is not support
2014-07-28 13:05:08 +02:00
Thomas Müller
539d2b7ec3
Merge pull request #9784 from josh4trunks/libreoffice_match_cl
...
Cleanup Document Preview
2014-07-28 13:03:33 +02:00
Thomas Müller
a3411e3719
Merge pull request #9641 from owncloud/localuser-addressbook
...
ownCloud users are exported as address book
2014-07-28 12:18:56 +02:00
Thomas Müller
534fb9ebf9
Merge pull request #9631 from owncloud/update-getid3
...
update getID3 library
2014-07-28 11:51:36 +02:00
Thomas Müller
11214219f3
Merge pull request #9819 from owncloud/updater-setversionafterupdate
...
Set version AFTER a successful update
2014-07-28 11:19:57 +02:00
Thomas Müller
0aa652ecfd
Merge pull request #9859 from tiezdne/master
...
Update mimetypes.list.php
2014-07-28 11:16:43 +02:00
Thomas Müller
cfaa05cc0e
Merge pull request #9905 from owncloud/joblist-non-existing-class
...
Dont try to execute jobs that no longer exist
2014-07-28 11:09:27 +02:00
Thomas Müller
ab8efe3aa2
Merge pull request #9935 from owncloud/harden-get-urlco
...
Verify whether the URL is valid
2014-07-28 11:07:41 +02:00
Thomas Müller
c87f425fe7
generate copy of sqlite database file in data directory
2014-07-28 10:29:39 +02:00
Thomas Müller
f2982b7a08
Merge pull request #9904 from owncloud/loggedout-getuserfolder
...
Dont throw an error when calling $server->getUserFolder when logged out
2014-07-28 10:04:01 +02:00
Thomas Müller
37f673c8b5
Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master
...
don't silently exit in cli-mode in case ownCloud in not yet installed
2014-07-28 09:40:40 +02:00
Jenkins for ownCloud
a169572223
[tx-robot] updated from transifex
2014-07-28 01:54:30 -04:00
Lukas Reschke
260729fd7d
Verify whether the URL is valid
...
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017
@karlitschek Backport for stable6 and stable7 requested.
2014-07-27 16:46:32 +02:00
Jenkins for ownCloud
9a4d2871eb
[tx-robot] updated from transifex
2014-07-27 01:54:31 -04:00
Robin Appelman
2c4e06d325
Prevent nginx from buffering event source events
2014-07-26 16:07:11 +02:00
Jenkins for ownCloud
010732019a
[tx-robot] updated from transifex
2014-07-26 01:54:40 -04:00
Michael Kuhn
ecdd04374a
Allow specifying the item source in unshareFromSelf().
2014-07-26 02:00:49 +02:00
Jörn Friedrich Dreyer
ec7a10f882
reorder if statements to remove negation, indentation correction
2014-07-25 19:39:29 +02:00
Robin Appelman
43978befda
Dont try to execute jobs that no longer exist
2014-07-25 18:02:02 +02:00
Robin Appelman
acafb4a426
Merge pull request #9669 from owncloud/group-public
...
Add group management to the public api
2014-07-25 17:55:12 +02:00
Robin Appelman
bf12bba079
Dont throw an error when calling $server->getUserFolder when logged out
2014-07-25 17:52:50 +02:00
Morris Jobke
ae3761f15d
add autoload
2014-07-25 17:37:33 +02:00
Morris Jobke
a9666c4f5b
update getID3 library
2014-07-25 15:25:45 +02:00
Bjoern Schiessle
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
Thomas Müller
07dc0b2fdf
setting and checking default_charset in php.ini to be UTF-8
2014-07-25 09:53:25 +02:00
Jenkins for ownCloud
3f58d949e0
[tx-robot] updated from transifex
2014-07-25 01:54:32 -04:00
Thomas Müller
176ecbd311
ownCloud users are exported as address book
2014-07-24 17:35:02 +02:00
Thomas Müller
788a2eca2f
Merge pull request #9841 from owncloud/fix-password-reset-master
...
Fix password reset in console command and lost password controller
2014-07-24 15:58:02 +02:00
tiezdne
6a2f3921f6
Update mimetypes.list.php
2014-07-24 15:43:55 +02:00
Thomas Müller
2594fb80aa
don't silently exit in cli-mode in case ownCloud in not yet installed
2014-07-24 13:45:06 +02:00
Thomas Müller
a8b6cc6a07
- adding default value for $recoveryPassword
...
- set password correctly in lost password
2014-07-24 12:50:39 +02:00
Thomas Müller
7d60f7a222
register type mappings for unknown/unsupported mysql types
2014-07-24 12:17:26 +02:00
Vincent Petry
6f329dcb6c
Set version AFTER a successful update
...
If an app upgrade failed, the core version will not be increased either
in the database. This will re-display the update page and make it
possible to redo the apps upgrade.
Note that any core repair routine must take into account that an update
might need to be redone again even though the core's DB state is already
the one of the new version.
2014-07-23 23:38:17 +02:00
Thomas Müller
363ba04f5e
only commit in case a transaction is active
2014-07-23 20:13:19 +02:00
josh4trunks
acd5660492
Cleanup Document Preview
...
Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php .
This will stop the creating of multiple directories for document conversion in tmpDir.
2014-07-22 22:46:38 -07:00
Sander
4e2954673a
Revert change
2014-07-22 19:45:01 +02:00
Sander
eacdf26cde
Allow getAppFolder to get another apps path
...
cc @Raydiation
2014-07-22 16:07:43 +02:00
Thomas Müller
0567fd031f
Merge pull request #9772 from owncloud/fix-chunked-upload-master-2
...
adding special handling of checkPrecondition() for chunked upload
2014-07-22 15:47:55 +02:00
Thomas Müller
8ed6adaf85
Merge pull request #9738 from owncloud/remove-uneeded-strip
...
Remove uneeded strip_tags
2014-07-22 15:06:23 +02:00
Thomas Müller
31149fb1c3
adding special handling of checkPrecondition() for chunked upload
2014-07-22 13:06:20 +02:00
Robin Appelman
e9de20952a
Return the proper owner for home storages
2014-07-21 16:59:59 +02:00
Joas Schilling
677c0288fb
Merge pull request #9757 from owncloud/issue/9756
...
Add language parameter to public API for getL10N()
2014-07-21 16:50:48 +02:00
Joas Schilling
01878153e0
Add language parameter to public API for getL10N()
...
Fix #9756
2014-07-21 14:50:34 +02:00
Thomas Müller
0a9e0d1051
perm -> permissions
2014-07-21 13:49:22 +02:00
Vincent Petry
3df7a83c72
Merge pull request #9406 from philfry/master
...
silently discard the response body, needed for apache/mod_dav and maybe ...
2014-07-21 12:22:06 +02:00
Morris Jobke
76a5fa11f5
Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master
...
check if $tables is an array
2014-07-20 21:40:53 +02:00
Andreas Fischer
8cd1f7464e
Merge pull request #9672 from owncloud/mysql-affectedrows
...
Make MySQL affected row count consistent with other DBMSes
* owncloud/mysql-affectedrows:
Added test of OCS privatedata to trigger key duplication
Document why we have to check with defined() first.
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-20 21:29:16 +02:00
Thomas Müller
f0c0bd5251
check if $tables is an array
2014-07-19 20:23:38 +02:00
Lukas Reschke
1c16d012ab
Remove uneeded `strip_tags`
...
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
2014-07-19 10:17:24 +02:00
Jenkins for ownCloud
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
Andreas Fischer
bfd59bddf4
Extract Auth Header logic into new function handleAuthHeaders().
2014-07-19 02:21:18 +02:00
Andreas Fischer
fafed17c60
Deduplicate user/password extraction from alternative HTTP headers.
2014-07-19 02:06:37 +02:00
Jenkins for ownCloud
80983f5853
[tx-robot] updated from transifex
2014-07-18 01:54:43 -04:00
Frank Karlitschek
f92b5a2507
update appstore api url
2014-07-17 21:54:46 -04:00
Vincent Petry
77d6d11b91
Merge pull request #9682 from owncloud/mappedlocal-rename
...
Fix renaming files in the root folder of a MappedLocal storage
2014-07-17 09:19:17 +02:00
Jenkins for ownCloud
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
Robin Appelman
5a0397eb5e
Fix renaming files in the root folder of a MappedLocal storage
2014-07-16 21:24:18 +02:00
icewind1991
d58c8d72cf
Merge pull request #9550 from kofemann/dcache-fixes-for-upstream
...
storage: do not check file mode on rename
2014-07-16 16:06:14 +02:00
Andreas Fischer
d8bd8c4b66
Document why we have to check with defined() first.
2014-07-16 15:13:35 +02:00
Andreas Fischer
e26612244a
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-16 14:35:47 +02:00
Robin Appelman
94fa21d146
Add group management to the public api
2014-07-16 14:25:31 +02:00
Stephan Peijnik
4d74aa09bf
Port of #9584
...
Fixes #9583
lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Fix indentation.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Renamed $grp to $group in foreach loop.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Use is_null() instead of empty() when checking the return value of GroupManager::get().
Additionally, $grp was renamed to $group inside
\OC\Group\MetaData::fetchGroups().
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Updated code to reflect changes introduced to \OC\Group\MetaData.
Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-16 12:23:26 +02:00
Björn Schießle
7d8a8e78fa
Merge pull request #9640 from owncloud/fix_9627
...
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-16 10:12:52 +02:00
Jenkins for ownCloud
0155326227
[tx-robot] updated from transifex
2014-07-16 01:55:55 -04:00
Thomas Müller
0f9b22107b
Merge pull request #9644 from owncloud/fix_user_api
...
Fix user api
2014-07-15 23:57:02 +02:00
blizzz
10b59f101f
Merge pull request #9540 from owncloud/use_fileinfo_in_search_results
...
use fileinfo object in search results
2014-07-15 19:49:36 +02:00
Bjoern Schiessle
6967d328e2
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-15 17:48:25 +02:00
Jörn Friedrich Dreyer
818929274d
use UserSession service to resolve user id
2014-07-15 17:42:17 +02:00
Jörn Friedrich Dreyer
b3106c321c
use correct IUser in interface
2014-07-15 17:41:44 +02:00
Vincent Petry
a8d95356ca
Merge pull request #8987 from owncloud/lastindexid-debug
...
[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
2014-07-15 17:01:57 +02:00
icewind1991
61b5a770e4
Merge pull request #9561 from libasys/patch-3
...
Fix Error undefined index: file_target
2014-07-15 16:54:57 +02:00
Thomas Müller
6c93bcc814
Merge pull request #9621 from owncloud/fix_logger_implementation
...
fix logger implementation
2014-07-15 16:05:15 +02:00
Jörn Friedrich Dreyer
4a855be814
fix logger implementation and test
2014-07-15 10:10:16 +02:00
Jenkins for ownCloud
ff11ef3c5b
[tx-robot] updated from transifex
2014-07-15 01:55:20 -04:00
Thomas Müller
e8f02b9410
Merge pull request #9562 from owncloud/users-groupfilter
...
Do not filter groups, but therefore update the user counts according to the filter
2014-07-15 07:40:55 +02:00
Thomas Müller
73e2bf7bf4
fixing PHPDoc
2014-07-14 21:26:47 +02:00
Arthur Schiwon
ab2c7e06a4
remove dead code
...
do not filter groups. but update the user count according to the filter
improve phpdoc
improve metadata runtime cache
add metadata tests
2014-07-14 21:26:37 +02:00
Jörn Friedrich Dreyer
8f11019f45
mkae getRelativePath of file search results overwriteable in subclasses
2014-07-14 19:27:10 +02:00
Jörn Friedrich Dreyer
eea5c2ee0a
return relative path
2014-07-14 19:12:06 +02:00
Robin Appelman
c3991ae13e
Use the correct path when building the FileInfo for the search result
2014-07-14 18:32:45 +02:00
Morris Jobke
9ee1c7ff71
Merge pull request #9228 from owncloud/remove-routing-singular-issues
...
Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
2014-07-14 17:10:07 +02:00
Thomas Müller
4b91741875
Merge pull request #9598 from owncloud/fix-app-installation-master
...
append file extension to the temporary file which contains the downloade...
2014-07-14 17:05:36 +02:00
Vincent Petry
10a29556b0
- Added test to trigger index id error
...
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
Robin Appelman
51d0bdc90c
Expose the user manager in the public server container
2014-07-14 15:10:56 +02:00
Robin Appelman
20c1ce7f47
Add public interfaces for User, UserManager and UserSession
2014-07-14 15:10:51 +02:00
Björn Schießle
05ba9b3c64
Merge pull request #9539 from enoch85/patch-1
...
Fix for #9422
2014-07-14 12:58:23 +02:00
Vincent Petry
e58dce2ee0
Merge pull request #9571 from owncloud/fix_appstore_update_issue
...
Fix update to button issue
2014-07-14 10:00:39 +02:00
Jenkins for ownCloud
d7b8e3209b
[tx-robot] updated from transifex
2014-07-13 01:54:35 -04:00
Jenkins for ownCloud
c1e95d62ec
[tx-robot] updated from transifex
2014-07-12 01:54:39 -04:00
Thomas Müller
e47cd5ebf1
append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable
2014-07-11 16:51:59 +02:00
Georg Ehrke
fb685b0856
improve check for duplicate apps
2014-07-10 17:18:10 +02:00
Georg Ehrke
305db9c2d7
add proper version comparision in OC_Installer::isUpdateAvailable
2014-07-10 17:17:55 +02:00
Morris Jobke
e33ef0d449
Merge pull request #9536 from owncloud/default-app-groups-master
...
Default app groups master
2014-07-10 15:45:44 +02:00
Tigran Mkrtchyan
03f422153d
files: storage: rename should check parent directories of old and new files
...
as described by POSIX.1-2008
(see http://pubs.opengroup.org/onlinepubs/9699919799/functions/rename.html )
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-07-10 14:58:59 +02:00
libasys
cd88c2fd7b
Update share.php
...
change isset with empty on line 1911
2014-07-10 13:19:35 +02:00
libasys
b395ff549b
Update share.php
...
Added isset for error:
```
Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911
```
2014-07-10 13:02:04 +02:00
Georg Ehrke
380aacdf93
fix orientation in image-backend, not in preview system itself
2014-07-09 23:07:58 +02:00
Jörn Friedrich Dreyer
3f093974f9
use fileinfo object in search results
2014-07-09 14:47:43 +02:00
Daniel Hansson
851c1f87d6
Fix for #9422
2014-07-09 14:40:05 +02:00
Thomas Müller
5d2a3c83ac
adding 'groups' entry to remote apps
2014-07-09 11:23:17 +02:00
Thomas Müller
1ae6e1bcf8
fixing typos
2014-07-09 10:20:17 +02:00
Thomas Müller
63fdaacbfc
Merge pull request #9510 from libasys/patch-1
...
BugFix missing $item on 'file_target' Line 1911
2014-07-09 07:58:37 +02:00
Jenkins for ownCloud
6e2e0108ee
[tx-robot] updated from transifex
2014-07-09 01:55:51 -04:00
Thomas Müller
10978a80c2
Merge pull request #9507 from owncloud/fix-9302-master
...
Upload abortion is now detected within the OC_Connector_Sabre_File::put...
2014-07-08 17:39:34 +02:00
Thomas Müller
65d9d6ad01
Merge pull request #9412 from owncloud/public-api-activity
...
Public api activity
2014-07-08 16:37:18 +02:00
Arthur Schiwon
3338a0f236
port of #9500
...
don't trigger update from checkPassword, it is already called by userExists, this is enough.
do not write to database when the value is the same
add test cases. also split test classes in a file each, looks like only the first class is being executed
also appconfig shall not write to database if the value is unchanged
2014-07-08 16:32:01 +02:00
Robin Appelman
3e3d460729
use case insensitive LIKE when searching for files in mysql
2014-07-08 15:49:27 +02:00
Robin Appelman
76c709d7de
Add repair step to set MySQL collation to utf8_bin
...
Set default collation of mysql connection to utf8_bin
Set utf_bin as default collation for new tables
2014-07-08 15:12:07 +02:00
Thomas Müller
ea269f0067
Upload abortion is now detected within the OC_Connector_Sabre_File::put()
...
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless
Adding unit test testUploadAbort()
2014-07-08 11:09:59 +02:00
libasys
e70a7af6da
BugFix missing $item on 'file_target' Line 1911
...
I think this should be right!
2014-07-08 10:51:05 +02:00
Thomas Müller
8363f3c635
Adding new interface \OCP\Activity\IExtentsion
...
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager
2014-07-08 09:04:37 +02:00
Jenkins for ownCloud
20fc4b8b53
[tx-robot] updated from transifex
2014-07-08 01:55:17 -04:00
Morris Jobke
29bdfc0ce2
Merge pull request #9502 from owncloud/add_ocsids
...
Add ocsids for shipped apps in core repo
2014-07-07 19:58:41 +02:00
Morris Jobke
b2377129b6
Merge pull request #9494 from owncloud/issue/9490
...
[issues/9490] \OC::$WEBROOT is invalid when called from cron.php
2014-07-07 19:36:41 +02:00
Georg Ehrke
e5e8e28ae7
add ocsids to info.xml
2014-07-07 17:11:50 +02:00
Joas Schilling
5d3e1bc023
Only calculate the WEBROOT from scriptName if it contains $SUBURI
...
If not we are most likely in CLI mode. However to be able to still
generate valid URLs, we need to use the overwrite webroot instead.
Fix #9490
2014-07-07 15:08:46 +02:00
Joas Schilling
e8537afd60
Only overwrite serverHost when in unit tests
...
The intention of the original commit 12f7cb8767
was to fix tests. But cron should always return a valid host not localhost.
2014-07-07 15:08:45 +02:00
Thomas Müller
b091b15f0b
MySQL: adding repair step to convert MyIsam tables to InnoDB
2014-07-07 12:32:24 +02:00
Vincent Petry
5c444c2da8
Merge pull request #9468 from owncloud/fix_logout_error_messages
...
better validation: cadd extra check if appinfo/info.xml exists
2014-07-07 10:58:23 +02:00
Jenkins for ownCloud
6e9905d7cf
[tx-robot] updated from transifex
2014-07-07 01:54:28 -04:00
Jenkins for ownCloud
33492b4448
[tx-robot] updated from transifex
2014-07-06 01:54:33 -04:00
Georg Ehrke
1565089c02
fix phpDocBlock for OC_App::getAppInfo
2014-07-05 13:32:21 +02:00
Georg Ehrke
042ec984bd
better validation: cadd extra check if appinfo/info.xml exists
2014-07-05 13:28:47 +02:00
Jenkins for ownCloud
23e0ef6ed0
[tx-robot] updated from transifex
2014-07-05 01:56:33 -04:00
Jörn Friedrich Dreyer
8fbcca1291
Merge pull request #9419 from owncloud/fix_search_results_in_root_dir
...
Fix search results in root dir & deprecate OC_Search_Provider
2014-07-04 18:28:54 +02:00
Björn Schießle
a544bd3a0f
Merge pull request #9357 from owncloud/sharing_unshare_on_delete
...
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
icewind1991
d3fab824f7
Merge pull request #9445 from owncloud/filelist-auth-error
...
Reload the page when the files app encounters an authentication error
2014-07-04 16:39:00 +02:00
Robin Appelman
4fe1cdd2a7
Add machine readable error messages to OC\JSON
...
Reload the files app in case of authentication errors, expired tokens or disabled app
Reloading will triger the full server side handeling of those errors
formatting
fix missing semicolon + some jshint warnings
2014-07-04 16:20:27 +02:00
Jörn Friedrich Dreyer
aeeae5f1b2
Merge pull request #8308 from owncloud/case_insensitive_search_oracle
...
use case insensitive linguistic sort and compare when connecting to oracle
2014-07-04 15:51:57 +02:00
Thomas Müller
2327d41b11
Merge pull request #9269 from owncloud/fix_versions_preview
...
change order of registering api and capabilities to fix file version previews
2014-07-04 15:25:24 +02:00
Bjoern Schiessle
e9f5730869
make sure that the umount hook always contains the path relative to data/user/files
2014-07-04 10:34:54 +02:00
Jenkins for ownCloud
e4a3f8d3c4
[tx-robot] updated from transifex
2014-07-04 01:56:01 -04:00
Vincent Petry
dd4273e2e3
Merge pull request #9413 from owncloud/fix_hook_names
...
fix hook names
2014-07-03 22:01:24 +02:00
Jörn Friedrich Dreyer
b5545b81c6
make search case insensitive on postgres and oracle
2014-07-03 19:01:00 +02:00
Jörn Friedrich Dreyer
b56f5f2773
deprecate OC_Search_Provider in favor of \OCP\Search\Provider
2014-07-03 16:03:09 +02:00
Bjoern Schiessle
3c45925e74
fix hook names
2014-07-03 13:52:58 +02:00
Vincent Petry
2fec6cbd5b
Remove forgotten debug log
2014-07-03 12:26:17 +02:00
Philippe Kueck
ef114b6594
silently discard the response body, needed for apache/mod_dav and maybe other dav servers which return an html body
2014-07-03 12:04:38 +02:00
Jenkins for ownCloud
1a1c5aa3c0
[tx-robot] updated from transifex
2014-07-03 01:56:24 -04:00
Vincent Petry
ed29e7d160
Merge pull request #9329 from owncloud/sharing_check_target
...
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Vincent Petry
f4eb90e229
Merge pull request #9311 from owncloud/storage-not-available
...
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Morris Jobke
904e3102d3
Merge pull request #9288 from owncloud/fix_dispatcher_null_values
...
don't typecast null values inside dispatcher.php
2014-07-02 15:29:33 +02:00
Robin Appelman
c4fa07d7cf
Also update sqliteadapter
2014-07-02 15:27:27 +02:00
Robin Appelman
edb67f9f4d
Remove invalid mounts from the active fs
2014-07-02 15:00:12 +02:00
Volkan Gezer
805a7cf485
Merge pull request #9338 from owncloud/fix-redirect-for-appframework
...
Redirect after session expiry to the previous loaded page
2014-07-02 11:39:41 +02:00
Jenkins for ownCloud
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
Vincent Petry
94c3bac9ed
Merge pull request #9327 from owncloud/migrator-postgreskeywordtest
...
Added migrator test for reserved keyword
2014-07-01 20:40:18 +02:00
Vincent Petry
3d921ed3c3
Merge pull request #9334 from owncloud/defaultappfix
...
Default app fix
2014-07-01 20:39:13 +02:00
Bjoern Schiessle
bb935978fa
don't move a share mount point into a different mount point
2014-07-01 19:38:55 +02:00
Jonny007-MKD
4161fd2408
Update adapter.php
...
Modified insertIfNotExist() to support NULL values
2014-07-01 17:47:27 +02:00
Bjoern Schiessle
735eac6c9d
add a explicit interface for the home storage
2014-07-01 17:31:33 +02:00
Vincent Petry
7c17452028
Added unit test for default app URL
2014-07-01 16:55:29 +02:00
Morris Jobke
b6a4cc20f7
Redirect after session expiry to the previous loaded page
...
* fixes #6945
2014-07-01 16:54:52 +02:00
Jörn Friedrich Dreyer
5a588333b2
introduce and use getCurrentConnection()
2014-07-01 16:45:00 +02:00
Vincent Petry
3e78f41d00
Use getAbsoluteUrl for redirection URL
...
Also separate the function into getDefaultPageUrl() and
redirectToDefaultPage() to make it testable.
2014-07-01 16:02:38 +02:00
Vincent Petry
c005515ebd
Support for multiple default apps
...
If a default app isn't visible for the user, try the next one.
Else fallback to the "files" app.
2014-07-01 15:42:26 +02:00
Robin Appelman
8161104420
Catch StorageInvalidException in webdav
2014-07-01 15:03:29 +02:00
blizzz
616f9b1e03
Merge pull request #9156 from owncloud/solve-8959
...
search term for users and groups may occur anywhere in the name or displ...
2014-07-01 14:37:09 +02:00
Robin Appelman
1c43081d38
Detect removed public shares
2014-07-01 14:36:06 +02:00
Vincent Petry
894d69184a
Add bak defaultapp setting
2014-07-01 14:28:45 +02:00
Jörn Friedrich Dreyer
dd20b9f672
reset collection to 'root' after adding a route to the api
2014-07-01 14:21:20 +02:00
Vincent Petry
b752aff51d
Fix migrator tests to use the correct migrator instances
2014-07-01 12:54:35 +02:00
Jan-Christoph Borchardt
75a5746b70
Merge pull request #9306 from owncloud/publicneedsupgrade
...
Return 503 in public.php and OCS API when upgrade is due
2014-07-01 11:52:39 +02:00
Morris Jobke
88e6f5c318
Merge pull request #9292 from owncloud/issue/9161
...
Use get random bytes as uniqeid() is not unique in some cases
2014-07-01 09:51:45 +02:00
Jenkins for ownCloud
a878b42b42
[tx-robot] updated from transifex
2014-07-01 01:54:43 -04:00
Arthur Schiwon
16275eca84
loop over usernames, not passwords
2014-06-30 20:43:50 +02:00
Robin Appelman
99960d7747
Handle StorageNotAvailableException in webdav
2014-06-30 16:36:11 +02:00
Robin Appelman
d78a2a9f78
Add StorageNotAvailableException
2014-06-30 15:46:37 +02:00
Vincent Petry
972fffbe02
Return 503 OCS response with requested format
2014-06-30 15:37:38 +02:00
Joas Schilling
0c711e1cfa
Use get random bytes as uniqeid() is not unique in some cases
...
Fix #9161
2014-06-30 11:10:10 +02:00
Jenkins for ownCloud
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
Georg Ehrke
c30bea45e9
don't typecast null values inside dispatcher.php
2014-06-29 22:40:50 +02:00
Thomas Müller
9032ce4535
Merge pull request #9266 from owncloud/fix_objectstore_etag_update
...
always regenerate etag when writing back file to objectstore
2014-06-29 20:59:20 +02:00
Jenkins for ownCloud
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
Volkan Gezer
ae68a773c0
more strings to translate in utils also some fixes in defaults
2014-06-28 13:29:24 +02:00
Normal Ra
42edd5b788
Add .apk mimetype.
2014-06-28 00:13:15 +02:00
icewind1991
1a3e698294
Merge pull request #9263 from owncloud/remote-share-update
...
Better detecting of remote changes for external shares
2014-06-27 19:31:18 +02:00
Jörn Friedrich Dreyer
23fa75f5ac
always regenerate etag when writing back file to objectstore
2014-06-27 18:49:06 +02:00
Robin Appelman
db3f0cee4a
Fix parsing of webdav permissions
2014-06-27 17:28:56 +02:00
Robin Appelman
6f5d5b9a30
Also check for updated permissions for webdav storages
2014-06-27 17:27:47 +02:00
Robin Appelman
5b8c2ac750
Use the etag to check for updates in webdav storages where available
2014-06-27 17:10:46 +02:00
Vincent Petry
fd8b5680dd
Merge pull request #8383 from owncloud/object_storage
...
Object storage
2014-06-27 16:53:03 +02:00
Jörn Friedrich Dreyer
25dbbbadd3
use normalize path to convert '.' to '' in objectstorestorage
2014-06-27 15:00:29 +02:00
Thomas Müller
4d6019b73f
Merge pull request #9247 from owncloud/move-webdav-class-to-core-master
...
Move webdav class to core master
2014-06-27 12:59:59 +02:00
Jörn Friedrich Dreyer
ab93f1949d
update hasUpdated description, overwrtie testStat for objectstore test
2014-06-27 12:14:31 +02:00
Vincent Petry
4b5bf606cb
Merge pull request #9215 from owncloud/officemimetypesupdatefix
...
Office mime types update fix
2014-06-27 11:23:19 +02:00
Thomas Müller
171475b95a
fix autoloader
2014-06-27 08:52:40 +02:00
Thomas Müller
c745240543
Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies
2014-06-27 08:52:28 +02:00
Jenkins for ownCloud
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
Robin Appelman
f93457c41d
Fix check if class exists
2014-06-27 00:52:37 +02:00
Robin Appelman
437094bbfc
Check if classes/method exists before trying to call them in background jobs
2014-06-26 22:40:12 +02:00
Thomas Müller
7804bd010c
Merge pull request #9230 from owncloud/fix-repair-step-php-53
...
Redeclared as public to allow invocation from within the closure in php ...
2014-06-26 17:20:09 +02:00
Vincent Petry
8526556110
Merge pull request #9206 from owncloud/occ-scan-user
...
Prevent running the files:scan command as the wrong user
2014-06-26 17:03:23 +02:00
Vincent Petry
67d0a3c15e
Fixed mime type repair step
2014-06-26 16:40:12 +02:00
Vincent Petry
b7d79a90b0
Merge pull request #9210 from owncloud/better_validation_in_getAppPath
...
better validation for OC_App::getAppPath()
2014-06-26 15:52:12 +02:00
Thomas Müller
4c80c9595f
Redeclared as public to allow invocation from within the closure in php 5.3
2014-06-26 14:27:41 +02:00
Bernhard Posselt
2662c4c61b
use id instead of resourceId
2014-06-26 14:20:35 +02:00
Bernhard Posselt
5496ca234b
dont strip the s from the resource
2014-06-26 14:02:20 +02:00
voxsim
5d30ed9ad1
fix in displayNamesInGroup: when specified limit N, we did complex search only in the first N users
2014-06-26 12:38:33 +02:00
Jörn Friedrich Dreyer
f96a535f80
fix objectstore test execution
2014-06-26 11:30:00 +02:00
Björn Schießle
1822bba5e9
Merge pull request #9193 from owncloud/sharing_etag_propagation
...
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Vincent Petry
b1e778d5fd
Moved office mimetype update to a repair step
2014-06-25 19:49:18 +02:00
VicDeo
7c362ab55e
Merge pull request #9194 from owncloud/revertloadapps
...
Bring back loadApps() in base.php
2014-06-25 18:52:56 +03:00
Georg Ehrke
09356bc5b3
better validation for OC_App::getAppPath()
2014-06-25 16:24:55 +02:00
Robin Appelman
9a2ed86672
Prevent running the files:scan command as the wrong user
2014-06-25 15:22:49 +02:00
icewind1991
16396e2e33
Merge pull request #9123 from owncloud/webdav-move-permissions
...
Fix permissions check when moving a file to a different directory over webdav
2014-06-25 15:09:58 +02:00
Jörn Friedrich Dreyer
8e6cb6dc54
delete object without downloading it first
2014-06-25 14:53:38 +02:00
Arthur Schiwon
f3ecf819ec
extend Dummy user and group implementation to pass tests
2014-06-25 13:13:53 +02:00
Robin Appelman
113749bd96
really always take root of the substorage
2014-06-25 13:00:11 +02:00
Bjoern Schiessle
a0b85fc5e4
make sure that during share and unshare the etags get propagated correctly
2014-06-25 12:11:56 +02:00
Arthur Schiwon
121d52860e
return int, not string
2014-06-24 21:54:57 +02:00
Bjoern Schiessle
92a82f02b3
always take root of the substorage
2014-06-24 18:53:51 +02:00
Vincent Petry
a120d6e9a3
Bring back loadApps() in base.php
...
loadApps() had been deleted by mistake in
799205488c
2014-06-24 17:37:58 +02:00
Robin Appelman
92f2a430a8
Don't bother checking for external updates for objectstore storages
2014-06-24 14:48:59 +02:00
Robin Appelman
eb97eee964
Only initialize the swift container when manipulating an object
2014-06-24 14:42:52 +02:00
Robin Appelman
159b603d13
Add support for rackspace swift backends
2014-06-24 14:36:29 +02:00
Bjoern Schiessle
70ca292fd9
only the mount point has delete and update permissions to enable rename operation
2014-06-24 13:55:04 +02:00
Bjoern Schiessle
84d36df70b
make sure that we always return the correct permissions
2014-06-24 13:39:37 +02:00
Jenkins for ownCloud
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
Thomas Müller
f913b1629b
Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master
...
fix recursion on rmdirr
2014-06-23 23:18:10 +02:00
Thomas Müller
fba694edae
update PHPDoc $fileInfo is a SplFileInfo
2014-06-23 23:15:30 +02:00
Joas Schilling
167ba14af7
Merge pull request #9159 from owncloud/enabledapp-cache-loggedin
...
Only cache enabled apps when logged in
2014-06-23 18:02:57 +02:00
Jörn Friedrich Dreyer
28c1a95575
use common storage test
2014-06-23 16:29:01 +02:00
macjohnny
11ccb57fc7
modified caching mechanism in getUserGroupIds
...
removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId
2014-06-23 15:59:27 +02:00
Vincent Petry
8c82098281
Merge pull request #8974 from owncloud/router-preventloadappsonupgrade
...
Prevent loadApps on upgrade
2014-06-23 15:15:50 +02:00
Robin Appelman
2547945779
Add comment
2014-06-23 15:14:35 +02:00
macjohnny
24e397afd2
clean up function getUserGroupIds
...
clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds
2014-06-23 14:47:19 +02:00
Thomas Müller
ed31f30afd
dir itself has to be removed as well
2014-06-23 14:40:55 +02:00
Robin Appelman
8b41689fe6
Only cache enabled apps when logged in
2014-06-23 13:55:21 +02:00
Thomas Müller
f83821c388
fix recursion on rmdirr
2014-06-23 13:54:27 +02:00
Arthur Schiwon
01a012980a
search term for users and groups may occur anywhere in the name or displayname, not just in the beginning
2014-06-23 12:03:09 +02:00
Jörn Friedrich Dreyer
7ec53571c4
use 'object' as the fakedir stream name
2014-06-23 11:07:01 +02:00
Arthur Schiwon
81ecbbb061
trusted domains shall not be ignored on autosetup
2014-06-23 10:33:15 +02:00
Vincent Petry
53ad15e0e3
Merge pull request #9138 from owncloud/fix-documentation
...
Add explanation about the current implementation of updateApp
2014-06-23 10:32:41 +02:00
Jenkins for ownCloud
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
Bart Visscher
089139f8ea
Add explanation about the current implementation of updateApp
2014-06-22 12:45:59 +02:00
macjohnny
405e89f45a
Update manager.php
2014-06-21 16:06:11 +02:00
Jenkins for ownCloud
da0e4b0af0
[tx-robot] updated from transifex
2014-06-21 01:54:37 -04:00
Robin Appelman
80e6d357a2
Fix permissions check when moving a file to a different directory over webdav
2014-06-20 14:29:13 +02:00
Jörn Friedrich Dreyer
c112a1d323
move to stream based IObjectStore interface, rearrange & reformat code
2014-06-20 12:27:47 +02:00
Jenkins for ownCloud
ca96b9d3d5
[tx-robot] updated from transifex
2014-06-20 01:54:32 -04:00
macjohnny
6a3d6d3e4b
Update manager.php
2014-06-19 20:32:37 +02:00
macjohnny
14fcd68172
Update manager.php
2014-06-19 19:35:10 +02:00
macjohnny
c954168973
Update manager.php
...
defined $uid in getUserGroupIds
2014-06-19 13:28:37 +02:00
macjohnny
18c7c94b7a
Update manager.php
...
added description and blank lines in getUserGroupIds
2014-06-19 11:41:29 +02:00
macjohnny
356e4b6665
Update manager.php
...
add caching to getUserGroupIds
2014-06-19 11:37:46 +02:00
Jenkins for ownCloud
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
Jörn Friedrich Dreyer
f2fe00e972
fix rebase, use 'object::user:<username>' or 'object::store:<storageid> as storage id, by default use container/bucket name for storageid, make storageid configurable, store user only for HomeObjectStoreStorage, change updateObject() to writeObject()
2014-06-18 15:20:26 +02:00
Jörn Friedrich Dreyer
5cae863408
change architecture from inheritance to composition
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
9335a5f07f
remove duplicate method
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
5722e31d1a
add autocreate config option for containers, implement autocreate and delete of containers, use generated container names for tests
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
4e65889f54
only use one config option 'objectstore' for root and home storage configuration
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
7493ff0624
fix unit test by always initializing the root of the storage in the constructor
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
10de4a7b90
move creation of / and users 'files' from storage constructor to setupFS / mount initialization
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
87aaf39259
fix checking unset array values, deduplicate code, remove file from cache if it could not be stored in the objectstore
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
eca536d8b4
minor code cleanup
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
c020e8e658
use exceptions to notify abstract parent class of problems
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
60a8419a1f
when root storage cannot be mounted throw an exception visible to the end user
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
1374ba9adf
fix fallback config for default home storage
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
ccb698a6a8
move swift and abstract code to core
2014-06-18 12:53:20 +02:00
Jörn Friedrich Dreyer
85ccfad37c
change 'object_storage' config param to 'root_storage'
...
copy skeleton only for local filesystems
2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
2bf7e5c02f
make objectstore setup more robust, don't pass user to object store mounted as root
2014-06-18 12:53:19 +02:00
Jörn Friedrich Dreyer
3c66a8c8ed
allow configuring objectstore as home and root storage
2014-06-18 12:53:19 +02:00
Vincent Petry
799205488c
Prevent loadApps on upgrade
...
Moved OC::needUpgrade() to OCP\Util::needUpgrade() to make it accessible
form the router.
Moved maintenance + upgrade check to the router.
2014-06-18 11:10:07 +02:00
Jenkins for ownCloud
baf46c74cd
[tx-robot] updated from transifex
2014-06-18 01:55:13 -04:00
Lukas Reschke
d4bdcb7a9b
Merge pull request #9047 from owncloud/fix_preload_fundamental_apps
...
Load fundamental apps, before any possible customizing app may follow
2014-06-18 07:29:04 +02:00
icewind1991
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Vincent Petry
cce58368ad
Merge pull request #9065 from owncloud/migrator-keepprimaryindexname
...
Do not rename primary key index when renaming table
2014-06-17 16:43:33 +02:00
Vincent Petry
7aa11b4361
Do not rename primary key index when renaming table
...
When the migrator renames a table, for example for upgrade simulation,
it should not rename the primary key to avoid messing up with the diff
because the MySQL Doctrine code expects that index to always be called
"primary".
2014-06-17 15:23:18 +02:00
Andreas Fischer
9db0a82a26
We obviously have to pass the hostname as is when there is no ':' in the hostname.
...
This reverts commit 73062040e6
.
2014-06-17 14:48:32 +02:00
Robin Appelman
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
Jenkins for ownCloud
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
Lukas Reschke
f2fc214ce0
Add deprecation notice to load* functions
...
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.
Port of https://github.com/owncloud/core/pull/9033
2014-06-16 20:33:04 +02:00
Jörn Friedrich Dreyer
cd77f92f4c
add new keynote mimetype
2014-06-16 16:25:12 +02:00
Robin Appelman
b188550c22
Also support removeable mounts with rmdir
2014-06-16 16:24:42 +02:00
Robin Appelman
0532f5c39a
Fix permission for movable storage root
2014-06-16 16:20:40 +02:00
Georg Ehrke
15c215cd03
Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
...
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Georg Ehrke
86f546ff64
disable code check for shipped apps
2014-06-16 13:49:02 +02:00
Arthur Schiwon
7b704eeb5e
Load fundamental apps, before any possible customizing app may follow
2014-06-16 13:12:21 +02:00
Vincent Petry
a48bcceb23
Merge pull request #8917 from owncloud/repair-routine-base
...
Add support for repair step classes
2014-06-16 11:13:10 +02:00
Jenkins for ownCloud
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
macjohnny
e5224782fa
Merge pull request #9022 from owncloud/speedup-nested-ldap-groups
...
drastic speedup for nested ldap groups
2014-06-16 07:50:53 +02:00
Jenkins for ownCloud
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
Robin Appelman
87e311b996
Fix storage being passed to cache/watcher and scanner when using storage wrappers
2014-06-14 10:14:08 +02:00
Robin Appelman
c61f759a8b
Fix check for shared files inside shares
2014-06-14 10:14:08 +02:00
Robin Appelman
c6a83b2f17
Fix exposing single files over webdav
2014-06-14 10:13:24 +02:00
Robin Appelman
65f3b2fad2
Add server<->server sharing backend
2014-06-14 10:10:37 +02:00
Morris Jobke
35f7565e9b
Merge pull request #8978 from owncloud/movie_preview_improvements
...
movie previews: use file directly when it's stored locally and encryption is not enabled
2014-06-14 01:01:59 +02:00
Georg Ehrke
65028c459b
don't skip code check for skipped apps
...
those apps will have to use the public api
2014-06-13 21:51:16 +02:00
Georg Ehrke
c378e76412
skip certain tests for shipped apps
2014-06-13 21:45:31 +02:00
Frank Karlitschek
87101e6638
Merge pull request #9018 from owncloud/dbms-socket-support
...
Refactor OC_DB::connect() to properly support sockets.
2014-06-13 18:09:51 +02:00
Jenkins for ownCloud
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
macjohnny
767aa4e35f
drastic speedup for nested ldap groups
...
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
- getGroupObject() (executed for every group!)
- groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
2014-06-13 00:04:06 +02:00
Andreas Fischer
73062040e6
Don't specify host when using a socket.
2014-06-12 20:22:45 +02:00
Andreas Fischer
0932760304
Rename variable to indicate that it can be port and socket.
2014-06-12 20:18:38 +02:00
Andreas Fischer
3d8eabedbd
No need to check the port number as this will fail anyway.
2014-06-12 20:17:30 +02:00
Andreas Fischer
4ca1e3cc02
Move getValue() to where required. This actually is not required "global data".
2014-06-12 19:59:40 +02:00
Andreas Fischer
17c2e63449
Move check for : to where it belongs, getting rid of $socket = false;
2014-06-12 19:56:51 +02:00
Andreas Fischer
4b87586487
Extract common variables of $connectionParams.
2014-06-12 19:53:33 +02:00
Andreas Fischer
6da2beeaff
Inline $port expression, getting rid of $port variable.
2014-06-12 19:48:37 +02:00
Vincent Petry
b595c982d0
Merge pull request #8968 from owncloud/scanner-parent-repair
...
Repair broken parent link in the scanner
2014-06-12 17:40:44 +02:00
Vincent Petry
05e351416e
Fixed instanceof to use interface instead of class
2014-06-12 17:38:26 +02:00
Vincent Petry
ca690c4d02
Added RepairStep interface and default repair step lists
...
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.
Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.
Added unit test to test messaging, error and exception cases.
2014-06-12 17:38:26 +02:00
Vincent Petry
6fcd1af4db
Add support for repair step classes
...
This also makes it possible to unit test each repair step class
individually
2014-06-12 17:38:26 +02:00
Morris Jobke
ab7cff6dfd
Revert "Merge pull request #8998 from macjohnny/master"
...
This reverts commit 482eded8b3
, reversing
changes made to 354cace14a
.
2014-06-12 14:56:46 +02:00
macjohnny
482eded8b3
Merge pull request #8998 from macjohnny/master
...
drastic speedup for nested ldap groups
2014-06-12 14:49:15 +02:00
Vincent Petry
3e1576011f
Merge pull request #8980 from owncloud/better-accept-header
...
handle http accept headers more gracefully
2014-06-12 13:28:03 +02:00
macjohnny
e8e2e47e68
Update manager.php
2014-06-12 11:29:20 +02:00
macjohnny
b1094cfe82
Update group.php
2014-06-12 11:28:57 +02:00
macjohnny
0af8aa689f
drastic speedup for nested ldap groups
...
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
- getGroupObject() (executed for every group!)
- groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
2014-06-12 09:51:23 +02:00
macjohnny
ede2aa236e
Update manager.php
...
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
2014-06-12 09:41:23 +02:00
Vincent Petry
5def2a72dd
Merge pull request #8991 from owncloud/fix-php53-arraycombine
...
Fixed array_combine for PHP 5.3
2014-06-12 09:08:50 +02:00
Jenkins for ownCloud
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
josh4trunks
1b02991a1d
Fixes based on suggestions
...
I use the term socket for any extension, either unix socket, or internet socket (port).
I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.
By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.
I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks
2014-06-11 21:47:45 -07:00
Vincent Petry
4e4c2b04c8
Fixed array_combine for PHP 5.3
2014-06-11 19:13:49 +02:00
Vincent Petry
75a53b3c49
Merge pull request #8901 from owncloud/permissions-update-cache
...
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
Vincent Petry
65b3d293ce
Added ORDER BY to enforce share entry order
...
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.
This fix adds an ORDER BY clause to force the order by id.
2014-06-11 14:28:30 +02:00
Vincent Petry
491c96eaa9
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
...
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
Bernhard Posselt
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
Bernhard Posselt
0252d39bb6
fix indention
2014-06-11 00:57:00 +02:00
Bernhard Posselt
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
Georg Ehrke
7396e5f455
movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756
2014-06-10 22:08:27 +02:00
Georg Ehrke
5e9fa64819
don't show update button when appstore is disabled or no writable dir exists
2014-06-10 18:39:34 +02:00
Georg Ehrke
e047e28ac5
make text preview backend use imagettftext, fixes #8087
2014-06-10 17:29:40 +02:00
Robin Appelman
6b1d8a56bb
remove unused argument
2014-06-10 15:42:37 +02:00
Robin Appelman
054083b9cd
add some comments
2014-06-10 15:37:43 +02:00
Robin Appelman
21cfd1014a
Repair broken parent link in the scanner
2014-06-10 15:26:18 +02:00
Bjoern Schiessle
9dc0befcca
call self::getNumericStorageId() to get the numeric ID
2014-06-10 14:48:19 +02:00
Georg Ehrke
602404c631
fix php doc block
2014-06-10 13:58:41 +02:00
Georg Ehrke
6bf06890e7
always return a bool in OC_App::updateApp
2014-06-10 13:56:05 +02:00
Georg Ehrke
5d4f3baf56
fix php doc block
2014-06-10 13:51:20 +02:00
Georg Ehrke
1ab9bdcaa0
remove unnecessary @return
2014-06-10 13:01:10 +02:00
Jenkins for ownCloud
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
Robin Appelman
41d2354191
Save the permissions in the filecache if it's not saved yet
2014-06-09 12:34:35 +02:00
Morris Jobke
63c5c7bd21
set logger before registrate to an error handler
2014-06-09 10:02:23 +02:00
Jenkins for ownCloud
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
Morris Jobke
e769ef9bbb
Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix
...
Added hacky fix for long path cleanup routine
2014-06-08 20:46:00 +02:00
Jenkins for ownCloud
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
Jenkins for ownCloud
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
Björn Schießle
3da47db33c
Merge pull request #8927 from owncloud/expire_only_link_shares
...
only expire link shares
2014-06-06 19:24:15 +02:00
Thomas Müller
647dcce514
Merge pull request #8253 from owncloud/pk-on-all-tables-master
...
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
Thomas Müller
c053f27381
Merge pull request #8921 from owncloud/fix-remove-storage-master
...
No need to create a storage within remove
2014-06-06 16:16:44 +02:00
Bjoern Schiessle
f15d7dfec0
only expire link shares
2014-06-06 15:47:37 +02:00
Thomas Müller
fe8bae31dc
adding PK to table encryption
...
adding auto increment/PK to table files_trash
adding PK to table ldap_user_mapping and ldap_group_members
adding PK to table ldap_group_mapping
truncate permissions table to allow smooth creation of primary key
adding unit test for creating an auto increment column on a table which already contains data
remove unneeded table files_trashsizes
fix unit test
no need to truncate *PREFIX*permissions
On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
Vincent Petry
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
Jörn Friedrich Dreyer
a59b5249d3
add more and fix office mimetypes, migrate wrong mimetypes
2014-06-06 12:00:25 +02:00
icewind1991
c47d4ebbac
Merge pull request #8666 from owncloud/mount-remove
...
Support for (re)moving mountpoints
2014-06-06 11:57:43 +02:00
Vincent Petry
0661d737e6
Merge pull request #8900 from guruz/webdav_permission_moveable_renameable
...
WebDAV Permissions: Distinguish between renameing and moving
2014-06-06 11:51:39 +02:00
Vincent Petry
ff12969276
Merge pull request #8905 from owncloud/update-cli-skipcheckmigrate
...
Added CLI arguments for upgrade simulation steps
2014-06-06 11:42:14 +02:00
Thomas Müller
26993f2167
No need to create a storage within remove
2014-06-06 11:39:35 +02:00
Thomas Müller
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer
56470fa9b3
fix namespace for legacy search classes
2014-06-06 11:01:35 +02:00
Vincent Petry
6e2358c3a6
Added hacky fix for long path cleanup routine
2014-06-06 10:41:49 +02:00
Thomas Müller
3a7b30795c
Merge pull request #8783 from owncloud/remove-serializers
...
Remove controller serializers
2014-06-06 10:33:16 +02:00
Vincent Petry
5e27ac3e0d
Added CLI arguments for upgrade simulation steps
...
Added "dry run" argument to only run the update simulation.
Added argument to disable migration (useful for bigger setups where
table duplication would take too much space)
2014-06-06 10:11:14 +02:00
Thomas Müller
ff651a3e0d
Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master
...
use system function to recursive remove the directory used by temporary ...
2014-06-06 10:02:23 +02:00
Robin Appelman
46f70aabfd
Dont connect hooks twice
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
3459f99dd6
make sure that we only delete shares for the current user
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
eec1c4398a
only unshare user share if it was shared with the current user
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
5bbfdc35d7
make sure that we remove all shares refering to the same parent
2014-06-06 09:56:02 +02:00
Bjoern Schiessle
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
Robin Appelman
e362373a30
Movable storage root can always be moved and deleted
2014-06-06 09:56:01 +02:00
Robin Appelman
a432459685
use triple equals
2014-06-06 09:56:01 +02:00
Robin Appelman
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
Bjoern Schiessle
b0a74edbb2
allow moving files to the root
2014-06-06 09:56:00 +02:00
Bjoern Schiessle
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
Robin Appelman
dea5219244
Fix folder name for storage root
2014-06-06 09:55:59 +02:00
Bjoern Schiessle
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
Robin Appelman
4fbc991ea2
Add the removing logic for mounts
2014-06-06 09:55:59 +02:00
Robin Appelman
8abe1c3f1a
Don't do rename hooks for cache when moving the mountpoint
2014-06-06 09:55:58 +02:00
Robin Appelman
60a659c87e
Add a system for (re)movable mount points
2014-06-06 09:55:58 +02:00
Thomas Müller
79b65269c9
Merge pull request #8877 from owncloud/getpath-storage-check
...
Verify that we have a valid storage in View->getPath
2014-06-06 09:44:57 +02:00
Thomas Müller
d359765bdc
Update PHPDoc
2014-06-06 09:44:34 +02:00
Georg Ehrke
a110973b3a
some additional type checks
2014-06-06 09:41:53 +02:00
Georg Ehrke
498aa66648
add additional type check
2014-06-06 09:33:34 +02:00
Thomas Müller
ad4ec414c9
use system function to recursive remove the directory used by temporary storage
2014-06-06 09:29:31 +02:00
Jenkins for ownCloud
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
Jörn Friedrich Dreyer
aaf0d13171
make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api
2014-06-06 01:17:02 +02:00
Georg Ehrke
0fe8f77c17
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
settings/templates/apps.php
2014-06-05 22:54:27 +02:00
Jörn Friedrich Dreyer
5034bd1b12
minor phpdoc cleanup and imports
2014-06-05 19:49:21 +02:00
Andrew Brown
7a224f5762
Move new search results to 'lib/private/search'
2014-06-05 19:23:44 +02:00
Andrew Brown
8a223eb62d
Move legacy search to 'lib/private/legacy'
...
This fixes errors where apps would try to start providers using
OC_Search and would fail. Also, made OC_Search simply inherit from
\OC\Search.
2014-06-05 19:23:44 +02:00
Andrew Brown
794a133f9a
Re-add type to legacy OC_Search_Result class
2014-06-05 19:23:44 +02:00
Andrew Brown
70be98f6d0
Add audio and image result types
2014-06-05 19:22:22 +02:00
Andrew Brown
c46d514733
Add audio and image result types
2014-06-05 19:22:22 +02:00
Jörn Friedrich Dreyer
afd24385a8
fix formatting
2014-06-05 19:22:22 +02:00
Andrew Brown
a6583d3976
Add legacy adapters for file search
2014-06-05 19:21:47 +02:00
Andrew Brown
ac72828eae
Move to new namespace convention and add new result sub-classing
2014-06-05 19:21:47 +02:00
Thomas Müller
70e0ae0637
Merge pull request #8483 from owncloud/encryption_use_oc_preferences
...
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
Bernhard Posselt
587a8df566
remove controller serializers
2014-06-05 18:00:36 +02:00
Vincent Petry
1c59808517
Merge pull request #8865 from owncloud/improve_share_settings
...
Improve share settings
2014-06-05 17:23:42 +02:00
Bjoern Schiessle
2d83424a29
allow to set pre-condition for setValue
2014-06-05 16:54:03 +02:00
Thomas Müller
4b650a20a4
Merge pull request #8893 from owncloud/feature/get-users-by-preference
...
Add method to get users by their preference
2014-06-05 16:52:00 +02:00
Thomas Müller
fad3bd7fc0
reenable checkCode()
2014-06-05 16:32:46 +02:00
Robin Appelman
00539cf8f9
Verify that we have a valid storage in View->getPath
2014-06-05 15:50:19 +02:00
Bjoern Schiessle
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
Thomas Müller
3dbfd1fe46
Merge pull request #8529 from owncloud/remove-legacy-routing
...
Remove legacy routing code
2014-06-05 15:22:46 +02:00
Markus Goetz
e6665a0542
WebDAV Permissions: Distinguish between renameing and moving
2014-06-05 14:39:06 +02:00
Thomas Müller
e1beb8c6c3
Merge pull request #8889 from owncloud/mtime-reuse
...
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
Vincent Petry
bbdcbb9911
Merge pull request #8866 from owncloud/flock-quotafix
...
Fixed quota wrapper to return the value from flock()
2014-06-05 13:11:45 +02:00
Joas Schilling
4b18967129
Hack around oracle for CLOB fields
2014-06-05 12:19:48 +02:00
Jan-Christoph Borchardt
9e56acbdc9
add snap.js script
2014-06-05 11:52:17 +02:00
Joas Schilling
879237f32a
Add method to get users by their preference
2014-06-05 11:50:43 +02:00
Lukas Reschke
7c4abce373
Move authentication to it's own call
2014-06-05 11:45:45 +02:00
Lukas Reschke
ac7fb1b23e
Remove legacy routing code
...
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.
This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.
Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
2014-06-05 11:45:45 +02:00
icewind1991
bd373d9621
Merge pull request #7878 from owncloud/quota-extstorageswitch
...
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
Jörn Friedrich Dreyer
f1bf06f8cf
Merge pull request #8884 from owncloud/move-flock-to-app
...
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
Thomas Müller
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Vincent Petry
71b86136c2
Merge pull request #8878 from owncloud/update-checkmigrationforapps
...
Simulate apps database schema update on upgrade
2014-06-05 10:28:30 +02:00
Robin Appelman
3e73251750
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 10:08:25 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
josh4trunks
ea162c8a39
Fix variable not always being defined.
2014-06-04 23:03:13 -07:00
Jenkins for ownCloud
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
josh4trunks
e77c9bb97e
Work with MySQL Sockets
...
This passes anything that is not a valid port (0<int<65535) as a unix socket.
I tested this with unix sockets; this needs to be tested with a non-standard mysql port as well but I don't foresee any issues.
To use a unix socket, even one different than PHP's mysql.default_socket..
* Database Host = localhost:/path/to/socket
2014-06-04 22:50:23 -07:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Thomas Müller
ec7225da66
remove file locking - code will continue to live in it's own app
2014-06-04 20:11:54 +02:00
Vincent Petry
95fda3c17c
Do not load apps when upgrade is needed
...
This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.
2014-06-04 18:52:52 +02:00
Thomas Müller
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Vincent Petry
d4ffafe467
Removed simulate db update flag and split into separate methods
2014-06-04 18:17:46 +02:00
Thomas Müller
48eee0b432
use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface
2014-06-04 17:47:09 +02:00
Vincent Petry
5b97369b00
Simulate apps database schema update on upgrade
...
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
2014-06-04 17:16:44 +02:00
Georg Ehrke
724d027f19
add unit test
2014-06-04 16:29:41 +02:00
Vincent Petry
da889ff029
Added experimental switch to count external storage data in quota
...
This includes all mountpoints except the Shared one in
the used space calculation.
Added unit tests for ext storage inclusion in quota calculation
2014-06-04 16:08:59 +02:00
Jan-Christoph Borchardt
35308f5b09
hide navigation by default, not only on small screens, first step
2014-06-04 14:29:46 +02:00
Vincent Petry
b5f0a17918
Merge pull request #8822 from owncloud/cache-change-propagator
...
[WIP] Improved propagation of cache changes
2014-06-04 13:03:14 +02:00
Vincent Petry
3507964820
Fixed quota wrapper to return the value from flock()
2014-06-04 12:36:53 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Georg Ehrke
2c00ab13cf
update autoloader
2014-06-04 11:34:09 +02:00
Bernhard Posselt
ade6ed3797
Merge pull request #8701 from owncloud/slide-up-toggle
...
Create reusable data attribute for apps setting slideup
2014-06-04 11:31:04 +02:00
Jan-Christoph Borchardt
a244172219
Merge pull request #8853 from owncloud/design-typeface
...
Use Open Sans as typeface
2014-06-04 11:16:03 +02:00
Thomas Müller
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Jenkins for ownCloud
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
ringmaster
0a417b1174
Use ->instanceOfStorage() not instanceof for Storage instances.
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
48eb0515e9
only lock if unlink is called for a file
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
ab6680e9ab
name the storage wrapper to make sure that we don't apply the wrapper multiple times
2014-06-04 07:55:46 +02:00
ringmaster
cda87fd9c4
Normalize lock exception messages.
2014-06-04 07:55:45 +02:00
ringmaster
ba887d2b17
Restore the reference to this used exception class.
2014-06-04 07:55:45 +02:00
ringmaster
54865815f5
Move Lock to private namespace, add interface. Update PHPDoc.
2014-06-04 07:55:45 +02:00
ringmaster
c9c6a0ab1e
Don't error out on console.
2014-06-04 07:55:45 +02:00
ringmaster
392a1b6662
Removed unused vars/declarations, update PHPDoc.
2014-06-04 07:55:45 +02:00
Lukas Reschke
826b14e36b
Fix typo
2014-06-04 07:55:45 +02:00
Lukas Reschke
9bbc4b0034
Fix typo
2014-06-04 07:55:44 +02:00
ringmaster
896bc526e6
Remove unused methods.
2014-06-04 07:55:44 +02:00
ringmaster
6b94732bdf
Respect locked files, surface correct exception.
2014-06-04 07:55:44 +02:00
ringmaster
428510a4f8
Simpler log unique id.
2014-06-04 07:55:44 +02:00
ringmaster
f9dbdb7c5c
Add actual locking and log changes necessary for debugging.
2014-06-04 07:55:44 +02:00
ringmaster
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
Robin Appelman
a6bb1e1bf8
Fix size calculation during recursive scan
2014-06-03 19:54:59 +02:00
Morris Jobke
3a1994d001
Merge pull request #8686 from owncloud/session-early
...
Make the session available as early as possible
2014-06-03 19:23:30 +02:00
Thomas Müller
6764d5b122
Merge pull request #8698 from owncloud/sharing_improve_permissions
...
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Jan-Christoph Borchardt
80627dfd2c
use Open Sans as typeface
2014-06-03 19:07:08 +02:00
icewind1991
cdf8a123e7
Merge pull request #8264 from owncloud/app-enable-by-group
...
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
Thomas Müller
e4c3ff03d6
Merge pull request #8809 from owncloud/appconfig-caching
...
Improve caching in AppConfig
2014-06-03 18:59:37 +02:00
icewind1991
68b15f3282
Merge pull request #7015 from owncloud/db-migration-check-copy
...
Check database migration on a copy of the table first
2014-06-03 16:27:06 +02:00
Georg Ehrke
19129b3db2
use isset() instead of array_key_exists()
2014-06-03 16:23:33 +02:00
Morris Jobke
cea7d4961e
move to updated version of placeholder
2014-06-03 16:18:06 +02:00
Jan-Christoph Borchardt
7177d3a496
first step of infield label removal, fix login screen
2014-06-03 15:28:59 +02:00
Thomas Müller
587159c73e
Merge pull request #8838 from owncloud/backgroundjob-legacy-gc
...
Support having legacy `OC_Cache_FileGlobalGC` background jobs
2014-06-03 15:06:35 +02:00
Thomas Müller
79b3558c6d
Merge pull request #7151 from owncloud/user-jquery
...
Continuing the New User management
2014-06-03 15:04:30 +02:00
Thomas Müller
2b1a7a76c3
Merge pull request #8425 from owncloud/columns_should_be_nullable_by_default
...
columns should be nullable by default
2014-06-03 12:55:42 +02:00
Robin Appelman
3b1f291c60
Fix sorting of apps
2014-06-03 12:42:35 +02:00
Robin Appelman
c09852e006
Fix phpdoc
2014-06-03 12:42:35 +02:00
Robin Appelman
53dc30af4f
Add option to enable app for specific groups
2014-06-03 12:42:35 +02:00
Robin Appelman
b4025b3174
Allow enabling apps by group by setting the config value to a json encoded array of groups
2014-06-03 12:42:35 +02:00
Robin Appelman
6ed3194863
Use a map to prevent having to use search
2014-06-03 12:40:23 +02:00
Robin Appelman
bff9e11ff9
Remove duplicate cache cleanup
2014-06-03 12:38:15 +02:00
Robin Appelman
4429b54ce4
Fix typo
2014-06-03 12:00:39 +02:00
Robin Appelman
82b982a4eb
Better unique names for temporary tables
2014-06-03 11:24:31 +02:00
Robin Appelman
3be2643168
Add `generateChangeScript()` back
2014-06-03 11:19:58 +02:00
Robin Appelman
397a763c49
add a getter for the table
2014-06-03 11:18:46 +02:00
Robin Appelman
c6053b2830
Quote identifiers on mysql
2014-06-03 11:18:45 +02:00
Robin Appelman
6f71419f2b
Skip migration checks for all sql backends besides mysql, postgres and sqlite
2014-06-03 11:18:45 +02:00
Robin Appelman
a59f6818eb
Only quote identifiers for oracle during migration
2014-06-03 11:18:45 +02:00
Robin Appelman
3b4555ca91
Try and check migration before applying it
2014-06-03 11:18:17 +02:00
Robin Appelman
adeac7aa39
Check sqlite migration on a copy of the database file
2014-06-03 11:17:21 +02:00
Robin Appelman
35550e8d9a
Fix migrator for postgres
2014-06-03 11:17:21 +02:00
Robin Appelman
be80dce585
Fix temporary schema creation
2014-06-03 11:17:21 +02:00
Robin Appelman
58c61c8336
Fix generating migration test schemas
2014-06-03 11:17:21 +02:00
Robin Appelman
0035147be9
Create unique names for temporary indexes
2014-06-03 11:17:21 +02:00
Robin Appelman
9c6a93a87c
Add a mechanism to try the database migration on a copy of the tables before running it on the "real" data
2014-06-03 11:17:21 +02:00
Robin Appelman
ec9bf8a2d6
Support having legacy `OC_Cache_FileGlobalGC` background jobs
2014-06-03 11:01:01 +02:00
Robin Appelman
3e14affa9b
Add some comments
2014-06-03 10:57:18 +02:00
Georg Ehrke
eea501b847
various fixes as requested by pr reviewers
2014-06-02 21:39:15 +02:00
Robin Appelman
6689d67a5b
Fix recursive scanning
2014-06-02 21:04:36 +02:00
Bjoern Schiessle
e0a5f3b570
get permissions directly from share storage to avoid additional db calls
2014-06-02 20:17:40 +02:00
Bjoern Schiessle
7ad0fee0b5
let file cache handle the versions size
2014-06-02 18:55:13 +02:00
Morris Jobke
9a67986473
add OCP\Config:deleteSystemValue
2014-06-02 18:31:43 +02:00
Morris Jobke
57ef089aac
drop allowZIPdownload and maxZIPSize as options
2014-06-02 16:29:03 +02:00
Robin Appelman
e002ff6065
propagate changes in the scanner
2014-06-02 15:24:08 +02:00
Robin Appelman
0158788a2a
Split of cache writes in the scanner to their own methods
2014-06-02 14:52:21 +02:00
Robin Appelman
a31f089266
Add a change propagator class to handle propagating etag and mtime changes
2014-06-02 14:39:12 +02:00
Arthur Schiwon
e235de98e6
this line was lost on rebase
2014-06-02 13:22:06 +02:00
Arthur Schiwon
b15a5a7ca0
undo lastLogin changes in base and user/user as this has now been properly done in #8681
2014-06-02 12:55:45 +02:00
Arthur Schiwon
2d83c68f05
make search parameter optional, which is already the case in the medthod it is passed to
2014-06-02 12:53:59 +02:00
Arthur Schiwon
a9e8d53c8f
fix PHPDoc
2014-06-02 12:53:59 +02:00
Arthur Schiwon
122ebf28f7
typo
2014-06-02 12:53:59 +02:00
Arthur Schiwon
f9f9550969
small fixes / cleanup
2014-06-02 12:53:57 +02:00
Arthur Schiwon
734dd7013e
add MetaData class for groups
2014-06-02 12:53:56 +02:00
Arthur Schiwon
2a8afb0ad9
add PHP doc
2014-06-02 12:53:56 +02:00
Arthur Schiwon
57ffaddf26
add Last Login column
2014-06-02 12:53:51 +02:00
Vincent Petry
4e957c7b18
Merge pull request #8443 from owncloud/csrf-on-login-and-logout
...
Add CSRF check on login and logout
2014-06-02 11:27:20 +02:00
Lukas Reschke
c8b5ae675c
Fix PHPDoc
...
- Remove not anymore existing parameters
- Fix typo
2014-06-01 21:46:05 +02:00
Robin Appelman
a4949f4b31
Simplify AppConfig->getValues()
2014-06-01 14:14:30 +02:00
Robin Appelman
91180bfef4
Add caching to AppConfig->getApps
2014-06-01 14:04:17 +02:00
Georg Ehrke
c8a8c7e933
read ocsid from shipped apps on install
2014-05-31 18:02:59 +02:00
Georg Ehrke
020255b4e5
add button for properly uninstalling apps
2014-05-31 17:50:39 +02:00
Georg Ehrke
c8636ca4d9
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
lib/private/installer.php
2014-05-31 14:55:00 +02:00
Georg Ehrke
2bcfd8e084
make it possible to update shipped apps via the appstore
2014-05-31 12:17:54 +02:00
Jenkins for ownCloud
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
Thomas Müller
86b06c72bb
Merge pull request #8800 from owncloud/db-changes-as-required-by-8483
...
Database code cleanup
2014-05-31 00:47:03 +02:00
Thomas Müller
999f6216dc
- fix dropTable() and introduce tableExists()
...
- kill replaceDB() - this function is unused and it's implementation obviously wrong
- add method annotation OC_DB_StatementWrapper::fetchAll
- remove duplicate code in Test_DBSchema and reuse OC_DB::tableExists
- remove unused variables
2014-05-30 23:34:42 +02:00
Thomas Müller
5dd3e34f57
Merge pull request #8444 from owncloud/cleanup-list-code
...
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
Thomas Müller
555b9cc245
Merge pull request #7614 from owncloud/test_annotations_working
...
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
Owen Winkler
da6aae28ad
Merge pull request #8607 from owncloud/filescan_app_hook
...
Allow apps to control via a hook skipping add/remove a file during filescan
2014-05-30 12:38:37 -04:00
ringmaster
19f0c47842
Missed one.
2014-05-30 10:40:26 -04:00
Thomas Müller
31ad1cbdd8
Merge pull request #5365 from owncloud/filesize-improvements-32bit
...
Add LargeFileHelper / Add CURL filesize workaround / Fix some 32-bit filesize issues
2014-05-30 16:13:48 +02:00
ringmaster
16ae63bdfd
Updates per comments on PR:
...
* Use "filesystem_cache_readonly" config setting, update comment in config.sample
* Use $this->cacheActive to cache config setting
* Add public Scanner::setCacheActive() to set $cacheActive programmatically
2014-05-30 09:42:41 -04:00
icewind1991
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
Jenkins for ownCloud
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
Lukas Reschke
45d93cc6ec
Merge pull request #8759 from owncloud/fix-phpunit
...
fix 8757, get rid of service locator antipattern
2014-05-29 21:35:47 +02:00
Lukas Reschke
705242d390
Merge pull request #8727 from owncloud/upgrade-overview
...
Added update overview page
2014-05-29 21:28:47 +02:00
Andreas Fischer
2929d19c7f
Document exceptions thrown by \OC\LargeFileHelper.
2014-05-29 16:26:02 +02:00
Andreas Fischer
ea246d058e
Use "file size" instead of "filesize", then also apply camel case.
2014-05-29 16:26:02 +02:00
Andreas Fischer
0417e52134
Increase file size limit from 2 GiB to 4 GiB when workarounds are unavailable.
2014-05-29 16:26:02 +02:00
Andreas Fischer
fb4556033a
Cast '{DAV:}getcontentlength' to number instead of int.
2014-05-29 16:26:02 +02:00
Andreas Fischer
0bae68017e
Cast to number instead of integer in OC\Files\Cache\HomeCache
2014-05-29 16:26:02 +02:00
Andreas Fischer
a34aa1959a
Cast to number instead of integer in OC\Files\Cache\Cache
2014-05-29 16:26:01 +02:00
Andreas Fischer
a9b28323dd
Add LargeFileHelper::__construct() verifying that our assumptions hold.
2014-05-29 16:26:01 +02:00
Andreas Fischer
2c36a4b07a
Add helper method for turning int|float into base-10 unsigned integer string.
2014-05-29 16:26:01 +02:00
Andreas Fischer
fb7ec2bb22
Only call $this->filesize() for files.
2014-05-29 16:26:01 +02:00
Andreas Fischer
df29eec72b
Windows exec() implementation.
2014-05-29 16:26:01 +02:00
Andreas Fischer
626e87aa54
Output validation for exec() method.
2014-05-29 16:26:01 +02:00
Andreas Fischer
c8fa1fd687
Refactor Large File handling code.
2014-05-29 16:26:01 +02:00
Andreas Fischer
3f8f8027d2
Cast to numeric instead of float, i.e. use an integer if possible.
2014-05-29 16:17:13 +02:00
Andreas Fischer
6195f13bda
Use CURL to get filesize on 32bit systems.
2014-05-29 16:17:13 +02:00
Robin Appelman
998fa2d9be
Pass any methods custom to specific storage implementations to the wrapped storage
2014-05-29 16:13:05 +02:00
Robin Appelman
0ae7a49c8e
Fix storage wrapper being called with null
2014-05-29 14:15:48 +02:00
Robin Appelman
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
Robin Appelman
8c5521fdfc
Add $storage->instanceOfStorage to handle instanceof for storage wrappers
2014-05-29 13:45:50 +02:00
icewind1991
c0f02be50a
Merge pull request #3908 from owncloud/storage-folder-copy-rename
...
Recursive copy and remove for local storage backends
2014-05-29 13:29:24 +02:00
Thomas Müller
3ef9570d02
Merge pull request #8547 from owncloud/path-length-master
...
Handling long paths properly in \OC\Files\View
2014-05-29 00:08:29 +02:00
Lukas Reschke
1af293dc13
Merge pull request #8754 from owncloud/3rdparty-upgraded-phpmailer
...
upgraded phpmailer into v5.2.8 via composer
2014-05-28 22:42:45 +02:00
ringmaster
f79948f519
Prevent apps from affecting the scanner via hook.
2014-05-28 13:20:20 -04:00
Lukas Reschke
ce9d5df6df
Merge pull request #8681 from owncloud/logintimestamp
...
Record login timestamp per user. Required for new user managament.
2014-05-28 19:06:47 +02:00
Robin Appelman
467e9c2bb0
Remove code duplication
2014-05-28 18:16:24 +02:00
Robin Appelman
af35b6ad9d
Fix LocalStorage->unlink to work on folder as expected
2014-05-28 18:16:24 +02:00
Robin Appelman
8187164fe1
re-use rescursive copy from common storage
2014-05-28 18:16:24 +02:00
Robin Appelman
488fc402e4
remove unneeded check
2014-05-28 18:16:23 +02:00
Robin Appelman
d15ed9b4d3
use \OC\Files\Filesystem::isIgnoredDir
2014-05-28 18:16:23 +02:00
Robin Appelman
ea44f0e20f
fix recursive copy and rename for common storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
c3c9612c99
fix recursive copy and rename for mapped local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
03ba497a8c
add recursive copy to local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
38c1da0976
fix recursive rename for local storage backend
2014-05-28 18:16:23 +02:00
Robin Appelman
e83b41493f
remove unneeded delTree
2014-05-28 18:16:23 +02:00
Thomas Müller
a2e4bc8d33
# This is a combination of 2 commits.
...
# The first commit's message is:
adding tests for long paths
increment path field in database up to 4000 (maximum for Oracle - otherwise we could use php's 4096)
increment version to trigger database migration
adding unit test for too long path
# This is the 2nd commit message:
fix too long path
2014-05-28 15:30:44 +02:00
ringmaster
3d1ba574e4
Change visibility of scanner internals
...
so that descendant classes can access them.
2014-05-28 07:59:38 -04:00
Vincent Petry
09645b9221
Merge pull request #8755 from owncloud/fix-8737-master
...
remove legacy OC_Filesystem being used in a hook callback
2014-05-28 10:57:54 +02:00
Jenkins for ownCloud
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
Bernhard Posselt
5e9ea2b365
fix 8757, get rid of service locator antipattern
2014-05-28 02:15:16 +02:00
Thomas Müller
f03a3d9d05
remove legacy OC_Filesystem being used in a hook callback
2014-05-28 00:13:54 +02:00
Volkan Gezer
c100da33bb
upgraded phpmailer into v5.2.8 via composer
2014-05-27 23:33:18 +02:00
Bart Visscher
a51e9a5cfe
Merge pull request #8136 from owncloud/contactsmanager-register
...
Implement the register function of OC\ContactsManager
2014-05-27 22:35:50 +02:00
ringmaster
26d169b27c
Use 'filesystem_check_enable' as a config option.
2014-05-27 16:01:16 -04:00
ringmaster
3b287f8274
Allow the default behavior to come from the config.
2014-05-27 15:21:35 -04:00
ringmaster
fdf26c5a3f
Rename variable to something more appropriate.
2014-05-27 15:12:56 -04:00
ringmaster
645e7035a4
Allow apps to control via a hook to skip adding/removing a file during filescan
2014-05-27 15:12:54 -04:00
Vincent Petry
02f682b156
Now showing disabled apps as upgrade status line
...
- Added app id in update overview.
- Added status message for disabled app for CLI upgrade and web upgrade
2014-05-27 15:20:33 +02:00
Vincent Petry
146583a98d
Added update overview page
2014-05-27 14:53:08 +02:00
Vincent Petry
d43a7c5f6e
Added requiremin/requiremax fields for apps
...
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
2014-05-27 11:54:12 +02:00
Jenkins for ownCloud
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
Bernhard Posselt
c2330e558e
rename to apps.js
2014-05-26 17:31:41 +02:00
Arthur Schiwon
3a21c3e2f4
Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp
2014-05-26 13:56:40 +02:00
Arthur Schiwon
4a4ea67a31
drop superflous statement in phpdoc
2014-05-26 13:56:08 +02:00
Arthur Schiwon
748a219243
add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook
2014-05-26 13:53:26 +02:00
Vincent Petry
a34491e288
Merge pull request #8687 from owncloud/recursive-remove-smb
...
Make the recursive delete more robust
2014-05-26 11:06:13 +02:00
Frank Karlitschek
48d0cebc42
Merge pull request #8674 from owncloud/watch-policy
...
Add a config option for setting the filesystem watcher policy
2014-05-26 10:48:44 +02:00
Jenkins for ownCloud
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
Jenkins for ownCloud
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
Lukas Reschke
c03e7fcfa9
Clarify comment
2014-05-24 10:24:42 +02:00
Jenkins for ownCloud
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
Bernhard Posselt
db1511a11d
add a slideup mechanism
2014-05-23 18:49:16 +02:00
Robin Appelman
be8326668a
Make the recursive delete more robust
2014-05-23 13:31:45 +02:00
Robin Appelman
8b56d52398
Make the session available as early as possible
2014-05-23 13:27:27 +02:00
Robin Appelman
151c48494e
Add a config option fro setting the filesystem watcher policy
2014-05-23 12:20:31 +02:00
Arthur Schiwon
2e85d5a852
increase scrutinizer happyiness by removing minor/informational issues
2014-05-23 11:20:46 +02:00
Björn Schießle
050df76830
Merge pull request #8599 from owncloud/sharing_disable_for_groups
...
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Robin Appelman
ff1f341d97
Fix phpdoc
2014-05-22 13:30:32 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Vincent Petry
25ecd2bdda
Merge pull request #8659 from owncloud/get-preference-multiple-user
...
Add a method to get the values for multiple users to OC\Preferences
2014-05-22 09:59:20 +02:00
Björn Schießle
14a953fbe0
Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
...
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
Arthur Schiwon
2c89962919
clean up tryRememberLogin and save the timestamp of users last login
2014-05-21 18:03:37 +02:00
Joas Schilling
e20fb37038
Correctly create list of placeholders
2014-05-21 14:35:59 +02:00
Bjoern Schiessle
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
Joas Schilling
4fbfe077fb
Move return to new line
2014-05-21 13:10:23 +02:00
Joas Schilling
cf3cd572b0
Add a method to get the values for multiple users to OC\Preferences
2014-05-21 11:14:52 +02:00
scolebrook
954d5b27ff
use custom logfile path if defined, otherwise use default of owncloud.log in data directory
2014-05-20 11:29:59 -04:00
Jenkins for ownCloud
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
Thomas Müller
06af8e09da
adding annotation check to checkServer()
2014-05-19 21:51:35 +02:00
Thomas Müller
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
Thomas Müller
8749442fec
no return on register and unregister
2014-05-19 21:39:19 +02:00
Thomas Müller
bb6fac1102
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-05-19 21:35:13 +02:00
Thomas Müller
51a6764f31
Merge branch 'master' into cleanup-list-code
...
Conflicts:
apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
Thomas Müller
f8cb8f4803
Merge branch 'master' into csrf-on-login-and-logout
...
Conflicts:
core/templates/login.php
2014-05-19 20:40:55 +02:00
Thomas Müller
b6d2d6329d
Merge pull request #8639 from owncloud/drop-brief
...
Remove all occurences of @brief and @returns from PHPDoc
2014-05-19 20:18:32 +02:00
Morris Jobke
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Frank Karlitschek
090d127050
Merge pull request #6457 from owncloud/db-convert-tool
...
Command line tool to convert current database to others, except sqlite
2014-05-19 16:41:31 +01:00
Thomas Müller
95741f3936
Merge pull request #8435 from owncloud/fix-8322-master
...
Expose permission via WebDAV
2014-05-19 16:52:03 +02:00
Thomas Müller
04e6c12fe2
Merge pull request #8557 from owncloud/custom_session_handling
...
Allow apps to create custom session handlers.
2014-05-19 15:58:30 +02:00
Morris Jobke
48977c8579
Merge pull request #7286 from owncloud/issue/4823
...
Set expiration date by default when adding additional shares
2014-05-19 10:26:54 +02:00
Jenkins for ownCloud
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
Joas Schilling
ab7ae004f7
Automatically copy the share expiration date when new shares are created
...
Fix #4823
2014-05-19 01:38:47 +02:00
Morris Jobke
804020bb6d
Merge pull request #7363 from owncloud/optimize-startup-queries
...
Optimize some queries that are always executed when loading base.php
2014-05-19 01:21:37 +02:00
Jenkins for ownCloud
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
Björn Schießle
42b99b6d0f
Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
...
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
Björn Schießle
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle
7a48f24459
use default expire date only for link shares
2014-05-16 18:12:13 +02:00
Bjoern Schiessle
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
Vincent Petry
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
Jenkins for ownCloud
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
Vincent Petry
04f73275ba
Now settings CSS class with appid in content DIV
2014-05-15 17:51:04 +02:00
Thomas Müller
7abe3b1989
Merge pull request #8587 from Raydiation/master
...
Small cleanup and language detection for apps
2014-05-15 12:22:47 +02:00
Jenkins for ownCloud
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
Jenkins for ownCloud
c9df98abae
[tx-robot] updated from transifex
2014-05-14 01:55:31 -04:00
Bernhard Posselt
d8020c3506
use registerService method instead of array access
2014-05-14 01:09:48 +02:00
Bernhard Posselt
9e36c33104
use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability
2014-05-14 01:09:48 +02:00
Bernhard Posselt
512373fadf
provide a way to detect the language that is being used (e.g. for clientside javascript language selection
2014-05-14 01:09:48 +02:00
Thomas Müller
37ba6f503a
fixing variable naming
2014-05-13 19:09:15 +01:00
Thomas Müller
fa503a4772
fix PHPDoc
2014-05-13 19:09:15 +01:00
Thomas Müller
650a55e2ba
object -> \OC\Preview
2014-05-13 19:09:14 +01:00
Thomas Müller
7853bc4cac
adding PHPDoc
2014-05-13 19:09:14 +01:00
Thomas Müller
147007bdd8
fixing typo and missing @throws
2014-05-13 19:09:14 +01:00
Robin McCorkell
4755392c65
More PHPDoc for file functions
2014-05-13 19:09:14 +01:00
Robin McCorkell
f7e777f7d2
Fix various code errors detected by Scrutinizer
...
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell
bac8962bbc
Fix Scrutinizer errors
2014-05-13 19:08:14 +01:00
Robin McCorkell
bd3bf4b507
Change parameter order of implode
2014-05-13 19:08:14 +01:00
Robin McCorkell
8ab01599a9
Use OC_User_Interface instead of OC_User_Backend
2014-05-13 19:08:14 +01:00
Lukas Reschke
7e448a376f
Fix PHPDoc and typos
...
Some things my IDE complained about while creating a custom backend.
Fix PHPDoc and typos
Some things my IDE complained about while creating a custom backend.
Conflicts:
lib/private/group/database.php
lib/private/group/dummy.php
lib/private/group/example.php
2014-05-13 19:08:14 +01:00
Robin McCorkell
3bed3d2a23
Change parameter type for useBackend
2014-05-13 19:08:14 +01:00
Robin McCorkell
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
a7ae2e874a
Squash 'a | b' into 'a|b', in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b5bc37d2e4
Fix @return array PHPDocs, in /lib
2014-05-13 19:08:14 +01:00
Robin McCorkell
b653ad164b
Replace @returns with @return, in /lib
2014-05-13 19:08:14 +01:00
Thomas Müller
f5bc680f9c
Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
...
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry
bab8c1f8e5
Fixed getAbsolutePath case when path is "0"
...
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Björn Schießle
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Bjoern Schiessle
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
Bernhard Posselt
a152e320f6
make it possible to omit parameters and use the default parameters from the controller method
2014-05-13 10:40:49 +02:00
Vincent Petry
e3f6abf1f0
Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master
...
Rotate thumbnail when encryption is enabled
2014-05-13 10:27:41 +02:00
Jenkins for ownCloud
a60db322c2
[tx-robot] updated from transifex
2014-05-13 01:55:41 -04:00
Thomas Müller
8314e5f4d1
fixing typos and adding PHPDoc
2014-05-12 21:58:09 +02:00
Thomas Müller
408189b7e4
Merge pull request #8556 from owncloud/kill-legacy-code-master
...
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke
aea44ee0d5
Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
...
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Thomas Müller
ee8a7b53da
Merge pull request #8553 from owncloud/fix-8549-master
...
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
2014-05-12 17:45:08 +02:00
ringmaster
75bc25f906
Allow apps to create custom session handlers.
2014-05-12 11:08:28 -04:00
Thomas Müller
1d18fd4e6d
Merge pull request #8482 from owncloud/public-logger
...
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller
f5ed92bf31
remove legacy aka deprecated code: OC_Cache_FileGlobalGC
2014-05-12 16:34:47 +02:00
Thomas Müller
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
Thomas Müller
33987eea83
remove legacy aka deprecated code: OC_Cache
2014-05-12 16:23:33 +02:00
Thomas Müller
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
Thomas Müller
3cd32dcb7c
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place
2014-05-12 15:14:01 +02:00
Morris Jobke
9d95fff427
fix missing spaces
2014-05-12 13:32:03 +02:00
Thomas Müller
da0e37ef03
Rotate thumbnail when encryption is enabled
...
When a picture is encrypted, save it to a temporary file first so that
the PHP function for rotation can access it as file.
2014-05-12 11:27:39 +02:00
Thomas Müller
d853c60d7e
adding interpolation as requested by PSR-3
2014-05-12 10:54:09 +02:00
Jenkins for ownCloud
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
Morris Jobke
2054837d01
Merge pull request #8541 from owncloud/hardenIsSubDirectory
...
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
Morris Jobke
6499995474
Merge pull request #8477 from owncloud/better-controllers
...
Better appframework controllers
2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13
Merge pull request #8274 from owncloud/appframework-db
...
Port database layer from appframework to core
2014-05-12 00:12:19 +02:00
Bernhard Posselt
63f2f16b85
use new controllermethodreflector for corsmiddleware
2014-05-11 17:55:59 +02:00
Bernhard Posselt
474b8f071d
Fix typo
2014-05-11 17:54:09 +02:00
Bernhard Posselt
3e58a767ad
Fix method signature
2014-05-11 17:54:09 +02:00
Bernhard Posselt
fcb1aa36f0
default to null to not fail if type is not annotated via phpdoc
2014-05-11 17:54:09 +02:00
Bernhard Posselt
1d45239c65
adjust license headers to new mail address
2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6
rename formatter to responder, formatResponse to buildResponse
2014-05-11 17:54:08 +02:00
Bernhard Posselt
c590244fa1
add private property for reflector in security middleware
2014-05-11 17:54:08 +02:00
Bernhard Posselt
ede7325772
fix broken if
2014-05-11 17:54:08 +02:00
Bernhard Posselt
d8da79cab0
add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST
2014-05-11 17:54:08 +02:00
Bernhard Posselt
4dca2038bf
add request to dispatcher class
2014-05-11 17:54:08 +02:00
Bernhard Posselt
80648da431
implement most of the basic stuff that was suggested in #8290
2014-05-11 17:54:08 +02:00
Bernhard Posselt
a252f59cd4
Merge pull request #8504 from owncloud/cors-middleware
...
Add cors middleware
2014-05-11 16:54:34 +02:00
Lukas Reschke
fd5b2d11d6
Rename issubdirectory to isSubDirectory
2014-05-11 15:50:59 +02:00
Lukas Reschke
a40e49cae5
Harden issubdirectory()
...
realpath() may return false in case the directory does not exist since we can not be sure how different PHP versions may behave here we do an additional check whether realpath returned false
2014-05-11 15:49:19 +02:00
Lukas Reschke
cd3ed01483
Fix Typo
...
I guess that should be `default` and not `defautl`, wondering how this ever worked.
2014-05-11 15:24:42 +02:00
Bernhard Posselt
e05192a23d
Fix method signature
2014-05-11 14:03:58 +02:00
Lukas Reschke
e1e1009ccc
Redirect to index if the logout link is accessed without valid session
...
This is needed to prevent "Token expired" messages while login if a session is expired
@see https://github.com/owncloud/core/pull/8443#issuecomment-42425583
2014-05-11 13:09:46 +02:00
Bernhard Posselt
3af30625ab
Make db connection protected
2014-05-11 12:54:44 +02:00
Jenkins for ownCloud
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
Jenkins for ownCloud
05ea8c8a10
[tx-robot] updated from transifex
2014-05-10 01:55:50 -04:00
Bernhard Posselt
9a4d204b55
add cors middleware
...
remove methodannotationreader namespace
fix namespace for server container
fix tests
fail if with cors credentials header is set to true, implement a reusable preflighted cors method in the controller baseclass, make corsmiddleware private and register it for every request
remove uneeded local in cors middleware registratio
dont uppercase cors to easily use it from routes
fix indention
comment fixes
explicitely set allow credentials header to false
dont depend on better controllers PR, fix that stuff later
split cors methods to be in a seperate controller for exposing apis
remove protected definitions from apicontroller since controller has it
2014-05-09 23:34:41 +02:00
Bernhard Posselt
b4298c68ca
- make logger available in the container
...
- inject logger class into log
- adding PHPDoc comments and fixing typos
2014-05-09 23:26:20 +02:00
Thomas Tanghus
287c8981bc
Check if ReflectionMethod::getDocComment is working
2014-05-09 22:44:55 +02:00
Lukas Reschke
1083085e6e
Merge pull request #7546 from owncloud/no_freaking_tag_dupes
...
Tags cleanup
2014-05-09 22:10:45 +02:00
Thomas Müller
e5ee84ca9b
- update permissions
...
- change xml tag to perm
2014-05-09 17:18:43 +02:00
Andreas Fischer
bd4d315d78
Merge pull request #8512 from owncloud/fix-memcached-hasKey
...
Be more strict in checking the resultCode of memcached hasKey function
* owncloud/fix-memcached-hasKey:
Memcached hasKey should test for success, the get can fail for other reasons.
2014-05-09 12:41:46 +02:00
Jenkins for ownCloud
9919ec48df
[tx-robot] updated from transifex
2014-05-09 01:55:42 -04:00
Vincent Petry
6e7c274d2e
Merge pull request #8499 from owncloud/shareextstoragemountpointfix
...
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
Bart Visscher
88225db4af
Memcached hasKey should test for success, the get can fail for other reasons.
...
One of the other failures is no running server.
2014-05-08 18:11:29 +02:00
Vincent Petry
05dc694c5c
Fix getPathById for Oracle
...
Added extra code to handle the case of Oracle which saves empty strings
as null values.
2014-05-08 13:33:55 +02:00
Andreas Fischer
8ede209ea3
Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-on-that
...
Use strict type comparison
* owncloud/we-certainly-don't-want-type-juggling-on-that:
Use strict type comparison
2014-05-08 13:02:48 +02:00
Vincent Petry
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
Bart Visscher
9f88141bcd
Use 'boolean' as type instead of 'bool'
2014-05-07 20:46:08 +02:00
Bart Visscher
f569c721a6
Merge branch 'master' into optimize-startup-queries
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
tests/lib/group/manager.php
removed hasFilesSharedWith from lib/public/share.php and
sharedstorage.php to fix merge
2014-05-07 17:54:38 +02:00
Lukas Reschke
c4109d9aef
Use strict type comparison
...
We certainly don't want to have type juggling on that.
2014-05-07 15:11:42 +02:00
Lukas Reschke
254fa5eb22
Merge pull request #8488 from owncloud/sabre-notfoundloglevel
...
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 15:05:17 +02:00
Vincent Petry
75d81eefc1
Merge pull request #8223 from owncloud/fix_linkToPublic
...
Fix linkToPublic and linkToAbsolute.
2014-05-07 14:40:59 +02:00
Vincent Petry
4a493c8835
Some expected Sabre exceptions are now logged with DEBUG level
2014-05-07 11:43:50 +02:00
Vincent Petry
d16bb09aed
Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uri
...
Send URI instead of filepath to NGINX for X-Accel
2014-05-06 18:41:06 +02:00
Bart Visscher
72864d1c53
Typo
2014-05-06 18:05:06 +02:00
Morris Jobke
9411ba2acd
Merge pull request #8459 from owncloud/fix-getUserFolder
...
fix getUserFolder() of server container
2014-05-05 23:08:42 +02:00
Morris Jobke
91a5e728c0
fix getUserFolder() of server container
2014-05-05 18:15:48 +02:00
Robin Appelman
578eb33c20
Dont create borders around previews when scaling up is disabled
2014-05-05 14:54:34 +02:00
Vincent Petry
1a454f61ed
Merge pull request #8386 from owncloud/fix_6946_master
...
Fix 6946 master
2014-05-05 14:08:45 +02:00
Thomas Müller
341fcdc37a
Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
...
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
Thomas Müller
d2754af7c3
Merge pull request #8442 from owncloud/fix-typo
...
Fix typo and PHPDoc
2014-05-05 10:03:47 +02:00
Jenkins for ownCloud
51d1e6c8b1
[tx-robot] updated from transifex
2014-05-05 01:55:47 -04:00
Lukas Reschke
0b7d9e2668
Cleanup code a little bit
...
- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
2014-05-04 15:51:08 +02:00
Lukas Reschke
73b914ddbc
Add CSRF check on login and logout
...
This is a minor issue and not worth a backport in my opinion as it could break more things than it's worth having it.
2014-05-04 13:56:21 +02:00
Lukas Reschke
5cfc9d973d
Fix PHP Doc and use readable variable name
2014-05-04 13:02:58 +02:00
Lukas Reschke
6f57911b44
Does also take int or string
2014-05-04 13:01:57 +02:00
Lukas Reschke
d091cca636
Fix typo
2014-05-04 12:53:06 +02:00
Morris Jobke
623161b9a9
Merge pull request #8023 from flyser/master
...
Fix setting the max-upload-size for really large values.
2014-05-03 11:49:38 +02:00
Bernhard Posselt
906061a07b
Merge pull request #8171 from owncloud/fix-import
...
be nice and use a relative import so people can use the class without fi...
2014-05-02 22:43:19 +02:00
Vincent Petry
9e18be6422
Merge pull request #8377 from youngguns-nl/issue_8376
...
RecursiveDirectoryIterator does not work on NFS
2014-05-02 18:45:09 +02:00
Thomas Müller
c92c577b5e
- Introduce isShared() and isMounted() on FileInfo class
...
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns }permissions as additional WebDAV property containing the permission string
2014-05-02 17:37:16 +02:00
Thomas Müller
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
Jenkins for ownCloud
6519b9672a
[tx-robot] updated from transifex
2014-05-02 01:55:53 -04:00
Jörn Friedrich Dreyer
6694129cbc
columns should be nullable by default
2014-05-01 23:03:45 +02:00
Bart Visscher
614cc67f88
Correct return type for getFilePath
2014-05-01 18:12:17 +02:00
Bart Visscher
c34659dd89
Better documentation for isValidSource function
2014-05-01 18:11:55 +02:00
Bart Visscher
50f49c57b5
Some more params are optional
2014-05-01 18:11:30 +02:00
Jenkins for ownCloud
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
Thomas Müller
11404b2b12
Merge pull request #8391 from owncloud/router-parameter-sorting
...
Preserve keys when sorting parameters when generatings urls
2014-04-30 15:10:36 +02:00
Thomas Müller
4481a8412c
Merge pull request #8132 from owncloud/issue/8131
...
Issue/8131 Fix emitting of filesystem related hooks
2014-04-30 13:57:44 +02:00
Jenkins for ownCloud
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
Robin Appelman
77e6278d09
Preserve keys when sorting parameters when generatings urls
2014-04-29 11:55:19 +02:00
icewind1991
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
Joas Schilling
c060f6ec7b
Deduplicate code
2014-04-29 10:34:28 +02:00
Joas Schilling
c1caaa6241
Correctly emit create/update hooks when a large file is being created/update
...
after being uploaded in .part files
Fix #8131
2014-04-29 10:34:27 +02:00
Joas Schilling
4fa9e46d2b
Emit a new hook, when a file is being updated only
...
The write-hook also is triggered for created files
Fix #8131
2014-04-29 10:34:26 +02:00
Jenkins for ownCloud
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
Thomas Müller
7c0340c63c
Merge pull request #7852 from josh4trunks/basic_auth_fix
...
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-28 21:46:52 +02:00
Thomas Müller
6935364b33
add class Pimple to autloader
2014-04-28 20:57:44 +02:00
Volkan Gezer
e7c6111ae3
Update outdated comment
2014-04-28 20:23:18 +02:00
Sjors van der Pluijm
e8a287f5bb
refs #8376 ; spaces=>tabs
2014-04-28 19:52:06 +02:00
Sjors van der Pluijm
54f482ff9c
refs #8376 ; added comment and applied patch on other files
2014-04-28 19:32:25 +02:00
Bart Visscher
66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
Arthur Schiwon
45e42c25de
Group Database backend must not gather user details itself but ask user
...
backends. This is a port to master from PR #7745
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Conflicts:
lib/private/group/backend.php
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Conflicts:
apps/user_ldap/group_ldap.php
apps/user_ldap/group_proxy.php
clean up group backends
Conflicts:
lib/private/group/database.php
remove now unnecessary test
implement getDisplayNames in group manager
adjust user manager tests
test for group manager's displayNamesInGroup
trim must not be used in empty in PHP < 5.5
keep the constant to not provoke PHP warnings
Conflicts:
lib/private/group/backend.php
2014-04-28 13:49:56 +02:00
Sjors van der Pluijm
d7ec1fe447
rewind iterator before iteration starts
2014-04-28 13:05:20 +02:00
Georg Ehrke
b68098ebba
remove preview office fallback as it makes too much trouble and generates inacceptable results
2014-04-28 12:05:10 +02:00
Sjors van der Pluijm
d8be9d96ed
fixes #8376
2014-04-28 10:20:24 +02:00
Thomas Müller
5fd776debf
Merge pull request #7473 from owncloud/append-error-document
...
Remove .htaccess creation code
2014-04-28 08:50:42 +02:00
Jenkins for ownCloud
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
Lukas Reschke
e910e63140
Merge pull request #8372 from owncloud/give-admins-a-hint
...
Clarify the trusted_domain error page
2014-04-27 18:28:18 +02:00
Lukas Reschke
1d9ac38da6
Remove an added t by the github webeditor
...
Notice to myself: Stick to my IDE.
2014-04-27 16:41:09 +02:00
Lukas Reschke
7a8bfeae6e
Grammatical fixes
2014-04-27 16:31:04 +02:00
Jenkins for ownCloud
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
Lukas Reschke
b6612ef04a
Clarify the trusted_domain error page
2014-04-26 23:11:29 +02:00
Bart Visscher
7c0370105a
Fix wrong var name
2014-04-26 11:15:09 +02:00
Bart Visscher
fc9371ae10
Merge branch 'master' into contactsmanager-register
...
Conflicts:
lib/private/contactsmanager.php
2014-04-26 10:55:25 +02:00
Jenkins for ownCloud
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
icewind1991
7599fa94ce
Merge pull request #8350 from owncloud/share-search-mime
...
fix search by mime for shared single files
2014-04-25 15:54:36 +02:00
icewind1991
5194f014c9
Merge pull request #7504 from owncloud/webdav-injection
...
Proper injection of filesystem view into the webdav connector
2014-04-25 14:42:43 +02:00
Robin Appelman
194ea66cb5
Merge branch 'master' into share-search-mime
2014-04-25 14:04:41 +02:00
Robin Appelman
672a8248ce
Correct the path returned by getFolderContent for substorages
2014-04-25 13:56:45 +02:00
Robin Appelman
456ca0cf7d
fix paths of searchByMime results on substorages
2014-04-25 12:31:44 +02:00
Robin Appelman
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
Robin McCorkell
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
Jenkins for ownCloud
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
Lukas Reschke
1cafd1e3b9
Merge pull request #8337 from owncloud/flv-to-mimes
...
Add flv to known mimetypes
2014-04-24 19:09:01 +02:00
Björn Schießle
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
Victor Dubiniuk
fc4be3d0ad
Add flv to known mimetypes
2014-04-24 19:09:31 +03:00
Bjoern Schiessle
35321c7d41
add additional rows to the select statement, 'stime' is needed for the expire check
2014-04-24 15:18:25 +02:00
Bjoern Schiessle
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
Robin Appelman
cd0c5990f8
properly quote etags
2014-04-24 11:12:39 +02:00
Robin Appelman
49b44e7e22
Normalize paths when moving properties
2014-04-24 11:12:39 +02:00
Thomas Müller
8127e984bd
Merge pull request #8332 from owncloud/l10n-access-untrusted
...
This adds one more missing untranslated text from lib/share
2014-04-24 10:06:37 +02:00
Jenkins for ownCloud
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
Volkan Gezer
ff0dab6e92
This adds one more missing untranslated text from lib/share
...
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
Thomas Müller
4ba6f4839d
fixing typos and PHPDoc
2014-04-23 15:36:01 +02:00
Robin Appelman
e77d89fc4b
Revert changes to OC_Connector_Sabre_Server
2014-04-23 14:21:09 +02:00
icewind1991
c8801a41d8
Merge pull request #8324 from owncloud/expired-link-error
...
Fix error when viewing expired link
2014-04-23 14:13:44 +02:00
Bernhard Posselt
5199e4508a
dont update entity and dont run an update query if an entity wasnt changed at all
2014-04-23 13:43:17 +02:00
Bjoern Schiessle
b312d38d38
remove hard-coded shared folder
2014-04-23 12:59:22 +02:00
Bjoern Schiessle
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
Bjoern Schiessle
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
dfb69e9418
allow user to delete shared files/folders
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
4c840cb61d
fix target generation for group shares
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
27c5a978f9
we no longer need to handle the Shared folder different from any other folder
2014-04-23 12:54:25 +02:00
Bjoern Schiessle
c4e0fb75a4
add api to get shares from a specific user
2014-04-23 12:54:24 +02:00
Bjoern Schiessle
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
Bjoern Schiessle
72bbb9ca20
allow to remove and change mount points
2014-04-23 12:54:24 +02:00
Bjoern Schiessle
cfc52ccc3d
add some action items
2014-04-23 12:54:24 +02:00
Robin Appelman
3d0661a1e7
Fix error when viewing expired link
2014-04-23 12:54:18 +02:00
Joas Schilling
704b9e6a0d
Merge pull request #8009 from owncloud/feature/add-sharing-target
...
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
Thomas Müller
535e6ff71f
Merge pull request #7617 from nishiki/cache_user
...
Cache user
2014-04-23 12:32:30 +02:00
Thomas Müller
dcc48f9b46
Merge pull request #8068 from wakeup/fix-share.php-string-extraction
...
Make lib/** share.php strings extractable for translation
2014-04-23 09:58:10 +02:00
Jenkins for ownCloud
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
Robin Appelman
b42ce6c30a
Prevent error if previously cached data doesn't have an etag
2014-04-22 15:24:38 +02:00
Volkan Gezer
6e857de6b7
Make lib/** share.php strings extractable for translation
...
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated
This should fix : #8011
2014-04-22 14:56:44 +02:00
Thomas Müller
0330481c5e
Merge pull request #8263 from LEDfan/add-key-to-contacts
...
Add key to every contact
2014-04-22 14:20:53 +02:00
Tobia De Koninck
efff7dd2a4
Change key to addressbook-key
2014-04-22 12:46:09 +02:00
Robin Appelman
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
Jenkins for ownCloud
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
Morris Jobke
0ebb4662ec
Merge pull request #8281 from owncloud/public-responses
...
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
Lukas Reschke
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
Jenkins for ownCloud
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
Andreas Fischer
f2f5a53d36
Merge pull request #7988 from owncloud/routing-cache-webroot
...
Keep cached urls with different hostnames or baseurls seperate
* owncloud/routing-cache-webroot:
Sort parameters and cast to int
add delimiter between host and baseurl
Keep cached urls with different hostnames or baseurls seperate
2014-04-20 18:27:23 +02:00
Bernhard Posselt
7e447f4f42
make download and redirectresponse public
2014-04-20 16:12:46 +02:00
Andreas Fischer
f2e5494edc
Merge pull request #8203 from owncloud/correct-link
...
Use direct link instead of JS
* owncloud/correct-link:
Link to previous directory
Use direct link instead of JS
2014-04-20 15:58:53 +02:00
Lukas Reschke
886c5177e7
Fix typo & add type
2014-04-20 01:09:25 +02:00
Lukas Reschke
e930ce6436
Add type hinting
2014-04-20 00:55:01 +02:00
Bernhard Posselt
0c736feaba
remove useless import
2014-04-19 19:31:49 +02:00
Bernhard Posselt
4a7e0561ca
move db into iservercontainer
2014-04-19 19:30:12 +02:00
Bernhard Posselt
95a83233a9
fix doc strings for db facade
2014-04-19 15:32:17 +02:00
Bernhard Posselt
93237d87ec
fix scrutinizer issues
2014-04-19 15:25:36 +02:00
Bernhard Posselt
f260951825
port database layer from appframework to core
2014-04-19 14:56:16 +02:00
Jenkins for ownCloud
1abd9c1305
[tx-robot] updated from transifex
2014-04-19 01:56:06 -04:00
LEDfan
b78c1373b6
Add key to every contact
2014-04-18 14:30:44 +02:00
Bart Visscher
9583549556
camelCase vars in OC\ContactsManager
2014-04-17 17:56:23 +02:00
Morris Jobke
707658c00a
Merge pull request #8205 from owncloud/fix-8202
...
Add one more LOWER.
2014-04-17 16:10:33 +02:00
Morris Jobke
a2a0eb370b
Merge pull request #8222 from owncloud/type-hinting
...
Type hinting fixes
2014-04-17 16:08:15 +02:00
Robin McCorkell
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
Jörn Friedrich Dreyer
8a0c8a1956
Merge pull request #8240 from owncloud/thumbnail-on-short-videos-master
...
videos which are shorter then 5 seconds will now get a proper thumbnail ...
2014-04-17 11:15:05 +02:00
Morris Jobke
5a1a056c6d
Merge pull request #8183 from owncloud/move-security-headers
...
Move security headers
2014-04-16 23:46:20 +02:00
Lukas Reschke
81c23b02da
Link to previous directory
2014-04-16 21:10:14 +02:00
Thomas Müller
a4389340b8
escape $second + update PHPDoc
2014-04-16 19:45:55 +02:00
Thomas Müller
d0f8cc20c5
videos which are shorter then 5 seconds will now get a proper thumbnail at 1 second
2014-04-16 17:16:03 +02:00
Thomas Tanghus
da99e403bc
Also fix linkToAbsolute
2014-04-16 14:30:24 +02:00
Jenkins for ownCloud
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
Thomas Tanghus
6fe3fd4a0b
Fix linkToPublic. Refs #8218
2014-04-15 23:04:35 +02:00
Bart Visscher
cc8a4511fe
Fix PHPdoc in lib/public
...
using scrutinizer patch
2014-04-15 22:55:47 +02:00
Bart Visscher
a4b7f5155f
Fix PHPdoc in lib/private
...
using scrutinizer patch
2014-04-15 22:55:20 +02:00
Thomas Müller
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
Bart Visscher
a9bf3df82d
Fix PHPdoc in OC\Share\Share and OCP\Share
2014-04-15 21:05:44 +02:00
Lukas Reschke
8322a9e5c2
Merge pull request #8210 from owncloud/enhance-assets-management-master
...
adding checks and log messages regarding the assets folder
2014-04-15 20:07:07 +02:00
Robin Appelman
295b75cca9
merge master into webdav-injection
2014-04-15 20:05:43 +02:00
Robin Appelman
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
Lukas Reschke
ffab31e3ee
Merge pull request #8197 from owncloud/secure_mimetypes
...
White-list known secure mime types. Refs. #8184
2014-04-15 19:50:33 +02:00
Arthur Schiwon
64679b2e62
Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint
2014-04-15 17:46:48 +02:00
Andreas Fischer
714343cd74
Add Bart to PgSqlTools copyright.
2014-04-15 16:29:43 +02:00
Thomas Müller
02726acbc8
adding checks and log messages regarding the assets folder
2014-04-15 16:26:12 +02:00
Robin Appelman
7f77b08098
Sort parameters and cast to int
2014-04-15 15:48:02 +02:00
Andreas Fischer
bd37010f35
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
...
* owncloud/master: (61 commits)
[tx-robot] updated from transifex
Make email display name change translatable again
Ignore jquery.multiselect.js - it's 3rdparty
javascript code cleanup + fixing syntax errors
Revert "close-button for share_dropdown"
close-button for share_dropdown
[tx-robot] updated from transifex
The latest developer manual link
The latest developer manual link
p() and print_unescaped() also take arrays as parameter
Check whether the user has permissions to add personal storage backends
[tx-robot] updated from transifex
Fix a wrong WebDAV Warning with self-signed-certs
fix translation link
upda mailinglist address
fix contribute link
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
[tx-robot] updated from transifex
use references for middleware to fix problems on 5.3
...
2014-04-15 15:44:44 +02:00
Thomas Müller
e125dc60cd
introduce new function to force a language
2014-04-15 15:12:25 +02:00
Björn Schießle
2dbb2db7e0
Merge pull request #7780 from owncloud/share-file-exists
...
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
Victor Dubiniuk
91d40f5033
remove unneeded LOWER. Fixes #8202
2014-04-14 22:19:21 +03:00
Lukas Reschke
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
Lukas Reschke
9046f7b2f8
Merge pull request #8178 from owncloud/fix-request-parameters
...
Correctly process request parameters other than GET or POST, dont use gl...
2014-04-14 20:42:26 +02:00
Lukas Reschke
2bda3f9ae0
Use direct link instead of JS
...
Due to our CSP policy this link won’t work as it it considered as
inline Javascript.
This commit replaces the link with a static link to the files app.
Reimplementation of #8067 - fixes #7742
2014-04-14 20:16:52 +02:00
Andreas Fischer
9cc41a2460
Move PostgreSQL sequence resynchronisation out into PgSqlTools class.
2014-04-14 18:37:47 +02:00
Thomas Tanghus
2fb68c120b
Added explanation to mimetypes.list.php to avoid future confusion.
2014-04-14 18:21:19 +02:00
Thomas Tanghus
51e47319ef
White-list known secure mime types. Refs. #8184
2014-04-14 17:17:50 +02:00
Thomas Müller
fe364656a4
Merge pull request #8181 from owncloud/fix_wrong_webdav_warning
...
Fix a wrong WebDAV Warning with self-signed-certs
2014-04-14 16:53:06 +02:00
Thomas Müller
8df19c4379
Merge pull request #8019 from owncloud/thumbnail_fixes
...
Thumbnail fixes
2014-04-14 16:23:03 +02:00
Thomas Müller
71de321869
Merge pull request #8156 from owncloud/fix-middleware-container
...
fix the middleware registration process in the container
2014-04-14 14:53:58 +02:00
Lukas Reschke
c123dc7de4
Fix typo
...
Thanks @DeepDiver1975
2014-04-14 10:15:31 +02:00
Robin McCorkell
eeee9eacea
Prevent error from cache update on deleted files
2014-04-13 16:17:13 +01:00
Lukas Reschke
eecc400698
p() and print_unescaped() also take arrays as parameter
...
This fixes some scrutinizer issues.
2014-04-13 16:18:05 +02:00
Lukas Reschke
387d46cb98
Typo + Line breaks
2014-04-13 12:54:26 +02:00
Lukas Reschke
b04d95b116
Remove uneeded usages of nosniff
2014-04-13 12:48:16 +02:00
Lukas Reschke
a2a850dd91
Fix indentation
2014-04-13 11:52:31 +02:00
Lukas Reschke
df67a04385
Move security headers to base.php
...
Some headers were currently only added to the templates but not to other components (e.g. SabreDAV / JSON / etc...)
The migration to base.php ensures that the headers are served to all requests passing base.php
2014-04-13 11:51:03 +02:00
Jenkins for ownCloud
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
kondou
d98ae4f9b2
Fix a wrong WebDAV Warning with self-signed-certs
...
Occuring in the admin interface
2014-04-13 05:24:29 +02:00
Bernhard Posselt
62cce982bb
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
2014-04-12 16:17:49 +02:00
Bernhard Posselt
e7fa2790f3
Correctly process request parameters other than GET or POST, dont use globals in the class but inject it
2014-04-12 15:02:19 +02:00
Jenkins for ownCloud
329b8f3e99
[tx-robot] updated from transifex
2014-04-12 01:56:11 -04:00
Bernhard Posselt
526100dc90
be nice and use a relative import so people can use the class without firing up owncloud
2014-04-12 01:33:21 +02:00
Bernhard Posselt
4af72a076d
use references for middleware to fix problems on 5.3
2014-04-11 20:50:49 +02:00
Lukas Reschke
77ecfdd1a4
Only encode dangerous dangerous characters
...
There is no need to encode all characters into HTML entities, only potential dangerous characters as &, ", ', < and > should get encoded.
This may fix issues like https://github.com/owncloud/calendar/pull/394
2014-04-11 19:42:15 +02:00
Jenkins for ownCloud
36107e1bad
[tx-robot] updated from transifex
2014-04-11 01:55:15 -04:00
Bernhard Posselt
763da4258e
fix the middleware registration process in the container
2014-04-10 20:51:03 +02:00
Bernhard Posselt
2fc6fb36ad
Merge pull request #8139 from owncloud/fix-middleware-registration
...
register middleware as string to not force request to be instantiated to...
2014-04-10 20:24:30 +02:00
Bart Visscher
694244f2e0
Supply the contactsmanager object to the callbacks
2014-04-10 18:07:15 +02:00
Bart Visscher
5c412f480c
$key is not needed for registering contactsmanager callbacks
2014-04-10 18:06:31 +02:00
Thomas Müller
e401df26bc
Merge pull request #8107 from owncloud/dav-negativetimestampfix
...
Fixed Sabre Node implementation to correctly return timestamps as int
2014-04-10 17:37:53 +02:00
Thomas Müller
26a89e369e
Merge pull request #8137 from owncloud/routeing-requirements
...
add requirements to routing
2014-04-10 16:23:01 +02:00
Thomas Müller
ecd74d3630
Merge pull request #8138 from owncloud/allow-app-in-routes.php
...
To isolate the variable scope used inside the $file it is required in it...
2014-04-10 16:09:23 +02:00
Tom Needham
654d5af394
Merge pull request #8027 from owncloud/routes-ocs
...
Load all routes when matching an ocs route
2014-04-10 12:22:34 +01:00
Vincent Petry
6cc578d1a7
Merge pull request #8018 from owncloud/ocs_result_success_is_100
...
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
Vincent Petry
8d05848391
Merge pull request #7825 from owncloud/hash-stream
...
Use streams when generating hashes of remote files
2014-04-10 10:42:04 +02:00
Vincent Petry
9a8457aca0
Merge pull request #8053 from owncloud/preview-hook-root
...
Pass the correct root to the preview on post_write
2014-04-10 10:31:40 +02:00
Jenkins for ownCloud
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
Bernhard Posselt
f06ef8aa4b
register middleware as string to not force request to be instantiated too early and thus not having url parameters
2014-04-09 23:59:57 +02:00
Thomas Müller
98a5f121fd
To isolate the variable scope used inside the $file it is required in it's own method
2014-04-09 22:45:34 +02:00
Thomas Müller
d2961dcf11
Merge branch 'master' into lukepolo-master
...
Conflicts:
apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
Bernhard Posselt
70c88027db
add requirements to routing
2014-04-09 21:57:32 +02:00
Bart Visscher
511816b878
Implement the register function of OC\ContactsManager
2014-04-09 21:53:06 +02:00
Vincent Petry
4f11786a3d
Fixed Sabre Node implementation to correctly return timestamps as int
...
Negative timestamps were returned as string and were confusing other
Sabre API like Sabre_DAV_Property_GetLastModified.
This fix makes sure the timestamp is returned as int when defined.
2014-04-09 15:46:51 +02:00
Andreas Fischer
78ee4c1327
Merge remote-tracking branch 'owncloud/master' into db-convert-tool
...
* owncloud/master: (137 commits)
add comment to clearify when a skip in the foreach happens
remove obsolete code
Always define sendmail_is_available
[tx-robot] updated from transifex
Make hardcoded exception messages translatable
Disable sharing in trashbin app
class Test_Config is already declared
[tx-robot] updated from transifex
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
fixing undefined exception classes
unit test testSetAppValueIfSetToNull() added
unit tests for dynamic backend registration
ignore underscore.js in scrutinizer.yml
adding ownCloud globals to jshintrc: OC, t, n
Use git checkout on directory as some files may not be in git resulting in, e.g.:
adding underscore.js
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
translations for oc-dialogs reside in code
Fix copy conflict dialog translation
[tx-robot] updated from transifex
...
2014-04-09 15:20:18 +02:00
Joas Schilling
352063cf0a
Fix Undefined index: storage in share.php
...
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
2014-04-09 15:14:44 +02:00
Joas Schilling
d418e176ce
Do not query when the list is empty
2014-04-09 15:02:06 +02:00
Joas Schilling
015b9b1dac
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-09 15:02:05 +02:00
Jenkins for ownCloud
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
Thomas Müller
1a09d64a77
Merge pull request #8117 from owncloud/fix-hard-coded-uman-str
...
Make hardcoded exception messages translatable
2014-04-08 22:45:19 +02:00
Thomas Müller
73ac3d0fcd
Merge pull request #7643 from owncloud/chainable_response
...
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Volkan Gezer
a4f42676ea
Make hardcoded exception messages translatable
2014-04-08 20:07:25 +02:00
Arthur Schiwon
5f8d9b3a4e
ask implementsAction instead of checking method_exists for easier testing
2014-04-08 12:31:11 +02:00
Arthur Schiwon
698297feb3
add optional countUsersInGroup method to group backends
2014-04-08 12:04:38 +02:00
Jenkins for ownCloud
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
Thomas Müller
7dd0074655
fixing mkdir code to respect external file systems as well
2014-04-07 23:17:35 +02:00
Thomas Müller
3587c88fe9
Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master
...
Conflicts:
apps/files/js/file-upload.js
2014-04-07 22:28:16 +02:00
Thomas Müller
c1fd300048
using array_key_exists() instead of isset() - required because in case the value is null isset is returning false
2014-04-07 21:05:48 +02:00
Thomas Müller
85e7921b14
fixing undefined exception classes
2014-04-07 20:57:08 +02:00
Thomas Müller
1e559f7239
Merge pull request #8088 from owncloud/fix-personal.js
...
reduce code duplication, fix parse error, prevent page reload on hitting...
2014-04-07 16:59:32 +02:00
Thomas Müller
0fe32eee13
Merge pull request #8083 from owncloud/fix-link-to-sync
...
Remove wrong whitespace from URL and use HTTPS
2014-04-07 14:38:47 +02:00
Thomas Müller
647abe512b
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
2014-04-07 14:04:16 +02:00
Robin Appelman
51fbf0bcbc
add delimiter between host and baseurl
2014-04-07 13:27:18 +02:00
Robin Appelman
84285011ce
Merge branch 'master' into routing-cache-webroot
2014-04-07 13:24:51 +02:00
blizzz
0c444fb2fb
Merge pull request #8017 from Raydiation/master
...
Remove dependency on container, removing service locator antipattern
2014-04-07 10:19:18 +02:00
Jenkins for ownCloud
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
Lukas Reschke
592371f367
Merge pull request #8064 from owncloud/remove-not-existing-functions
...
Removed two unused functions
2014-04-06 22:24:30 +02:00
Lukas Reschke
6babf90175
Switch to HTTPS
2014-04-06 22:06:38 +02:00
Lukas Reschke
5679f5c37e
Remove wrong whitespace from URL and use HTTPS
...
The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/ " target="_blank">`)
Additionally I switched the link to HTTPS.
2014-04-06 22:04:14 +02:00
Jenkins for ownCloud
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
Lukas Reschke
1b55c312e5
Removed two unused functions
...
These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
2014-04-04 22:27:05 +02:00
icewind1991
4028301dea
Merge pull request #8055 from owncloud/getfileinfo-exists
...
dont scan not existing files in View->getFileInfo
2014-04-04 18:07:29 +02:00
Vincent Petry
0597c5226a
Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey
...
Do not expire chunks while checking for their existence
2014-04-04 17:18:54 +02:00
Thomas Müller
ccf1287fbf
adding unit test for cache mechanism
2014-04-04 16:21:50 +02:00
Robin Appelman
b61ec7352b
dont scan not existing files in View->getFileInfo
2014-04-04 15:10:07 +02:00
Robin Appelman
e76c246718
Pass the correct root to the preview on post_write
2014-04-04 15:02:08 +02:00
Thomas Müller
f029312e5b
fixing typos/spellings
2014-04-04 11:37:47 +02:00
Vincent Petry
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
josh4trunks
5b402aa846
Fixed Typo
2014-04-03 22:12:57 -07:00
josh4trunks
a266144750
Don't always $cookie_path, only set it when needed
2014-04-03 22:12:57 -07:00
josh4trunks
d1106f1749
cookie would be useless if value is not set
2014-04-03 22:12:57 -07:00
josh4trunks
63df8354da
Don't to set the cookie it wasn't needed.
2014-04-03 22:12:57 -07:00
josh4trunks
4ddf5d92f2
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-03 22:12:57 -07:00
josh4trunks
9b4643f386
Send URI instead of filepath to NGINX for X-Accel
2014-04-03 20:46:54 -07:00
Vincent Petry
ab56f69416
Do not expire chunks while checking for their existence
...
The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.
2014-04-03 21:12:35 +02:00
Thomas Müller
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
Robin Appelman
db95f49b7e
Load all routes when matching an ocs route
2014-04-03 13:01:20 +02:00
Jörn Friedrich Dreyer
c7324f7e44
fix float comparison for negative results
2014-04-03 12:00:53 +02:00
Fabian Henze
7cdb16979a
Fix setting the max-upload-size for really large values.
...
php can only parse filesize units up to gigabytes, not terabytes or petabytes.
2014-04-03 01:17:28 +02:00
Jörn Friedrich Dreyer
b9a8bd7e1f
extract more methods
2014-04-02 18:32:32 +02:00
Jörn Friedrich Dreyer
436a78db44
extract method isCachedBigger
2014-04-02 18:00:21 +02:00
Bernhard Posselt
5f3b8c45d7
Remove dependency on container, removing service locator antipattern
2014-04-02 17:54:33 +02:00
tomneedham
6b017201b8
Only accept success as 100 like the OCS spec does
2014-04-02 15:50:51 +00:00
Jörn Friedrich Dreyer
bca6cc6f74
remove unnecessary code
2014-04-02 17:34:48 +02:00
Jörn Friedrich Dreyer
b8248f4a0a
compare floats with epsilon
2014-04-02 17:32:27 +02:00
Robin Appelman
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
Robin Appelman
850a0e7388
Verify that a file exists before we share it
2014-04-02 13:47:11 +02:00
Morris Jobke
7bdc085022
Merge pull request #8006 from wakeup/master
...
Fix admin-dir_permissions redirection when cannot write warning is shown.
2014-04-02 13:21:53 +02:00
Morris Jobke
1782dcbb50
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
...
always encrypt files to owner
2014-04-02 13:20:51 +02:00
Vincent Petry
c0746f6b49
Merge pull request #7968 from owncloud/core-overwritewebrootwithroot
...
Allow using "/" in "overwritewebroot"
2014-04-02 12:56:36 +02:00
Volkan Gezer
b6ad7c3cdd
Fix admin-dir_permissions redirection when cannot write warning
...
is shown.
2014-04-02 12:41:46 +02:00
Vincent Petry
4cc70ec39d
Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop
...
Correctly read the full stream in file_get_contents
2014-04-02 10:55:50 +02:00
Thomas Müller
7086c386fd
Merge branch 'master' into append-error-document
...
Conflicts:
lib/private/setup.php
lib/private/updater.php
2014-04-02 08:48:37 +02:00
Jenkins for ownCloud
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
Robin Appelman
1c7a71ca77
use binary safe read
2014-04-02 04:38:54 +02:00
Robin Appelman
54a15a8001
Use streams when generating hashes of remote files
2014-04-02 04:38:54 +02:00
Thomas Müller
82d1ea240e
Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available
...
idn_to_ascii is only used if available
2014-04-01 22:51:23 +02:00
Vincent Petry
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
Vincent Petry
6e6a131b32
Merge pull request #7696 from owncloud/chunk-remainingspacefix
...
Fixed chunking and insufficient storage check
2014-04-01 16:09:19 +02:00
Robin Appelman
9c8596e95b
Keep cached urls with different hostnames or baseurls seperate
2014-04-01 15:43:27 +02:00
Vincent Petry
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Morris Jobke
a94ac41512
Merge pull request #7966 from owncloud/url_generation_hack
...
Check if web root has already been appended
2014-04-01 10:59:53 +02:00
Vincent Petry
0067a4eac2
Added missing fclose in file_get_contents and file_put_contents
2014-04-01 10:08:16 +02:00
Vincent Petry
d6ce45fe61
Correctly read the full stream in file_get_contents
...
When using user-defined stream wrappers, PHP will
return a maximum of 8192 bytes even if more was
requested.
This fix uses stream_get_contents to make sure the full stream is read
and not only the first 8 KB.
Added unit test with a bigger test file to cover this case.
2014-04-01 10:07:16 +02:00
Jenkins for ownCloud
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
Bart Visscher
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Andreas Fischer
f9853b253c
Deduplicate connection handling code into \OC\DB\ConnectionFactory
2014-03-31 20:09:07 +02:00
Bjoern Schiessle
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
Thomas Müller
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
Vincent Petry
cf361b6b4a
Allow using "/" in "overwritewebroot"
...
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
2014-03-31 15:36:48 +02:00
Bjoern Schiessle
3a731a01b1
select statement always need to contain file_source respectively item_source
2014-03-31 15:03:35 +02:00
Robin Appelman
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
Thomas Tanghus
6292aa57af
Check if web root has already been appended
2014-03-31 14:24:38 +02:00
Vincent Petry
65e3f63400
Merge pull request #7939 from owncloud/wring_redirect_on_login
...
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-31 10:50:05 +02:00
Thomas Tanghus
7278f2f567
Sub-dir was prepended twice
2014-03-29 20:40:49 +01:00
Thomas Tanghus
3a7829f784
Sub-dir was prepended twice
2014-03-29 20:39:55 +01:00
Morris Jobke
73c81ae709
Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master
...
adding @method annotation to declare methods which can be called on the ...
2014-03-28 21:20:09 +01:00
Thomas Tanghus
c14107550d
Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936
2014-03-28 18:05:48 +01:00
Robin Appelman
f331d5f9d4
Give storages the option to implement the getById behaviour for View->getPath
2014-03-28 15:15:56 +01:00
Morris Jobke
e4069e1553
Emit event after setting a new expiration for a share
...
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
2014-03-28 15:00:13 +01:00
Thomas Müller
70db348475
Merge pull request #7824 from owncloud/hash-parameter-order
...
Fix parameter order for Storage\Local::hash
2014-03-28 13:06:07 +01:00
Thomas Müller
f1b085df01
adding @method annotation to declare methods which can be called on the wrapped statement object
2014-03-28 12:57:27 +01:00
Vincent Petry
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
Vincent Petry
5068c57845
Merge pull request #7613 from owncloud/fix_urlGenerator2
...
Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL()
2014-03-28 12:12:49 +01:00
Thomas Müller
2d592ddc8f
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
...
Squashed commit of the following:
commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943
Merge: 1e9c5be
1e7d7bd
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri Mar 28 11:49:04 2014 +0100
Merge branch 'master' of https://github.com/kev300/core into kev300-master
commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:11:42 2013 +0100
Update util.php
commit 3f0723f054a27a506be7f26932ccb54fff6f2be9
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:09:15 2013 +0100
Update util.php
commit 512176abdcfbe5b2b060b91033abc9608912d1f8
Author: kev300 <admin@gadeco.de>
Date: Tue Dec 17 14:02:04 2013 +0100
Update util.php
commit 6cbefd080188d287024e0b047b88dd4525d6c2c1
Author: kev300 <admin@gadeco.de>
Date: Mon Dec 16 16:44:46 2013 +0100
Update util.php
Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled.
2014-03-28 12:09:29 +01:00
Vincent Petry
040f430f0c
Merge pull request #7829 from owncloud/cachefolderlocation
...
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
Thomas Müller
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
Vincent Petry
c9ccacb9ea
Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix
...
Use the correct resolve method to resolve file storage (x-sendfile)
2014-03-27 09:31:17 +01:00
Vincent Petry
b48510c978
Use the correct resolve method to resolve file storage
...
When detecting whether the file to be downloaded is on external storage,
the correct path needs to be used.
It turns out that \OC\Files\View is needed to resolve the path correctly
relative to the user's home.
2014-03-26 18:14:35 +01:00
Thomas Müller
10e62bfd68
Merge pull request #7893 from owncloud/no-routed-link-for-css-files
...
css files are not to be routed through index.php anymore
2014-03-26 16:48:54 +01:00
Thomas Müller
93b984ecf8
css files are not to be routed through index.php anymore
2014-03-26 15:36:55 +01:00
Robin Appelman
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
Robin Appelman
9b2bb7c6ab
fix undefined index warning in router
2014-03-26 13:02:11 +01:00
Thomas Müller
83b4bcfdbf
idn_to_ascii is only used if available
2014-03-26 11:17:23 +01:00
Vincent Petry
e76be308eb
Remove unused setUserVars utility method
...
That method was moved to the external storage recently so
isn't needed here any more.
2014-03-26 09:39:09 +01:00
Jenkins for ownCloud
75d8de378c
[tx-robot] updated from transifex
2014-03-26 01:56:21 -04:00
Thomas Müller
743ca4581d
Merge pull request #7748 from owncloud/postgresversionwarning
...
Added PostgreSQL version warning on upgrade
2014-03-25 23:17:18 +01:00
Thomas Müller
6bfeb342db
fixing code style
2014-03-25 23:17:00 +01:00
Thomas Müller
1816f43722
Merge pull request #7864 from owncloud/routing-performance
...
Routing performance
2014-03-25 23:00:36 +01:00
Thomas Müller
ed97d872af
Merge pull request #7325 from owncloud/recursive-mkdir-local
...
Recursive mkdir fixes #7047
2014-03-25 22:45:14 +01:00
Thomas Müller
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
Thomas Müller
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
Bjoern Schiessle
31681a3a27
finally fix the paths for the OCS Share API
2014-03-25 17:52:45 +01:00
Bjoern Schiessle
3653a51af2
fix path creation for re-shares, issue #7662
2014-03-25 17:48:50 +01:00
Bjoern Schiessle
2d8607fae9
don't assign variables in if condition
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
5db3b049fd
add todo
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
bc0292c16d
always return an array
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
154277ab11
seperate formatResults()
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
ecde48fce8
don't assign variables in if conditions
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
078fafdc5a
use variable
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
3a459db358
seperate transformDBResults
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
6607f7cb5e
seperate creation of select statement
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
6afd496d9b
remove prepFileTarget() seems that it is no longer in use
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
b602662578
add a "helper" and a "hooks" class. Move constants needed by multiple classes
...
to a "constants" class
2014-03-25 17:47:24 +01:00
Bjoern Schiessle
8b6d1d3bf2
added private share api
2014-03-25 17:47:24 +01:00
Robin Appelman
d75c3d5f9a
Fix routes getting lost when loading app routes twice
2014-03-25 14:28:30 +01:00
Robin Appelman
e1d3d0e948
fix incorect array
2014-03-25 14:04:18 +01:00
Robin Appelman
c17f415356
Only load core routes for ocs and settings
2014-03-25 13:42:47 +01:00
Thomas Müller
531c9564b3
Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master
...
idn have to be converted before being used
2014-03-25 12:38:32 +01:00
Jenkins for ownCloud
b92dad992f
[tx-robot] updated from transifex
2014-03-25 01:55:34 -04:00
Robin Appelman
9e89ad07c6
Only load core routes when matching a core route
2014-03-24 16:38:01 +01:00
Robin Appelman
0e1cb001b6
Cache generated urls for routes
2014-03-24 15:42:21 +01:00
Robin Appelman
f17674fef2
Only load routes from the apps we need
2014-03-24 15:41:46 +01:00
Thomas Müller
3eb5898f7b
use \OC_Mail::validateAddress() to validate the email address - fixes #7862
2014-03-24 15:35:07 +01:00
Robin Appelman
0d0aac6fff
Load the routes when matching or generating a route instead of when creating the router
2014-03-24 14:55:03 +01:00
Thomas Müller
fb7f3008d3
idn have to be converted before being used
2014-03-24 13:46:31 +01:00
icewind1991
4c8a83e82f
Merge pull request #7714 from owncloud/phpunit-config
...
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-24 13:01:37 +01:00
Vincent Petry
10c9b8eb99
Cache folder is now configurable
...
When using an external cache folder, it is automatically mounted in
FileSystem::initFileSystem so that any app can use it transparently
by creating a view on the "/$user/cache" directory.
2014-03-24 12:57:11 +01:00
Vincent Petry
a25b86a30e
Log exception when PostgreSQL version check failed
2014-03-24 11:54:44 +01:00
Jenkins for ownCloud
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
adrien
0da61a26ee
remove cache all user
2014-03-21 15:50:25 +01:00
Morris Jobke
43313d120d
Merge pull request #7820 from owncloud/core-macwarning
...
Added warning for Mac OS on setup page
2014-03-21 15:06:11 +01:00
Thomas Müller
96e6cb3db4
all authentication apps are loaded at first - everything else relies on these apps
2014-03-21 15:00:25 +01:00
Thomas Müller
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
Robin Appelman
7a8f1389fe
fix temporary file based common hash
2014-03-21 13:23:14 +01:00
Vincent Petry
a52bc333a2
Merge pull request #7611 from owncloud/fix-updater
...
Use $installedVersion instead of $currentVersion
2014-03-21 12:16:51 +01:00
Lukas Reschke
2c561c9c50
Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
...
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
Robin Appelman
fffe330bbc
Fix parameter order for Storage\Local::hash
2014-03-20 15:32:12 +01:00
Vincent Petry
316a22b463
Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown
...
Still return quota value when free space is unknown
2014-03-20 15:29:14 +01:00
Vincent Petry
6de9033d86
Added warning for Mac OS on setup page
2014-03-20 12:57:55 +01:00
Vincent Petry
36c0f08ec0
Merge pull request #7732 from owncloud/datafolderexistence
...
Added .ocdata file to check for data folder validity
2014-03-20 11:31:28 +01:00
Morris Jobke
970878b581
Merge pull request #7818 from owncloud/logException_undefined_variable
...
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 11:14:30 +01:00
Thomas Müller
8a81df0f2c
Merge pull request #7651 from owncloud/close-session-faster-master
...
Close session faster
2014-03-20 11:07:21 +01:00
Thomas Tanghus
51fe3b8ccd
Fix 'Undefined variable: message' in OCP\Util::logException
2014-03-20 10:23:40 +01:00
Vincent Petry
66bc0f0848
Still return quota value when free space is unknown
...
Fixed the quota storage wrapper to correctly return the quota value when
the free space is not known (which usually happens when the disk_free_space
function is disabled)
2014-03-19 19:07:11 +01:00
Lukas Reschke
9abe6b7f87
Add mimetype for MKV videos
...
This will make oC create previews for MKVs.
Test file: http://www.auby.no/files/video_tests/h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv
To test this just apply this change and upload the test file, if an preview is generated this change is most likely working as expecting.
2014-03-19 17:45:20 +01:00
Vincent Petry
4cb53f77b2
Moved external storage mounting code to files_external app
...
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
Thomas Müller
c216c4777b
Merge branch 'master' into close-session-faster-master
...
Conflicts:
apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
Vincent Petry
80180bea32
Added IV for ext storage password encryption
2014-03-19 11:42:22 +01:00
Thomas Müller
33e96597d1
Merge pull request #7790 from owncloud/fix/7788
...
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Jenkins for ownCloud
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
Thomas Müller
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
Thomas Müller
effea790c7
redefine reopen() in class \OC\Session\Internal to avoid accidental calls in productive code
2014-03-18 11:44:22 +01:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Thomas Müller
6bbbf8536f
introduce reopen() method to be used for unit test execution only - right after a unit test has been executed the session will be reopened
2014-03-17 21:57:10 +01:00
Thomas Müller
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Vincent Petry
3cd09f2b09
Added PostgreSQL version warning on upgrade
2014-03-17 18:58:00 +01:00
icewind1991
6fbf3dd7c4
Merge pull request #7764 from owncloud/datadir-chmod
...
use a non-recursive chmod on the datadir
2014-03-17 15:52:44 +01:00
icewind1991
5c72b526a3
Merge pull request #7760 from owncloud/core-roundbytes
...
Correctly round bytes when converted from human readable format
2014-03-17 15:21:57 +01:00
Lukas Reschke
239069c838
Use $installedVersion instead of $currentVersion
2014-03-17 13:27:42 +01:00
icewind1991
4112d63a40
Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning
...
Added warning for trusted_domains after CLI upgrade
2014-03-17 13:21:54 +01:00
Vincent Petry
4033eba374
Fixed chunking and insufficient storage check
...
- fixed free space detection based on the already uploaded chunks
- now deleting chunks as soon as it is read out before writing it into
the part file, which reduces the space needed when assembling part
files
2014-03-17 13:04:34 +01:00
Vincent Petry
bd98538a36
Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete_hook_2
...
use preDelete instead of postDelete hook
2014-03-17 12:59:35 +01:00
Vincent Petry
43ebd8cb64
Merge pull request #7728 from owncloud/oc_image_show_save_custom_mime
...
make it possible to influence output type of \OC_Image
2014-03-17 12:58:40 +01:00
Robin Appelman
166dfbf58b
use a non-recursive chmod on the datadir
2014-03-17 12:53:55 +01:00
Vincent Petry
145db370d1
Correctly round bytes when converted from human readable format
...
Instead of leave two decimal places which is confusing, round the byte
values correctly to the closest byte.
2014-03-17 12:15:12 +01:00
Thomas Müller
cd038604d3
unit tests for specific image type output added
2014-03-17 08:40:59 +01:00
Thomas Müller
79ba930ef9
fixing PHPDoc
2014-03-17 08:17:56 +01:00
Jenkins for ownCloud
c89aa6d5fe
[tx-robot] updated from transifex
2014-03-16 03:13:21 -04:00
Jenkins for ownCloud
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
Vincent Petry
b619ff6076
Return 503 when a config/data dir error exists
2014-03-14 21:05:15 +01:00
Georg Ehrke
3527adbbe1
OC_Image::_output() - throw exception instead of falling back to png
2014-03-14 18:19:16 +01:00
Georg Ehrke
9dee3772eb
remove image/pjpeg from OC_Image::_output
2014-03-14 18:12:33 +01:00
Vincent Petry
3c46dcd7dd
Added .ocdata file to check for data folder validity
...
In environments where the data folder is mount from another partition,
it is important to check that the data folder we see is actually the
real one. If the mount failed for some reasons, this fix will make
ownCloud temporarily unavailable instead of causing unpredictable
behavior.
2014-03-14 15:36:35 +01:00
Georg Ehrke
c140010e81
don't change mimetype of whole image object
2014-03-14 11:17:20 +01:00
Vincent Petry
1a116828cf
Added warning for trusted_domains after CLI upgrade
...
If trusted_domains is not set after a CLI upgrade, show a warning in the
output.
2014-03-14 11:16:45 +01:00
Georg Ehrke
0c3c75efd5
always output a png
2014-03-14 11:14:09 +01:00
Georg Ehrke
6f96ab3e90
make it possible to influence output type of \OC_Image
2014-03-14 11:13:45 +01:00
Jenkins for ownCloud
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
Robin Appelman
eabeedb306
Merge branch 'master' into cachehooks-first
2014-03-13 15:22:00 +01:00
Bjoern Schiessle
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
Robin Appelman
a8eb7a5092
Allow setting the config dir to use as enviroment variable for phpunit
2014-03-13 13:33:09 +01:00
Georg Ehrke
f438337493
improve validation of getFileInfo in \OC\Preview
2014-03-13 12:32:13 +01:00
Jenkins for ownCloud
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
Georg Ehrke
8048868bd7
use preDelete instead of postDelete hook
2014-03-13 03:14:42 +01:00
Vincent Petry
b2ac8755ce
Merge pull request #6632 from eduardosan/master
...
Fix PostgreSQL port configuration on install
2014-03-12 18:52:47 +01:00
Vincent Petry
ce790119ae
Merge pull request #7683 from owncloud/proper-content-type-on-ocs-exceptions
...
set content-type on ocs exceptions
2014-03-12 10:19:40 +01:00
Thomas Müller
88f6dd7db1
fixing method names
2014-03-12 10:00:22 +01:00
Lukas Reschke
942d5fcff3
Merge pull request #7682 from owncloud/sanitize-fallbackid-master
...
sanitize fallbackId
2014-03-12 09:22:46 +01:00
Jenkins for ownCloud
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
Thomas Müller
743addd1e3
set content-type on ocs exceptions
2014-03-12 00:35:19 +01:00
Thomas Müller
7c78368e8b
sanitize fallbackId
2014-03-12 00:18:51 +01:00
adrien
ea6f8ba352
fix remove cache when delete
2014-03-11 16:58:10 +01:00
Björn Schießle
03f40116e1
Merge pull request #7665 from owncloud/fix_ocs_share_api_paths
...
Fix ocs share api paths
2014-03-11 16:55:52 +01:00
Robin Appelman
d55c7223a9
Merge branch 'master' into foldersize-reuse
...
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
Bjoern Schiessle
36885dc64c
fix path creation for re-shares, issue #7662
2014-03-11 12:58:46 +01:00
Vincent Petry
c1cb9ee9b0
Merge pull request #7650 from owncloud/quota-totalspace
...
Fixed total space display when data size exceeds quota
2014-03-11 12:40:59 +01:00
adrien
f827761e71
remove static variable, add limit and offset
2014-03-11 11:56:46 +01:00
Vincent Petry
0e4d522dd9
Merge pull request #7659 from owncloud/fix-7596
...
Fix 7596
2014-03-11 11:36:22 +01:00
Jenkins for ownCloud
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
Thomas Müller
0de43f1fbe
remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname
2014-03-10 21:56:37 +01:00
Thomas Müller
f1ecc758f5
send an individual email to each recipient
2014-03-10 21:54:23 +01:00
Vincent Petry
1cde17d60b
Merge pull request #7602 from owncloud/flush-updater-cache
...
Reset time of last update feed polling after successful update
2014-03-10 19:54:00 +01:00
Vincent Petry
010eef95c0
Fixed total space display when data size exceeds quota
...
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
2014-03-10 17:59:14 +01:00
Vincent Petry
f4f61f03c9
Disable XML entities when parsing XML
2014-03-10 17:51:13 +01:00
adrien
415b1d03bc
fix cache when remove an user
2014-03-10 17:27:51 +01:00
Thomas Müller
9fe5033f1e
PHPDoc updated
2014-03-10 17:15:19 +01:00
Thomas Müller
41f814515e
Merge branch 'master' into close-session-faster-master
2014-03-10 17:00:09 +01:00
Vincent Petry
4fdf7682c9
Merge pull request #7398 from owncloud/trash_dont_rely_on_db
...
[trash] fall back if file is not in db
2014-03-10 16:04:47 +01:00
Thomas Müller
a074adb2af
fix close() implementation in \OC\Session\Internal
2014-03-10 15:36:20 +01:00
Bjoern Schiessle
4562909a20
get trash size from file cache
2014-03-10 15:13:28 +01:00
Thomas Müller
3c5185edab
Merge pull request #7632 from owncloud/fix-7582-master
...
we first shall check if the current session is valid - otherwise the ses...
2014-03-10 15:10:19 +01:00
Thomas Müller
f0603a971d
close the session for all DAV calls right after authentication - no need to write to the session afterwards
2014-03-10 14:40:36 +01:00
Robin Appelman
4a2b16d76d
update copyright header
2014-03-10 14:40:05 +01:00
Thomas Müller
73a1ece753
adding an explicit close method to class session - write operations (set and remove) being called after close() will throw an exception
2014-03-10 14:21:12 +01:00
Robin Appelman
26793e1f94
switch OC::getRouter usages to OC::$server->getRouter
2014-03-10 14:06:47 +01:00
Robin Appelman
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
Vincent Petry
26513bc17b
Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
...
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
Thomas Tanghus
a1aacc18df
Add @return PHPDocs
2014-03-10 09:31:30 +01:00
Thomas Tanghus
212699e389
Merge pull request #7628 from owncloud/fileinfo-type
...
Fix FileInfo->getType errors
2014-03-09 23:34:01 +01:00
Thomas Tanghus
8f6ea900f2
Chainable Response in AppFramework
2014-03-09 23:01:16 +01:00
nishiki
ba9d8f7c1a
fix undifined uid
2014-03-09 12:47:19 +01:00
nishiki
75011c2e09
add query result (boolean) for update or delete
2014-03-09 12:22:47 +01:00
nishiki
d8843f6cd3
minor clean code
2014-03-09 12:01:35 +01:00
Thomas Müller
25f523680a
fixing ident
2014-03-07 20:06:06 +01:00
Thomas Müller
0d90b90d94
we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth
2014-03-07 20:00:34 +01:00
Robin Appelman
51165a1a04
Check if value exists before returning
2014-03-07 15:16:35 +01:00
Vincent Petry
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
Robin Appelman
65f52fee4f
Fix FileInfo->getType errors
2014-03-07 14:52:44 +01:00
Robin Appelman
db6fb198fe
don't throw errors in getType
2014-03-07 14:27:23 +01:00
icewind1991
3eb58d9973
Merge pull request #7529 from owncloud/getlocalfile-cache
...
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
Vincent Petry
7f24d42ca5
Propagate unencrypted_size up to the file cache root
2014-03-07 11:00:22 +01:00
Vincent Petry
ba3f5fe53a
Merge pull request #7583 from owncloud/trusteddomainerrorpage
...
[master] Show warning page when accessing server from an untrusted domain
2014-03-07 10:37:16 +01:00
adrien
fbde24c89a
fix undefined in loadUsers
2014-03-07 08:46:34 +01:00
Thomas Tanghus
ceb5b918d7
Add \OC:: to URLGenerator::getAbsoluteURL()
2014-03-06 23:56:11 +01:00
adrien
5cdfc56867
update the cache when add user
2014-03-06 22:34:43 +01:00
adrien
dde4f2f917
upgrade the cache user
2014-03-06 22:23:17 +01:00
adrien
08a46e3080
add cache for single users
2014-03-06 17:57:09 +01:00
Vincent Petry
536c33895f
Merge pull request #7592 from owncloud/fixstoragefreespace
...
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
Vincent Petry
1b8cf18c91
Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix
...
Fix imagerotate and move loadFromBase64() one up
2014-03-06 17:18:17 +01:00
Victor Dubiniuk
242cbb802a
Reset time of last update feed polling
2014-03-06 18:19:58 +03:00
Vincent Petry
6e4ea09d52
Merge pull request #7494 from owncloud/fix-7307
...
Replace OC.Router.generate() with OC.generateUrl()
2014-03-06 14:49:12 +01:00
Robin Appelman
895fc0fa26
Fix check if fileinfo is valid
2014-03-06 14:23:27 +01:00
Vincent Petry
0dcac65aa1
Fixed upload issue when free space is not known
2014-03-06 13:53:55 +01:00
Robin Appelman
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
Georg Ehrke
eb5265b106
fix merge conflicts
2014-03-06 11:55:45 +01:00
Vincent Petry
9136e6ad30
Fixed X-Forwarded-Host parsing
2014-03-06 11:51:25 +01:00
Vincent Petry
f8fe2753b1
Added localhost as trusted domain
2014-03-06 11:51:10 +01:00
Vincent Petry
421cff00bd
Show warning page when accessing server from an untrusted domain
...
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
2014-03-06 11:51:08 +01:00
Thomas Müller
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
Lukas Reschke
e3156fa5ad
Merge pull request #7354 from pschmitt/master
...
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
Björn Schießle
9111af0478
Merge pull request #7531 from owncloud/dont_create_shared_folder
...
don't allow to create a file or folder named 'Shared' in the root folder
2014-03-05 18:13:31 +01:00
Georg Ehrke
dbf83aada2
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
2014-03-05 15:57:45 +01:00
Georg Ehrke
32a5d51fa6
add fclose, fixes issue from bdb96b9af8
2014-03-05 15:37:26 +01:00
Georg Ehrke
bdb96b9af8
fix issue with spamming logging files when loading cached thumbnail
2014-03-05 13:20:50 +01:00
Bjoern Schiessle
2e73c957e5
don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters
2014-03-05 13:16:25 +01:00
Thomas Müller
7edd8df07f
Merge pull request #7521 from owncloud/docstrings_2_kondou
...
Fix some more docstrings
2014-03-05 00:40:49 +01:00
Thomas Tanghus
b54b0b2153
Yet another cleanup
2014-03-05 00:26:06 +01:00
Tom Needham
9986b470ee
Merge pull request #7251 from owncloud/fix-ocsapi-getuser
...
Add displayname for admins on external api
2014-03-04 15:37:45 +00:00
Vincent Petry
620dd4afbd
Merge pull request #7481 from tripflex/fix_downloadlink_spaces
...
replace spaces in download link without encoding entire URL
2014-03-04 16:33:41 +01:00
Robin Appelman
a8c67dc675
Add caching for getLocalFile on remote storages
2014-03-04 15:44:58 +01:00
Robin Appelman
5ef37c28d1
Remove the need for a custom SabreDav server constructor
2014-03-04 13:28:48 +01:00
Vincent Petry
ad195a881e
Merge pull request #7453 from owncloud/preview-fileinfo
...
Cache the fileinfo in OC\Preview
2014-03-03 18:52:25 +01:00
kondou
5e3b6f1fd9
Fix some more docstrings
2014-03-03 17:32:29 +01:00
Frank Karlitschek
7983c90fdc
Merge pull request #7500 from owncloud/theme-mailtemplate
...
Enable theming of the mail template header
2014-03-03 17:22:33 +01:00
Robin Appelman
06c6163265
Check if fields we need are actually set to prevent errors
2014-03-03 16:48:28 +01:00
Vincent Petry
79ae3c4527
Allow XML entity loader for MDB2 schema loader
...
Forward port of 762b0d9
from stable6 to master
2014-03-03 14:17:51 +01:00
Robin Appelman
fe994669cd
Make path for dummy fileinfo absolute
2014-03-03 13:57:08 +01:00
Robin Appelman
9231195c98
Fix FileInfo->getType
2014-03-03 13:51:49 +01:00
Robin Appelman
c87658feda
Fix updater when getFileInfo fails
2014-03-03 12:56:08 +01:00
Jan-Christoph Borchardt
b8d0fc9494
make mail notification header color themable
2014-03-03 12:43:22 +01:00
Thomas Müller
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
Morris Jobke
084050530c
Merge pull request #7486 from owncloud/l10n_docstrings
...
Fix some docstrings in l10n.php
2014-03-01 10:38:48 +01:00
Thomas Tanghus
eff7667d26
Merge pull request #7433 from owncloud/config_basic_auth
...
Config to disable basic_auth username checking
2014-03-01 06:08:32 +01:00
kondou
5d5306175f
Fix some docstrings in l10n.php
2014-03-01 03:38:35 +01:00
Bart Visscher
8951328a87
More PHPDoc updates
2014-02-28 21:03:43 +01:00
Myles McNamara
195bdff91f
move replace to inside isset
2014-02-28 11:19:19 -05:00
Myles McNamara
4ab7f58745
replace spaces in download link without encoding entire URL
2014-02-28 11:15:49 -05:00
Thomas Müller
dd32091016
Merge pull request #7444 from owncloud/fix/7443
...
remove unused code and fix wrong variable names - some PHPDoc updated
2014-02-28 14:48:21 +01:00
Bart Visscher
e2286c6598
Type is with a small letter
2014-02-28 14:37:20 +01:00
Robin Appelman
da386aad59
Allow re-using already known fileinfo when calculating folder sizes
2014-02-28 14:23:07 +01:00
Robin Appelman
3ff12ef4ec
Also send explicit cache hooks when calling file_put_contents with a resource
2014-02-28 14:21:33 +01:00
Morris Jobke
d3866754a4
Merge pull request #7471 from owncloud/fix-css-loading
...
CSS is now loaded directly instead via PHP
2014-02-28 14:19:36 +01:00
Bart Visscher
35a8dfb2fa
More PHPDoc fixes, using scrutinizer patches as hints
2014-02-28 13:53:41 +01:00
Bart Visscher
89e0763d3d
Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N
2014-02-28 13:37:41 +01:00
Lukas Reschke
d1c04e1136
Typo + use regular assignment
2014-02-28 13:32:09 +01:00
icewind1991
8a93a2e7d5
Merge pull request #7455 from owncloud/rawlist-fileinfo
...
Update rawlist to work with new fileinfo object
2014-02-28 12:36:56 +01:00
Lukas Reschke
357fdb1a4d
Remove .htaccess creation code
...
1. We're maintaining the same code twice which leads inevitably to problems as this one. The createHtaccess routine is only used to use the correct paths to the 404 and 403 document.
2. Updating the ownCloud instance as described in our documentation (`Delete everything from your ownCloud installation directory, except data and config.`) will break the links to the ErrorDocuments anyways and show the default error handlers if ownCloud is not installed in the root directory.
2014-02-28 11:59:30 +01:00
Lukas Reschke
4c4bb70cb6
CSS is now loaded directly instead via PHP
...
269f24cf96
was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
2014-02-28 11:14:18 +01:00
Bart Visscher
47d70da2f5
Use limit=1 so the db can stop searching on the first hit
2014-02-28 09:29:20 +01:00
Bart Visscher
cb37a2716a
Also clear cached UserGroup when a user is added/removed
2014-02-27 20:09:07 +01:00
Bart Visscher
00e27d5343
Clear the cached user groups when a group is deleted
2014-02-27 19:12:03 +01:00
Morris Jobke
49b331be39
add BMP mimetype for BMP previews
2014-02-27 14:39:16 +01:00
Robin Appelman
7c92e2e3ad
Update rawlist to work with new fileinfo object
2014-02-27 14:04:19 +01:00
Robin Appelman
8282cfff04
Cache the fileinfo in OC\Preview
2014-02-27 13:15:18 +01:00
Vincent Petry
22adc397de
Also quote old column name during DB migration
...
This fixes alter table commands that didn't quote the old column name
2014-02-27 09:09:16 +01:00
Thomas Müller
ab850b961d
remove unused code and fix wrong variable names - some PHPDoc updated
2014-02-26 23:56:46 +01:00
kondou
da19109f40
Config to disable basic_auth username chacking
...
This can be confusing and/or annoying
2014-02-26 18:06:13 +01:00
Bart Visscher
7f05c23231
Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash
...
- removed slash-adding for logout-header-redirect
2014-02-26 16:05:09 +01:00
Björn Schießle
b7385986ae
Merge pull request #7393 from owncloud/fix_path_in_sharing_results
...
fix path in sharing results if it is a file in the Shared folder
2014-02-26 15:19:30 +01:00
Robin Appelman
bc49c6be04
Manually triger the filecache update hooks before any other hook
2014-02-26 14:29:13 +01:00
icewind1991
59df3ffdf4
Merge pull request #7279 from owncloud/folderid-reuse
...
Reuse the folder id in View->getFolderContents
2014-02-26 12:18:34 +01:00
Jan-Christoph Borchardt
8759c35e74
Merge pull request #7399 from owncloud/themable-doc-links
...
introduce new theme function to allow full creation of documentation lin...
2014-02-26 12:04:52 +01:00
Vincent Petry
5c98e0c7c7
Merge pull request #7328 from owncloud/McNetic-zipstreamer
...
McNetic zipstreamer
2014-02-26 10:19:12 +01:00
Thomas Müller
574883c47a
introduce new theme function to allow full creation of documentation links: buildDocLinkToKey()
2014-02-25 23:06:23 +01:00
Bjoern Schiessle
e3f676e009
fix path in sharing results if it is a file in the Shared folder
2014-02-25 17:27:23 +01:00
Robin Appelman
3a21755963
Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object
2014-02-25 16:23:09 +01:00
Vincent Petry
7f7d674c2a
Merge pull request #7335 from owncloud/fix-7333
...
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
Vincent Petry
9b4af31bac
Merge pull request #7371 from owncloud/core-storagemovedeleteall
...
Replace deleteAll call with unlink call on rename
2014-02-25 14:52:21 +01:00
Björn Schießle
e10ca7c2e9
Merge pull request #7374 from owncloud/enc_dont_overwrite_keys
...
[encryption] don't overwrite keys if rename was done by a stream copy
2014-02-25 12:34:49 +01:00
Vincent Petry
432a42d846
Fix case where port is missing
...
Forward port of 6d3b5b24fd
to master
2014-02-25 11:40:05 +01:00
Bjoern Schiessle
ebd73aee8f
don't overwrite keys if rename was done by a stream copy
2014-02-24 17:24:43 +01:00
Thomas Müller
0d78d9c180
Merge branch 'master' into McNetic-zipstreamer
...
Conflicts:
3rdparty
2014-02-24 12:53:55 +01:00
Vincent Petry
a23ef25010
Removed unused deleteAll method on Common storage class
...
The "deleteAll" method on the Common storage class isn't used anywhere.
Also, it isn't defined on the Storage interface so this fix removes it
completely.
2014-02-24 12:21:48 +01:00
Vincent Petry
c465835e85
Replace deleteAll call with unlink call
...
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
2014-02-24 12:20:11 +01:00
Lukas Reschke
c9ab11a9bd
Merge pull request #7259 from owncloud/overwritehost-always
...
Add overwritehost config on setup and upgrade
2014-02-22 07:35:56 +01:00
Bart Visscher
1d7564dc2f
Only check for existence of shared files when doing shared storage setup
...
The getItemsSharedWith function also retrieves related information,
resulting in work that isn't used here.
2014-02-21 23:07:35 +01:00
Bart Visscher
f4f72e77d8
Delay fetching the display name until it is requested
2014-02-21 23:07:35 +01:00
Bart Visscher
6f4ecd32b3
Add more caching in the group manager
2014-02-21 23:07:35 +01:00
Robin Appelman
f86dffd56c
Merge branch 'master' into recursive-mkdir-local
2014-02-21 15:43:54 +01:00
Robin Appelman
3487a95eab
Remove fileid parameter for getFolderContent
2014-02-21 15:36:24 +01:00
Robin Appelman
dd98e6333f
Split getFolderContentById
2014-02-21 15:35:12 +01:00
Robin Appelman
3980a7d9c6
Merge branch 'master' into folderid-reuse
2014-02-21 15:33:12 +01:00
Lukas Reschke
fe44ac264b
Add overwritehost config on setup and upgrade
2014-02-21 15:19:01 +01:00
Thomas Müller
27ad69eea5
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-21 14:01:24 +01:00
Thomas Müller
a40cedf507
Merge branch 'master' into McNetic-zipstreamer
2014-02-21 13:57:18 +01:00
Philipp Schmitt
43b1d81f77
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-02-21 13:45:57 +01:00
Robin Appelman
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +01:00
Thomas Müller
f19276f7bc
Merge branch 'master' into no-css-js-delivery-via-php
...
Conflicts:
config/config.sample.php
2014-02-21 09:51:51 +01:00
Lukas Reschke
f7fa8662e2
Remove `session_id_regenerate` from here
...
Jenkins somewhat complains that there are already sent headers.
2014-02-21 08:12:45 +01:00
Lukas Reschke
69325c5eeb
Move session_regenerate_id to `login()`
2014-02-21 08:11:07 +01:00
Lukas Reschke
f11658698d
Fix path to the mount file
2014-02-20 18:53:37 +01:00
Thomas Müller
ec45a3c0e2
Merge pull request #6962 from owncloud/quota-space-root
...
Allow passing a root folder to get the used space from in the quota wrapper
2014-02-20 16:47:59 +01:00
Thomas Müller
b35cd54e87
Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer
...
Conflicts:
lib/private/files.php
2014-02-20 16:36:37 +01:00
Robin Appelman
d1c392d9ad
Also make "regular" local storage's mkdir recursive
2014-02-20 15:36:30 +01:00
Joshua Medeiros
76aa4714cf
Recursive mkdir fixes #7047
2014-02-20 15:35:00 +01:00
Lukas Reschke
c869e0116b
Merge pull request #6999 from kofemann/mount-config
...
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
Björn Schießle
4eadc36094
Merge pull request #6935 from owncloud/fix_urlGenerator
...
Add missing slash in URLGenerator::getAbsoluteURL().
2014-02-20 14:57:03 +01:00
Lukas Reschke
e4c3ef2ca6
Merge pull request #7289 from owncloud/fix-filetype-icons
...
Fix filetype icons
2014-02-20 14:53:41 +01:00
Lukas Reschke
0241ddc759
Merge pull request #6519 from nhirokinet/master
...
Security Update: session fixation
2014-02-20 14:28:26 +01:00
Thomas Müller
fbea02bebb
kill $coreStyles and $coreScripts
2014-02-20 14:18:01 +01:00
Thomas Müller
a0e790227e
remove unused functions - have been introduced with the old minimizer approach
2014-02-20 14:11:31 +01:00
Thomas Müller
31bab55847
Merge branch 'master' into no-css-js-delivery-via-php
2014-02-20 13:52:53 +01:00
icewind1991
742f54b6d5
Merge pull request #7301 from owncloud/fix-fuckup
...
fix master - #7274 brokes it
2014-02-20 13:40:12 +01:00
Thomas Müller
8cf73ca42f
integrate assetic for asset pipeline-ing
2014-02-20 13:28:27 +01:00
Thomas Müller
7242d00aa6
enable static delivery of css files
2014-02-20 13:27:46 +01:00
Thomas Müller
ac8e6b15b6
kill references to core.js and core.css
2014-02-20 13:23:24 +01:00
Thomas Müller
bf22ed7bdb
kill old minimizer code
2014-02-20 13:10:56 +01:00
Björn Schießle
16eb43c033
Merge pull request #7247 from owncloud/sharing_cleanup_step1
...
clean up the sharing ajax calls, add mail notification class
2014-02-20 11:56:20 +01:00
Lukas Reschke
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
Jan-Christoph Borchardt
3e2c56157b
reduce width of searchbox on mobile, fix overlap, fix #7282
2014-02-20 11:33:46 +01:00
Jan-Christoph Borchardt
3e235b2699
merge master
2014-02-20 10:51:13 +01:00
Jan-Christoph Borchardt
a6fb6abbe0
fix filetype icons for gzip, tex, perl, csv, sh
2014-02-20 10:45:11 +01:00
Morris Jobke
b76a3993d4
fix master - #7274 brokes it
2014-02-20 09:47:59 +01:00
Luke Policinski
b01492fecd
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:28:32 +00:00
Luke Policinski
79a6d89bcc
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:23:39 +00:00
Bjoern Schiessle
2fd75d8f1c
clean up the sharing ajax calls, add mail notification class
2014-02-19 19:33:00 +01:00
Jan-Christoph Borchardt
cac4652c10
coding style: spaces around =>
2014-02-19 16:28:29 +01:00
Jan-Christoph Borchardt
937a25593b
fix lots of file type icons for archives, js, flash, ics, fonts, code, ...
2014-02-19 16:27:38 +01:00
Lukas Reschke
2d5b3899a6
Hardening: Remove dangerous characters + Subdirectory Check
...
If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`.
2014-02-19 15:38:00 +01:00
Vincent Petry
952584e9c7
Merge pull request #7195 from owncloud/files-selectall
...
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
Morris Jobke
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
Morris Jobke
f944707a15
fix wrong removes
2014-02-19 11:50:17 +01:00
icewind1991
2d5ab1a5c4
Merge pull request #7260 from owncloud/watcher-policy
...
Allow setting the frequency of which the file watcher checks for updates
2014-02-19 11:17:27 +01:00
Robin Appelman
1331de554c
Reuse the folder id in View->getFolderContents
2014-02-19 10:46:02 +01:00
Vincent Petry
e517e642be
Merge pull request #7257 from owncloud/filelist-fileinfo
...
use a FileInfo object of the directory when generting the filelist
2014-02-19 09:40:11 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
Thomas Müller
1e321406ee
Merge pull request #7114 from owncloud/scrutinizer_documentation_patches
...
polish documentation based on scrutinizer patches
2014-02-19 07:04:37 +01:00
Thomas Müller
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
icewind1991
3cc7228c7c
Merge pull request #7253 from owncloud/preferences-caching
...
Add caching to OC\Preferences
2014-02-18 18:17:58 +01:00
Thomas Müller
8991e4505a
Merge pull request #6796 from owncloud/statementwrapper-bindparam
...
Add bindParam to the database statement wrapper
2014-02-18 18:13:57 +01:00
Thomas Müller
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
Vincent Petry
bd71a1b7b6
Added file name check in webdav connector
...
- added file name check for the put, rename and setNames() methods which
throw a "Bad Request" whenever invalid characters are used
- replaced \OC\Filesystem usage with $this->getFS() to be able to write
unit tests
2014-02-18 17:54:32 +01:00
Vincent Petry
797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
Tom Needham
a573fe7d76
Merge pull request #6650 from owncloud/migration_unit_tests
...
User migration fix, and basic unit test
2014-02-18 17:35:49 +01:00
Lukas Reschke
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
tomneedham
0beaeed713
Remove unused variables
2014-02-18 16:28:04 +00:00
Robin Appelman
2166683e3b
Allow setting the frequency of which the file watcher checks for updates
2014-02-18 16:34:25 +01:00
Robin Appelman
d18b9f6ea4
use a FileInfo object of the directory when generting the filelist
2014-02-18 15:39:35 +01:00
Robin Appelman
ac2e3ab373
remove some unneeded isset's
2014-02-18 14:27:55 +01:00
Robin Appelman
2e97a4cd32
Fix some phpdoc
2014-02-18 14:26:27 +01:00
tomneedham
df38d4ef1a
Return 101 if user doesnt exist
2014-02-18 10:36:18 +00:00
Robin Appelman
b6f44e9a1d
Add caching to OC\Preferences
2014-02-18 11:21:39 +01:00
tomneedham
2f1a24eee7
Add displayname for admins
2014-02-18 09:50:46 +00:00
Thomas Müller
5d3fc03750
Merge pull request #7239 from owncloud/cbr-filetype-icon
...
add cbr/cbz file type icon, fix #6953
2014-02-18 10:23:54 +01:00
Jan-Christoph Borchardt
c2adf033f2
use file icon as fallback instead of application icon, fix #7237
2014-02-17 20:58:33 +01:00
Jan-Christoph Borchardt
0f434038a7
add cbr/cbz file type icon, fix #6953
2014-02-17 20:48:32 +01:00
tomneedham
a4b6d66703
Merge branch 'master' into migration_unit_tests
2014-02-17 11:03:57 +00:00
Thomas Müller
750ffa8231
Merge pull request #7156 from owncloud/backgroundjob-public
...
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
Thomas Müller
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Morris Jobke
df282d9ef8
Merge pull request #7207 from owncloud/fileinfo-serializable
...
Remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 22:11:54 +01:00
Thomas Müller
41f0ad2d13
Merge pull request #7204 from owncloud/groupexists-duplicate
...
Remove duplicate call to groupExists
2014-02-14 21:53:03 +01:00
Robin Appelman
09502fcb36
remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 19:26:06 +01:00
icewind1991
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Robin Appelman
b35f679483
Fix test cases for group manager
2014-02-14 15:07:08 +01:00
Robin Appelman
0ba0596341
remove duplicate call to groupExists
2014-02-14 14:25:45 +01:00
Georg Ehrke
f62f1658ce
suppress error msg caused by php bug
2014-02-14 11:23:39 +01:00
Vincent Petry
d5397d813c
Do not send file list for select all on Download/delete
...
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
with root
- Delete will send "allfiles" to the server that will find the file
list or the passed directory by itself
2014-02-13 20:28:52 +01:00
Robin Appelman
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
Thomas Müller
4b84e3a7e8
Merge pull request #4624 from owncloud/convert-oc_appconfig
...
Convert OC_Appconfig to object interface
2014-02-13 15:51:40 +01:00
kondou
fc01a13811
Fix imagerotate and move loadFromBase64() one up.
...
imagerotate() with third parameter being -1 does not seem to work in PHP 5.5
loadFromBase64() one up, so debug-logs aren't spammed (as much) with urlencoded
base64-data from loadFromFile() debug output.
2014-02-12 22:35:49 +01:00
Bart Visscher
2c6411b897
$default of OC_Config::[gs]etValue can have more then string as type
2014-02-12 17:38:32 +01:00
icewind1991
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
Robin Appelman
d6576c640c
Add unit tests for JobList
2014-02-12 13:52:13 +01:00
Robin Appelman
62288971ca
Additional phpdoc
2014-02-12 13:32:16 +01:00
Robin Appelman
3aafa837b8
Remove internal methods from the public interface
2014-02-12 13:25:50 +01:00
Robin Appelman
60bd9d512d
Merge branch 'master' into backgroundjob-public
2014-02-12 13:21:47 +01:00
Bart Visscher
1fb5f96c37
Style fixes
2014-02-12 09:09:51 +01:00
Vincent Petry
c442a03d3a
Merge pull request #7075 from owncloud/quota-storagexsendfile
...
Added isLocal() method to storage, used for xsendfile
2014-02-11 14:49:39 +01:00
Robin Appelman
50cc6a85e5
Add explicit sorting
2014-02-11 14:26:40 +01:00
Robin Appelman
a6399f9cef
Add the background job list to the public server container
2014-02-11 14:00:24 +01:00
Robin Appelman
a7c50514ac
Merge branch 'master' into convert-oc_appconfig
2014-02-11 13:26:54 +01:00
Arthur Schiwon
af781bdea7
fix DI
2014-02-11 10:50:03 +01:00
Arthur Schiwon
32afdcbefe
Inject logger
2014-02-11 10:49:59 +01:00
Arthur Schiwon
20bfbb0fd9
wrong tld
2014-02-11 10:49:54 +01:00
Arthur Schiwon
82716ced48
sort following entries in alphabetical order
2014-02-11 10:49:41 +01:00
Arthur Schiwon
41e8d44cf7
move sorter into a class
2014-02-11 10:49:34 +01:00
Bart Visscher
082abdc620
Merge branch 'master' into migration_unit_tests
2014-02-10 21:32:17 +01:00
Vincent Petry
bea80ffe20
Merge pull request #6881 from owncloud/remove-user-storage-entry
...
Also remove the user's home storage from the storage table when deleting a user
2014-02-10 15:04:05 +01:00
Tom Needham
84607db284
Merge pull request #6988 from owncloud/oc_api_fix_warinigs
...
[ocs API] getData() always needs to return an array
2014-02-10 13:43:16 +00:00
Robin Appelman
e6df86f4cb
Merge branch 'master' into quota-space-root
2014-02-10 14:03:06 +01:00
Robin Appelman
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
Robin Appelman
5ffc43cba0
Merge branch 'master' into remove-user-storage-entry
2014-02-10 13:53:01 +01:00
Thomas Müller
45d07906b8
Merge pull request #7131 from owncloud/issue/6269
...
Change MySQL to MariaDB/MySQL in the frontend
2014-02-10 11:09:03 +01:00
Thomas Müller
8c7fb64b8b
Merge pull request #7066 from owncloud/check_svg_installed
...
properly check if pdf and svg modules are installed
2014-02-10 10:28:32 +01:00
Thomas Müller
8de9758fee
Merge pull request #7071 from jcfischer/master
...
close statement in MimeType detection is executed [#7069 ]
2014-02-10 10:27:21 +01:00
Andreas Fischer
bbfd97ce03
Merge pull request #6247 from owncloud/memcached-multiple-servers
...
Add support for multiple memcached servers.
* owncloud/memcached-multiple-servers:
Readd support for memcached_server config variable.
Add support for multiple memcached servers.
2014-02-08 14:21:19 +01:00
Joas Schilling
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
Robin Appelman
8ad3fc89be
Merge branch 'master' into quota-space-root
2014-02-07 23:29:26 +01:00
Thomas Tanghus
2ff0d3a255
Test if $url is already prefixed by '/'
2014-02-07 17:39:19 +01:00
Joas Schilling
dbec143f09
Change MySQL to MySQL/MariaDB in the frontend
...
Fix issue #6269
2014-02-07 17:03:43 +01:00
Bjoern Schiessle
dc53c83e7b
getData() always needs to return an array
2014-02-07 16:38:15 +01:00
Vincent Petry
60cba9962d
Merge pull request #7112 from owncloud/enc_fix_size_for_shared_files
...
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 14:49:22 +01:00
Robin Appelman
cd3ef0bb9d
Add caching to appconfig
2014-02-07 14:03:39 +01:00
Thomas Müller
f0afbffaef
Merge pull request #6997 from owncloud/fix_l10n_warnings
...
change order of issubdirectory() calls to avoid error messages for non-apps
2014-02-07 13:47:33 +01:00
Robin Appelman
b537d90e58
use the 'new' server container for appconfig
2014-02-07 13:45:59 +01:00
Bjoern Schiessle
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer
81031984a6
remove duplicate param lines for OCP\User::getUsers()
2014-02-07 12:12:16 +01:00
Vincent Petry
788c8540aa
Added isLocal() method to storage, used for xsendfile
...
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
2014-02-06 20:53:15 +01:00
Vincent Petry
be47e156a5
Merge pull request #6952 from MartialGeek/add_freebox_support
...
New user agent added for the Freebox.
2014-02-06 18:12:32 +01:00
Vincent Petry
5ab12a8b85
Merge pull request #6445 from owncloud/fix_5956
...
fix issue with logging non utf8 chars
2014-02-06 17:47:13 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Thomas Müller
79fc4f3126
Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging
2014-02-06 11:34:27 +01:00
Thomas Müller
0db5fead8e
remove some more global variable $RUNTIME_NOAPPS
2014-02-06 10:04:18 +01:00
Thomas Müller
afbe50d09c
remove global variable $RUNTIME_NOAPPS - it's just superfluous
2014-02-06 09:44:13 +01:00
Robin Appelman
1e79369338
merge master into storagestatistics-reuse
2014-02-05 13:36:55 +01:00
Jan-Christoph Borchardt
0609f30d1c
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
...
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
Jens-Christian Fischer
11f46e121c
close statement in MimeType detection is executed [ #7069 ]
...
close statement was never executed due to it being after a return
statement.
2014-02-04 17:03:52 +01:00
Vincent Petry
bd6734291c
Merge pull request #6081 from owncloud/partfilewebdavfix
...
Allow getting info or renaming part files through WebDAV
2014-02-04 07:48:37 -08:00
Robin Appelman
f830ad0e47
Don't create new thumbnails on the write hook
2014-02-04 16:28:41 +01:00
Morris Jobke
3c80071807
Merge pull request #4795 from owncloud/setup
...
Move core setup code to controller class
2014-02-04 06:04:21 -08:00
icewind1991
a27529709b
Merge pull request #6647 from owncloud/memcache-public
...
Add Memcache to the public api
2014-02-04 05:38:53 -08:00
Georg Ehrke
d55ef442cd
properly check if pdf and svg modules are installed
2014-02-04 12:59:14 +01:00
Bjoern Schiessle
36838b2837
add test for password remove method
2014-02-04 11:18:04 +01:00
Björn Schießle
c0aeaf9ec0
Merge pull request #7013 from owncloud/dont_write_passwords_to_log
...
wrap stat() call in a try/catch block
2014-02-03 07:58:44 -08:00
Robin Appelman
0ae4022fb4
Also clean up the filecache table when deleting a storage entry
2014-02-03 16:36:21 +01:00
Robin Appelman
8d6a3a00b4
Revert "Use Cache->clear to cleanup the filecache for removed users"
...
This reverts commit 5a5b6f187e
.
2014-02-03 16:29:04 +01:00
Bjoern Schiessle
cf5277b558
also load error handler if debugging is enabled
2014-02-03 12:08:28 +01:00
Bjoern Schiessle
44b637470c
remove passwords in URLs from all log messages
2014-02-03 12:07:56 +01:00
Bart Visscher
f1c60c7f8b
Remove unused functions from OC_Helper
...
init_var and init_radio where only used in the installation template
2014-01-31 17:33:15 +01:00
Bart Visscher
bca725dc32
Merge branch 'master' into setup
...
Conflicts:
core/setup.php
2014-01-31 16:43:12 +01:00
Robin Appelman
0d9fe770f3
Mark an app as loaded before we start loading it
2014-01-31 15:12:21 +01:00
Pellaeon Lin
099b71c712
Merge branch 'master' into pr-exceed_upload_limit_msg
...
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
Tigran Mkrtchyan
8cc9727520
mount: make location of mount.json configurable
...
do not share users data with config files
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
Robin Appelman
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
Jan-Christoph Borchardt
f5f918b8bf
Merge pull request #6903 from owncloud/fix-ms-office-icons
...
Add/fix Microsoft Office file icons.
2014-01-29 07:31:25 -08:00
Bjoern Schiessle
229f13adc0
change order of issubdirectory() calls to avoid error messages for non-apps
2014-01-29 14:40:59 +01:00
Martial Saunois
0f1c587e6b
The regexp of the Freebox user agent is now more strict.
...
A new unit test has been added in consequence.
2014-01-29 10:58:34 +01:00
Thomas Müller
ab9ddda8f2
Merge pull request #6907 from owncloud/webdav-logexceptions
...
Added exception logger plugin for sabre connector
2014-01-27 07:48:40 -08:00
Robin Appelman
20c2aaab00
Actually rename the variable
2014-01-27 16:26:54 +01:00
Robin Appelman
c8207312c7
Fix phpdoc
2014-01-27 16:00:10 +01:00
Robin Appelman
3c1ab66eda
Reuse the calculated free_space in buildFileStorageStatistics
2014-01-27 15:56:57 +01:00
Robin Appelman
a521949baf
Allow passing a root folder to get the used space from in the quota wrapper
2014-01-27 15:41:56 +01:00
Morris Jobke
b4d11df843
Merge pull request #6930 from jcfischer/master
...
Add 'mail_from_address' configuration
2014-01-27 04:27:35 -08:00
Morris Jobke
6ee1250d27
Merge pull request #6933 from seberm/master
...
Add check for apc.enabled option
2014-01-27 04:25:31 -08:00
Morris Jobke
0a1708ba11
Merge pull request #6912 from owncloud/replace-webroot-in-css
...
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
Vincent Petry
11ef12a106
Added exception logger plugin for sabre connector
...
Whenever an exception occurs in the sabre connector code or code called
by it, it will be logged.
This plugin approach is needed because Sabre already catches exceptions
to return them to the client in the XML response, so they don't appear
logged in the web server log.
This will make it much easier to debug syncing issues.
2014-01-27 11:40:17 +01:00
Martial Saunois
c2ed8d5aa1
New user agent added for the Freebox.
...
The Freebox is the multimedia device of a french Internet provider: Free. This device provides a seedbox which uses the user agent "Mozilla/5.0". In the "Content-Disposition" header, if the "filename" key is used with the "filename*=UTF-8''" value, the seedbox does not take care about the header and saves the file name with the origin URL. This patch brings the support for the Freebox users.
2014-01-26 18:46:09 +01:00
Thomas Tanghus
5f610a1cbc
Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840
2014-01-24 16:40:32 +01:00
Robin Appelman
1ab7ca0a19
Fix some phpdoc errors and rename interface
2014-01-24 16:01:19 +01:00
Robin Appelman
fc5f20112e
Add isReadable, isUpdateable, isDeletable, isShareable
2014-01-24 15:54:40 +01:00
Otto Sabart
2f8ebd03b0
Add check for apc.enabled option
...
Sometimes it's not possible to disable APC entirely and some of
apc_functions are disabled. Only thing which is possible is
to disable apc.enable option.
2014-01-24 15:52:28 +01:00
Jens-Christian Fischer
0f6c607171
added function documentation
2014-01-24 14:22:42 +01:00
Jens-Christian Fischer
506393090b
Add 'mail_from_address' configuration
...
In environments where there are rules for the email addresses, the "from
address" that owncloud uses has to be configurable.
This patch adds a new configuration variable 'mail_from_address'.
If it is configured, owncloud will use this as the sender of *all*
emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by
default). By using the 'mail_from_address' configuration, only this
email address will be used.
2014-01-24 14:04:37 +01:00
Thomas Müller
9fa788c452
Merge pull request #6736 from owncloud/tests-jsunittests
...
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Vincent Petry
5ad28f4d1f
Allow getting info or renaming part files through WebDAV
...
When mounting an ownCloud (backend OC) inside another ownCloud (frontend
OC), the frontend OC will use WebDAV to upload file, which will create
part files. These part files need to be accessible for the frontend OC
to rename them to the actual file name.
This fix leaves the file cache untouched but gives direct access to part
file info when requested.
This means that part file can be accessed only when their path and name
are known. These won't appear in file listtings.
Fixes #6068
2014-01-23 18:42:56 +01:00
Jan-Christoph Borchardt
25e9b7a742
add icons.css file, first step to get rid of %webroot%
2014-01-23 12:55:39 +01:00
Andreas Fischer
96f194c0f6
Add icons for mdb and accdb files.
2014-01-23 03:06:14 +01:00
Andreas Fischer
47ea7704ca
Fix icons for xml,ppt,dot,dotx files.
2014-01-23 02:46:05 +01:00
Andreas Fischer
689516ebd7
Remove duplicate mimetypes while keeping previous behaviour.
2014-01-23 02:23:20 +01:00
Andreas Fischer
6241655df4
Bring mimetype list into alphabetical order.
2014-01-23 02:15:42 +01:00
Robin Appelman
02aa44d055
Merge branch 'master' into memcache-public
2014-01-22 13:19:49 +01:00
Robin Appelman
5a5b6f187e
Use Cache->clear to cleanup the filecache for removed users
2014-01-22 13:00:45 +01:00
Nicolai Ehemann
99ad4e8000
switched zip file creation to ZipStreamer to create zip files directly in memory
2014-01-22 12:49:52 +01:00
Nicolai Ehemann
791772abea
refactored/cleaned up lib/files.php
...
cleaned up get() logic
fixed get() to only send headers if requested (xsendfile could get in the way)
do no longer readfile() when already using mod_xsendfile or similar
2014-01-22 11:53:03 +01:00
Robin Appelman
374e3475c9
Also remove the user's home storage from the storage table when deleting a user
2014-01-21 23:58:48 +01:00
Thomas Müller
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
Jörn Friedrich Dreyer
0dd54a1250
Merge pull request #6844 from owncloud/fix-css-loading-master
...
Revert "use getAppWebPath() in here as well"
2014-01-21 08:31:22 -08:00
Thomas Müller
c57c9eae76
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 16:01:24 +01:00
Thomas Müller
262f221d11
Merge branch 'master' into fix-setupfs-only-for-existing-users-master
2014-01-21 15:35:32 +01:00
Jörn Friedrich Dreyer
267e1f3c40
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
2014-01-21 12:41:10 +01:00
Thomas Müller
a3ea5aa2ac
fixing comment + adding unit test for checkPasswordProtectedShare
2014-01-21 12:07:08 +01:00
Thomas Müller
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
Thomas Müller
6746ad0a73
in case no share is found for the given token we can return right away
2014-01-21 10:55:10 +01:00
Thomas Müller
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
Thomas Müller
0f794b6889
Merge pull request #6820 from owncloud/phpunit-test-config
...
Load a separate config (if present) when running unit tests
2014-01-20 12:14:09 -08:00
Robin Appelman
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
Vincent Petry
62dd58aa19
Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix
...
Fixed quota wrapper to not wrap failed fopen streams
2014-01-20 05:29:27 -08:00
Robin Appelman
164915a3f8
Move test config folder to tests/config
2014-01-20 13:41:52 +01:00
Thomas Müller
221e656e91
Revert "use getAppWebPath() in here as well"
...
This reverts commit 6254f0a403
.
2014-01-20 10:10:34 +01:00
Thomas Müller
39be83ca8b
Merge pull request #6676 from aseques/check_internet_proxy
...
Fix internet detection to use OC_Util::getUrlContent
2014-01-19 12:08:55 -08:00
Vincent Petry
1af7dab535
Fixed quota wrapper to not wrap failed fopen streams
...
When calling fopen() on some storage types, these return false instead
of throwing an exception.
This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.
Also added 'rb' as another case that doesn't need to be wrapped.
Fixes #6832
2014-01-19 18:51:36 +01:00
Morris Jobke
3a2e03a7f0
Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps
...
Fix activation of unknown apps
2014-01-18 08:13:57 -08:00
Nicolai Ehemann
66aa9b4e27
lib/files.php: make use of === instead of ==
2014-01-18 15:16:17 +01:00
Bjoern Schiessle
bf0471a92e
show link to app documentation
2014-01-17 14:56:25 +01:00
Robin Appelman
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
Robin Appelman
6b4c3df087
Load a separate config (if present) when running unit tests
2014-01-17 14:40:48 +01:00
Vincent Petry
350214c609
Added Javascript unit tests
...
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
Robin Appelman
504645cf00
Add bindParam to statement wrapper
2014-01-16 14:07:16 +01:00
Björn Schießle
32e941a2bc
Merge pull request #6644 from ben-denham/unshare-all-fix
...
\OCP\Share::unshareAll() fix
2014-01-16 03:13:26 -08:00
Thomas Müller
7f68497b39
error handling in case a requested app doesn't exists
2014-01-15 17:11:29 +01:00
Robin Appelman
729210daa0
Merge branch 'master' into memcache-public
...
Conflicts:
apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
Thomas Müller
d4519125db
Merge pull request #6744 from owncloud/fix_ocs_response_messages
...
keep response message
2014-01-15 03:17:24 -08:00
Vincent Petry
34559ef114
Merge pull request #6768 from owncloud/scanner-use-storage-mtime
...
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-15 01:31:33 -08:00
Robin Appelman
c01949ec0e
Merge branch 'master' into fileinfo
2014-01-14 16:31:08 +01:00
Vincent Petry
c3a0b0d7f3
Merge pull request #6704 from owncloud/encryptedfoldersizecalc
...
Fix calculated folder size to use unencrypted size
2014-01-14 07:20:16 -08:00
Robin Appelman
203d5d01ca
Use storage_mtime when determining if we can reuse cached data while scanning
2014-01-14 13:54:07 +01:00
Thomas Müller
92969052d7
remove ru_RU - it has bee removed from transifex
2014-01-13 16:41:10 +01:00
Robin Appelman
e706cf6c06
add Support for passing a FileInfo instance to View->putFileInfo
2014-01-13 15:57:49 +01:00
Robin Appelman
82762bb462
remove ArrayAccess, JsonSerializable from the public part of FileInfo
2014-01-13 15:13:45 +01:00
Robin Appelman
39d2c18793
Extends phpdoc for \OCP\File\FileInfo
2014-01-13 14:42:14 +01:00
Robin Appelman
617acbd6f9
Add a FileInfo class which holds all info of a file and return that from getFileInfo, getDirectoryContent and search
2014-01-13 14:28:49 +01:00
Bjoern Schiessle
6845860470
keep response message
2014-01-13 12:27:05 +01:00
st3so
a2cae551f3
fixing typo in redirection query string
2014-01-12 15:49:32 +01:00
Georg Ehrke
6f21da12e8
encode imagePath and fix documentation of loadFromFile
2014-01-11 12:07:28 +01:00
Joan
2abea96462
Disabled internet checking as mentioned when in proxy mode
2014-01-10 09:33:35 +01:00
Andreas Fischer
acd81f6c69
Readd support for memcached_server config variable.
2014-01-10 00:57:40 +01:00
Andreas Fischer
320353c237
Add support for multiple memcached servers.
2014-01-10 00:57:34 +01:00
Vincent Petry
4faba49f0a
Fix calculated folder size to use unencrypted size
...
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
2014-01-09 17:47:50 +01:00
Vincent Petry
b24c21b00f
Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
...
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
Robin Appelman
5d456c7cc2
Merge branch 'master' into memcache-public
2014-01-09 13:54:58 +01:00
Robin Appelman
d50c7391d8
Use $server->getMemCacheFactory() in ldap connection
2014-01-09 13:54:50 +01:00
Thomas Müller
c3829dfa61
rename user-id to loginname to stay consistent
2014-01-09 10:29:21 +01:00
Thomas Müller
22bd69f75c
set login name within apache auth backend
2014-01-09 10:28:24 +01:00
Thomas Müller
9b7c3a5c66
fixing PHPDoc and use cameCase names
2014-01-09 10:27:47 +01:00
blizzz
d8b8abb429
Merge pull request #6681 from owncloud/userreport
...
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Arthur Schiwon
4585b4ea3f
Infowarning about 32bit
2014-01-08 19:41:10 +01:00
Vincent Petry
8eaa39f4e2
Removed special handling of part files in shared storage rename
...
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
Thomas Müller
e35bca1c26
Fix ownCloud for php5.3.x
2014-01-08 16:07:01 +01:00
Robin Appelman
5a2a0426a6
Also update the OCP\IServerContainer
2014-01-08 15:51:40 +01:00
Robin Appelman
be7837402d
get the memorycache factory from OCP\Server instead of a cache instance
...
this allows apps to specify a prefix to use
2014-01-08 15:18:12 +01:00
Arthur Schiwon
d7cb5ab080
add tests for user counting
2014-01-08 13:26:48 +01:00
Arthur Schiwon
cb6a3e2617
if backends have the same class name, sum their users up instead of overwriting
2014-01-08 13:24:28 +01:00
Vincent Petry
f642ad3961
Prevent deleting storage root
...
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.
Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
2014-01-08 13:17:36 +01:00
Thomas Müller
4c93b00990
Merge branch 'master' into disable-mod_pagespeed
2014-01-08 10:19:16 +01:00
Vincent Petry
1614ad42b3
Merge pull request #6673 from owncloud/master-quota-insufficientstorageforfilesfix
...
Now also preventing to override "files" dir size with -1
2014-01-08 00:55:11 -08:00
Thomas Müller
5eef107344
turn off mod_pagespeed
2014-01-08 07:56:08 +01:00
Jörn Friedrich Dreyer
f356894aa3
Merge pull request #6594 from owncloud/kill-index.php-from-url
...
Kill index.php from url
2014-01-07 22:28:58 -08:00
eduardo
428d2b6e0f
Remove unused spaces
2014-01-08 00:16:37 -02:00
eduardo
938ece1a3f
Remove name from code
2014-01-08 00:15:08 -02:00
Arthur Schiwon
1e1ced7772
Introduce user count action to user management
2014-01-07 23:05:37 +01:00
Vincent Petry
5be4af9f51
Now also preventing to override "files" dir size with -1
...
Fixes #6526
2014-01-07 22:34:01 +01:00
Thomas Müller
b6474506eb
Merge pull request #6660 from owncloud/fixing-disabled-function-checks
...
Fixing disabled function checks
2014-01-07 11:10:45 -08:00
Thomas Müller
2d5427efa9
Merge pull request #6290 from owncloud/files-androidcontentdisposition
...
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Thomas Müller
09d7882571
trimming all array elements
2014-01-07 19:47:01 +01:00
Thomas Müller
f2fbfbc665
Merge pull request #6642 from owncloud/update-SabreDAV
...
Update sabre dav to 1.7.9
2014-01-07 08:04:13 -08:00
Thomas Müller
3abe4c3e88
Merge pull request #6663 from owncloud/fix_empty_mimetypes
...
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 07:31:12 -08:00
Thomas Müller
e0bd7e145c
Remove @ in order to get proper error handling
2014-01-07 16:24:05 +01:00
Jörn Friedrich Dreyer
9404a8f40c
remove duplicate exe mimetype, add correct msi mimetype
2014-01-07 15:51:08 +01:00
Thomas Müller
9d869ab596
we shall explode on ',' only
2014-01-07 14:53:02 +01:00
Thomas Müller
07a84aa5eb
reuse existing helper function OC_Helper::is_function_enabled
2014-01-07 14:52:18 +01:00
Thomas Müller
970eed2867
Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-master
...
Adding a random postfix to the part file.
2014-01-07 03:25:26 -08:00
Thomas Müller
ed469a7d2c
in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string
2014-01-07 11:53:33 +01:00
Jenkins for ownCloud
d2f2645a6a
[tx-robot] updated from transifex
2014-01-07 01:56:11 -05:00
tomneedham
5c3c379f35
Merge branch 'fix-5388-master' into migration_unit_tests
2014-01-07 00:40:36 +00:00
Robin Appelman
4d65a80892
Remove the static dependency on OC_Util from Memcache
2014-01-06 13:11:38 +01:00
Robin Appelman
cd147bb37a
Use APCIterator for Memcache\APC::clear()
2014-01-06 12:58:43 +01:00
Robin Appelman
1df1b55b66
expose memory cache in public api
2014-01-06 12:55:56 +01:00
Jenkins for ownCloud
0e843b9d7d
[tx-robot] updated from transifex
2014-01-06 01:55:59 -05:00
ben-denham
baccc8f584
Unshare all will now delete all shares for the item, instead of only for a single owner.
2014-01-06 11:14:43 +13:00
Thomas Müller
214aecac78
require composer's autoload.php if present
2014-01-05 21:49:08 +01:00
Morris Jobke
ce3df44699
Merge pull request #6031 from s0taka/master
...
No decimal points for Kilobyte and Byte #5371 .
2014-01-05 11:52:10 -08:00
eduardo
569851fa0e
Add tabs to conformance with owncloud code standards
2014-01-05 12:38:54 -02:00
Jenkins for ownCloud
e4616199df
[tx-robot] updated from transifex
2014-01-05 01:55:53 -05:00
eduardo
d258ade35e
Fix PostgreSQL port configuration on install
2014-01-04 19:23:25 -02:00
tomneedham
1824ae1222
Merge branch 'master' into fix-5388-master
2014-01-04 13:46:08 +00:00
icewind1991
f016a3ead3
Merge pull request #6610 from owncloud/apcu-clear
...
Fix APCIterator syntax in \OC\Memcache\APCu::clear
2014-01-03 05:30:49 -08:00
Thomas Müller
1ce45713bd
Merge pull request #6605 from owncloud/free_space_disabled
...
Return SPACE_UNKNOWN if disk_free_space is disabled
2014-01-02 08:19:52 -08:00
Robin Appelman
83f968ace2
Fix APCIterator syntax in \OC\Memcache\APCU::clear
...
see http://www.php.net/manual/en/apciterator.construct.php
2014-01-02 16:12:56 +01:00
icewind1991
14e0b1b6d1
Merge pull request #6513 from owncloud/user-no-change-displayname
...
Re-add the config options to remove the ability for users to change their displayname
2014-01-02 05:04:27 -08:00
Robin Appelman
25370fcb82
Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free space on a local storage
2014-01-02 13:19:10 +01:00
Jenkins for ownCloud
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
Thomas Müller
25a9311e94
Merge pull request #6601 from AdamWill/pimple-include
...
don't specify path to 3rdparty directory when registering Pimple autoloader
2014-01-01 15:25:58 -08:00
Adam Williamson
9b4a827e0b
don't specify path to 3rdparty directory when registering Pimple autoloader
...
The core 3rdparty directory is in the include_path from lib/base.php anyway, so this is unnecessary, and causes problems for downstream distributors who unbundle Pimple.
2014-01-01 09:52:19 -08:00
lolozere
d5382ac05d
Add support mimetype
...
Add support mimetype for extension .sh, .bash and .sh-lib
2014-01-01 14:09:02 +01:00
Niklas Sombert
4c179850ab
Revert "Added support for extra backends (see pull request #5043 )"
...
This reverts commit 2d75914f2a
, reversing
changes made to 760fa9ea30
.
2014-01-01 13:43:23 +01:00
Niklas Sombert
2d75914f2a
Added support for extra backends (see pull request #5043 )
...
Somebody had forgotten "OC_User::setupBackends();"...
2014-01-01 11:53:27 +01:00
Thomas Müller
6254f0a403
use getAppWebPath() in here as well
2013-12-31 15:12:17 +01:00
Thomas Müller
ae5671d281
new config parameter 'front_controller_active' which will instruct the url generator to generate urls without index.php
2013-12-31 14:36:02 +01:00
Jenkins for ownCloud
760fa9ea30
[tx-robot] updated from transifex
2013-12-31 01:55:42 -05:00
Jenkins for ownCloud
9ea9638490
[tx-robot] updated from transifex
2013-12-30 01:55:38 -05:00
Jenkins for ownCloud
64a001edab
[tx-robot] updated from transifex
2013-12-27 01:55:35 -05:00
Jenkins for ownCloud
7b2f4b08ac
[tx-robot] updated from transifex
2013-12-26 01:55:34 -05:00
Thomas Müller
97031ba45c
Merge pull request #6520 from owncloud/tests-testcleanuplistener
...
Added test cleanup listener to detect untidy tests
2013-12-24 14:27:39 -08:00
Thomas Müller
efdeba7416
Merge pull request #6449 from owncloud/core-appsorderfix
...
Fixed apps loading order
2013-12-24 14:26:11 -08:00
Jenkins for ownCloud
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
Frank Karlitschek
7b428f6009
Merge pull request #6460 from owncloud/remove-numRows
...
Remove OC_DB_StatementWrapper::numRows()
2013-12-23 03:38:56 -08:00
Jenkins for ownCloud
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
Andreas Fischer
63a2bea7ec
Remove OC_DB_StatementWrapper::numRows().
...
Using this method will result in an unneccesary extra SQL query (which also may
return an incorrect result because the underlying table changed in the
meantime).
In general:
If you are performing an UPDATE, DELETE or equivalent query,
OC_DB_StatementWrapper::execute() will already give you the number of
"affected rows" via \Doctrine\DBAL\Driver\Statement::rowCount(). This will
not work for SELECT queries, however.
If you want to know whether a table contains any rows matching your condition,
use "SELECT id FROM ... WHERE ... LIMIT 1".
If you want to know whether a table contains any rows matching your condition
and you also need the data, use "SELECT ... FROM ... WHERE ...", then use
one of the fetch() methods.
If you want to count the number of rows matching your condition, use use
"SELECT COUNT(...) AS number_of_rows FROM ... WHERE ...", then use one of the
fetch() methods.
2013-12-21 19:36:14 +01:00
nhirokinet
c2e2c59ca7
Update user.php to fix duplicate session-duplicate
2013-12-22 01:31:04 +09:00
Vincent Petry
c6377e9125
Fixed apps loading order
...
On SQLite the app order can be arbitrary and cause strange bugs.
On MySQL, the app order seems to be always alphabetical.
This fix enforces alphabetical order to make sure that all environments
behave the same and to reduce bugs related to app loading order.
Fixes #6442
2013-12-20 17:16:57 +01:00
Thomas Müller
1c0b8ed214
Adding a random postfix to the part file.
2013-12-20 13:48:46 +01:00
Bart Visscher
ac85dea267
Fix migration import of user files
2013-12-20 12:22:49 +01:00
Bart Visscher
34fcf1e9d0
Wrap the import/export db in a wrapper to make it compatible with the old style
2013-12-20 12:09:19 +01:00
Frank Karlitschek
dc45141f4a
Merge pull request #6262 from nickvergessen/issue/4375
...
correctly mark app management active
2013-12-20 02:27:52 -08:00
Vincent Petry
1c340444a4
Added test cleanup listener to detect untidy tests
...
After each test suite, detects whether there are stray datafiles, hooks
or proxies, then show a warning and clear them.
2013-12-19 20:18:09 +01:00
NARUKAWA Hiroki
068688063e
Security Update: session fixation
...
Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here.
2013-12-20 03:38:51 +09:00
Vincent Petry
09bd5bd517
Added isUserAgent() method to request
...
- added isUserAgent() method to OC_Request which makes it possible to
test it
- OC_Response::setContentDisposition now uses OC_Request::isUserAgent()
2013-12-19 18:40:22 +01:00
Andreas Fischer
526e873073
Merge pull request #6219 from leo-b/fix_router_deprecation
...
Symfonys addCollection() with multiple arguments is deprecated
* leo-b/fix_router_deprecation:
Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
2013-12-19 17:38:37 +01:00
Robin Appelman
321d961353
Merge branch 'master' into user-no-change-displayname
2013-12-19 15:57:04 +01:00
Thomas Müller
ae3df84e20
Merge pull request #6491 from owncloud/fix-warning-array_walk_recursive-json
...
only walk an array
2013-12-19 03:25:58 -08:00
icewind1991
3ea01e2152
Merge pull request #6492 from owncloud/appconfig-cache
...
Fetch all appconfig values for an app at once and cache the results
2013-12-19 03:25:20 -08:00
Thomas Müller
9b18a4fd87
Merge pull request #4378 from owncloud/fixing-3417-master
...
Don't use xcache in case admin auth is enabled
2013-12-19 03:24:37 -08:00
Vincent Petry
684e331b5b
Merge pull request #6503 from owncloud/finally-kill-mdb2-master
...
Finally kill mdb2 master
2013-12-19 02:56:46 -08:00
Frank Karlitschek
748d90592a
Merge pull request #6502 from owncloud/core-extramimetypes
...
Added missing mime types
2013-12-18 23:41:36 -08:00
Thomas Müller
aa17a896ac
fix return statement
2013-12-19 00:33:29 +01:00
Thomas Müller
5eae75eeca
kill MDB2 in PHPDoc
2013-12-19 00:32:46 +01:00
Thomas Müller
62fdc2b0dc
Merge pull request #6476 from ogasser/dbal_precision_scale
...
DB: Support DECIMAL(precision,scale) syntax in XML
2013-12-18 15:15:26 -08:00
Vincent Petry
b109d411d8
Added missing mime types
...
This is mostly to fix acceptance tests that have a .cc file.
Also fixed typo in python mime type.
2013-12-18 22:40:58 +01:00
Andreas Fischer
38f4ecaeac
Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
...
* owncloud/master: (30 commits)
Added entry with ext storage info
[tx-robot] updated from transifex
[tx-robot] updated from transifex
clarifying license
remove unused method tail()
reliable detect encrypted files
[tx-robot] updated from transifex
remove duplicated code
add missing quotes + field declarations
Do not use xcache variable cache if cache size is 0.
always show home breadcrumb in files view
Use DEBUG instead of ERROR when favourites not found. Fix #6419
update file cache for target file
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
Fixed JS plural function to be per app
call set password hook because it doesn't get triggered during test execution and fix paths
Do not use L10n when logging exceptions
Also add default to the \OCP\IConfig interface
add default parameter for AllConfig->get*Value()
always show 'Deleted Files' breadcrumb
...
Conflicts:
lib/private/memcache/xcache.php
2013-12-18 15:44:46 +01:00
Robin Appelman
2e195dbdae
dont re-read the config values for an app when a non existing key is fetched
2013-12-18 15:28:32 +01:00
Thomas Müller
6c707323f2
only walk an array
2013-12-18 15:25:28 +01:00
Robin Appelman
5a646477a5
Fetch all appconfig values for an app at once and cache the results
2013-12-18 15:10:12 +01:00
Thomas Müller
277ae28171
Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
...
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
Thomas Müller
a90342b781
Merge pull request #6461 from owncloud/check-xcache-varsize
...
Do not use xcache variable cache if cache size is 0.
2013-12-18 05:36:40 -08:00
Thomas Müller
9c5a620c4f
Merge pull request #6256 from owncloud/session-preserver-thirdparty
...
preserve 3rd party values in in the Session destructor
2013-12-18 05:20:06 -08:00
Robin Appelman
e7a5c90cab
Replace static usage of OC_Config and OC_Preferences with the injected \OC\ConfigAll
2013-12-18 13:03:19 +01:00
Robin Appelman
a6c1b3ece3
fix the config option to remove the ability for users to set their displayname
2013-12-18 13:03:19 +01:00
Oliver Gasser
3b0d0e2b1f
DB: Support DECIMAL(precision,scale) syntax in XML
...
Add support for specifying the precision and scale of a decimal data
type to the XML description language.
See owncloud/core#6475
2013-12-17 22:46:45 +01:00
Jenkins for ownCloud
6488ff2c75
[tx-robot] updated from transifex
2013-12-17 16:43:17 -05:00
Frank Karlitschek
1d0af242b9
Merge pull request #6436 from owncloud/allconfig-defaults
...
Add default parameter to OC\AllConfig/OCP\IConfig's getValue's
2013-12-17 05:09:58 -08:00
Jenkins for ownCloud
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
Thomas Müller
275d666d26
Merge pull request #6438 from owncloud/core-logexceptionfix
...
Do not use L10n when logging exceptions
2013-12-17 00:53:03 -08:00
Andreas Fischer
dfeb04a574
Do not use xcache variable cache if cache size is 0.
...
This is possible because it is possible to only use xcache as an opcode cache
but not a variable cache.
2013-12-17 02:40:16 +01:00
Bart Visscher
8f0c56c1b2
Merge branch 'master' into fix-5388-master
2013-12-16 22:38:22 +01:00
Thomas Tanghus
a3fbad43c1
Use DEBUG instead of ERROR when favourites not found. Fix #6419
2013-12-16 17:07:22 +01:00
Georg Ehrke
059c3c8708
fix issue with logging non utf8 chars
2013-12-16 15:38:55 +01:00
Vincent Petry
2a1d6d3106
Do not use L10n when logging exceptions
...
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
2013-12-16 15:11:13 +01:00
icewind1991
fed63dff06
Merge pull request #6315 from owncloud/ingroup-cache
...
cache the result from inGroup
2013-12-16 06:01:00 -08:00
Robin Appelman
e2efad6ae7
Also add default to the \OCP\IConfig interface
2013-12-16 14:33:03 +01:00
Robin Appelman
59f02066b6
add default parameter for AllConfig->get*Value()
2013-12-16 14:30:01 +01:00
Andreas Fischer
c205d8d1c9
Merge remote-tracking branch 'owncloud/master' into fixing-3417-master
...
* owncloud/master: (1989 commits)
[tx-robot] updated from transifex
dont try to register background jobs if we haven't upgraded yet
adjust test
coding style
coding style
On webdav sesssions, loginname was compared to username which does not need to match necessarily
rely only on php DateTime to parse the db datetime string
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
Fix webroot for update page
Update 3rdparty ref
update 3rdparty
toggle select all checkbox
remove unneeded ; in comment
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
Add test for having utf8 filenames in the cache
fix fallback overwriting result of getHome
[tx-robot] updated from transifex
fix smbclient directory listing parser
cache the home folder of a User
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
...
Conflicts:
lib/util.php
2013-12-14 18:32:48 +01:00
Jenkins for ownCloud
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
Robin Appelman
4c45c6f418
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:15:18 +01:00
Arthur Schiwon
f26ba5846d
coding style
2013-12-13 16:58:16 +01:00
Arthur Schiwon
dcfda5c2a9
coding style
2013-12-13 16:58:09 +01:00
Arthur Schiwon
91d6a6dd7c
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-13 16:58:03 +01:00
Jörn Friedrich Dreyer
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
Vincent Petry
ad998c1fb5
Merge pull request #6390 from owncloud/migration-fixwebroot
...
Fix webroot for update page
2013-12-13 05:35:29 -08:00
Vincent Petry
df1a404466
Fix webroot for update page
...
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
2013-12-13 12:56:48 +01:00
Thomas Müller
7b30ffbf23
Merge pull request #6318 from owncloud/gethome-cache
...
cache the home folder of a User
2013-12-13 01:30:43 -08:00
Robin Appelman
8a86837eac
remove unneeded ; in comment
2013-12-12 13:59:00 +01:00
Robin Appelman
f23b7a262f
fix fallback overwriting result of getHome
2013-12-12 12:57:25 +01:00
Vincent Petry
335b2f40a6
Fixed download file from URL error messages
...
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
2013-12-12 10:38:12 +01:00
Robin Appelman
3d29992378
user Group->users as assosiative array
2013-12-11 16:25:41 +01:00
Robin Appelman
366d75e947
cache the home folder of a User
2013-12-11 16:22:26 +01:00
Robin Appelman
b126374780
cache the result from inGroup
2013-12-11 15:47:36 +01:00
Robin Appelman
5c7a08aab4
check if a $_SESSION entry exists before we try to remove it
2013-12-11 12:59:48 +01:00
tomneedham
7afe6b3493
Merge branch 'master' into fix-5388-master
2013-12-11 09:12:47 +00:00
Andreas Fischer
cdd182ce35
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-11 00:19:51 +01:00
Vincent Petry
82bf1f9c8c
Added workaround for Android content disposition
...
Fixes #5807
2013-12-10 12:42:41 +01:00
Vincent Petry
409b510889
Moved content disposition code+workarounds to OCP\Response
...
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.
Refactored download code to use the new API.
Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
Joas Schilling
009e25788f
correctly mark app management active
2013-12-09 15:53:31 +01:00
Jenkins for ownCloud
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
Robin Appelman
a36bf5c2b5
preserve 3rd party values in in the Session destructor
2013-12-09 12:38:27 +01:00
blizzz
bc3650e48c
Merge pull request #6231 from owncloud/fix-plural-l10n
...
fix plural translation - fixes #6226
2013-12-09 01:41:06 -08:00
Pellaeon Lin
fc607e6bce
Separate PHP upload limit and free space
2013-12-08 22:59:46 +08:00
Jenkins for ownCloud
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
Morris Jobke
4c4c9096c4
fix plural translation - fixes #6226
2013-12-07 11:38:01 +01:00
blizzz
6a747106db
Merge pull request #6150 from owncloud/backgroundjob-log-exception
...
Remove background jobs that are giving errors
2013-12-06 11:56:53 -08:00
Vincent Petry
123bc9921a
Merge pull request #6201 from owncloud/backgroundscan-reuse-etag
...
reuse etags when doing a background scan
2013-12-06 10:13:14 -08:00
Robin Appelman
9eca2471b3
Merge branch 'master' into backgroundscan-reuse-etag
2013-12-06 18:27:46 +01:00
Bart Visscher
4c8bc61753
XSendfile and encryption don't work together
...
The file on disk is encrypted, and not readable on client systems
2013-12-06 17:59:59 +01:00
Bart Visscher
6aa9daf4e6
Users of getFolderContent are mostly interested in the unecrypted file size
2013-12-06 15:51:49 +01:00
Björn Schießle
b18c8e5c53
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
...
Sharing etag propagation on expire
2013-12-06 05:41:08 -08:00
Morris Jobke
9c4bbf9ad7
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
...
This reverts commit eba35d28cd
.
2013-12-05 20:53:11 +01:00
Bjoern Schiessle
3f7aac1a79
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-05 17:29:15 +01:00
Morris Jobke
eba35d28cd
Revert "Fix user's displayName being overwritten by (old) cookie"
...
This reverts commit 2a7380cc21
.
2013-12-05 16:12:46 +01:00
Robin Appelman
01ab15a2b0
reuse etags when doing a background scan
2013-12-05 15:23:34 +01:00
Nico Kaiser
2a7380cc21
Fix user's displayName being overwritten by (old) cookie
2013-12-05 14:18:32 +01:00
Jenkins for ownCloud
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
Alexander Bergolth
301d469813
Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
2013-12-04 18:01:51 +01:00
Morris Jobke
d73875b2b4
Merge pull request #6169 from owncloud/php_version_warning
...
PHP version warning
2013-12-04 01:49:54 -08:00
Frank Karlitschek
61296ed7bb
lower required php version to 5.3.3
2013-12-04 10:25:22 +01:00
Frank Karlitschek
8fdbb98899
Merge pull request #6168 from owncloud/extstorage-testtestmethod
...
Added unit test for the test() method of ext storage
2013-12-03 11:00:49 -08:00
Thomas Müller
16eb7c15d2
Merge pull request #6076 from owncloud/fix-6073-master
...
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-12-03 08:21:45 -08:00
Vincent Petry
6cf9844e9c
Added unit test for the test() method
...
This is to make sure that method isn't broken
2013-12-03 14:35:53 +01:00
Frank Karlitschek
b83e891456
Merge pull request #5929 from owncloud/code_check_on
...
switch code checker on by default. apps are not allowed to access
2013-12-03 01:14:35 -08:00
Thomas Müller
a999350f69
Merge pull request #6158 from owncloud/rmdir-check
...
check if a directory exists before we try to remove it
2013-12-02 15:14:41 -08:00
Jenkins for ownCloud
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
Robin Appelman
64bfcbee0a
check if a directory exists before we try to remove it
2013-12-02 22:44:28 +01:00
Robin Appelman
4f4ad72460
remove background jobs if they are failing
2013-12-02 13:43:26 +01:00
Robin Appelman
35bb6f7e3a
Catch exceptions from background jobs and log them
2013-12-02 13:41:47 +01:00
Thomas Mueller
87e795a693
fixing PHPDoc and spelling
2013-12-02 08:42:28 +01:00
Thomas Müller
832be7c908
Merge pull request #6052 from owncloud/datetime-doctrine
...
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
Jenkins for ownCloud
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
Frank Karlitschek
3c62de90fd
Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble
...
Fixed touch after chunk assembling
2013-11-29 09:19:51 -08:00
Vincent Petry
80d2371f97
Fixed touch after chunk assembling
...
Fixed touch after chunk assembling which was using the wrong path,
resulting in the creation of an extra file.
Fixes #6007
2013-11-29 16:29:35 +01:00
Frank Karlitschek
7ca0de9bd3
make 5.3.8 the minimum supported version. This fixes several issues with broken PHP versions like: https://github.com/owncloud/core/issues/5734
...
Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value.
2013-11-29 15:46:10 +01:00
Frank Karlitschek
a03ba06dcd
Merge pull request #6077 from owncloud/fix-api-documentation
...
API doc for contacts manager, server container and share
2013-11-29 03:24:19 -08:00
Morris Jobke
41a1a32e5a
Merge pull request #6099 from owncloud/fix_source_not_found_warnings
...
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
Morris Jobke
0cbe9d79ba
Merge pull request #6106 from owncloud/fix_preview_creation
...
Fix preview creation
2013-11-28 12:48:19 -08:00
Bjoern Schiessle
466ed01e5d
correctFolder() already resolves the dirname internally
2013-11-28 19:25:49 +01:00
Bjoern Schiessle
bdfef554c4
add PHPDoc for setMimetype()
2013-11-28 19:05:43 +01:00
Bjoern Schiessle
eeb31420fe
we need to be able to set the mimetype manually
2013-11-28 18:52:58 +01:00
Bjoern Schiessle
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
Frank Karlitschek
dab3629ff5
Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
...
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
Andreas Fischer
93b0bd0a9e
Use getLastError() everywhere.
2013-11-28 12:05:46 +01:00
Andreas Fischer
904573d0d0
Add getLastError()
2013-11-28 12:04:28 +01:00
Andreas Fischer
955127231a
No function as oci_last_error. It's oci_error.
2013-11-28 11:37:29 +01:00
Andreas Fischer
fcf332abbf
There is no property such as dbusername. It's 'dbuser'.
2013-11-28 11:33:49 +01:00
Andreas Fischer
b90f88f939
Correct property name. It's 'dbpassword', with the 'db' prefix.
2013-11-28 11:33:43 +01:00
Andreas Fischer
005c98e46c
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-11-28 11:23:45 +01:00
Frank Karlitschek
d2567129a1
Merge pull request #6072 from owncloud/mssql-fix-schema-migration-oc6
...
on mssql the schema migration sometimes fails due to an already existing...
2013-11-28 02:16:16 -08:00
Thomas Müller
f23d641b82
Merge pull request #6084 from owncloud/fix-app-routing
...
fix custom routes defined by apps
2013-11-28 00:00:09 -08:00
Vincent Petry
43b1cf7988
Redetect mime type whenever extension is renamed
2013-11-27 21:34:51 +01:00
Robin Appelman
885d04bc86
Fix getRawPathInfo for the '/' edge case
2013-11-27 21:28:54 +01:00
Morris Jobke
39f9e16f20
Merge pull request #6086 from owncloud/incognito_mode
...
return false if user is in incognito mode
2013-11-27 09:11:18 -08:00
Jenkins for ownCloud
4a78f12682
[tx-robot] updated from transifex
2013-11-27 12:10:54 -05:00
Bjoern Schiessle
6deda1b9f6
return false if user is in incognito mode
2013-11-27 16:52:30 +01:00
Robin Appelman
c47e46fda0
fix custom routes defined by apps
2013-11-27 15:35:49 +01:00
Morris Jobke
a81909097c
Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
...
fix appframework routing
2013-11-27 01:55:52 -08:00
Morris Jobke
7755e69af0
add PHPDoc for urlParams
2013-11-27 10:55:06 +01:00
Morris Jobke
b910524acb
add comment from @DeepDiver
2013-11-27 10:32:48 +01:00
Morris Jobke
7c88736292
API doc for contacts manager, server container and share
2013-11-27 00:35:36 +01:00
Thomas Mueller
4fbc2774ef
on mssql the schema migration sometimes fails due to an already existing transaction - error: 'New transaction is not allowed because there are other threads running in the session.'
...
The solution is to simple reconnect to the database to start with a fresh connection
2013-11-26 22:39:01 +01:00
blizzz
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Björn Schießle
1fef97f6a5
Merge pull request #6060 from owncloud/fix-6050-oc6
...
fixing getRawPathInfo() once more
2013-11-26 10:13:58 -08:00
Thomas Müller
52941341fd
fixing failing unit test
2013-11-26 16:52:33 +01:00
Jenkins for ownCloud
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
Thomas Müller
2a93720f3f
fixes #6050
2013-11-26 14:13:33 +01:00
Robin Appelman
10d84f6e9b
Add a (currently) empty system for running common repair steps
2013-11-26 14:12:48 +01:00
Bjoern Schiessle
62afe7fe7a
remove passwords from logfile
2013-11-26 12:26:32 +01:00
Andreas Fischer
3bbaba1eca
Use the Doctrine to convert date string to DateTime object.
2013-11-26 12:21:31 +01:00
Andreas Fischer
a330b2ef9b
Use DateTime object instead of fixed format date string.
...
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
Andreas Fischer
9fb1da2811
Use bindValue() instead of passing parameters in execute().
2013-11-26 11:50:14 +01:00
Jenkins for ownCloud
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
Robin Appelman
9fbccc83e3
merge master into single-user-mode
2013-11-25 21:25:04 +01:00
Owen Winkler
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -08:00
Jörn Friedrich Dreyer
4b67d4258d
Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6
...
Fixing rawpath reverseproxy oc6
2013-11-25 08:21:33 -08:00
Thomas Müller
a42d152ac3
Merge pull request #6037 from owncloud/fix-6007-oc6
...
adding chunked upload handling
2013-11-25 08:16:45 -08:00
Thomas Müller
1fdd2ac7ee
adding documentation for registerRoutes()
2013-11-25 17:15:08 +01:00
Morris Jobke
b3e7e54c8d
fix some capital letters
2013-11-25 16:42:28 +01:00
Morris Jobke
4e0fa85307
page level doc blocks and class descriptions
2013-11-25 16:39:01 +01:00
Morris Jobke
bc8cc9142e
AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixes
2013-11-25 16:28:24 +01:00
Thomas Müller
27cc333dfe
adding chunked upload handling
2013-11-25 15:35:26 +01:00
Robin Appelman
71c1327691
Add "single user mode" which restricts access to users in the admin group
...
This can be enabled by setting 'singleuser' to true in config.php
2013-11-25 15:08:24 +01:00
Thomas Müller
b9fed935b4
in case uri and script name don't match we better throw an exception
2013-11-25 14:42:34 +01:00
Morris Jobke
248eed16a6
fix defaults.php doc
2013-11-25 14:26:26 +01:00
Thomas Müller
a0a665ea45
handle duplicate slashes in case of reverse proxy configuration
2013-11-25 14:21:51 +01:00
Morris Jobke
7f47cc062c
fix defaults.php doc
2013-11-25 14:13:58 +01:00
Morris Jobke
b7ddc78626
fix db.php doc
2013-11-25 14:06:25 +01:00
Robin Appelman
317d421874
provide more cli friendly error messages
2013-11-25 13:04:23 +01:00
Simon Könnecke
243f3f0c4c
No decimal points for Kilobyte and Byte #5371 .
2013-11-25 12:26:03 +01:00
Thomas Müller
993fea2f05
fix appframework routing
2013-11-25 11:36:33 +01:00
Thomas Müller
1a69079139
Merge pull request #6021 from owncloud/show_build
...
Show build number
2013-11-24 15:01:11 -08:00
Thomas Mueller
37b07fe6a9
Merge branch 'master' into fix-5388-master
2013-11-24 23:27:44 +01:00
Thomas Müller
a2d4cd87d0
Merge pull request #5874 from owncloud/fix-5845
...
Fix file uploads on Windows with SQL Server
2013-11-24 14:15:17 -08:00
Thomas Mueller
228f1788fa
add new function to generate the human readable version string based on version, channel and build number
2013-11-24 21:26:34 +01:00
Thomas Mueller
6229f457d0
update PHPDoc
2013-11-24 21:18:14 +01:00
Frank Karlitschek
a11192bab3
send the build number too to push the next daily build. This is needed for the new daily build update channel
2013-11-24 16:45:06 +01:00
Frank Karlitschek
2ce850f7db
fix overwrite host support and make the code a bit more readable
2013-11-24 12:41:09 +01:00
Vincent Petry
aef34618de
Merge pull request #5995 from owncloud/extstorage-isreadablefix
...
Return plausible isReadable() default impl for ext storage
2013-11-24 03:04:33 -08:00
Jenkins for ownCloud
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
Arthur Schiwon
6085878966
Avatar: accept OC_Image as in setParameter
2013-11-22 23:57:23 +01:00
Vincent Petry
c62cce8269
Moved default isReadable/isUpdatable impl into Common class
...
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
2013-11-22 18:21:17 +01:00
Bjoern Schiessle
aeefe48cba
Revert "use relative paths to create images from a file. This way it also works if"
...
This reverts commit 3488f0b77a
.
2013-11-22 18:01:44 +01:00
Thomas Müller
26e9e68a39
Merge branch 'master' into fix-5388-master
2013-11-22 17:14:15 +01:00
Bart Visscher
9adff4f7f5
Change OC_Migrate from MDB2 to Doctrine
2013-11-22 15:53:56 +01:00
Vincent Petry
3b904647b0
Merge pull request #6003 from owncloud/incognito_mode
...
Incognito mode
2013-11-22 06:08:49 -08:00
Bjoern Schiessle
7e4f50d4e3
add incognito mode, allows to hide my user ID. For example, this is useful to access public resources while a user is still logged in
2013-11-22 13:55:38 +01:00
Thomas Müller
c05177b25b
Merge pull request #5882 from owncloud/preview-movie-5s
...
Movie preview - use frame after 5 seconds
2013-11-22 04:27:34 -08:00
Arthur Schiwon
8ccac86c98
Enable user backends to provide avatar images
2013-11-22 13:25:20 +01:00
Raghu Nayyar
c503588827
Merge pull request #6000 from owncloud/use_relative_path_to_create_images
...
use relative paths to create images from a file.
2013-11-22 03:52:40 -08:00
blizzz
2f73db12bb
Merge pull request #5040 from owncloud/public_api_avatar_master
...
Add public API for \OC\Avatar
2013-11-22 03:42:28 -08:00
Thomas Müller
92c8672c0f
fixing PHPDoc comments and syntax
2013-11-22 12:34:37 +01:00
Bjoern Schiessle
3488f0b77a
use relative paths to create images from a file. This way it also works if
...
no user is logged in (e.g. public gallery share)
2013-11-22 12:26:01 +01:00
Thomas Müller
14e7075030
we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
...
in some cases 1MB was no enough to generate thumbnail
2013-11-22 12:23:22 +01:00
Thomas Müller
c22019dec5
Working on a chunked video can result in a broken frame index the option -vsync 1 can heal that
2013-11-22 12:20:06 +01:00
Jenkins for ownCloud
60cfdae503
[tx-robot] updated from transifex
2013-11-21 21:07:12 -05:00
Arthur Schiwon
f94a6eb166
Add missing Avatar Interface
2013-11-22 00:43:23 +01:00
Arthur Schiwon
00071401d7
Round out Avatar Public API
2013-11-21 23:40:25 +01:00
Thomas Müller
4a2f9636cf
Merge pull request #5773 from owncloud/fix-2152-master
...
Make working en_US.UTF-8 locale a hard requirement
2013-11-21 08:03:21 -08:00
Jenkins for ownCloud
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
Vincent Petry
d0265f3388
Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome
...
Quota storage wrapper is now used for all users in sharing mode
2013-11-21 06:59:50 -08:00
Thomas Müller
cd1cf58875
Fixing the warning notifications
2013-11-21 14:44:25 +01:00
Vincent Petry
69e8e7dbd5
Now using the "Home" storage detection approach for quota
...
To find out whether to apply a quota, we now try and detect whether the
storage to wrap is a "Home" storage.
2013-11-21 12:17:47 +01:00
Vincent Petry
356eef0739
Quota storage wrapper is now used for all users in sharing mode
...
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.
This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00
Thomas Müller
f2fe47bc21
fixing spelling and restructure sentence
2013-11-21 09:59:21 +01:00
Vincent Petry
a88aec8a5c
Merge pull request #5965 from owncloud/mimetype-only-path
...
Change default mimetype detection for storage backends to only use filename
2013-11-20 08:11:41 -08:00
Thomas Müller
51a8172868
always get the right node for the given file path
2013-11-20 16:14:08 +01:00
Robin Appelman
a0d570b4cc
Change default mimetype detection for storage backends to only use filename
2013-11-20 15:25:29 +01:00
Vincent Petry
726a202cdb
Fixed getLocalFile() condition for x-send-file
...
Until now, addSendfileHeader() was called even when no x-send-file
headers were set. Even though the method itself doesn't do anything,
a call to getLocalFile() was done and would trigger a full download
when using external storage.
Additionally, the storage resolution code is wrong and always
returns the local storage of the root filesystem, which caused the code to
be run anyway.
This commit fixes both issues.
2013-11-20 14:33:59 +01:00
Morris Jobke
4a0d295e4a
Merge pull request #5927 from owncloud/quota-excludeextstorage
...
External storage space is now not counted in total space
2013-11-18 14:42:40 -08:00
Frank Karlitschek
7504fc0aef
switch code checker on by default. apps are not allowed to access some of the internal classes where we have a public api for now
2013-11-18 18:42:06 +01:00
Vincent Petry
3e2fd9942b
Root size for home storage is now size of "files" subdir
...
Fixes #4593
2013-11-18 18:17:25 +01:00
Vincent Petry
614e4d485c
External storage space is now not counted in total space
...
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.
Fixes #5924
2013-11-18 18:09:01 +01:00
Frank Karlitschek
385a296864
one tab less
2013-11-18 12:19:16 +01:00
Frank Karlitschek
e5994f9c1a
fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485
2013-11-18 12:16:03 +01:00
Jenkins for ownCloud
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
Bart Visscher
368342a085
Update error messages
2013-11-15 14:46:00 +01:00
Bart Visscher
630e46f60a
Merge pull request #5789 from ogasser/db_fix_default_for_numeric
...
DB: Set correct default value for numeric types
2013-11-15 04:19:33 -08:00
Bart Visscher
bcf56b0407
Use \Patchwork\Utf8\Bootup::initLocale
2013-11-15 13:06:35 +01:00
Thomas Müller
49e9f771ff
Merge pull request #5813 from owncloud/fix-4736-master
...
Don't set a default value when there isn't a default specified
2013-11-15 01:06:38 -08:00
Morris Jobke
926b274200
Movie preview - use frame after 5 seconds
2013-11-15 01:46:51 +01:00
Thomas Müller
617dc0e468
Merge branch 'master' into moviepreviewfallback
...
Conflicts:
lib/private/preview/movies.php
2013-11-14 20:57:29 +01:00
Thomas Müller
ecc7b01cee
Merge pull request #5824 from owncloud/fix-publicshare-non-existing
...
Fix fatal error when trying to open a non existing public link
2013-11-14 11:45:08 -08:00
Thomas Müller
2bb4c266a6
Merge pull request #5862 from owncloud/files-singledotdirs
...
Files singledotdirs
2013-11-14 11:40:21 -08:00
Thomas Müller
447e468d1a
Merge pull request #5850 from owncloud/oc_api_tests
...
Add unit tests for OC_API::mergeResponses and fix error with api returning incorrect status codes.
2013-11-14 07:58:51 -08:00
ringmaster
bd3ead0d31
Compare dirname() results to DIRECTORY_SEPARATOR, not '/'
2013-11-14 09:42:56 -05:00
ringmaster
ca675d7b08
Alias the aggregate columns so SQL Server doesn't combine them.
2013-11-14 09:41:55 -05:00
Thomas Müller
19e03ef77f
Merge pull request #5827 from owncloud/avoid_preview_errors
...
Use dedicated OC_Image loader methods in previews
2013-11-14 05:52:51 -08:00
Vincent Petry
c06d8bb007
Fixed normalizePath() to strip out single dot dirs
...
Now removing "/./" and trailing "/." from the paths when normalizing.
2013-11-14 13:15:03 +01:00
tomneedham
1449437c9e
Merge multiple failed third party responses when returning the result
2013-11-14 01:21:54 +00:00
tomneedham
bb182bbfb2
Merge multiple shipped failures before responding.
2013-11-14 01:19:46 +00:00
tomneedham
ca5c39a3a1
Return failed shipped responses over succedded shipped responses
2013-11-14 01:14:37 +00:00
tomneedham
a39f3fdbf9
Return result object when only one successful response is returned
2013-11-14 01:10:56 +00:00
tomneedham
790055571d
Update lib/private/api.php after merge conflict
2013-11-14 01:00:14 +00:00
tomneedham
b06682b7fb
Merge branch 'ocs_api_fix_success_code' into oc_api_tests
2013-11-14 00:41:04 +00:00
tomneedham
00944a376a
Merge branch 'master' into oc_api_tests
2013-11-14 00:40:57 +00:00
tomneedham
f19caeed33
Remove OC_App dependancy from OC_API::mergeResponses()
2013-11-13 22:46:24 +00:00
Morris Jobke
408ce91b25
Merge pull request #5768 from owncloud/quota-workaroundwhenmissingrootsize-home-only
...
Do not use -1 as the size for the root folder of the home storage
2013-11-13 05:57:16 -08:00
Vincent Petry
3fa651f2b1
Merge pull request #5447 from owncloud/fixing-5117-master
...
No data corruption duriing parallel upload
2013-11-13 02:59:34 -08:00
Tom Needham
17e45e2002
Pick any none 100 status code before defaulting to 100
2013-11-13 00:45:49 +00:00
Thomas Tanghus
ec51825d31
Use dedicated OC_Image loader methods
...
This prevents excessive logging and disk access
2013-11-13 00:36:42 +01:00
Vincent Petry
34c92f6656
Now using HomeStorage for legacy home storage ids
...
Legacy home storage ids with the format "local://path/to/datadir/user1"
are now also wrapped by the HomeStorage.
2013-11-12 18:01:02 +01:00
Vincent Petry
1a65e3a725
Now calling parent method when path is not root
2013-11-12 16:15:44 +01:00
Robin Appelman
32a703ab36
Do not use -1 as the size for the root folder of the home storage
2013-11-12 16:15:43 +01:00
Robin Appelman
abc428916c
Fix fatal error when trying to open a non existing public link
2013-11-12 15:38:00 +01:00
Georg Ehrke
49cd5dad24
add trash bin and file versions delete hooks in OC::registerPreviewHooks
2013-11-12 14:08:55 +01:00
Oliver Gasser
53f17a71d1
treat numeric as an alias for decimal
2013-11-12 13:55:20 +01:00
Oliver Gasser
4b01eaf6cc
changed type to decimal
2013-11-12 13:47:47 +01:00
Bart Visscher
dcca887f18
Don't set a default value when there isn't a default specified
2013-11-11 17:58:25 +01:00
Bjoern Schiessle
68f3f2e691
make it possible to detect transferID part
2013-11-11 17:47:46 +01:00
Vincent Petry
99ee95d46c
Added missing escaping
2013-11-11 15:41:03 +01:00
Morris Jobke
55331479cd
Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes
...
Fixed watcher to also update the owner's folder sizes
2013-11-11 06:16:51 -08:00
Oliver Gasser
b278356eb9
DB: Set correct default value for numeric types
...
Set 0 as default value for columns with numeric data type instead of the
empty string ''. Otherwise the database complains about an invalid
default value for this column.
To reproduce put the following in your ````appinfo/database.xml````:
````
<field>
<name>modified</name>
<type>decimal</type>
<default/>
<notnull>true</notnull>
<length>15</length>
</field>
````
See owncloud/mozilla_sync#14
2013-11-10 14:15:33 +01:00
Vincent Petry
df288605d4
Fixed undefined variable error when using avconv
2013-11-10 11:46:46 +01:00
Thomas Müller
841c622085
Merge pull request #5687 from owncloud/fixing-5659-master
...
display the exception instead of meaningless message
2013-11-09 23:14:52 -08:00
Thomas Müller
a8f6a2446c
Merge pull request #5759 from owncloud/fixing-5757-master
...
adding proper htaccess commands for Apache 2.4
2013-11-09 23:13:17 -08:00
Jenkins for ownCloud
3428c03b80
[tx-robot] updated from transifex
2013-11-09 01:45:32 -05:00
Thomas Müller
b5e013973b
implementing solution using <ifModule mod_authz_core>
2013-11-08 17:29:14 +01:00
Bart Visscher
a6d8854d2a
Make working en_US.UTF-8 locale a hard requirement
2013-11-08 14:30:08 +01:00
Vincent Petry
4b5083e3ca
Fixed the rebellous space, replaced with a tab
2013-11-08 12:27:53 +01:00
Vincent Petry
0c6af55112
Added ffmpeg fallback when avconv is not available
...
On some distros, avconv isn't available yet.
This fix adds a fallback to ffmpeg.
When none is found, no error message is displayed in the console any
more.
Fixes #5745
Also, this now uses exec() instead of shell_exec() to be able to get the
return code.
The binary path found with "which" is now used to prevent further FS
binary lookup when running the commands.
Moved the "-ss" parameter before "-i" for ffmpeg.
2013-11-08 12:19:32 +01:00
Thomas Müller
f93dcc5d77
the filesystem has to be initialized once we know the user
2013-11-08 11:24:19 +01:00
Thomas Müller
9c8b1e1775
adding proper htaccess commands for Apache 2.4
2013-11-08 10:45:35 +01:00
Morris Jobke
4459d964d6
Merge pull request #5747 from owncloud/scanner-post-hooks
...
Add post hooks for filesystem scanner
2013-11-07 12:44:23 -08:00
Vincent Petry
013444813e
Now removing stray old cookies from 5.0.12
...
Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't
there,
thus making it impossible to logout correctly.
This fix adds extra code to delete such stray cookies.
Ported from stable5 branch 99e5c6f7eb
2013-11-07 18:49:50 +01:00
Robin Appelman
d6845babd6
Add post hooks for filesystem scanner
2013-11-07 16:22:29 +01:00
kondou
bcd776b0c0
Fix a regression (Tags→TagManager)
2013-11-07 12:51:03 +01:00
kondou
4ac05e071a
Remove duplicate getAvatarManager()
2013-11-07 12:48:41 +01:00
kondou
507325dd50
Add public API for \OC\Avatar
2013-11-07 12:48:40 +01:00
Jenkins for ownCloud
263603aa4c
[tx-robot] updated from transifex
2013-11-06 21:44:36 -05:00
blizzz
7c89309e26
Merge pull request #5691 from owncloud/switch-to-oc6-documentation
...
move to oc6 documentation
2013-11-05 08:22:26 -08:00
Vincent Petry
e3868ba118
Fixed watcher to also update the owner's folder sizes
...
Note that the root folder size is mandatory for quota calculation.
2013-11-05 13:58:14 +01:00
Thomas Müller
08c8bf5a7b
decode arguments as array
2013-11-05 10:30:18 +01:00
Thomas Müller
3488202f67
Merge pull request #5582 from owncloud/files-previewcaching
...
Append file etag to preview URLs
2013-11-05 01:21:51 -08:00
Thomas Müller
f91fe8d595
Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master
...
Oc6 windows server mssql master
2013-11-05 00:41:11 -08:00
Thomas Müller
d48ba5a5bf
Merge pull request #5540 from owncloud/scanner-enhancments-master
...
Scanner enhancments master
2013-11-04 23:58:42 -08:00
Thomas Müller
01f2b7eb3a
move to oc6 documentation
2013-11-04 22:50:12 +01:00
Andreas Fischer
8274d9f91c
Inherit lastInsertId() from Adapter.
2013-11-04 22:28:41 +01:00
Thomas Müller
4f24d4ba01
display the exception instead of meaningless message
2013-11-04 21:55:55 +01:00
Thomas Müller
c3898061a8
Merge pull request #5544 from owncloud/fixing-3593-2-master
...
Add FileId header and switch fileid and instance id
2013-11-04 04:30:12 -08:00
Thomas Müller
0f266d0f62
set log level to DEBUG
2013-11-04 12:58:30 +01:00
Jenkins for ownCloud
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
Jenkins for ownCloud
07e540613e
[tx-robot] updated from transifex
2013-11-03 12:44:12 -05:00
Thomas Müller
7125bfba21
Merge pull request #5678 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-03 06:38:44 -08:00
Morris Jobke
ba2dd3b37c
Merge pull request #5671 from owncloud/fixing-5668-master
...
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-03 05:08:56 -08:00
Morris Jobke
ef592981ea
unify license headers for public API files
2013-11-03 13:51:39 +01:00
Morris Jobke
d2a48d58ce
fix "No page-level DocBlock"
2013-11-03 13:38:25 +01:00
Andreas Fischer
7c1f0da0fe
Always select item_source.
2013-11-03 12:34:40 +01:00
Andreas Fischer
fa56aec4b8
Deduplicate expiration date check into a method.
2013-11-03 12:34:38 +01:00
Andreas Fischer
779b87d46a
Use unshareItem() when unsharing expired shares.
2013-11-03 12:33:34 +01:00
Andreas Fischer
ebf1694795
Use unshareItem() in unshareAll().
2013-11-03 12:33:34 +01:00
Andreas Fischer
1d1f5b288e
Extract unshare() code into unshareItem().
2013-11-03 12:33:34 +01:00
Andreas Fischer
329299e34c
OCP\Share::unshareAll(): Deduplicate hook parameters.
2013-11-03 12:33:31 +01:00
Thomas Mueller
e37047b2a0
WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311
2013-11-02 20:22:12 +01:00
Thomas Mueller
5ecebe211b
mssql: fixing lastInsertId() implementation
2013-11-02 20:21:19 +01:00
Thomas Mueller
eb3c5070c0
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-02 19:11:46 +01:00
Bart Visscher
06b42f9788
Merge pull request #5443 from owncloud/fix-autoloader-caching
...
Remove Autoloader Cache Hack. Do not use Cache on Install.
2013-11-01 05:35:34 -07:00
Morris Jobke
eb0ecaa13c
Merge pull request #5658 from owncloud/session-error-full-sentence
...
[Trivial] Make "Please contact your system administrator" a full sentence.
2013-11-01 05:08:19 -07:00
Andreas Fischer
b6bb2b26dd
Make "Please contact your system administrator" a full sentence.
2013-11-01 11:35:02 +01:00
Morris Jobke
f5b42c63d4
Merge pull request #5653 from owncloud/fix-api-documentation
...
fix documentation stuff
2013-11-01 02:56:03 -07:00
Morris Jobke
fad2149e3f
Merge pull request #5551 from owncloud/fix-5202-master
...
When updating an appstore app, execute a database update
2013-10-31 11:10:28 -07:00
Morris Jobke
0dbe90cc9a
fix documentation stuff
2013-10-31 19:00:53 +01:00
Jörn Friedrich Dreyer
ae469b67a0
Merge pull request #5637 from owncloud/fix_privatedata
...
Fix privatedata
2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer
b4cdac0a60
Merge pull request #5591 from owncloud/home-storage
...
Make home folders movable without requiring rescans
2013-10-31 10:20:03 -07:00
Andreas Fischer
d6ddb12c20
Get rid of the SELECT query. Try UPDATE, on failure INSERT.
2013-10-31 16:04:18 +01:00
Thomas Müller
aae6e76926
fixing undefined index in delete()
2013-10-31 10:24:28 +01:00
Thomas Müller
64d0b0d184
PHPDoc comment updated - checkLoggedIn() removed
2013-10-31 10:21:17 +01:00
Thomas Müller
0cec17ba87
no need to check if the user is logged in
2013-10-31 10:14:06 +01:00
Thomas Müller
47da2ef8db
fixing php notice: Undefined index key
2013-10-31 10:02:18 +01:00
Thomas Müller
b2929de0a7
no need to check if the user is logged in - this is already done in the ocs dispatcher itself
...
adding @return
2013-10-31 09:58:18 +01:00
Thomas Müller
64bfd21ccd
Merge branch 'master' into fix_privatedata
2013-10-31 09:05:35 +01:00
Thomas Müller
3f42c890be
we should check if a user is logged in before we check for admin privilege
2013-10-30 22:59:31 +01:00
Thomas Müller
261cd87efa
Merge branch 'master' into home-storage
2013-10-30 22:11:19 +01:00
Lukas Reschke
c1730d241c
Merge pull request #5615 from owncloud/fixing-5614-master
...
http header OCS-ApiRequest: true is required in case of session based OC...
2013-10-30 13:12:16 -07:00
Lukas Reschke
cba12e009f
Added missing HTTP prefix to the $_SERVER variable
2013-10-30 21:07:19 +01:00
Frank Karlitschek
330d026be7
fix the privatedata key value store
2013-10-30 19:36:29 +01:00
Robin Appelman
c9f3f2874f
Merge branch 'master' into update-parent-storage-mtime
...
Conflicts:
lib/private/files/cache/updater.php
2013-10-30 13:41:10 +01:00
Vincent Petry
de342a5ac7
Merge pull request #5603 from owncloud/fix_file_cache_updater_master
...
Fix file cache updater (backport to master of #5513 )
2013-10-30 02:31:08 -07:00
Thomas Müller
3d42e402c5
http header OCS-ApiRequest: true is required in case of session based OCS API calls
2013-10-29 23:07:27 +01:00
Bjoern Schiessle
e1e4c7c214
Merge branch 'master' into fix_file_cache_updater_master
2013-10-29 17:47:33 +01:00
Björn Schießle
e08f38f99b
Merge pull request #5605 from owncloud/fix_delete_user
...
remove user from cache if he was deleted successfully
2013-10-29 09:46:21 -07:00
Thomas Müller
e0bc89c87f
Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath
...
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-29 09:29:29 -07:00
Bjoern Schiessle
0d7d396d80
make sure that also the storage etag gets changed
2013-10-29 16:30:47 +01:00
Bjoern Schiessle
f021dad204
remove user from cache if he was deleted successfully
2013-10-29 15:50:33 +01:00
Morris Jobke
34c1512466
Merge pull request #5601 from owncloud/fix-mimetype-detection
...
Fix mimetype detection
2013-10-29 07:47:20 -07:00
Morris Jobke
7223b5acce
Merge pull request #5396 from owncloud/fix-sharing-code
...
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
Bjoern Schiessle
a80ac9c492
make getUidAndFilename() private
2013-10-29 15:10:02 +01:00
Bjoern Schiessle
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
Robin Appelman
b3626f34cd
Update the parent folders storage_mtime on write and delete to prevent rescans
2013-10-29 14:18:57 +01:00
Andreas Fischer
b3e39dd3d9
Map empty mimetypes to octet-stream for Oracle DBMS.
2013-10-29 14:18:42 +01:00
Andreas Fischer
fa6ae81149
Return early if fileinfo is there.
2013-10-29 13:48:30 +01:00
Andreas Fischer
68d13210bd
Reset mimetype to application/octet-stream on empty reply from file command.
2013-10-29 13:29:35 +01:00
Robin Appelman
0e92a4896d
dont use the home storage for non-existing users
2013-10-29 13:12:28 +01:00
Andreas Fischer
a04a01d51f
Do not calculate $isWrapped if not needed.
2013-10-29 12:54:30 +01:00
Jenkins for ownCloud
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
Thomas Müller
aaefb64306
Merge pull request #5493 from owncloud/fix-language-detection
...
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
Robin Appelman
e273c14540
use the new home storage backend when no existing local storage backend exists for the user's home
2013-10-29 00:26:35 +01:00
Robin Appelman
f1e6e80eb1
add specialized storage backend for home folders
2013-10-29 00:14:23 +01:00
Bjoern Schiessle
db0fa6c529
use getHome() to delete users data
2013-10-29 18:01:37 +01:00
Jörn Friedrich Dreyer
682d6e8a80
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-28 14:18:20 +01:00
Vincent Petry
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
Morris Jobke
4750fbc226
Merge pull request #5550 from owncloud/fix-4716-master
...
'Update to' is shown when there is no update
2013-10-28 03:33:27 -07:00
Morris Jobke
78971c61e6
update documentation for app update
2013-10-28 11:27:51 +01:00
Morris Jobke
c61d328ab9
Merge pull request #3889 from owncloud/apps_preload
...
Don't load the apps when we need to upgrade
2013-10-28 03:17:52 -07:00
Jenkins for ownCloud
8df8211225
[tx-robot] updated from transifex
2013-10-27 07:27:22 -04:00
Jenkins for ownCloud
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
Arthur Schiwon
466b6c1ee0
local user backend shall search for both username and displayname, fixes #5401
2013-10-25 21:57:12 +02:00
Vincent Petry
ebcd9ae628
Added comment for clarification about fseek() call in quota.php
2013-10-25 16:15:01 +02:00
Bart Visscher
b6c67c4c63
'Update to' is shown when there is no update
...
See #4716
2013-10-25 15:41:59 +02:00
Bart Visscher
310c8400df
When updating an appstore app, execute a database update
...
See #5202
2013-10-25 15:38:08 +02:00
Thomas Müller
c455cb989b
add header 'OC-FileId' on PUT
2013-10-25 13:20:59 +02:00
Thomas Müller
3bca1519ee
switch instance id and file id
2013-10-25 13:20:29 +02:00
Thomas Müller
8253994262
using array_diff_assoc to detect diffs in values as well
2013-10-25 12:40:31 +02:00
Thomas Müller
f619f59f1c
cast storage_mtime to int
2013-10-25 12:39:50 +02:00
Vincent Petry
c8df27de73
Fixed quota stream to not wrap read-only fopen calls
2013-10-25 12:33:16 +02:00
Vincent Petry
d8b245490b
Fixed quota stream's fseek method
...
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
2013-10-25 12:09:46 +02:00
Thomas Müller
3917d18980
Merge pull request #5528 from frisco82/changeUpadateNotification
...
Changed update message to be more instructive
2013-10-24 10:28:17 -07:00
Thomas Müller
66813e9df6
Merge branch 'master' into fix-language-detection
2013-10-24 19:27:33 +02:00
Ramiro Aparicio
3a81c8e3af
Changed update message to be more instructive, changed update style to be less aggresive
...
Fix br tags
Improve english messages
2013-10-24 19:21:40 +02:00
Thomas Müller
54e9d8c306
Merge pull request #5507 from owncloud/webdav-removeredirectfromindex
...
Remove WebDAV redirect from the root path
2013-10-24 10:05:21 -07:00
Thomas Müller
222f1b8da2
Merge pull request #5494 from owncloud/fixing-3593-master
...
introducing new dav property {xmlns:oc="http://owncloud.org/ns }id
2013-10-24 09:41:56 -07:00
Thomas Müller
c5b8963b18
log the data arrays
2013-10-24 18:13:21 +02:00
Thomas Müller
a22f12cfe0
- fixing namespace
...
- remove property only if present
2013-10-24 14:40:43 +02:00
Thomas Müller
88d1e20d56
some logging added ....
2013-10-24 14:24:56 +02:00
Vincent Petry
c186f33428
Remove WebDAV redirect from the root path
...
This will prevent people mounting the root path.
They should use the full webdav path instead.
Fixes #4923
2013-10-24 10:34:09 +02:00
Thomas Müller
808e9b0f51
Merge pull request #5402 from owncloud/fixing-5367-master
...
fixes chunked upload
2013-10-24 00:56:46 -07:00
Thomas Müller
db70b18c1d
Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg
...
prefer logo png from theme over svg from core
2013-10-23 14:44:43 -07:00
Thomas Müller
291cdbdd98
Merge pull request #5497 from owncloud/ie8-placeholdershim
...
Ie8 placeholdershim
2013-10-23 13:18:37 -07:00
Thomas Müller
caa3a8d784
Merge pull request #5464 from owncloud/fixing-5456-master
...
Fixing 5456 master
2013-10-23 10:50:36 -07:00
Thomas Müller
54e0f1d739
fixing PHPDoc & grammar
2013-10-23 19:06:36 +02:00
Vincent Petry
086b82bd69
Fixed sharing dropdown placeholders in IE8/9
...
Added jquery.placeholder shim to handle input field placeholders in IE8/9
2013-10-23 18:51:25 +02:00
Thomas Müller
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
Thomas Müller
1909288fcb
Merge branch 'master' into fix-sharing-code
2013-10-23 17:16:16 +02:00
Thomas Müller
3d5e229ac5
Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts
...
Ignore duplicate inserts in file cache and mime type
2013-10-23 07:47:50 -07:00
Jörn Friedrich Dreyer
0bf034da96
prefer logo png from theme over svg from core
...
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.
fixes #5074
partially solves #5421 , but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem
@karlitschek @jancborchardt please review
2013-10-23 16:44:56 +02:00
Thomas Müller
b02a485712
handle case where fileid is not set
2013-10-23 16:40:29 +02:00
Thomas Müller
8c69a5388e
Merge pull request #5478 from owncloud/core-logexceptionstacktrace
...
Expand exception stack trace in log in debug mode
2013-10-23 07:19:14 -07:00
Thomas Müller
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
Andreas Fischer
06f2ae082e
Have to also strtolower() on available language name. Otherwise no match.
2013-10-23 15:39:50 +02:00
Andreas Fischer
daf93c4516
Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching.
2013-10-23 15:38:54 +02:00
Andreas Fischer
c14b470ea2
Apply substring on the correct value.
2013-10-23 15:38:22 +02:00
VicDeo
959b0f9125
Merge pull request #5458 from owncloud/fixing-5222-master
...
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-23 05:35:33 -07:00
Vincent Petry
c4dee281e6
Added $app parameter to logException
2013-10-23 13:58:42 +02:00
Vincent Petry
a542c57a7b
Catch duplicate insertion errors while scanning files
...
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.
These errors are now logged and ignored.
Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.
Fixes #5199
2013-10-23 13:00:46 +02:00
Andreas Fischer
4c76dd3871
Better variable names.
2013-10-23 12:56:51 +02:00
Andreas Fischer
207f6d55ce
Fix coding style for else.
2013-10-23 12:39:12 +02:00
Thomas Müller
3c710696e8
add missing file header
2013-10-23 12:27:54 +02:00
Andreas Fischer
9d1b425b62
Correct indentation for default language.
2013-10-23 12:25:48 +02:00
Vincent Petry
42c58220de
Moved logException to OCP\Util class
2013-10-23 10:48:27 +02:00
Björn Schießle
2d14daf36b
Merge pull request #5472 from owncloud/enc_init_status_on_enable
...
Encryption set init status on enable
2013-10-23 01:02:45 -07:00
Thomas Müller
4bf37f72b2
Merge pull request #5482 from owncloud/fix_weird_http_namespace
...
Fix namespace for OCP\Appframework\Http
2013-10-23 00:40:30 -07:00
Thomas Müller
cf61b1a977
Merge pull request #5391 from owncloud/undefined-property-in-schema-master
...
removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
2013-10-22 22:46:43 -07:00
Thomas Tanghus
ad017285e1
Fix namespace for OCP\Appframework\Http
...
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
2013-10-23 05:57:34 +02:00
Thomas Müller
064fd5ae53
Merge pull request #5451 from owncloud/reuse-session-ocs-master
...
Support existing sessions within OCS API calls
2013-10-22 14:41:21 -07:00
Thomas Müller
09903aa36c
- delete properties on node delete
...
- move properties on node move
2013-10-22 19:41:26 +02:00
Bjoern Schiessle
bd450d6f6b
add post_enable hook if a app gets enabled
2013-10-22 16:15:19 +02:00
Andreas Fischer
c85cc13d1a
Allow null as cache parameter (if no cache was found) and for cache removal.
2013-10-22 11:17:15 +02:00
Andreas Fischer
dde832b76c
Only write-back on cache miss.
2013-10-22 11:17:15 +02:00
Andreas Fischer
f5e2b92688
Only use autoloader cache when 'instanceid' is available.
2013-10-22 11:17:15 +02:00
Andreas Fischer
eb6637682e
Inject memoryCache into Autoloader. Remove recursion-prevention hack.
2013-10-22 11:17:15 +02:00
Thomas Müller
6e0e621218
creating and deleting of file and folder 'Shared' in root is not allowed
2013-10-22 11:10:07 +02:00
Thomas Müller
cadd71ec8a
Merge pull request #5455 from owncloud/fixing-2423-master
...
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
Thomas Müller
9d976013da
Merge pull request #5437 from owncloud/create-custom-logfile
...
Try to create custom log file before falling back to default.
2013-10-22 01:17:31 -07:00
Thomas Müller
7f1432600c
fixing php 5.3.3 error:
...
Undefined variable: this
lib/private/appframework/dependencyinjection/dicontainer.php:92
2013-10-22 09:29:17 +02:00
Thomas Müller
87a09156f8
use OC_Helper::linkToDocs() in lib/private/config.php
2013-10-21 23:08:09 +02:00
Thomas Müller
e30e4ea1cc
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-21 22:51:56 +02:00
Thomas Müller
408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
Thomas Müller
124984905e
introduce OC_Helper::linkToDocs()
2013-10-21 22:01:27 +02:00
Victor Dubiniuk
97aff7c64e
Use quoteIdentifier with proper objects
2013-10-21 22:31:57 +03:00
Thomas Müller
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
Thomas Müller
66a2f3b0b9
New OCS route:
...
/ocs/cloud/user
Response:
<?xml version="1.0"?>
<ocs>
<meta>
<status>ok</status>
<statuscode>100</statuscode>
<message/>
</meta>
<data>
<id>thomas</id>
<display-name>DeepDiver</display-name>
<email>no-response@domain.tld</email>
</data>
</ocs>
2013-10-21 20:14:18 +02:00
Thomas Müller
581cd9bb9c
Support existing sessions within OCS API calls
2013-10-21 18:58:46 +02:00
Thomas Müller
2628601e79
adding oc-mtime handling to chunked upload
2013-10-21 15:00:28 +02:00
Thomas Müller
3cb666ad77
chunked files are assembled into a part file on the target storage followed by an atomic rename operation.
2013-10-21 13:21:39 +02:00
Andreas Fischer
5978ddbec6
Try to create custom log file before falling back to default.
2013-10-20 23:58:07 +02:00
Arthur Schiwon
701009bd72
dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209
2013-10-20 20:55:27 +02:00
Jenkins for ownCloud
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
Frank Karlitschek
9e99f9d13d
the logfile shoudn't be world readable.
2013-10-18 17:15:02 +02:00
Frank Karlitschek
05523e7a70
Merge pull request #3219 from owncloud/disabled-links-ui
...
Disabled links UI fixes
2013-10-18 05:02:06 -07:00
Arthur Schiwon
33c4747fdf
Use display name from magic cookie, fixes #4884
2013-10-18 13:36:33 +02:00
Morris Jobke
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
Michael Gapczynski
4cf328e3b9
Don't return links for shared files if disabled
2013-10-18 10:34:30 +02:00
Vincent Petry
5c5621d84e
Merge pull request #5395 from owncloud/more_check_options
...
add options to disable the check for a working .htaccess file in data
2013-10-18 01:23:20 -07:00
Vincent Petry
11cfb9dc48
Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
...
Added timeout for WebDAV post setup check
2013-10-18 01:10:04 -07:00
Vincent Petry
b1f72edc57
Fixed spaces
2013-10-17 23:22:19 +02:00
Thomas Müller
d2d2c9a46d
fixes #5367
2013-10-17 20:20:13 +02:00
Jenkins for ownCloud
2845747528
[tx-robot] updated from transifex
2013-10-17 13:48:52 -04:00
Morris Jobke
f9bbfad3e5
Fix sharing error message - id -> file name
...
fixe #2827
2013-10-17 16:45:11 +02:00
Frank Karlitschek
6a60a47d59
add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
2013-10-17 16:27:43 +02:00
Thomas Müller
c3c27b3e58
Merge pull request #5394 from owncloud/sabre-server-location
...
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 07:11:50 -07:00
Andreas Fischer
5ee74b656c
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 16:04:59 +02:00
Georg Ehrke
4c5959e1f5
fix comment
2013-10-17 15:19:15 +02:00
Thomas Müller
e55d2359b1
removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed
...
adding PHPDoc
2013-10-17 14:54:37 +02:00
Georg Ehrke
521277b8b6
only call shell_exec if enabled
2013-10-17 14:31:07 +02:00
Morris Jobke
9c8d1190c0
Merge pull request #5385 from owncloud/generate-sql-migration-master
...
new console command to generate sql migration scripts
2013-10-17 04:53:18 -07:00
Frank Karlitschek
d2b1a361cc
Merge pull request #5379 from owncloud/undefined-shipped
...
fix undefined "shipped"
2013-10-17 04:37:40 -07:00
Thomas Müller
6e1881dbe4
new console command to generate sql migration scripts
2013-10-17 12:51:30 +02:00
Morris Jobke
793ccfd1df
fix undefined "shipped"
2013-10-17 11:35:13 +02:00
Thomas Müller
b70d67d49a
Merge pull request #5237 from owncloud/coverage-on-windows-master
...
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
Frank Karlitschek
186c6a56d1
Merge pull request #4949 from owncloud/improve_unknown_preview_backend
...
use svg to generate filetype icon if imagick available
2013-10-17 01:48:34 -07:00
Frank Karlitschek
d70a6c3f98
Merge pull request #4935 from owncloud/webdav-depth-fix-master
...
WebDAV depth infinity support - the dirty way
2013-10-17 01:37:38 -07:00
Morris Jobke
30f4d91d01
Public API documentation fixes
...
refs #4883
* http/response.php
* config.php
* response.php
* files.php
* idbconnection.php
* app.php
* user.php
* template.php
* share.php
* db.php
* icache.php & il10n.php
2013-10-17 00:49:15 +02:00
Morris Jobke
04783da829
Merge pull request #5276 from owncloud/fixing-5170-master
...
only text/plain is now used to generate text previews
2013-10-16 14:21:40 -07:00
Thomas Müller
221a650815
Merge branch 'master' into activities-api
...
Conflicts:
lib/private/server.php
2013-10-16 21:15:25 +02:00
Thomas Müller
fdeef5e874
Merge branch 'master' into fixing-appframework-master
...
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
Thomas Müller
c3f7d22adc
Merge pull request #5067 from owncloud/urlParams_fix
...
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
Thomas Müller
852a50aa89
remove test code
2013-10-16 15:38:56 +02:00
Thomas Müller
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02:00
Thomas Müller
aca66270c7
accept text/markdown as well
2013-10-16 15:31:43 +02:00
Thomas Müller
d8a7b1e537
Merge branch 'master' into fixing-5170-master
2013-10-16 14:48:55 +02:00
Thomas Müller
fa3a65aea7
Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
...
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
Vincent Petry
52e31405f7
Added timeout value to WebDAV post setup check
...
Fixes #5357
2013-10-16 12:34:22 +02:00
Vincent Petry
7037f9c6f8
Added DAV client wrapper that support timeout values
...
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
2013-10-16 12:32:42 +02:00
Björn Schießle
ada94fb558
Merge pull request #5333 from owncloud/avater_with_encryption
...
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
Vincent Petry
5f249e1a54
Prevent renaming/deleting mount points
...
Fixed permissions returned for mount points to not include update and
delete permissions.
Fixes #5291
2013-10-15 14:58:58 +02:00
Bjoern Schiessle
25320f19df
Merge branch 'master' into avater_with_encryption
2013-10-15 11:53:51 +02:00
Vincent Petry
fa341e49a8
Merge pull request #5341 from owncloud/fix-logout-link-html
...
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
Thomas Müller
e3489b36ff
any preview requiring the which command will not be used on Windows
2013-10-15 00:15:45 +02:00
Andreas Fischer
06f9b7b862
Fix logout link HTML.
...
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
Thomas Müller
6df5c7ebd5
streamCopy() should return proper structure.
...
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
Bjoern Schiessle
3380bd650f
avatars should also work with encryption after pr #5332 was merged
2013-10-14 17:30:24 +02:00
Thomas Müller
c97b52090e
Merge pull request #4867 from owncloud/fixing-4546-master
...
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
Thomas Müller
5318df3b3c
there shall be tabs
2013-10-14 14:51:25 +02:00
Thomas Müller
fb3829e8b8
file system is now initialized with apache authentication as well
2013-10-14 14:46:43 +02:00
Georg Ehrke
71601a7c6f
implement previews for markdown
2013-10-14 14:10:47 +02:00
Frank Karlitschek
258ccdfabe
case insensitive sort
2013-10-14 11:15:04 +02:00
Frank Karlitschek
a201a66878
fix style
2013-10-14 10:57:00 +02:00
Thomas Müller
a5e808defc
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
Frank Karlitschek
f06df170cb
finally fix the app sorting
2013-10-14 10:54:38 +02:00
Jenkins for ownCloud
f3336f8877
[tx-robot] updated from transifex
2013-10-13 20:33:30 -04:00
Tom Needham
14617682c8
Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error
2013-10-12 09:15:59 +01:00
Tom Needham
6f8dd54788
Include exception message in log entry when session fails to start
2013-10-12 09:15:08 +01:00
Thomas Müller
dc58195c7f
Merge pull request #5207 from owncloud/fixing-4011-part2-master
...
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Tom Needham
cf7ea4bec5
Handle ownCloud logging when data dir not created
2013-10-11 17:16:37 +01:00
Tom Needham
cb110c0679
Log the session exception when ownCloud is not installed
2013-10-11 16:45:58 +01:00
Georg Ehrke
e28f7f8a33
remove php and js previews
2013-10-11 11:43:26 +02:00
Björn Schießle
4336d42ab0
Merge pull request #5233 from owncloud/enc_filter_users
...
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Thomas Tanghus
d75d80ba13
OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller
2013-10-11 10:07:57 +02:00
Jenkins for ownCloud
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
Thomas Müller
51e6565aab
only text/plain is now used to generate text previews
...
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
Thomas Müller
19ea4f79da
resize svg without loosing quality
2013-10-11 00:12:37 +02:00
VicDeo
26c0007a5f
Merge pull request #5263 from owncloud/fixing-5255-master
...
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
Morris Jobke
0641365a10
Merge pull request #4780 from AxelRb/master
...
On an auth failure the uid and the IP address should be logged to the st...
2013-10-10 07:21:36 -07:00
Thomas Müller
bc6e352ccd
the path need to be normalized before putting it into resolvePath()
...
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
2013-10-10 16:06:26 +02:00
Axel Roenn
9b0454380c
changed the argument to false for getValue , reformated else statement
2013-10-10 14:15:13 +02:00
Robin Appelman
1378af838c
merge master into hooks-view-same-start
2013-10-10 11:34:30 +02:00
VicDeo
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
Björn Schießle
6053007768
Merge pull request #5210 from owncloud/sharing_search_users_fix
...
find users which are in the same group
2013-10-10 01:50:51 -07:00
Frank Karlitschek
1a899ac4c3
Merge pull request #5232 from owncloud/fixing-webdav-touch-master
...
due to internal implementations touch will always be successful - $mtime...
2013-10-10 01:49:59 -07:00
Robin Appelman
7f8eeb0474
ensure the view's root is a subfolder of the the default root, not only starting the same
2013-10-09 20:46:43 +02:00
Robin Appelman
38c563dcdc
don't trigger the create hooks when if the file already exists for file_put_contents
2013-10-09 20:34:18 +02:00
Thomas Müller
8e97752bf7
adding OC6 public API for activities
2013-10-09 18:06:21 +02:00
Thomas Müller
926b3c9b7b
Merge branch 'master' into activities-api
2013-10-09 17:53:57 +02:00
Bjoern Schiessle
7fe493fdb8
make sure that we only find file/folder shares
2013-10-09 17:25:58 +02:00
Thomas Müller
27738fc4f5
due to internal implementations touch will always be successful - $mtime will be stored in the cache
...
from desktop client perspective it is necessary to set the mtime under every condition
2013-10-09 15:35:09 +02:00
Björn Schießle
b4df4cc61d
Merge pull request #5219 from owncloud/catch_wrong_timezone
...
catch unknown timezone and fall-back to UTC
2013-10-09 01:59:09 -07:00
Bjoern Schiessle
c1e5725db9
changed default time format to ISO8601
2013-10-09 10:40:20 +02:00
Andreas Fischer
fe64f7b900
Merge pull request #5032 from owncloud/fixing-5006-master
...
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
* owncloud/fixing-5006-master:
Use strict comparison === instead of ==.
Adjust return value tests for checkPassword() to what OC_User_Example says.
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
Use parent:: in Test_User_Database::getUser().
Test_User_Backend::getUser() does not return an array, it returns a string.
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
Thomas Müller
7bd5352509
php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer
2013-10-08 23:14:08 +02:00
Thomas Müller
51b581a84d
php 5.3 compatibility for \OC\Files\Storage
2013-10-08 23:00:41 +02:00
Thomas Müller
24e99016a9
Merge pull request #5188 from owncloud/master-delete-user
...
User::delete should return bool
2013-10-08 13:28:19 -07:00
Thomas Müller
6f3c49dabb
fixing php 5.3 compatibility
...
PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
2013-10-08 21:52:54 +02:00
Bjoern Schiessle
3cf4c46c43
catch unknown timezone and fall-back to UTC
2013-10-08 20:42:35 +02:00
Andreas Fischer
75588fc0b6
Use strict comparison === instead of ==.
2013-10-08 20:03:16 +02:00
Andreas Fischer
6eab36a89b
Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
...
The user id has to be returned.
2013-10-08 19:57:37 +02:00
Björn Schießle
76bdd6bc81
Merge pull request #5173 from owncloud/set_timezone_for_log
...
let admin specify timezone for log file entries
2013-10-08 09:27:13 -07:00
Bjoern Schiessle
835f36cb09
find users which are in the same group
2013-10-08 16:43:23 +02:00
Frank Karlitschek
92d9263e24
Merge pull request #5146 from guruz/cache_enabled_apps_list
...
OC_App: Cache list of enabled apps
2013-10-08 07:17:36 -07:00
Thomas Müller
3f27fefdbe
fixing status code and formatting
2013-10-08 15:40:42 +02:00
Thomas Müller
e7e53363ac
Merge pull request #5194 from owncloud/fixing-5172-master
...
adding check isDeletable() on $sourcePath
2013-10-08 06:18:29 -07:00
Björn Schießle
f49de34373
Merge pull request #5193 from owncloud/fix_5126_2
...
fix upload to /Shared
2013-10-08 06:15:43 -07:00
Thomas Müller
caa27824a9
catch specific file exceptions and convert them to proper http status code via webdav
2013-10-08 15:04:31 +02:00
Jenkins for ownCloud
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
Thomas Müller
053b55721d
Merge branch 'master' into fixing-appframework-master
2013-10-08 12:13:24 +02:00
Bjoern Schiessle
6c45fab037
part file needs to have .part extension
2013-10-08 12:00:32 +02:00
Thomas Müller
c77f74e1de
adding check isDeletable() on $sourcePath
2013-10-08 11:43:44 +02:00
Bjoern Schiessle
dd202d9ad3
updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file"
2013-10-08 11:27:08 +02:00
Bjoern Schiessle
0293d8e04f
If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder
2013-10-08 11:26:49 +02:00
Morris Jobke
2123ef57d8
Merge pull request #5181 from owncloud/fixing-chunked-upload-master
...
Fixing broken chunked upload due to #4974
2013-10-07 13:20:43 -07:00
Victor Dubiniuk
77f43c357c
User::delete should return bool
2013-10-07 22:30:15 +03:00
Bart Visscher
6a93994a01
Merge pull request #4796 from owncloud/config-no-catch
...
Remove the exception catch in OC_Config, this should be handled by a higher layer
2013-10-07 11:45:13 -07:00
Jenkins for ownCloud
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
Thomas Müller
61a534fb60
moving createFileChunked() to OC_Connector_Sabre_File
2013-10-07 17:49:21 +02:00
Thomas Müller
5e397d89c4
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/private/connector/sabre/directory.php
2013-10-07 17:47:54 +02:00
Thomas Müller
f496609085
the path for reassembling was created the wrong way
2013-10-07 17:34:21 +02:00
Bjoern Schiessle
6a411833b9
let admin specify timezone for log file entries
2013-10-07 15:34:48 +02:00
Thomas Müller
b48dffa9a3
Merge pull request #5072 from owncloud/apache-auth-master
...
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
Thomas Müller
730c80ff9c
adding additional exceptions for special cases where creating a file might not be allowed
2013-10-07 15:11:47 +02:00
Morris Jobke
2b3c351601
Merge pull request #5162 from owncloud/fixing-l10n-master-2
...
Fixing l10n master 2
2013-10-07 05:07:47 -07:00
Morris Jobke
be4aea2d1b
fix indentation
2013-10-07 13:21:20 +02:00
Georg Ehrke
e078fc3eda
fix wrong variable name
2013-10-07 13:19:21 +02:00
Georg Ehrke
3b5dc51be4
fix doc block of OC\Preview\Provider::getThumbnail()
2013-10-07 13:19:21 +02:00
Georg Ehrke
8a35d79a39
check if svg of filetype icon exists
2013-10-07 13:19:21 +02:00
Georg Ehrke
f81053072f
use readImage instead of readImageBlob
2013-10-07 13:19:21 +02:00
Georg Ehrke
d410faf11c
fix new extension
2013-10-07 13:19:21 +02:00
Georg Ehrke
4ac3ecace2
use svg to generate filetype icon if imagick available
2013-10-07 13:19:20 +02:00
Frank Karlitschek
30faaf92b9
Merge pull request #5142 from owncloud/fix_version_cache_expire
...
correctly expire cache if version file changed.
2013-10-07 03:48:29 -07:00
Frank Karlitschek
3f29e4ebea
a few styleguide fixes
2013-10-07 12:27:02 +02:00
Andreas Fischer
47ed6a5135
Move backend finding into its own method.
2013-10-07 12:26:25 +02:00
Thomas Müller
1e47468c53
Merge pull request #4974 from owncloud/fixing-4011-master
...
error handling added in case file_put_contents is failing
2013-10-07 02:58:00 -07:00
Thomas Müller
131d82e41e
move call to print_unescaped() to template
2013-10-07 11:49:43 +02:00
Thomas Müller
c3286402a8
removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileInfo()
2013-10-07 11:41:28 +02:00
Thomas Müller
39be4dca67
removing all link/url related calls from API class
2013-10-07 11:38:23 +02:00
Thomas Müller
3ea2dfa5f9
remove getTrans() from API class
2013-10-07 11:36:38 +02:00
Thomas Müller
aefea2a408
remove unused classes
2013-10-07 11:25:06 +02:00
Thomas Müller
4e0c4c8f34
move l10n factory into private
2013-10-07 10:00:23 +02:00
Thomas Müller
dbdf34402c
remove outdated translation files
2013-10-07 09:59:15 +02:00
Morris Jobke
d986495297
Merge pull request #5148 from owncloud/cache-gc-legacy
...
Fix loading legacy global filecache gc backgroundjobs
2013-10-06 16:25:38 -07:00
Jenkins for ownCloud
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
Thomas Müller
54e77e0e66
fixing typo
2013-10-07 00:40:37 +02:00
Thomas Müller
780280e53f
fixing errors regarding wrong function calls / missing parameters
2013-10-07 00:35:05 +02:00
Thomas Müller
f3c6546d5b
remove obsolete passesCSRFCheck()
2013-10-07 00:34:23 +02:00
Thomas Müller
e071bfc144
fixing SecurityMiddleware to use OC6 API
2013-10-07 00:33:54 +02:00
Thomas Müller
3829a746a1
moving file to the right location
2013-10-07 00:32:39 +02:00
Thomas Müller
fda37ea09c
PHPDoc added
2013-10-07 00:32:08 +02:00
Bart Visscher
8115c38670
Remove the exception catch, this should be handled by a higher layer
...
And is when using index.php as entry point
2013-10-07 00:09:25 +02:00
Thomas Müller
1f14ba6aed
move controller to OCP
2013-10-06 23:16:40 +02:00
Bernhard Posselt
381b76ebd0
Merge pull request #5144 from owncloud/public_middleware
...
Make abstract Middleware class public
2013-10-06 14:12:35 -07:00
Robin Appelman
98ef90ad04
Fix loading legacy global filecache gc backgroundjobs
2013-10-05 23:19:12 +02:00
Markus Goetz
e564a3a266
OC_App: Cache list of enabled apps
...
In my test here 1 SELECT instead of 5 (when doing a DAV request,
probably similar for other requests)
2013-10-05 19:18:18 +02:00
Thomas Tanghus
47b2007228
Remove misleading IMiddleware interface
2013-10-05 19:13:12 +02:00
Thomas Tanghus
0501a947bc
Merge pull request #5116 from owncloud/interfaces2
...
More Interfaces for the public api
2013-10-05 08:35:50 -07:00
Thomas Tanghus
c85621a897
Make abstract Middleware class public
...
It doesn't make sense for subclasses to have to implement
all methods.
2013-10-05 16:59:06 +02:00
Frank Karlitschek
72b30e3e45
correctly expire cache if version file changed. Fixes problem that ownCloud only starts upgrading during login
2013-10-05 12:50:36 +02:00
Frank Karlitschek
a82211220c
Merge pull request #5125 from owncloud/fixing-5122-master
...
upload abortion detection only for PUT
2013-10-05 02:25:45 -07:00
Frank Karlitschek
4bce2f8b85
Merge pull request #5123 from owncloud/cache_mimetypes
...
Load all mimetypes in one go
2013-10-05 02:24:38 -07:00
Victor Dubiniuk
8da1aac1d0
Check result only once
2013-10-04 23:24:38 +03:00
Thomas Müller
414b2eb4b6
upload abortion detection only for PUT
...
e.g. LOCK would break with this approach
2013-10-04 20:20:33 +02:00
Bart Visscher
21cbef0d2c
passesCSRFCheck added to OCP\IRequest
2013-10-04 18:13:04 +02:00
Bart Visscher
61a9098b7d
Add Helper and URLGenerator interfaces to server container
2013-10-04 18:11:02 +02:00
Bart Visscher
ce9436c051
OC_Defaults is only used in error reporting
2013-10-04 18:11:02 +02:00
Bart Visscher
9f777fba98
Add L10N interface to server container
2013-10-04 18:11:02 +02:00
Bart Visscher
bae121b16d
Merge pull request #5068 from owncloud/improved_request
...
Improved request
2013-10-04 09:05:20 -07:00
Victor Dubiniuk
ef65037211
Make mimetypes static. Jenkis will be happy
2013-10-04 18:09:42 +03:00
Victor Dubiniuk
65750cb244
Load all mimetypes in one go
2013-10-04 16:17:19 +03:00
Vincent Petry
48a4c67d48
Merge pull request #5087 from owncloud/templatefunction-relativedate
...
Added dateOnly argument to relative_modified_date
2013-10-04 05:53:13 -07:00
Vincent Petry
f3594904c2
Removed $fromTime argument from public template API
2013-10-04 14:45:12 +02:00
Thomas Müller
aebc330f26
Merge branch 'master' into fixing-4011-master
2013-10-04 14:06:42 +02:00
Markus Goetz
800bf0769f
Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag
...
DAV: Use fileinfo_cache for ETag
2013-10-04 04:27:28 -07:00
Bjoern Schiessle
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
Frank Karlitschek
47666796a7
ups. remove debug
2013-10-04 09:42:38 +02:00
Frank Karlitschek
e49ee47e7b
use Filesystem::isIgnoredDir
2013-10-04 09:28:46 +02:00
Frank Karlitschek
f0a98cc923
fix typo
2013-10-04 09:25:54 +02:00
Frank Karlitschek
6d95436695
add public static
2013-10-04 09:24:07 +02:00
Frank Karlitschek
e40afbebc6
make it possible to prepopulate a new user gome with a skeleton
2013-10-03 23:22:11 +02:00
Markus Goetz
7f7718888d
DAV: Use fileinfo_cache for ETag
2013-10-03 17:09:08 +02:00
Vincent Petry
006799616d
Fixed missing default values
...
Added default value for $fromTime to prevent missing argument errors and
keep backward compatible.
2013-10-03 14:21:41 +02:00
Vincent Petry
b0bb64c3ee
Added unit tests for relative_modified_date, changed method signature
...
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.
Added unit test for date and time cases.
2013-10-03 13:55:05 +02:00
Thomas Tanghus
aedc427ffd
Fix fix of POST :P
2013-10-03 03:56:37 +02:00
Thomas Tanghus
8a018d7a59
Fix POST decoding
2013-10-03 01:43:33 +02:00
Thomas Müller
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
Thomas Tanghus
965ce5719f
Modified PUT behaviour
...
Now only non-parable PUT requests return a stream resource.
2013-10-02 22:13:40 +02:00
Bart Visscher
a90ea2c069
Merge remote-tracking branch 'origin/master' into setup
2013-10-02 18:23:59 +02:00
Vincent Petry
ed14541aea
Removed stray debug log write
2013-10-02 16:44:38 +02:00
Vincent Petry
31e1c15db7
Added dateOnly argument to relative_modified_date
...
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
Andreas Fischer
aa34438d06
Also replace ApacheBackend with Authentication\IApacheBackend in user.
2013-10-02 15:11:49 +02:00
Thomas Müller
621ab1c7ee
fixing various PHPDoc comments
2013-10-02 15:04:42 +02:00
Thomas Müller
4d4eda0f06
fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBackend
2013-10-02 15:03:52 +02:00
Thomas Müller
8c77cd1901
remove obsolete function login()
2013-10-02 14:49:14 +02:00
Thomas Müller
78c60c25c8
only perform files upgrade in case there are actually entries in the old fscache table
2013-10-02 13:00:05 +02:00
Thomas Müller
1adadf36fc
Merge pull request #5071 from owncloud/fix-autoloader-master
...
Fix autoloader regression
2013-10-02 03:10:10 -07:00
Bjoern Schiessle
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
Bart Visscher
b35b22977c
Move legacy file to correct location
2013-10-02 09:15:31 +02:00
Bart Visscher
46b5202f4a
Merge branch 'master' into convert-oc_appconfig
2013-10-02 07:42:06 +02:00
Thomas Müller
0d7c36c9f1
adding PHPDoc comment
2013-10-02 01:13:02 +02:00
Thomas Müller
4cecede13d
code cleanup - remove special case for webdav in handleApacheAuth()
2013-10-02 00:55:35 +02:00
Thomas Müller
7e9e23f210
Merge branch 'master' into apache-auth-master
2013-10-02 00:21:11 +02:00
Victor Dubiniuk
5bb4330ea4
Fix autoloader regression
2013-10-02 00:58:51 +03:00
Thomas Müller
9eab8b39df
Merge branch 'master' into fixing-4620-master
2013-10-01 22:57:46 +02:00
Thomas Müller
0537960dcc
adding getCurrentUserId() to ApacheBackend
2013-10-01 22:56:47 +02:00
Thomas Tanghus
a2cabd4c2a
Remove getContent() from IRequest
2013-10-01 20:15:04 +02:00
Thomas Tanghus
0f13ffb773
Remove JSON request parsing from Server
2013-10-01 20:15:04 +02:00
Thomas Tanghus
973bcccd7c
Implement PUT an PATCH support
2013-10-01 20:13:13 +02:00
Thomas Tanghus
36d1156cf8
Add interface docs to IRequest.
2013-10-01 20:13:13 +02:00
Thomas Tanghus
cd2e1d0cfe
Add patch method to OC_Route
2013-10-01 20:13:13 +02:00
Thomas Tanghus
bdad7697ac
Check if accessor matched request method.
...
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
Thomas Tanghus
8603f956ab
Get urlParams registered before Request is instantiated
2013-10-01 19:03:34 +02:00
Thomas Müller
e2fe71b6e7
Merge branch 'master' into lib-private-master-2
2013-10-01 16:11:59 +02:00
Thomas Müller
d8ada370d7
Squashed commit of the following:
...
commit ae1f68ac54cf2878d265b2bbce13bd600d2d0719
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu Aug 22 11:45:27 2013 +0200
fixing undefined variable
commit 982f327ca10eea0a2222eae3e74210648591fd8a
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 12:00:14 2013 +0200
adding login.php as alternative for index.php/login
commit da0d7e1d096fb80789524b01f0f96fe08d147943
Author: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed Aug 7 11:36:12 2013 +0200
adding a route for web login
commit 8e2a01160485cf7e9a2eb8bf46f06fae73956e8e
Author: Karl Beecher <karl@endocode.com>
Date: Tue Aug 6 17:00:28 2013 +0200
Login attempt returns true instead of exiting immediately
commit fd89d55de9e71e986e03a0de9aad9407b632e22f
Author: Karl Beecher <karl@endocode.com>
Date: Mon Aug 5 15:31:30 2013 +0200
Further abstraction.
This change introduces the ApacheBackend interface for backends that
depend on Apache authentication and session management. There are no
longer references to specific backends in OC_User.
commit 469cfd98aea5a37985722cf5f9e00ece0ce38178
Author: Karl Beecher <karl@endocode.com>
Date: Thu Aug 1 15:46:36 2013 +0200
Make login attempt function protected.
commit d803515f19ff086e2028fcaa51afae579685e596
Author: Karl Beecher <karl@endocode.com>
Date: Wed Jul 31 16:00:22 2013 +0200
Amends the login link
When using a Shibboleth login, clicking logout displays a message to the
user instead of ending the session.
commit aa8c1fcea05c8268f26a10b21c4e0bc547c3414f
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 13:15:59 2013 +0200
Abstract Shibboleth authentication into an Apache authentication method
commit 69082f2ebcab267f6e8eceb1a252f84c52236546
Author: Karl Beecher <karl@endocode.com>
Date: Tue Jul 30 11:22:26 2013 +0200
Convert spaces -> tabs
commit 5a80861d86855eec5906fd5e235ac4ff12efb0f2
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:40:48 2013 +0200
Separate the authentication methods
SABRE authentication and base authentication have slightly different
workings right now. They should be refactored into a common method
later, but time pressure requires us to reinvent the wheel slightly.
commit dc20a9f8764b103b7d8c5b713f2bcdae18708b65
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 17:07:07 2013 +0200
Authenicate calls to WebDAV against Shibboleth.
When using WebDAV, the OC_Connector_Sabre_Auth::authenticate method is
normally called without trying the Shibboleth authentication... thus the
session is not established.
The method now tries Shib authentication, setting up a session if the
user has already authenticated.
commit 091e4861b2246c4084c9b30e232289fde4ba1abf
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 14:04:54 2013 +0200
Sets up the Shibboleth login attempt.
commit bae710ec0579ef99b23022cc12f6876c5fe6b0d5
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 12:36:44 2013 +0200
Add a method for attempting shibboleth login.
If the PHP_AUTH_USER and EPPN environment variables are set, attempt a
Shibboleth (passwordless) login.
commit 667d0710a7854e58fb109201d9cee6ec064e793a
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:38:04 2013 +0200
Revert "Adds the apps2 folder with user_shibboleth backend."
This reverts commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef.
commit 7abbdb64676d667b0c69aca37becdc47e56dc7ef
Author: Karl Beecher <karl@endocode.com>
Date: Mon Jul 29 11:28:06 2013 +0200
Adds the apps2 folder with user_shibboleth backend.
Conflicts:
core/templates/layout.user.php
lib/base.php
2013-10-01 14:29:01 +02:00
Thomas Müller
02d6976263
Merge branch 'master' into lib-private-master-2
2013-09-30 21:29:58 +02:00
Thomas Müller
7c659eb291
use public api for session access from server container
2013-09-30 20:28:00 +02:00
elchi
81db59cda0
Added support for extra backends
...
Somebody had forgotten "OC_User::setupBackends();"...
2013-09-30 20:26:00 +02:00
Thomas Müller
bed27b603d
Merge branch 'master' into channels
...
Conflicts:
lib/util.php
2013-09-30 20:21:51 +02:00
Frank Karlitschek
2cf26ee0b1
put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later
...
Conflicts:
lib/ocsclient.php
lib/util.php
2013-09-30 20:19:26 +02:00
Frank Karlitschek
69dd6af574
use ===
...
Shoudn't make a difference in this case but just in case
Conflicts:
lib/ocsclient.php
2013-09-30 20:15:16 +02:00
Frank Karlitschek
b948c1a1b6
prepare the updater for the new update channels
2013-09-30 20:14:18 +02:00
Thomas Müller
b58a464b86
Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
...
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
Thomas Müller
8e0060405d
reorganize file in lib
2013-09-30 16:39:03 +02:00
Thomas Müller
9c9dc276b7
move the private namespace OC into lib/private - OCP will stay in lib/public
...
Conflicts:
lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
Jenkins for ownCloud
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
Morris Jobke
d4fed61871
Merge pull request #5012 from owncloud/check_keyfiles_exists
...
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-30 06:55:56 -07:00
Thomas Müller
c2b6775efc
adding :
2013-09-30 13:27:46 +02:00
Thomas Müller
5e0cc6b5a6
adding copyright and PHPDocs
2013-09-30 13:12:51 +02:00
Thomas Müller
ecfde5faa1
Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the handling of depth infinity
...
The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released.
This will and has to follow!
2013-09-30 13:12:51 +02:00
Thomas Müller
480aeb804f
Merge pull request #4459 from owncloud/appframework-master
...
Public API for OC6+ (includes AppFramework)
2013-09-30 04:11:28 -07:00
Thomas Müller
a2301e8b69
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 11:45:52 +02:00
Thomas Müller
c62dc4fa80
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 11:36:08 +02:00
Thomas Müller
92c02e6797
remove commented code
2013-09-30 10:58:03 +02:00
Thomas Müller
e3dee63339
Merge branch 'master' into fixing-4011-master
...
Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
2013-09-30 10:46:50 +02:00
Thomas Müller
629faf6d34
Merge branch 'master' into appframework-master
2013-09-30 10:42:05 +02:00
Thomas Müller
fe352664a2
Merge branch 'master' into fixing-4546-master
...
Conflicts:
lib/connector/sabre/directory.php
2013-09-30 10:06:36 +02:00
Bjoern Schiessle
029abc9c43
mail is already themable via the template, no need to provide additional string in OC_Defaults
2013-09-30 10:03:12 +02:00
Thomas Müller
aaba0d83b5
fixing PHPDoc & typo
2013-09-30 10:03:07 +02:00
Thomas Müller
952433eae6
Merge branch 'master' into move-aborted-upload-detection-into-plugin-master
2013-09-30 09:21:37 +02:00
Thomas Müller
5899485ca1
Merge pull request #4969 from owncloud/fixing-4043-master
...
adding privilege check on move and rename operations
2013-09-30 00:20:34 -07:00
Evgeni Golov
b6fc143074
cURL does not honour default_socket_timeout
...
SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.
One has to use
curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.
2013-09-30 07:56:54 +02:00
Andreas Fischer
9ba0edcadb
Merge pull request #4966 from owncloud/text_preview_blacklist
...
add blacklist to txt preview backend
* owncloud/text_preview_blacklist:
rename variable in testIsTransparent
rename testTxtBlacklist to txtBlacklist
move fileView object initialization to testIsTransparent
use dataProvider for txt blacklist test
add test for txt blacklist
add test data for cal and contact preview
add blacklist to txt preview backend
2013-09-29 23:20:34 +02:00
Thomas Müller
a79294771b
Merge pull request #4960 from owncloud/fixing-mirall-1014-master
...
handle error situation of rename proper
2013-09-29 12:49:10 -07:00
Thomas Müller
48b5c1d5f9
initial implementation of activity manager
2013-09-29 20:31:12 +02:00
Thomas Müller
2e1e283592
Merge branch 'appframework-master' into activities-api
...
Conflicts:
lib/public/iservercontainer.php
2013-09-29 20:10:07 +02:00
Thomas Müller
adcb738e47
initialize $middleWares
2013-09-28 20:40:25 +02:00
Thomas Müller
57f37c876b
delay middleware registrations
2013-09-27 17:15:26 +02:00
Thomas Müller
adff34cb8a
fixing error in initialization of TagManager
2013-09-27 17:08:48 +02:00
Thomas Müller
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
Thomas Müller
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
Bjoern Schiessle
03d5ea6cec
check not only if the keyfile folder exists but also if it contains keyfiles
2013-09-27 13:34:48 +02:00
Morris Jobke
f47ff13abf
Merge pull request #5001 from owncloud/fixing-user-external-backends-master
...
prelogin apps have to be loaded within setupBackend() otherwise required...
2013-09-27 02:34:59 -07:00
Jenkins for ownCloud
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
Bjoern Schiessle
9bb244cc59
check every enabled app if the remember login feature needs to be disabled
2013-09-26 19:34:28 +02:00
Thomas Müller
e515509a81
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded
2013-09-26 13:34:47 +02:00
Thomas Müller
a86c10984a
catching NotPermittedException and throw it to the dav client as 403
2013-09-26 11:50:46 +02:00
Thomas Müller
b11d8799c1
adding unit tests for ObjectTree::move()
2013-09-26 10:50:15 +02:00
Thomas Müller
469b309b21
Merge pull request #4892 from owncloud/vcategories_public
...
OC_VCategories => OC\Tags. Public interface and getter in server container
2013-09-25 14:24:37 -07:00
Thomas Müller
0c44cdd4ea
remove unneccessary code
2013-09-25 17:28:45 +02:00
Thomas Müller
5e27ac4b1a
$path already contains the full path to the file
2013-09-25 17:17:29 +02:00
Thomas Müller
09b64535a9
fixing copyright and add class documentation
2013-09-25 17:05:14 +02:00
Arthur Schiwon
1c976a7c9b
manager checkPassword now returns User object, adjust internal user class accordingly.
2013-09-25 15:03:22 +02:00
Thomas Müller
68bfcfbf77
Merge pull request #4968 from owncloud/user_checkpwd
...
User: move checkPassword from User to Manager to not break API
2013-09-25 05:28:42 -07:00
Bjoern Schiessle
acd3c11e47
use OC_DB::executeAudited
2013-09-25 12:18:29 +02:00
Bjoern Schiessle
5a9e473a79
use OC_DB::executeAudited
2013-09-25 12:15:46 +02:00
Bjoern Schiessle
3cd0caa643
set default value for expire parameter
2013-09-25 12:15:30 +02:00
Bjoern Schiessle
883d1c0df3
use template for txt and html mails to send notification mails
2013-09-25 11:51:28 +02:00
Thomas Müller
30286c06ab
stripos return value check
2013-09-25 11:05:59 +02:00
Thomas Müller
b168d5aa3b
class API decommissioning part 1
2013-09-25 11:05:24 +02:00
Thomas Müller
b2ef978d10
AppFramework:
...
- get request from the server container
- implement registerMiddleWare()
- adding getAppName() to app container
2013-09-25 10:30:48 +02:00
Thomas Müller
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
Bjoern Schiessle
ca47fc5f18
fix PHPDoc
2013-09-24 19:37:24 +02:00
Jenkins for ownCloud
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
Bjoern Schiessle
0637dad0b3
some small fixes
2013-09-24 18:52:20 +02:00
Bjoern Schiessle
c486fc7608
introduce OC_Util::rememberLoginAllowed()
2013-09-24 18:01:34 +02:00
Thomas Tanghus
aaed871cee
Add factory class for the server container.
2013-09-24 17:10:01 +02:00
Arthur Schiwon
14a160e176
Adjust Tests and satisfy them
2013-09-24 17:10:01 +02:00
Thomas Müller
84a0e6930b
creating non static getETagPropertyForPath()
...
adding public $fileView to Node to allow unit testing
2013-09-24 15:35:21 +02:00
Thomas Müller
4e7f82ef04
unify duplicate code
2013-09-24 15:14:42 +02:00
Thomas Müller
cf9dbc6e34
adding error handling on file_put_contents within the web dav implementation
2013-09-24 14:25:56 +02:00
Arthur Schiwon
63324e2347
Fix doc
2013-09-24 14:12:44 +02:00
Arthur Schiwon
0a7ee7c3f7
Fix return value from User object to User ID
2013-09-24 14:11:47 +02:00
Thomas Müller
e9eb34f187
duplicate code :sigh: - will fix this in a second pr
2013-09-24 13:54:18 +02:00
Thomas Müller
6c5466a540
adding file_exists check just to be on the save side
2013-09-24 13:53:32 +02:00
Arthur Schiwon
fe88a62d6e
=== not ==
2013-09-24 13:51:33 +02:00
Arthur Schiwon
d101ff42f1
User: move checkPassword from User to Manager to not break API
2013-09-24 13:46:30 +02:00
Thomas Müller
ee1f627155
adding privilege check on move and rename operations
2013-09-24 13:26:12 +02:00
Bjoern Schiessle
b693b5085c
don't remember login if the encrypion app is enabled because the user
...
needs to log-in again in order to decrypt his private key with his password
2013-09-24 13:08:55 +02:00
Georg Ehrke
31d2048eb8
add blacklist to txt preview backend
2013-09-24 11:00:08 +02:00
Thomas Müller
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
Andreas Fischer
2129974584
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
2013-09-24 00:59:23 +02:00
Robin Appelman
235517f111
clear permissions cache when scanning a file
2013-09-24 00:57:58 +02:00
Thomas Tanghus
8c469394e6
Remove duplicate method definitions
2013-09-24 00:12:23 +02:00
Thomas Tanghus
698394c994
Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-24 00:09:21 +02:00
Thomas Tanghus
f2de5a34ef
Don't try to be clever
2013-09-24 00:04:57 +02:00
Thomas Tanghus
4d3e7fa78a
Add getUserFolder/getAppFolder to Server.
2013-09-23 23:57:39 +02:00
Thomas Tanghus
7cad510f28
Fix conflict
2013-09-23 23:48:28 +02:00
Thomas Tanghus
60bff6c589
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 23:39:36 +02:00
Thomas Tanghus
be402fab53
Forgot to return false if add() didn't add anything.
2013-09-23 23:39:36 +02:00
Thomas Tanghus
8a02afd87a
Added more error checking in add()
2013-09-23 23:39:36 +02:00
Thomas Tanghus
1bbeb12e2e
Updated method names and added a few more tests.
2013-09-23 23:39:36 +02:00
Thomas Müller
b63acdb125
fixing namespaces and rename hasCategory to hasTag
2013-09-23 23:39:36 +02:00
Thomas Tanghus
45f73feb69
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-23 23:39:36 +02:00
Thomas Tanghus
5ca181eb23
More trimming
2013-09-23 23:36:47 +02:00
Thomas Müller
e55f25b64d
handle error situation of rename proper
2013-09-23 22:04:37 +02:00
Thomas Müller
5d671a84b2
Merge pull request #4869 from owncloud/fixing-4866-master
...
recreate an etag within the scanner if the cache contains an empty etag
2013-09-23 07:13:12 -07:00
Thomas Tanghus
910a0338bb
Use fetchOne() instead of numRows() when doing a COUNT(*).
2013-09-23 15:52:06 +02:00
Andreas Fischer
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
Thomas Tanghus
93258e1170
Forgot to return false if add() didn't add anything.
2013-09-23 13:29:21 +02:00
Thomas Tanghus
0b4de847a9
Added more error checking in add()
2013-09-23 13:27:43 +02:00
Andreas Fischer
4a9f1cc74d
Merge remote-tracking branch 'owncloud/master' into fixing-4866-master
...
* owncloud/master: (98 commits)
[tx-robot] updated from transifex
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
setting a default on filecache column unencrypted_size
[tx-robot] updated from transifex
remove unneccessary lib in namespace
namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
initialize variable
calculate correct permissions while toggle the password protection
make sure that both $permissions and $oldPermissions have the same type
Add copyright, remove starting blank line
update inherit docs comment
Fix insert/update/delete helper functions for oracle
Add missing return true statements to legacy preferences functions
Add missing static
Convert OC_Preference to object interface
fix race condition in lazy preview loading
use {count} instead of 'One' for more versatile translation
fix double translation of error message
use n to translate title
fixing typos and l10n
...
Conflicts:
tests/lib/files/cache/scanner.php
2013-09-23 12:44:11 +02:00
Bjoern Schiessle
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
Björn Schießle
9851f0f4f2
Merge pull request #4896 from owncloud/sharing_allow_disable_password
...
sharing, allow user to disable password protection
2013-09-23 01:20:09 -07:00
Thomas Müller
03eedb58fc
Merge pull request #4327 from owncloud/scanfile-remove
...
remove deleted files while scanning
2013-09-22 22:40:13 -07:00
Bart Visscher
811f680457
Merge pull request #4623 from owncloud/convert-oc_preferences
...
Convert OC_Preference to object interface
2013-09-22 10:45:56 -07:00
Jenkins for ownCloud
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
Robin Appelman
a1d4eb1f95
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
2013-09-22 01:24:12 +02:00
Andreas Fischer
2a17025d53
Move bool to int conversion to buildParts(), so it also happens for update().
2013-09-21 02:20:01 +02:00
Andreas Fischer
011bca7b7f
Only update the etag. Do not re-submit any other unchanged data.
2013-09-20 23:53:02 +02:00
Andreas Fischer
a2f82da572
Use update() instead of put().
2013-09-20 23:52:05 +02:00
Bart Visscher
0c6dcdba6b
Add missing implements and fix parameters in IConfig
2013-09-20 22:45:22 +02:00
Thomas Müller
d3d52dd23f
PHPDoc & get UserManager from container for RooFolder
2013-09-20 21:57:48 +02:00
Thomas Müller
f83f323269
fixing typos + adding missing filed $activeEntry
2013-09-20 21:45:27 +02:00
Thomas Müller
e31f6c01e8
fixing PHPDoc
2013-09-20 21:43:17 +02:00
Thomas Müller
9116303cfc
fixing typos
2013-09-20 21:40:54 +02:00
Thomas Müller
d84d548618
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
2013-09-20 20:34:17 +02:00
Bart Visscher
e92abfd4d8
Add Config container class to server container
2013-09-20 20:21:24 +02:00
Bart Visscher
e3013c5801
Add Navigation class to server container
2013-09-20 20:20:01 +02:00
Jenkins for ownCloud
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
Thomas Müller
1b59003d6d
adding basic interfaces for the activities api
2013-09-20 16:37:52 +02:00
Bart Visscher
aa8a85f77d
Add DBConnection to server container
2013-09-20 14:33:45 +02:00
Bart Visscher
ac73ce1b2a
Add UserSession to server container
2013-09-20 14:32:43 +02:00
Bjoern Schiessle
944e9b8c69
make sure that both $permissions and $oldPermissions have the same type
2013-09-20 12:40:21 +02:00
Bart Visscher
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
Jörn Friedrich Dreyer
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
Bart Visscher
0a2a4cb12e
update inherit docs comment
2013-09-19 18:59:06 +02:00
Bart Visscher
2f79e94a35
Style fixes
2013-09-19 18:14:28 +02:00
Bart Visscher
ca88cf93ae
check for valid appinfo in installer
2013-09-19 18:14:27 +02:00
Bart Visscher
c546874159
Convert OC_Appconfig to object interface
...
Implemented unittest for OC\AppConfig
2013-09-19 18:14:27 +02:00
Bart Visscher
55efe1e56c
Fix insert/update/delete helper functions for oracle
2013-09-19 18:13:39 +02:00
Bart Visscher
f6284bdce7
Add missing return true statements to legacy preferences functions
2013-09-19 18:13:06 +02:00
Bart Visscher
395cc737a1
Add missing static
2013-09-19 18:13:06 +02:00
Bart Visscher
445d34a2a9
Convert OC_Preference to object interface
2013-09-19 18:13:06 +02:00
Jörn Friedrich Dreyer
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
Thomas Tanghus
9e4d13858c
Fix syntax error
2013-09-19 13:27:41 +02:00
Thomas Tanghus
d5126dd6b4
Merge branch 'appframework-master' into server_folder_methods
2013-09-19 12:32:32 +02:00
Thomas Tanghus
314ca843e8
Updated method names and added a few more tests.
2013-09-19 11:27:13 +02:00
Thomas Müller
76f8be3b7a
fixing namespaces and rename hasCategory to hasTag
2013-09-18 22:49:09 +02:00
Thomas Müller
690e98d45a
Merge branch 'appframework-master' into vcategories_public
...
Conflicts:
lib/server.php
2013-09-18 22:36:25 +02:00
Thomas Müller
1274d6116d
updating php docs
2013-09-18 22:22:51 +02:00
Jenkins for ownCloud
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
Thomas Tanghus
09d043729a
Note to self 2: Do as you preach. Test!
2013-09-18 15:02:25 +02:00
Thomas Tanghus
79cd655920
Note to self: Test before pushing!!!
2013-09-18 14:50:21 +02:00
Thomas Tanghus
2ef0b58ff6
Don't try to be clever
2013-09-18 14:25:12 +02:00
Thomas Tanghus
dd62ccdb4e
Merge branch 'appframework-master' into public_cache
...
Conflicts:
lib/public/iservercontainer.php
lib/server.php
2013-09-18 13:20:07 +02:00
Thomas Tanghus
534933ee9b
Use new emitter system
2013-09-18 13:15:38 +02:00
Thomas Tanghus
442a2e074c
Update to adhere to the coding guidelines.
2013-09-18 12:35:46 +02:00
Thomas Tanghus
6ba23912a7
Add getUserFolder/getAppFolder to Server.
2013-09-18 12:34:10 +02:00
Thomas Tanghus
d3f88ceeb4
Add some docs to the sessions interface.
2013-09-18 12:01:01 +02:00
Bjoern Schiessle
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
Thomas Müller
ce58c32c90
using OC_Config::$object->setValue in order to get the underlying exception thrown up to the caller
2013-09-18 11:07:19 +02:00
Thomas Müller
5ae4d67540
in case the cache cannot be initialized within the autoloader we just shoul not use it
2013-09-18 11:06:00 +02:00
Thomas Tanghus
b0762ad3bf
OC_VCategories=>OC\Tags. Public interface + getter in server container
2013-09-18 00:37:00 +02:00
Thomas Tanghus
e760343b98
Merge branch 'appframework-master' into vcategories_public
2013-09-17 20:04:51 +02:00
Thomas Tanghus
8b4f4a79e2
Still some session leftovers.
2013-09-17 19:46:08 +02:00
Jörn Friedrich Dreyer
b40925ae17
initial scrollto implementation:
...
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
Thomas Tanghus
5bddb5377a
Purge session from Request - and fix some styles
2013-09-17 18:38:18 +02:00
Thomas Tanghus
5c19b995db
Add interface for Session and add getter in server container.
2013-09-17 18:31:14 +02:00
Thomas Tanghus
1a13062701
Add legacy wrapper
2013-09-17 18:02:37 +02:00
Thomas Tanghus
fe86182dac
OC_Cache namespace changes and add UserCache to server container.
...
Refs #4863
2013-09-17 17:46:33 +02:00
Thomas Müller
b9e943f5d5
fix naming
2013-09-17 09:42:14 +02:00
Thomas Müller
4cd0ee47a8
Merge branch 'master' into appframework-master
2013-09-17 09:39:45 +02:00
Thomas Müller
822daa8f8a
class files have to be lowercase
2013-09-17 00:27:22 +02:00
Thomas Müller
981a41e2cd
adding interface for middleware
2013-09-17 00:26:55 +02:00
Thomas Müller
c8f9efeb94
etag changes are now propagated up the file tree
2013-09-16 23:32:17 +02:00
Andreas Fischer
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
Bart Visscher
9d18e16c77
Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle
...
Fix Sharing "Expiration Date" on Oracle
2013-09-16 12:16:44 -07:00
Thomas Müller
3c026b7cf6
recreate an etag within the scanner if the cache contains an empty etag
2013-09-16 12:09:15 +02:00
Thomas Müller
39599019e5
adding detection of aborted uploads
2013-09-16 10:48:21 +02:00
Thomas Müller
16ef5a8b35
returning the number of stored bytes in store() and adding cleanup() method
2013-09-16 10:47:29 +02:00
Thomas Müller
0fb719dffe
adding size() to the file cache
2013-09-16 10:43:53 +02:00
Bjoern Schiessle
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
Thomas Tanghus
eab84d3d96
Add OCP\DB::getErrorMessage() to public namespace.
2013-09-16 02:17:39 +02:00
Thomas Müller
5d4e9e0d25
/OC/Server has created too early causing issues with config operations as OC:$SERVERPATH was not yet initialized
...
This fixes unit test execution
2013-09-15 23:07:18 +02:00
Thomas Müller
af0069bf03
adding getRootFolder() to server container and hooking up the new files api
2013-09-15 22:24:57 +02:00
Thomas Müller
ad82a56f79
Merge branch 'master' into appframework-master
2013-09-15 21:18:59 +02:00
Thomas Müller
0f4e214a90
adding null check on a mount's storage
2013-09-15 20:40:40 +02:00
Bernhard Posselt
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
Jenkins for ownCloud
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
Thomas Müller
4480b0b164
Merge branch 'master' into appframework-master
2013-09-13 23:31:59 +02:00
Thomas Müller
6ff07f7681
Merge pull request #4712 from owncloud/fileapi-foreward
...
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-13 14:31:11 -07:00
Thomas Müller
4da8fc6907
Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
2013-09-13 20:57:18 +02:00
Thomas Müller
5b3388c7c4
Merge branch 'master' into appframework-master
2013-09-13 20:56:49 +02:00
Thomas Müller
049e57ac4a
remove unused OC_L10N
2013-09-13 17:41:09 +02:00
Thomas Müller
8c9add4d32
adding TB and GB to OC_Helper::humanFileSize
2013-09-13 17:22:45 +02:00
Thomas Müller
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
Andreas Fischer
786017c247
Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc.
2013-09-12 23:43:20 +02:00
Andreas Fischer
7f07d737f8
Create instance of Doctrine\Common\EventManager() in OC_DB.
2013-09-12 23:43:20 +02:00
Bart Visscher
a3705ce188
Merge branch 'master' into setup
...
Conflicts:
lib/util.php
2013-09-12 22:45:11 +02:00
Robin Appelman
58ed78aa9e
cleanup public storage interface a bit
2013-09-12 21:58:32 +02:00
Robin Appelman
c9d2663159
Merge branch 'master' into fileapi-foreward
2013-09-12 21:43:35 +02:00
kondou
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
Thomas Müller
8543951cf9
adding icons for shared folders and external folders
2013-09-12 00:12:20 +02:00
VicDeo
62eeac3390
Merge pull request #4798 from owncloud/fixing-variable-typos-master
...
no further comment - which dev did not test this BEFORE submitting the p...
2013-09-11 05:58:07 -07:00
Jenkins for ownCloud
68015b2761
[tx-robot] updated from transifex
2013-09-11 06:50:06 -04:00
kondou
bf7f94422f
Bring another enable_avatars to $_ and fix $thus->$this
2013-09-11 07:11:33 +02:00
Thomas Müller
af2164bbcb
no further comment - which dev did not test this BEFORE submitting the pull request?
...
which reviewer did not test the pull request?
2013-09-11 01:23:37 +02:00
Bart Visscher
65aab3dc8c
Check for failure in creating htaccessWorking testfile
2013-09-10 22:05:20 +02:00
Andreas Fischer
a2ade4294c
Merge pull request #4472 from owncloud/remove-disconnect
...
Remove disconnect function from OC_DB
* owncloud/remove-disconnect:
Remove disconnect function from OC_DB
2013-09-10 21:48:56 +02:00
Bart Visscher
8ae612f693
Move core setup code to controller class
2013-09-10 20:19:42 +02:00
Robin Appelman
2e5ce091f0
add storage backend interface to public namespace
2013-09-10 20:13:47 +02:00
Robin Appelman
9ad7891b4e
improve phpdoc for the public files interface
2013-09-10 20:10:25 +02:00
Robin Appelman
e271a55783
move filesystem expceptions to global namespace
2013-09-10 19:44:23 +02:00
Robin Appelman
315344eb9c
move public files api to a clearer namespace
2013-09-10 19:34:38 +02:00
Jenkins for ownCloud
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
Axel Roenn
7810e27dad
Changed default behaviour to not log IP address in case of an auth failure. Can be configured in OC conf now.
...
Log level changed to warning .
2013-09-10 11:07:26 +02:00
Thomas Müller
63a5409c6e
Merge pull request #4757 from owncloud/deleteAll-alias
...
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
2013-09-09 15:08:18 -07:00
Thomas Müller
5e1821f21d
Merge pull request #4772 from owncloud/preview_improvements
...
oc\preview use avconv instead of ffmpeg
2013-09-09 12:32:45 -07:00
kondou
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
Axel Roenn
0cd6473909
On an auth failure the uid and the IP address should be logged to the standard log file.
...
This update works for a standard setup, when using a proxy for the server one can probably use the X-forwarded-for header
instead of the remote address.
2013-09-09 15:35:39 +02:00
Jenkins for ownCloud
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
Robin Appelman
46a57a9f05
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
2013-09-07 14:10:51 +02:00
Jenkins for ownCloud
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
Robin Appelman
2e1b534957
update phpdoc for public fileapi
2013-09-06 20:55:47 +02:00
Robin Appelman
0131a32025
extract interfaces from fileapi for public namespace
2013-09-06 20:38:59 +02:00
Robin Appelman
1cfd03771f
use ===
2013-09-06 20:20:17 +02:00
Bjoern Schiessle
b8241aa79d
remove some more debug output
2013-09-06 16:07:54 +02:00
Bjoern Schiessle
edb78c917c
remove some error_logs
2013-09-06 16:07:45 +02:00
Bjoern Schiessle
d33fabd02d
remove error logs
2013-09-06 16:07:25 +02:00
Bjoern Schiessle
627b6164c4
if the files doesn't exist yet we start with the parent to search for shares
2013-09-06 16:07:07 +02:00
Thomas Müller
e9849270e3
Revert "fixes #4574"
...
This reverts commit 81a45cfcf1
.
2013-09-06 00:28:13 +02:00
kondou
221bbd275c
Use \OC_App for checking whether encryption is enabled
2013-09-05 23:26:02 +02:00
Bjoern Schiessle
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
Jenkins for ownCloud
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
Arthur Schiwon
c01675de5d
more is_resource checks before readdir
2013-09-05 11:58:57 +02:00
Georg Ehrke
2954db165b
use avconv instead of ffmpeg
2013-09-05 09:53:35 +02:00
Bernhard Posselt
fbedd643f7
Merge pull request #4477 from owncloud/hooks-view
...
also emit hooks for views that are a subfolder of the user folder
2013-09-04 16:09:22 -07:00
Thomas Müller
7618cf3005
adding public interface for preview
2013-09-04 23:45:11 +02:00
Thomas Müller
835f477d8f
Merge branch 'master' into appframework-master
2013-09-04 23:15:17 +02:00
kondou
b643c02bd5
Fix some bugs and remove \OCP\Avatar for now
2013-09-04 22:13:59 +02:00
Thomas Müller
68dce9dde5
fixing style, var name & PHPDoc
2013-09-04 21:22:36 +02:00
Arthur Schiwon
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
kondou
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
Thomas Tanghus
823b4cce60
More trimming
2013-09-04 08:16:27 +02:00
Morris Jobke
09187f3b3b
Merge pull request #4449 from owncloud/clean_up_util
...
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
Jenkins for ownCloud
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
Bjoern Schiessle
fd7469db9e
coding-style fixes
2013-09-03 13:37:06 +02:00
kondou
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
blizzz
431cf06e99
Merge pull request #4672 from owncloud/ocs_cleanup
...
Ocs cleanup
2013-09-02 14:24:46 -07:00
kondou
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
Bjoern Schiessle
931e90634e
fix db queries
2013-09-02 17:03:35 +02:00
Bjoern Schiessle
983da0d78f
fix db queries
2013-09-02 17:01:10 +02:00
Bjoern Schiessle
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
Jörn Friedrich Dreyer
06870a6e39
Merge pull request #4673 from owncloud/ocsapi_cleanup
...
remove the activity call here. it is not implemented anyways.
2013-09-02 01:46:29 -07:00
kondou
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
kondou
74c9223281
Properly check for tmpavatar, invalidate cache, fix debug msgs
2013-09-01 21:17:48 +02:00
Robin Appelman
a22f9ff301
Provide an implementation of the fileapi for oc6 build on top of the old api
2013-09-01 19:47:48 +02:00
Jenkins for ownCloud
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
kondou
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
kondou
ab70b8c26e
Merge branch 'master' into oc_avatars
2013-09-01 17:52:13 +02:00
Christopher
36424580b0
Merge pull request #4329 from owncloud/fix_4258
...
Fix #4258 and improve unittest
2013-09-01 08:46:27 -07:00
Bart Visscher
0aba549e7f
Use more object oriented way for console commands
2013-09-01 16:40:50 +02:00
kondou
2d6a400381
Check for $this->fileInfo and @depend on testData()
2013-09-01 15:50:58 +02:00
Frank Karlitschek
c54994d2e9
fixing this obvious typo directly
2013-09-01 08:23:11 +02:00
kondou
235638e5ab
Merge branch 'master' into fix_4258
...
Conflicts:
lib/image.php
2013-08-31 23:48:23 +02:00
Thomas Müller
206f83941b
move new interfaces into lib/public and OCP
2013-08-31 21:34:29 +02:00
Thomas Müller
97bdf008b1
PHPDoc added to existing interfaces
2013-08-31 20:57:16 +02:00
Frank Karlitschek
f1836a997f
remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
2013-08-31 18:14:46 +02:00
Frank Karlitschek
58e036e304
remove knowledgebase calls that are no longer used in ownCloud 5/6
2013-08-31 18:00:53 +02:00
kondou
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
Thomas Müller
ec9b7d1e84
fixing file header
2013-08-31 01:41:24 +02:00
Thomas Müller
a9d6b59307
Merge branch 'master' into appframework-master
2013-08-31 01:38:44 +02:00
kondou
0869f9b655
Fix #4258 , clean up \OC_Image and improve its unittest
2013-08-30 21:08:37 +02:00
Georg Ehrke
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
Jan-Christoph Borchardt
0f5df181a3
Merge pull request #4661 from owncloud/separate-app-styles
...
Move CSS for apps and browser-specific fixes out of main styles.css
2013-08-30 09:08:25 -07:00
Bjoern Schiessle
4bbefdf608
add expiration date if it is already set
2013-08-30 17:20:10 +02:00
Bjoern Schiessle
10cf1b3a4e
return mailSend status in getItems()
2013-08-30 15:39:43 +02:00
Jenkins for ownCloud
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
Stephane Martin
95f42d6544
Merge pull request #4578 from houbaastef/master
...
fixes #4574
2013-08-30 06:20:07 -07:00
Bjoern Schiessle
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
kondou
30526ded80
Fix \OCP\Avatar
2013-08-30 13:26:13 +02:00
Arthur Schiwon
7d398ba622
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
2013-08-30 11:45:16 +02:00
Jan-Christoph Borchardt
9c23ed580a
move CSS for browser-specific fixes out of styles.css into new fixes.css
2013-08-30 11:42:32 +02:00
Jan-Christoph Borchardt
cc8e19ad11
move CSS for apps out of styles.css into new apps.css
2013-08-30 11:38:49 +02:00
kondou
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
Thomas Müller
0104d3df96
Merge pull request #4592 from owncloud/fix-logic
...
fix weird logical behaviour
2013-08-29 08:40:33 -07:00
Thomas Müller
14b67d6c5f
fixing typo
2013-08-29 16:25:25 +02:00
Georg Ehrke
728fc7f123
fix parameter missing warning
2013-08-29 16:13:16 +02:00
Robin Appelman
1fa29b4c11
also emmit create hook when creating new files using touch()
2013-08-29 15:31:03 +02:00
kondou
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
Thomas Müller
301cce54cc
webdav quota information contains the values for used and free - not total
2013-08-29 12:34:48 +02:00
Georg Ehrke
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
Georg Ehrke
70b6e2161e
invert logic of disable_previews
2013-08-29 10:08:53 +02:00
kondou
0ba498119c
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 23:21:26 +02:00
kondou
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
Morris Jobke
d4952bd9df
fix typo
2013-08-28 18:36:32 +02:00
Bart Visscher
3fd2df4088
Only enable logrotate when configured. Also rotate size is settable.
2013-08-28 17:41:27 +02:00
Bart Visscher
42f3ecb60f
Check for installed state before registering the logrotate background job
2013-08-28 17:11:43 +02:00
Bart Visscher
62560ef859
Add description to log rotate class
2013-08-28 17:11:43 +02:00
Bart Visscher
594a2af75a
Review fixes
2013-08-28 17:11:43 +02:00
Bart Visscher
b5e2842e00
Very simple log rotation
2013-08-28 17:11:43 +02:00
kondou
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
kondou
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
Bart Visscher
45076edf4f
Merge pull request #3891 from owncloud/fix_loadAppScriptFile
...
Check if the app is enabled and the app path is found before trying to l...
2013-08-28 06:10:06 -07:00
Thomas Tanghus
9843c8e838
Merge pull request #4434 from owncloud/fix_octemplate_escaping
...
Fix octemplate string escaping.
2013-08-28 03:59:43 -07:00
Jenkins for ownCloud
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
Jenkins for ownCloud
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
Morris Jobke
e91edabe0f
add documentation
2013-08-27 16:07:25 +02:00
Tom Needham
273f162b26
Code style
2013-08-27 15:39:47 +02:00
Tom Needham
f14ce1efdc
Add quota to core api
2013-08-27 15:39:43 +02:00
Jörn Friedrich Dreyer
13514fd1ad
Merge pull request #4348 from owncloud/fixing-4343-master
...
fixes #4343
2013-08-27 04:26:51 -07:00
blizzz
163269805a
Merge pull request #4507 from owncloud/existingusersfromgroup
...
return only existing users in group
2013-08-27 03:47:56 -07:00
Morris Jobke
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
Morris Jobke
6e8bc13aa3
fix weird logical behaviour
2013-08-27 10:58:17 +02:00
Thomas Müller
d3d91ce347
revert debugging code which accidentially entered this pull request
2013-08-27 10:49:10 +02:00
Thomas Müller
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
Thomas Müller
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
Thomas Müller
1e4ebf47e2
webdav quota now displays the same values as the web interface does
2013-08-27 00:57:28 +02:00
Thomas Müller
21fd352c1a
as a quick example the public contacts API has been ported over as a service hosted within the server container
2013-08-26 23:48:18 +02:00
Thomas Müller
a995e81686
Merge branch 'master' into appframework-master
2013-08-26 21:31:15 +02:00
Thomas Müller
d1a6d2bc8f
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
2013-08-26 20:21:16 +02:00
Morris Jobke
7d141656ee
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
...
Conflicts:
lib/helper.php
2013-08-26 18:04:49 +02:00
Arthur Schiwon
1f5a55ddff
consolidate validity check for users in group class
2013-08-26 17:46:31 +02:00
kondou
e6473e6d49
Clean up some cruft
2013-08-26 17:41:19 +02:00
kondou
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
Stephane Martin
81a45cfcf1
fixes #4574
2013-08-26 15:16:41 +02:00
Georg Ehrke
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
Jenkins for ownCloud
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
kondou
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
kondou
5eb17aadb3
Fix spacing, have remove() and return JSON for custom-default-avatars
2013-08-25 21:06:02 +02:00
kondou
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
kondou
4a9c89fb33
Clean up and prepare a bit for custom default avatars
2013-08-25 21:06:01 +02:00
kondou
9c12da6a94
Several improvements
...
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
2013-08-25 21:05:40 +02:00
kondou
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +02:00
kondou
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
kondou
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
kondou
a58d270684
Load avatar from path, if one's provided
2013-08-25 21:04:09 +02:00
kondou
2bfe662235
Add unittests & check filetype in setLocalAvatar()
...
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
kondou
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
kondou
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
Christopher
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
Jenkins for ownCloud
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
Georg Ehrke
58c727a495
fix return value of method
2013-08-23 23:27:36 +02:00
Georg Ehrke
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
Georg Ehrke
1dab076750
make it possible to disable previews
2013-08-23 23:05:44 +02:00
kondou
8dd93c8c02
Fix some phpdoc and camelcase
2013-08-23 07:30:42 +02:00
Thomas Müller
9e1016f7d2
Merge branch 'master' into fixing-4343-master
...
Conflicts:
lib/connector/sabre/quotaplugin.php
2013-08-22 17:59:39 +02:00
Jenkins for ownCloud
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
Thomas Müller
1c258087c9
fixing typos
2013-08-22 01:20:28 +02:00
Thomas Müller
fbc23c4a01
Merge branch 'master' of github.com:owncloud/core
2013-08-22 00:18:14 +02:00
Thomas Müller
f1eec74f70
additional readdir check in mappedlocal
2013-08-22 00:17:08 +02:00
Arthur Schiwon
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Jenkins for ownCloud
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
Thomas Müller
38f9df4293
introducing OCP\AppFramework\App
2013-08-21 01:02:15 +02:00
Thomas Müller
911bd3c16f
moving response classes over to OCP
2013-08-21 01:00:26 +02:00
Thomas Müller
e39083c36f
typo
2013-08-21 00:58:33 +02:00
Thomas Müller
ba029ef4b2
initial setup of the server container
2013-08-21 00:58:15 +02:00
Thomas Müller
395deacc67
reducing controller annotations to:
...
@PublicPage - No user logon is expected
@NoAdminRequired - the login user requires no admin rights
@NoCSRFRequired - the incoming request will not check for CSRF token
2013-08-20 21:21:21 +02:00
Thomas Müller
25ebe495b8
controller reuses IRequest methods
2013-08-20 21:05:55 +02:00
Thomas Müller
f115b94927
Introducing IRequest
2013-08-20 17:53:58 +02:00
Thomas Müller
6e1946ab00
Introducing IContainer into public api
2013-08-20 17:22:33 +02:00
Thomas Müller
93194bb396
Introducing IContainer into public api
2013-08-20 17:21:14 +02:00
Thomas Müller
cdada78aa4
typos & unused var fixed
2013-08-20 17:20:36 +02:00
kondou
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
Thomas Müller
0fa2e1b3d9
there is no HttpMiddleware
2013-08-20 12:48:45 +02:00
Thomas Müller
72e1a8d83b
fixing require to Pimple
2013-08-20 12:47:23 +02:00
Thomas Müller
884c6b5a82
Merge pull request #4512 from owncloud/readdir-strict-equals
...
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
Jenkins for ownCloud
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
Georg Ehrke
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
Arthur Schiwon
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02:00
icewind1991
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Robin Appelman
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
Arthur Schiwon
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
Kondou
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Thomas Tanghus
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +02:00
kondou
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
Markus Goetz
ba430a7dfa
Merge pull request #4485 from guruz/class_autoloader_optimization
...
Class Auto Loader: Cache paths in APC
2013-08-18 03:32:13 -07:00
Markus Goetz
aba64a0b81
Class Auto Loader: Cache paths in APC
...
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
2013-08-18 12:29:43 +02:00
kondou
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
Robin Appelman
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
kondou
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
Thomas Müller
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Thomas Müller
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
Thomas Müller
fde9cabe97
initial import of appframework
2013-08-17 11:16:48 +02:00
Robin Appelman
d43b4c52ae
also emit hooks for views that are a subfolder of the user folder
2013-08-17 10:57:31 +02:00
Bart Visscher
a0b7bf78a6
Remove disconnect function from OC_DB
2013-08-16 19:05:07 +02:00
Robin Appelman
5c9aedac1b
remove outdated quota proxy
2013-08-16 15:50:50 +02:00
Robin Appelman
8f10c9571f
fix quota wrapper reporting negative free_space, breaking user interface
...
return 0 instead
2013-08-16 15:48:45 +02:00
Jan-Christoph Borchardt
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 -07:00
Jenkins for ownCloud
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
Thomas Müller
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
Georg Ehrke
4574c5cf5c
check if ->resource is a resource
2013-08-15 16:13:01 +02:00
kondou
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
Thomas Müller
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
Georg Ehrke
7a11911aea
add comment to make @jancborchardt happy
2013-08-15 13:25:45 +02:00
Georg Ehrke
825d8610d0
fix svg and cache transparency issue
2013-08-15 13:22:05 +02:00
Georg Ehrke
7fe9320ffe
improve unknown backend
2013-08-15 13:22:04 +02:00
Markus Goetz
3972198b61
Cache OC_Util::checkServer() result in session
...
The return value almost never changes but this function
is called for every request.
2013-08-15 11:58:09 +02:00
Jenkins for ownCloud
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
Andreas Fischer
d73285c186
Do not mention php.ini, it may be defined in xcache.ini or so.
2013-08-15 03:41:33 +02:00
Andreas Fischer
7fa53eae7f
Make it clear that log message is about the XCache opcode cache.
2013-08-15 03:40:57 +02:00
Andreas Fischer
9770f52da6
xCache -> XCache
2013-08-15 03:40:02 +02:00
Andreas Fischer
49cfd08f08
Add link to XCache API in class documentation.
2013-08-15 03:37:59 +02:00
Andreas Fischer
341d9caf79
xcache_unset_by_prefix() returns feedback, return it.
2013-08-15 03:36:42 +02:00
Andreas Fischer
799106db81
Clear xCache OpCode cache instead of variable cache in clearOpcodeCache().
2013-08-15 03:35:52 +02:00
Andreas Fischer
8d762f659a
Allow usage of xCache variable cache if xcache_unset_by_prefix() is present.
2013-08-15 03:34:43 +02:00
Andreas Fischer
fb2761a203
Do not define xcache_unset_by_prefix() if it does not exist.
...
The defined function is not compatible with the function provided by xcache
because it does not honor the prefix parameter. Thus defining it like this is
a bad idea.
2013-08-15 03:31:42 +02:00
Thomas Tanghus
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
Georg Ehrke
623f9ec817
don't generate previews of empty txt files
2013-08-14 21:20:31 +02:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Georg Ehrke
e5761d90ef
fix deleting old previews after file changed
2013-08-14 20:49:47 +02:00
Jörn Friedrich Dreyer
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
Georg Ehrke
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00
Bjoern Schiessle
6c3efaf26c
throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files
2013-08-14 09:44:29 +02:00
Bjoern Schiessle
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
Robin Appelman
f22719b1ee
Scanner: correctly pass trough reuse options when doing a recursive scan
2013-08-12 15:37:39 +02:00
Jenkins for ownCloud
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
Andreas Fischer
43be3eb4d0
Changing elseif statement to what the PEAR coding guidelines say.
2013-08-09 22:32:38 +02:00
Andreas Fischer
9c22046bff
Do not pass numeric strings to strtotime() when formatting dates.
...
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
2013-08-09 22:32:38 +02:00
Thomas Müller
c84171cec0
don't use xcache in case admin auth is enabled in php.ini - this can cause issues
2013-08-09 22:14:28 +02:00
Thomas Müller
507e48ee56
don't call xcache_clear_cache on clearOpcodeCache() in case admin auth is enabled for xcache in php.ini
2013-08-09 22:13:31 +02:00
kondou
b24b208dce
Throw exceptions instead of only logging in \OC_Installer::installApp()
2013-08-09 21:57:01 +02:00
kondou
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
kondou
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
kondou
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
Jan-Christoph Borchardt
4c0ec974b9
Merge pull request #4344 from owncloud/appmgmt-in-navigation
...
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
Jenkins for ownCloud
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
Georg Ehrke
1c9d52774e
update indexes of oc_permissions
2013-08-09 09:31:53 +02:00
Valerio Ponte
881e362f93
final fix for xsendfile zip generation race condition
2013-08-08 23:34:04 +02:00
Owen Winkler
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer
e38025ba67
Merge pull request #4151 from owncloud/doctrine-object
...
Move dbtype depending logic into object per type
2013-08-08 08:46:30 -07:00
Björn Schießle
c24bf47db8
Merge pull request #4349 from owncloud/oc_cache_fix
...
oc_cache needs to disable file proxys for read/write operation.
2013-08-08 08:19:14 -07:00
Morris Jobke
062769ab61
Remove noisy Log/Debug message
2013-08-08 16:39:33 +02:00
Bjoern Schiessle
df358dfef5
fix function call for searUsers()
2013-08-08 13:41:04 +02:00
Thomas Müller
fed1792510
adding unit tests for quota checks
2013-08-08 13:33:00 +02:00
Thomas Müller
d3a69bf4c6
adding unit tests to determine length
2013-08-08 11:04:40 +02:00
Bjoern Schiessle
ab6e47b44a
oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work.
2013-08-08 09:44:19 +02:00
Thomas Müller
fb890eee67
fixes #4343
2013-08-08 00:42:28 +02:00
Bart Visscher
d563367b0f
More style fixes
2013-08-07 22:22:33 +02:00
Bart Visscher
83988a5906
Fix stupid bug
2013-08-07 21:01:31 +02:00
Bart Visscher
0783267e2c
Move query processing after the check for prepared statement cache
2013-08-07 18:21:49 +02:00
Jan-Christoph Borchardt
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
Bart Visscher
2cc94cbc73
Style fixes
2013-08-07 18:17:37 +02:00
Robin Appelman
a0243e03ef
use ===
2013-08-07 17:17:30 +02:00
Robin Appelman
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
Robin Appelman
fc332acf8a
split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings
2013-08-07 16:38:57 +02:00
Jenkins for ownCloud
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
Georg Ehrke
dcc92445a0
allow permissions.user to be null as suggested by @butonic
2013-08-07 11:51:08 +02:00
kondou
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
Robin Appelman
3e7a86c6ec
remove deleted files while scanning
2013-08-06 15:59:06 +02:00
Robin Appelman
95a959b10b
merge master into doctrine-object
2013-08-06 15:43:58 +02:00
Bart Visscher
9b6357e6aa
Merge pull request #4291 from owncloud/schema
...
update DB Schema class
2013-08-05 11:29:52 -07:00
Georg Ehrke
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
Georg Ehrke
554b1990e2
suppress is_file error msg
2013-08-05 14:23:30 +02:00
Thomas Müller
464afb5eca
use isset to prevent undefined index
2013-08-05 13:51:45 +02:00
Thomas Müller
d1a39ab01c
Merge pull request #4293 from owncloud/config-date
...
make log date configurable, default to iso 8601
2013-08-04 15:18:05 -07:00
Thomas Müller
b5f18111f4
Merge pull request #4308 from owncloud/fix-4194
...
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
2013-08-04 15:16:32 -07:00
Thomas Müller
0ae2bb77ba
Merge pull request #4228 from owncloud/fix-3836
...
app migrate: Use = instead of LIKE as described in the comment above.
2013-08-04 15:00:24 -07:00
Thomas Müller
33d78ab9c7
fixing PHPDoc
2013-08-04 23:13:34 +02:00
Thomas Müller
b716d035c3
fixing PHPDoc
2013-08-04 22:58:40 +02:00
Jan-Christoph Borchardt
5a77b67147
change long couldn't be determined string to question mark again
2013-08-04 16:27:17 +02:00
Andreas Fischer
e03d9e3aa0
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
2013-08-04 02:48:00 +02:00
Thomas Müller
b229381dda
initialize $plural_form_string with English default
2013-08-03 23:29:31 +02:00
Robin Appelman
3534c3b373
add reveal mimetype
2013-08-03 21:59:44 +02:00
Thomas Müller
e04bf0aaeb
unit tests for plural translations added
2013-08-02 23:08:41 +02:00
Thomas Müller
35a42da3ca
PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction
2013-08-02 21:46:25 +02:00
Thomas Müller
afc8ee721d
Merge pull request #4299 from owncloud/simplify-db-transaction
...
Simplify OC_DB transaction functions
2013-08-02 12:32:41 -07:00
Robin Appelman
2af27434a4
merge master into doctrine-object
2013-08-02 19:53:04 +02:00
Bart Visscher
fd317f599b
Simplify OC_DB transaction functions
2013-08-02 16:12:34 +02:00
Bart Visscher
5ffb8fac24
Use function to create schema manager
2013-08-02 16:02:33 +02:00
Thomas Müller
821a99b937
Merge pull request #4287 from Takuto88/language-config
...
Make default language configurable via config.php
2013-08-02 06:49:54 -07:00
Robin Appelman
258e54182a
remove invalid type hinting and cleanup namespaces a bit
2013-08-02 15:09:50 +02:00
Bernhard Posselt
f5c3a346b0
make log date configurable, default to iso 8601
2013-08-02 13:34:20 +02:00
Bart Visscher
59c5529a2b
Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager
2013-08-02 13:19:27 +02:00
Bart Visscher
9432885428
Change OC_DB_Schema to use DI for db connection object
2013-08-02 13:14:18 +02:00
Lennart Rosam
79351d064f
Make default language configurable via config.php
2013-08-02 09:41:31 +02:00
Jakob Sack
2f17dcdba8
Fix syntax error.
2013-08-01 21:46:52 +02:00
Jakob Sack
eee2c369d9
Fix copy and paste errors in l10n.php
2013-08-01 21:36:33 +02:00
Jakob Sack
9673a563b5
Create plural functions on the fly
2013-08-01 21:25:14 +02:00
kondou
1b567b2ad1
Don't throw a fatal, if is_file() parameter isn't
...
a 'valid path', but only a data/base64-string.
Related to #4283
2013-08-01 21:01:26 +02:00
Jakob Sack
495e44e76c
Update l10n.php to read plural_forms string
2013-08-01 19:54:51 +02:00
Jörn Friedrich Dreyer
eed63ae512
Merge pull request #4221 from owncloud/fix-3698
...
Fix calculating size for empty folders
2013-08-01 08:05:19 -07:00
Bjoern Schiessle
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
Morris Jobke
30963d60bc
Merge pull request #4155 from owncloud/mdb2schemareader-booleans
...
Fix boolean support for xml schema definitions
2013-08-01 02:09:01 -07:00
Morris Jobke
0d69feb12e
Merge pull request #4208 from owncloud/scanner-php53
...
Fix scanner hooks throwing errors
2013-08-01 00:05:56 -07:00
Jenkins for ownCloud
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
Bjoern Schiessle
99354f9a28
fix searchUsers() call in group.php
2013-07-31 11:34:22 +02:00
Morris Jobke
50101a85a6
Merge pull request #3982 from owncloud/test_lastinsertid
...
test lastinsertid
2013-07-31 00:03:29 -07:00
Jenkins for ownCloud
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
Thomas Müller
f35aadb576
Merge pull request #4227 from owncloud/fixing-testGetById-master
...
implement a platform independent version of basename
2013-07-30 08:39:53 -07:00
Georg Ehrke
93cdfc3e8a
Merge branch 'master' into oc_preview
2013-07-30 13:52:53 +02:00
Georg Ehrke
640253fa31
fix code style of try catch blocks
2013-07-30 13:43:15 +02:00
Georg Ehrke
d84d8f7108
fix merge conflicts
2013-07-30 12:35:39 +02:00
Georg Ehrke
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
Thomas Müller
17c36b5074
fixes #4026
2013-07-30 10:26:42 +02:00
Jenkins for ownCloud
88e1ccbce3
[tx-robot] updated from transifex
2013-07-30 01:57:50 -04:00
Thomas Müller
f658852276
Merge branch 'master' into fixing-testGetById-master
2013-07-30 00:37:05 +02:00
Thomas Müller
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
Thomas Müller
085fdfec2f
adding unit tests for OC_Util::basename
2013-07-29 23:32:03 +02:00
icewind1991
7c6246fa45
Merge pull request #4213 from owncloud/scanning-performance
...
Cache: don't check if the parent exists in the cache if we are already sure it does
2013-07-29 13:08:23 -07:00
Andreas Fischer
89f8f8e42d
app migrate: Use = instead of LIKE as described in the comment above.
...
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
2013-07-29 18:41:22 +02:00
Robin Appelman
74c54587ec
better variable naming
2013-07-29 18:27:19 +02:00
Thomas Mueller
e2d3225e5a
implement a platform independent version of basename
2013-07-29 18:24:05 +02:00
Robin Appelman
dea3472ad7
remove unneeded 'use'
2013-07-29 17:04:28 +02:00
Robin Appelman
64774f30ba
dont need to explicitly pass by reference
2013-07-29 17:03:57 +02:00
Robin Appelman
d6c56b584a
make MDB2Schema reader non static
2013-07-29 16:33:00 +02:00
Robin Appelman
fbbe0ebe77
add function to get config object from OC_Config
2013-07-29 16:32:37 +02:00
Michael Gapczynski
1faac6108c
Use query to calculate folder size
2013-07-29 10:22:44 -04:00
Georg Ehrke
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
Georg Ehrke
e01bc7de98
Revert "OC\Preview - outsource static methods"
...
This reverts commit 14a35267c1
.
2013-07-29 14:51:06 +02:00
Georg Ehrke
65affdc9b3
make previews in files app smaller
2013-07-29 14:40:26 +02:00
Thomas Müller
954b5d9019
Merge pull request #4216 from owncloud/clean_php55_opcache
...
Also clean PHP 5.5 opcache
2013-07-29 04:40:01 -07:00
Jörn Friedrich Dreyer
05fa55f2eb
always return int
2013-07-29 02:17:09 +02:00
Michael Gapczynski
dd4e33fe6b
Fix calculating size for empty folders
2013-07-28 16:14:49 -04:00
Michael Gapczynski
c8e60900fc
Move check so the variable will never be undefined
2013-07-28 15:32:48 -04:00
kondou
8cd671c207
Also clean PHP 5.5 opcache
2013-07-28 16:33:03 +02:00
Jenkins for ownCloud
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
Robin Appelman
e1e7b6a940
Cache: don't check if the parent exists in the cache if we are already sure it does
2013-07-27 11:36:27 +02:00
Jenkins for ownCloud
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
Bart Visscher
d7916363e1
Make DB connection available to use for dependency injection
2013-07-26 20:36:48 +02:00
Robin Appelman
59bdba9bac
fix scanner hooks, cant use inside closures in php 5.3
2013-07-26 15:43:10 +02:00
Robin Appelman
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02:00
Robin Appelman
e2f04b3b42
use storage wrapper for quota instead of a filesystem proxy
2013-07-25 16:01:37 +02:00
Robin Appelman
5209cff371
add conveince function to wrap all storages
2013-07-25 16:01:05 +02:00
Robin Appelman
d042c8f166
use renamed constants
2013-07-25 16:00:48 +02:00
Robin Appelman
f4b6a8aa08
add option to wrap existing mounts
2013-07-25 16:00:24 +02:00
Robin Appelman
4e490b0688
fix getPermissionsCache for storage wrapper
2013-07-25 15:59:57 +02:00
Robin Appelman
1b50154c95
functions in OCP should be static
2013-07-25 15:25:17 +02:00
Andreas Fischer
75e93d041d
Merge pull request #3887 from owncloud/apc_user_cache
...
The APC User Cache doesn't return the cache_list anymore
* owncloud/apc_user_cache:
Add ACPu memory cache
2013-07-25 03:48:26 +02:00
Robin Appelman
cd8f0c21ce
add quota storage wrapper
2013-07-25 00:31:51 +02:00
Robin Appelman
10d3e63ce5
add quota streamwrapper that limits the amount of data that can be written to a stream
2013-07-25 00:31:51 +02:00
Robin Appelman
94560c68ba
rename constants
2013-07-25 00:29:27 +02:00
Bart Visscher
25003fb213
Add ACPu memory cache
2013-07-24 21:50:15 +02:00
icewind1991
ff86b6f134
Merge pull request #4183 from owncloud/fix-group-id
...
Fix group id naming fid->gid
2013-07-24 11:09:47 -07:00
icewind1991
1986416248
Merge pull request #3898 from owncloud/sabre-objecttree
...
WebDAV performance improvements
2013-07-24 10:46:27 -07:00
Bart Visscher
4e3bfd8ddd
Fix group id naming fid->gid
2013-07-24 17:54:31 +02:00
Jan-Christoph Borchardt
9b1866f1ac
merge master
2013-07-24 16:31:01 +02:00
Robin Appelman
ad266a4253
Merge branch 'master' into sabre-objecttree
2013-07-24 15:53:48 +02:00
Björn Schießle
651479322b
Merge pull request #4177 from owncloud/move_defaults_to_template_constructor
...
Move defaults to template constructor
2013-07-24 06:42:52 -07:00
icewind1991
98858e6f00
Merge pull request #3995 from owncloud/groups
...
Refactoring of group management code
2013-07-24 06:13:05 -07:00
Björn Schießle
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
Morris Jobke
2622839fcf
Merge pull request #4171 from owncloud/fix-config
...
Fix config
2013-07-24 00:48:43 -07:00
Thomas Müller
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
Thomas Müller
60ce492fac
Merge branch 'master' into groups
2013-07-24 01:11:12 +02:00
Thomas Müller
5fc0535f1b
Merge pull request #4090 from owncloud/cleanup-some-template-functions
...
Cleanup some template functions
2013-07-23 15:53:43 -07:00
Bart Visscher
793ff0fec9
Fix lastInsertId for OCI8 adapter
2013-07-23 22:16:04 +02:00
Robin Appelman
fb40d9e1e6
Merge branch 'master' into groups
2013-07-23 22:06:03 +02:00
Bart Visscher
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
...
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
Jan-Christoph Borchardt
93b227d803
shorten wording on config directory errors
2013-07-23 18:41:00 +02:00
Bart Visscher
3eb5fff02a
Add documentation to OC\DB\adapter class
2013-07-23 18:09:42 +02:00
Bart Visscher
485e8ab0a5
ignore config read failures
2013-07-23 17:38:37 +02:00
Bart Visscher
5caa7576d4
Revert "fix failing master branch - Test_Config::testWriteData"
...
This reverts commit 8f93490ac4
.
2013-07-23 17:36:08 +02:00
Jörn Friedrich Dreyer
f7422ad132
Merge pull request #4150 from owncloud/better-error-handling
...
Better error handling
2013-07-23 08:30:02 -07:00
Jenkins for ownCloud
a94c55be98
[tx-robot] updated from transifex
2013-07-23 02:03:19 -04:00
Bart Visscher
179b42c56d
Fixed review issues
2013-07-22 23:04:14 +02:00
Robin Appelman
499a01f179
use ===
2013-07-22 17:41:33 +02:00
Jörn Friedrich Dreyer
cb4cf3e2f7
need to use \OC_Image to escape OCP namespace
2013-07-22 17:25:55 +02:00
Kondou
bc86ce00cf
Merge pull request #4154 from owncloud/return-ocl10n
...
return result from getL10N
2013-07-22 08:05:32 -07:00
Robin Appelman
b073a34e77
add support for the <primary/> element within field definitions
2013-07-22 16:25:07 +02:00
Robin Appelman
dc272e6e20
db: cast default values for boolean fields to booleans
2013-07-22 16:24:46 +02:00
Robin Appelman
d509a0c403
return result from getL10N
2013-07-22 15:52:02 +02:00
Georg Ehrke
f1e939e1a3
Merge branch 'master' into fix_return_value_search_principals
2013-07-22 15:30:57 +02:00
Bart Visscher
be7c613993
Fix errors from unit tests
2013-07-21 23:17:37 +02:00
Bart Visscher
b66c9098bd
Correct namespace of OC_ classes
2013-07-21 23:17:37 +02:00
Bart Visscher
000b5a801f
Move building error string to connection
2013-07-21 23:17:37 +02:00
Bart Visscher
de83bf98c7
Group database connection and schema function
2013-07-21 23:17:37 +02:00
Bart Visscher
013333fe6a
Cleanup: remove code for multiple database backends
2013-07-21 23:17:37 +02:00
Bart Visscher
3e0e2cfa19
Use $connection for schema changes
2013-07-21 23:17:37 +02:00
Bart Visscher
8a332cdc94
Simplify OC_DB transaction functions
2013-07-21 23:17:37 +02:00
Bart Visscher
19b9c89634
Move insertIfNotExist to Connection wrapper
...
Real implementation is in DB\Adapter* classes
2013-07-21 23:17:37 +02:00
Bart Visscher
58991150ab
Move query statement fixup handling to Connection wrapper
2013-07-21 23:17:37 +02:00
Bart Visscher
1d5d23a1de
Move limit/offset handling to Connection wrapper
2013-07-21 23:17:37 +02:00
Bart Visscher
a48e9c488b
Move prepared query cache handling to Connection wrapper
2013-07-21 23:17:36 +02:00
Bart Visscher
e3c5fea989
Move lastInsertId to adapter classes
2013-07-21 23:17:36 +02:00
Bart Visscher
cd98ff1eaf
Move db prefix handling to Connection wrapper
2013-07-21 23:17:36 +02:00
Bart Visscher
66a215651b
Create DB Connection wrapper and DB\Adapter* classes
2013-07-21 23:17:36 +02:00
Bart Visscher
62ce3a5613
Only close db connection when disconnecting, keep the connection object
2013-07-21 23:17:36 +02:00
Bart Visscher
25e3c9cbeb
Only display call trace in debug mode
2013-07-21 22:56:21 +02:00
Bart Visscher
aa22194a09
In debug mode uncaught exceptions should display a nice page
2013-07-21 22:40:35 +02:00
Bart Visscher
8c5df31c49
DRY use OC_Template::printErrorPage
2013-07-21 22:30:32 +02:00
Bart Visscher
df8ad46dae
Change exit calls to throwing an exception
...
This way the error won't be fatal in a unit test
2013-07-21 22:29:50 +02:00
Bart Visscher
6d39e0ad6f
Change to use !== and ===
2013-07-21 21:42:42 +02:00
Thomas Müller
01c39cf2be
fixing typos, PHPDoc and missing namespace \
2013-07-21 21:42:42 +02:00
Bart Visscher
3de8570e35
Move basic template functions to their own class
2013-07-21 21:42:42 +02:00
Bart Visscher
2593395561
Move template functions to there own file
2013-07-21 21:37:25 +02:00
Bart Visscher
5965f3ecea
Split locating JS and CSS files to their own class
2013-07-21 21:36:15 +02:00
Bart Visscher
37a731bcad
Merge pull request #4131 from owncloud/scanner-split
...
Remove scanner logic from ajax file and place it in it's own class
2013-07-21 11:32:11 -07:00
Bart Visscher
639097db59
Merge pull request #4092 from owncloud/base-better-errors
...
Generate better errors in base.php
2013-07-21 11:20:30 -07:00
Bart Visscher
9bf12da750
Merge pull request #3880 from owncloud/code-checker
...
Add classes replaced by the public api to the code checker
2013-07-21 11:19:20 -07:00
Morris Jobke
8f93490ac4
fix failing master branch - Test_Config::testWriteData
2013-07-21 11:13:29 +02:00
Morris Jobke
05c83a163a
add proper deprecated tag
2013-07-21 10:30:00 +02:00
Morris Jobke
647e0a0cba
Merge pull request #4118 from owncloud/remove-size-experiment
...
finally remove the file size obfuscation as it had more disadvantages.
2013-07-21 01:25:39 -07:00
Jan-Christoph Borchardt
48267b6e6c
add back public API function, but mark as deprecated
2013-07-20 01:15:12 +02:00
Bart Visscher
11f28d7880
Result of && if not the part
2013-07-19 17:37:42 +02:00
Bart Visscher
cbe1c22b5f
Correct casing of OC_User and pass through the params to getUsers
2013-07-19 17:32:31 +02:00
Robin Appelman
2b89b7c880
Split scanning logic from ajax file
2013-07-19 16:44:47 +02:00
Robin Appelman
b397df2022
add option to get the mountmanager from the filesystem
2013-07-19 16:33:00 +02:00
Robin Appelman
02cdd52fb0
Make Cache\Scanner an emitter
2013-07-19 16:32:43 +02:00
Bart Visscher
a22940d3cd
Add OC_L10N to public api
2013-07-19 11:40:11 +02:00
Bart Visscher
9379cbf602
Add OC_Image to public api
2013-07-19 11:23:47 +02:00
Jenkins for ownCloud
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
Robin Appelman
a945ce908b
style fix
2013-07-19 02:23:57 +02:00
Bart Visscher
084cf0c202
Merge pull request #2221 from owncloud/doctrine
...
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
Jan-Christoph Borchardt
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
Bart Visscher
e2b6781cf9
Tweaks to the MDB2SchemaReader
2013-07-18 21:07:56 +02:00
Robin Appelman
e3ea3ed3c5
group: only pass backends that hold that specific group to the group constructor
2013-07-18 12:15:34 +02:00
Thomas Müller
3c6b205e37
Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
...
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:57:43 -07:00
Markus Goetz
3fd4ff79ee
Merge pull request #4042 from guruz/webdav_auth_check_existing
...
WebDAV Auth Connector: Check if already logged in
2013-07-17 05:00:59 -07:00
Markus Goetz
bf7514f76a
WebDAV Auth Connector: Check if already logged in
2013-07-17 13:51:15 +02:00
Thomas Mueller
24283425a6
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:18:46 +02:00
Bart Visscher
5b60fad467
Display the exception error backtrace preformatted
2013-07-16 22:42:09 +02:00
Bart Visscher
971a3fd124
Early errors (in base.php) don't have session available
2013-07-16 22:37:32 +02:00
Bart Visscher
49fca86f3c
Cleanup error generation in base.php
2013-07-16 22:36:39 +02:00
Bart Visscher
7d86e262e1
Use autoloader for Patchwork/PHP/Shim/Normalizer
2013-07-16 22:32:04 +02:00
Jakob Sack
fb97600091
Fix an error jenkins found
2013-07-16 22:27:55 +02:00
icewind1991
e09ffb6f57
Merge pull request #2395 from owncloud/cache
...
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
Jakob Sack
bb0c5bff5f
Add multiple plural forms to the php part
2013-07-16 22:16:53 +02:00
Bart Visscher
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
Robin Appelman
dc1a17b6f4
memcache: also switch factory to prefix
2013-07-16 16:08:37 +02:00
Robin Appelman
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
Robin Appelman
69048ab71f
memchache: use prefix string instead of global flag
2013-07-16 15:42:40 +02:00
Robin Appelman
d82c1dfcab
split out memcache factory from base class
2013-07-16 15:34:22 +02:00
Robin Appelman
0ae8eb4f5e
Merge branch 'master' into cache
2013-07-16 15:22:47 +02:00
VicDeo
feb01847e7
Merge pull request #4076 from owncloud/fix_typos_kondou
...
Fix some typos
2013-07-16 01:23:16 -07:00
kondou
d9c697534d
Fix some typos
2013-07-16 06:01:26 +02:00
Bart Visscher
1a2db491af
Merge pull request #3962 from owncloud/move-error-handlers
...
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-15 09:23:37 -07:00
Georg Ehrke
63791e2d8d
return empty array instead of 0
2013-07-15 16:58:30 +02:00
Thomas Müller
6f5b0af67f
Merge pull request #3487 from owncloud/basic_auth_hack
...
Basic Auth is broken - again...
2013-07-14 14:56:45 -07:00
Georg Ehrke
1303fe0f9f
OC\Preview - set scale factor down to 2 and upscale cached preview - this got lost in a git stash ...
2013-07-14 00:00:10 +02:00
kondou
0d604a6c9a
Include $defaults
2013-07-13 18:44:36 +02:00
Bart Visscher
5549c77ec5
Merge branch 'master' into doctrine
...
Conflicts:
3rdparty
lib/db.php
lib/setup.php
tests/lib/db.php
tests/lib/dbschema.php
2013-07-13 12:01:14 +02:00
Georg Ehrke
21abebf96a
OC\Preview - proper handling of a cached previews's filename
2013-07-12 11:50:24 +02:00
Georg Ehrke
33ac4d93d6
OC\Preview - use !== and === instead of != and ==
2013-07-12 10:04:27 +02:00
Thomas Müller
24b4806af4
Merge branch 'master' into googledrive
2013-07-12 09:43:04 +02:00
icewind1991
3abe68176f
Merge pull request #3270 from owncloud/convert-oc_config
...
Convert OC_Config to object so it can be used for DI
2013-07-11 18:21:08 -07:00
Georg Ehrke
14a35267c1
OC\Preview - outsource static methods
2013-07-11 20:35:55 +02:00
Georg Ehrke
1ffc42b4be
OC\Preview - fix logic of two return values
2013-07-11 20:15:30 +02:00
Georg Ehrke
c6849bed9d
OC\Preview - remove unneeded comment
2013-07-11 20:02:59 +02:00
Georg Ehrke
1e8a646f51
OC\Preview - improve documentation
2013-07-11 19:21:37 +02:00
Georg Ehrke
7b2aa5d830
OC\Preview - use camelCase
2013-07-11 19:03:21 +02:00
Jan-Christoph Borchardt
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
Georg Ehrke
ec75e1904d
make jenkins happy
2013-07-11 12:28:41 +02:00
Georg Ehrke
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
Georg Ehrke
06eca985ce
use $root instead of $path
2013-07-11 11:57:46 +02:00
Georg Ehrke
4bbbba1dc8
fix typo
2013-07-11 11:43:53 +02:00
Georg Ehrke
7f71ae60b0
improve validation of oc\preview and implement preview of error icon if something went wrong
2013-07-11 10:10:07 +02:00
Thomas Müller
d18bd17eb7
- eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
...
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:27:21 +02:00
icewind1991
d134ba9a82
Merge pull request #3978 from owncloud/forwarding-emitter
...
add forwarding emitter for agregating multiple emitters
2013-07-10 10:38:28 -07:00
Morris Jobke
e2a5af4b9e
Merge pull request #3985 from owncloud/cookie-past2
...
apply @LukasReschke's cookie changes, hopefully finally fix #854
2013-07-10 09:08:01 -07:00
Georg Ehrke
5c31b843fc
fix typo
2013-07-10 18:04:13 +02:00
Georg Ehrke
f14b0fa6e0
update some comments in preview lib
2013-07-10 18:01:04 +02:00
Georg Ehrke
7091d7a6d2
clean up oc\preview
2013-07-10 17:57:04 +02:00
Robin Appelman
63df8f3500
reneme id to gid
2013-07-10 17:52:34 +02:00
Georg Ehrke
45d1691671
fix orientation before caching preview
2013-07-10 13:38:42 +02:00
Georg Ehrke
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
Georg Ehrke
cf449d42e8
properly encode path
2013-07-10 12:30:20 +02:00
Jörn Friedrich Dreyer
6a50848a6e
Merge pull request #3994 from owncloud/fix_oracle_setup
...
General setup fixes for Oracle
2013-07-10 01:02:52 -07:00
Jenkins for ownCloud
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
Robin Appelman
065bc96b02
more consistent naming
2013-07-10 02:17:24 +02:00
Robin Appelman
db14775536
consistent naming
2013-07-10 02:09:42 +02:00
Robin Appelman
4de5e292e5
search parameter is not optional
2013-07-10 02:01:34 +02:00
Robin Appelman
cc2818ba13
more consitency in hook names
2013-07-10 01:59:59 +02:00
Robin Appelman
c2bff656ff
cant use private members from closure in php <5.4
2013-07-10 01:55:38 +02:00
Robin Appelman
912b151561
use new group api as backend for the old api
2013-07-10 00:07:46 +02:00
Robin Appelman
a735105a22
update group management
2013-07-10 00:06:22 +02:00
Victor Dubiniuk
194ab11322
General fixes
2013-07-10 00:49:05 +03:00
mvn23
40879c6327
Merge pull request #3787 from mvn23/patch-1
...
Thanks @bartv2 and @bantu, merged and closed.
2013-07-09 08:21:07 -07:00
Thomas Tanghus
9e9c323acd
Set path in cookie.
2013-07-09 16:46:35 +02:00
Victor Dubiniuk
5a3fce12a4
Implement encodePath
2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt
d70d4f435e
apply @LukasReschke's cookie changes, hopefully finally fix #854
2013-07-09 15:00:36 +02:00
Michael Gapczynski
4feff3456b
Only emit permissions hook for files and and include path
2013-07-08 17:28:18 -04:00
icewind1991
af1c3dd4ce
Merge pull request #3963 from owncloud/update-logic-split
...
Move the upgrade logic to \OC\Updater
2013-07-08 12:38:39 -07:00
Robin Appelman
a0d5ba1167
fix typo
2013-07-08 21:13:31 +02:00
Bart Visscher
e7b882a4fc
stupid namespace
2013-07-08 18:29:43 +02:00
Bart Visscher
4a6803ef9d
Check if logger is set, also no need to return true
2013-07-08 18:26:11 +02:00
Bart Visscher
abe9abab99
Add constructor documentation
2013-07-08 18:01:32 +02:00
Bart Visscher
52553c64ed
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-08 17:59:50 +02:00
Michael Gapczynski
5c2a0325ba
Add update permissions hook to sharing
2013-07-08 11:40:10 -04:00
Robin Appelman
4a4e139c83
forward previously registerd hooks
2013-07-08 16:54:26 +02:00
Robin Appelman
925d09cb0e
add forwarding emitter for agregating multiple emitters
2013-07-08 16:45:19 +02:00
Thomas Müller
02d2e41e04
Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
...
fix insertIfNotExist return value, update doc and corresponding test
2013-07-08 07:17:45 -07:00
Thomas Müller
0365d244e0
Merge pull request #3946 from owncloud/fixing-3942-master
...
handle anonymous upload to reshared folder
2013-07-08 02:27:21 -07:00
Georg Ehrke
04292ff16c
implement use of preview icons in thrashbin app
2013-07-08 10:53:53 +02:00
Björn Schießle
9b9ea7cd8e
Merge https://github.com/owncloud/core/pull/3827
...
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
Jenkins for ownCloud
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
Jakob Sack
560839195e
make l10n libs capable of handling plural translations
2013-07-07 20:06:14 +02:00
Robin Appelman
9cd7ecd502
Updater: pass update url as argument to update check
2013-07-06 17:05:38 +02:00
Robin Appelman
58f473d734
split upgrade logic from ajax file
2013-07-06 17:00:00 +02:00
Jenkins for ownCloud
c8ad3df1fa
[tx-robot] updated from transifex
2013-07-06 02:08:38 +02:00
Thomas Müller
98da4bf704
removing unused getSharedItem()
2013-07-06 00:04:01 +02:00
Thomas Müller
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
Thomas Müller
bc1c776642
Merge pull request #3951 from owncloud/fixing-3936-master
...
get the real physical folder name for anonymous upload
2013-07-05 14:43:47 -07:00
Bart Visscher
ab2037ab5d
Only change integer type when the length is set
2013-07-05 22:05:16 +02:00
Bart Visscher
b8a7e97301
Add comment to column definition
2013-07-05 21:42:37 +02:00
Bart Visscher
2db839c4d3
Move error handlers from OC_Log to OC\Log\ErrorHandler
2013-07-05 19:28:10 +02:00
Thomas Müller
e159cbf527
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
2013-07-05 17:39:41 +02:00
Thomas Müller
f8dae11a23
Merge pull request #3957 from owncloud/config-glob-fail
...
OC_Config: handle failure of glob('*.config.php')
2013-07-05 07:38:04 -07:00
Jörn Friedrich Dreyer
212ea0508d
update comment
2013-07-05 15:39:57 +02:00
Bart Visscher
22c29eb64b
Fix renaming using parenthesis
2013-07-05 15:38:09 +02:00
Robin Appelman
c1cf829b9d
OC_Config: handle failure of glob('*.config.php')
2013-07-05 15:07:15 +02:00
Jörn Friedrich Dreyer
00987feda1
fix insertIfNotExist return value, update doc and corresponding test
2013-07-05 14:05:42 +02:00
Thomas Müller
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
Bart Visscher
424ec94680
Make buildNotExistingFileName testable and write unittests
2013-07-05 13:03:01 +02:00
Jenkins for ownCloud
955646c461
[tx-robot] updated from transifex
2013-07-05 02:21:23 +02:00
Bart Visscher
ad9458e85d
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
2013-07-04 18:23:47 +02:00
Björn Schießle
3c1308fb6d
eddition string should be empty by default
2013-07-04 10:12:07 +02:00
Björn Schießle
6cfa016c39
add public api
2013-07-04 10:11:55 +02:00
Björn Schießle
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
Bart Visscher
20be58bfdc
Merge pull request #3888 from owncloud/ocs_api_fixes
...
Ocs api fixes
2013-07-03 12:33:04 -07:00
Thomas Mueller
32d69f6889
Merge branch 'master' into convert-oc_config
2013-07-03 17:03:47 +02:00
kondou
aa7d8edd14
Suppress warning in setup if config doesn't exist
2013-07-03 16:00:23 +02:00
Björn Schießle
690323092e
don't run hooks for .part files
2013-07-03 10:11:50 +02:00
Björn Schießle
04e4d9580f
if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal
2013-07-03 10:11:37 +02:00
Björn Schießle
4d4484fac1
Merge pull request #3870 from owncloud/reset_migration_status
...
introduce pre-disable-app hook and first usage in files_encryption
2013-07-02 07:26:48 -07:00
Thomas Müller
e789e05675
on unit test use @expectedException
...
some phpdoc added
2013-07-02 00:15:42 +02:00
Thomas Müller
fbdf46b76e
Merge pull request #3748 from owncloud/fixing-3740-master
...
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
2013-07-01 15:08:08 -07:00
Thomas Müller
7d7a2ce317
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
2013-07-01 23:51:43 +02:00
Thomas Müller
bb07dde988
Merge branch 'master' into convert-oc_config
2013-07-01 23:43:00 +02:00
Thomas Müller
c777026506
Merge pull request #3775 from owncloud/test_fixes_for_dbschema
...
use executeAudited, add table name to assert message, skip schema changi...
2013-07-01 14:38:28 -07:00
Thomas Müller
bf901eb52f
Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
...
remove unnecessary try catch blocks
2013-07-01 14:37:09 -07:00
Björn Schießle
cb5811bcf5
backport from pull request #3863
2013-07-01 11:12:18 +02:00
Björn Schießle
d8b3aee24e
set default logo claim to ''
2013-07-01 10:48:26 +02:00
Björn Schießle
d97d00fe0f
add logo claim to defaults.php
2013-07-01 10:48:13 +02:00
Björn Schießle
f622f35a1a
make mail footer aware of different themes
...
Conflicts:
lib/mail.php
2013-07-01 10:47:44 +02:00
Björn Schießle
68369ebb86
remove unneeded if condition
2013-07-01 10:46:49 +02:00
Björn Schießle
996b1e80c6
lib/defaults.php should only contain the default strings and read the other strings directly from the theme
2013-07-01 10:46:27 +02:00
Björn Schießle
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
Thomas Müller
121d3904c9
Merge pull request #3852 from owncloud/fixing-3830-master
...
session life time is now configurable and set to the same value
2013-06-30 14:41:51 -07:00
Robin Appelman
93750d2658
improved copy operation for objecttree
2013-06-30 19:41:38 +02:00
Robin Appelman
fe0de5fc10
improved move operation for sabre's objecttree
2013-06-30 18:37:47 +02:00
Robin Appelman
4e55d0ef9b
make use of the fact that rmdir is already recursive
2013-06-30 18:37:47 +02:00
Robin Appelman
2d1c6ae726
overwrite Sabre_DAV_ObjectTree with a faster getNodeForPath
2013-06-30 18:37:46 +02:00
Thomas Müller
8beec2015a
Merge pull request #3763 from owncloud/recursive-rmdir
...
Make rmdir recursive for local storage
2013-06-30 09:16:32 -07:00
Robin Appelman
d051d6f925
make rmdir recursive for mappellocal storage backend
2013-06-30 17:44:49 +02:00
Jenkins for ownCloud
4d74e8955f
[tx-robot] updated from transifex
2013-06-30 02:13:07 +02:00
Bart Visscher
60eb63e35a
Fix review items
2013-06-29 21:15:06 +02:00
Bart Visscher
e93ce26f27
Fix found errors
2013-06-29 21:15:06 +02:00
Bart Visscher
42c44d5165
Fix OCI setupDatabase parameter
2013-06-29 21:15:06 +02:00
Bart Visscher
bf30e03048
Remove unsued parameter
2013-06-29 21:15:05 +02:00
Bart Visscher
6831b78597
Use db setup class for option validation
2013-06-29 21:15:05 +02:00
Bart Visscher
2faccaee0d
Change database creation to use array to select db setup class
2013-06-29 21:07:11 +02:00
Bart Visscher
e232907698
Convert database setup code to objects
2013-06-29 21:07:11 +02:00
Bart Visscher
a6d07cd512
Split database specific install/setup code to their own class
2013-06-29 21:07:11 +02:00
Bart Visscher
414b5f150e
Merge pull request #2914 from Kondou-ger/label_overlapping_value
...
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
Bart Visscher
bd3e266408
Merge pull request #3688 from roha4000/fix_upload_max_filesize
...
upload_max_filesize = 0 not possible if post_max_size is not 0
2013-06-29 04:07:34 -07:00
Bart Visscher
d699ee9845
Merge pull request #3635 from owncloud/storage-wrapper
...
Give apps the option to wrap storage backends
2013-06-29 04:00:03 -07:00
Bart Visscher
68c0d54568
Merge pull request #3268 from owncloud/convert-oc_log
...
Convert OC_Log to object so it can be used for DI
2013-06-29 03:38:56 -07:00
icewind1991
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
Bart Visscher
57370353ad
Check if the app is enabled and the app path is found before trying to load the script file
2013-06-28 20:34:28 +02:00
Thomas Mueller
66e1eaac93
isError should detect a PEAR_Error even if the backend is PDO.
...
This can happen on errors during schema migration - which is always done with MDB2
2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer
e62eb2e8d1
correctly handle error results of PDO and MDB2 backends
2013-06-28 20:16:01 +02:00
Robin Appelman
dc0ebe9007
fix is_file and is_dir for the static streamwrapper
2013-06-28 19:54:16 +02:00
Robin Appelman
156e72a0c4
add option to clear the files in the static streamwrapper
2013-06-28 19:41:28 +02:00
Jörn Friedrich Dreyer
f3c4a37a78
Merge pull request #3832 from owncloud/oracle_sql_fixes
...
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
Robin Appelman
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
Bart Visscher
8ca0a957ad
Allow setting defaults and requirements for the api route
2013-06-28 17:25:10 +02:00
Bart Visscher
9a50a8f0cc
Don't load the apps when we need to upgrade
...
The loading can call functions that require new tables, like oc_jobs
2013-06-28 17:23:40 +02:00
Jörn Friedrich Dreyer
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
Bart Visscher
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Thomas Müller
3bedb09753
Merge pull request #3843 from owncloud/sabre-exceptions
...
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-28 07:05:09 -07:00
Bart Visscher
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
Robin Appelman
125f9f4221
move storage wrappers to their own namespace
2013-06-28 15:34:25 +02:00
Bart Visscher
6ddfe2029c
Merge pull request #3865 from owncloud/fix_test_for_oracle
...
Fix sharing test for oracle
2013-06-28 06:18:56 -07:00
Thomas Mueller
3b91ce695f
session_life_time -> session_lifetime
...
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
Bart Visscher
df9e56efd0
Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
...
manually calculate unix_timestamp for oracle
2013-06-28 06:11:28 -07:00
Bart Visscher
b04e09a901
Move DoctrineStatementWrapper to its own file
2013-06-28 11:48:38 +02:00
Bart Visscher
6145e61718
Remove deadcode
2013-06-28 11:42:23 +02:00
Bart Visscher
1edf01d09f
Fix usage of non existent consts
2013-06-28 11:15:25 +02:00
Thomas Mueller
10951f9bd5
adding PHPDoc
2013-06-27 23:34:36 +02:00
Thomas Mueller
de93b21505
missing $
2013-06-27 23:14:32 +02:00
Bart Visscher
12976fb2e1
Set debugMode after reading the config file
2013-06-27 22:50:28 +02:00
Bart Visscher
194b61b4c5
Revert "Can't determine if debug mode is defined until we read the config"
...
This reverts commit 969e43c87b
.
2013-06-27 22:24:17 +02:00
Bart Visscher
ae2b3732de
Use file_exists to fix the unittests
2013-06-27 22:23:53 +02:00
Bart Visscher
fb80cbd499
Fix review points
2013-06-27 22:01:52 +02:00
Bart Visscher
64f16f1db1
Fix stupid namespace separator
2013-06-27 21:57:59 +02:00
Bart Visscher
2eaad58922
Make the object drive the logging backend
...
This is the other way around then it was.
2013-06-27 20:10:54 +02:00
Bart Visscher
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
Jörn Friedrich Dreyer
77dc3964f8
check item id is set
2013-06-27 17:39:44 +02:00
Björn Schießle
c4aef89278
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
2013-06-27 14:09:22 +02:00
Jörn Friedrich Dreyer
45c897acf3
one if less
2013-06-27 13:13:49 +02:00
Jenkins for ownCloud
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
Bart Visscher
3b31afb2a7
Oracle doesn't know & as bitwise AND
2013-06-26 21:40:31 +02:00
Bart Visscher
a9ee15cf40
Use Doctrine platform to add limit and offset to query
2013-06-26 20:48:01 +02:00
Jörn Friedrich Dreyer
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
Georg Ehrke
806f3bddec
increase size of preview to size of row
2013-06-26 18:19:13 +02:00
Georg Ehrke
39c387eed4
implement server side use of previews
2013-06-26 18:04:22 +02:00
Georg Ehrke
9b7efef39d
improve Image Provider
2013-06-26 14:28:40 +02:00
Georg Ehrke
a98391b976
some minor improvements to preview lib
2013-06-26 11:18:53 +02:00
Thomas Mueller
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
Robin Appelman
6208780332
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-25 17:04:25 +02:00
Thomas Müller
39cca72964
Merge pull request #3750 from owncloud/dummy_session_for_errors
...
Init dummy session to render error pages
2013-06-25 03:34:49 -07:00
Roman Geber
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
Florian Scholz
b1fd9b3907
- add slash if webroot is an empty string
...
- added comment
2013-06-25 10:45:37 +02:00
Jörn Friedrich Dreyer
7273b43cd5
manuall calculate unix_timestamp for oracle
2013-06-25 09:52:04 +02:00
Jenkins for ownCloud
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
Jörn Friedrich Dreyer
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
Bart Visscher
fae3cf1a87
Always quote db identifiers in OC_DB_MDB2SchemaReader
2013-06-24 22:38:19 +02:00
Bart Visscher
144a8eb01f
Quote tablenames
2013-06-24 22:38:19 +02:00
Bart Visscher
9fa4b78ba4
Use Doctrines Oracle sequence suffix
2013-06-24 22:38:19 +02:00
Bart Visscher
159efa8bd4
OCI doesn't have a queryString
2013-06-24 22:38:19 +02:00
Bart Visscher
6300b95896
UNIX_TIMESTAMP replace for Oracle
2013-06-24 22:38:19 +02:00
Bart Visscher
dca8c1cbc1
Fixes connecting to Oracle without port set
2013-06-24 22:38:19 +02:00
Bart Visscher
d1b76f1b88
Fix not null with empty default
2013-06-24 22:37:07 +02:00
Jörn Friedrich Dreyer
c223bee6df
fix numRows usage in core lib
2013-06-24 16:29:59 +02:00
Jörn Friedrich Dreyer
643c8d3088
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
2013-06-24 16:29:58 +02:00
Jörn Friedrich Dreyer
3e3b66bd0d
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 16:12:21 +02:00
Bart Visscher
377e9a8677
Merge branch 'master' into doctrine
2013-06-24 08:27:25 +02:00
Roland Hager
a06d901e37
Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
...
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
2013-06-21 09:33:06 +02:00
mvn23
59fa3055e1
Reviewed code for X-Sendfile2
...
Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
2013-06-20 17:46:36 +03:00
Thomas Müller
4232ccbc6d
Merge pull request #3792 from owncloud/scanfolder-remove
...
remove deleted files when re-scanning a folder
2013-06-20 04:02:10 -07:00
blizzz
c41f11a821
Merge pull request #3779 from shkdee/patch-1
...
Update user.php
2013-06-20 02:37:12 -07:00
mvn23
3f20a080fe
Revert most changes for testing
2013-06-20 12:23:25 +03:00
Jörn Friedrich Dreyer
372f261fe3
remove unnecessary exception handling
2013-06-20 10:50:53 +02:00
Jörn Friedrich Dreyer
91c0b81130
add missing backticks
...
guys, please ...
2013-06-20 10:18:29 +02:00
Jenkins for ownCloud
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
Robin Appelman
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
mvn23
a25bfa9291
Update files.php
2013-06-19 23:44:45 +02:00
mvn23
46f97f4c38
Implement X-Sendfile2 for resume support in LigHTTPd
...
LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files.
To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect.
2013-06-19 15:36:48 +02:00
Georg Ehrke
fb67b45841
comment out old code
2013-06-19 13:41:01 +02:00
icewind1991
cb41b88520
Merge pull request #3764 from owncloud/scanfolder-existing
...
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
Björn Schießle
8406d3f7b1
also use the default theme if the theme is set to an empty string in the config.php
2013-06-19 11:58:29 +02:00
Jörn Friedrich Dreyer
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
Georg Ehrke
1fcbf8dd7a
implemenet getNoCoverThumbnail
2013-06-19 10:21:55 +02:00
shkdee
4a480e4f53
Update user.php
...
Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.
2013-06-18 21:47:47 +03:00
Jörn Friedrich Dreyer
78678be2b6
remove dangling AND in SQL statement
2013-06-18 16:18:19 +02:00
Georg Ehrke
cc478d2f48
use ppt icon instead of preview
2013-06-18 13:53:02 +02:00
Georg Ehrke
bea4376fd4
remove opendocument.php
2013-06-18 11:04:08 +02:00
Victor Dubiniuk
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
Robin Appelman
2ed0e6e915
add tests for reusing existing data in scanner
2013-06-17 18:03:57 +02:00
Robin Appelman
63c898c064
Make rmdir recursive for local storage
2013-06-17 17:34:09 +02:00
Florian Scholz
efea868704
- removed slash-adding for logout-header-redirect
2013-06-17 14:21:53 +02:00
Georg Ehrke
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
Georg Ehrke
6082a0649c
stream first mb of movie to create preview
2013-06-17 12:27:26 +02:00
Thomas Mueller
383e4c62b5
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing
2013-06-17 00:02:42 +02:00
Thomas Müller
e013e7adea
Merge pull request #3621 from owncloud/path-mimetype
...
seperate mimetype guessing from filename
2013-06-16 13:14:16 -07:00
Thomas Müller
0ac7c5712a
Merge pull request #3721 from owncloud/oracle_setup_fixes
...
Oracle setup fixes
2013-06-14 11:21:02 -07:00
Robin Appelman
f10a4db889
scanner: give more percision about what data is reused during scanning
2013-06-14 16:58:14 +02:00
Jörn Friedrich Dreyer
9498cf959f
remove default tablespace in parameter
2013-06-14 15:54:45 +02:00
Thomas Mueller
1ef66941a7
adding default to $hint within ctor of DatabaseSetupException
2013-06-14 15:38:09 +02:00
Robin Appelman
30c09d0c8b
split of scanning the childs of a folder
2013-06-14 15:35:06 +02:00
Thomas Mueller
5c7d7549ea
coding style
2013-06-14 13:54:41 +02:00
Jörn Friedrich Dreyer
471b9c055a
use executeAudited in sabredav lock
2013-06-14 12:23:44 +02:00
Jörn Friedrich Dreyer
961a001af3
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer
e5d3cd59ac
use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config
2013-06-14 12:09:49 +02:00
Jörn Friedrich Dreyer
dcdabac04d
oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect
2013-06-14 12:06:29 +02:00
Thomas Mueller
87521f6c6e
dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'
2013-06-14 11:59:30 +02:00
Morris Jobke
8d62bb3aab
Merge pull request #3684 from owncloud/pg_install_db_master
...
Try connection with specified db when postgres does not work
2013-06-14 02:50:01 -07:00
Morris Jobke
7093b0829f
improve comment
2013-06-14 11:28:33 +03:00
Thomas Mueller
c8564c0795
Merge branch 'master' into move-maint-start
...
Conflicts:
lib/util.php
2013-06-14 10:06:13 +02:00
Jenkins for ownCloud
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +02:00
Thomas Müller
8edb56de05
Merge pull request #3690 from owncloud/use_execute_audited_in_filecache
...
use executeAudited in files cache
2013-06-13 13:55:55 -07:00
Thomas Müller
2a58cf8117
Merge pull request #3686 from owncloud/minor_exception_cleanup
...
minor cleanup for exception handling
2013-06-13 13:50:31 -07:00
Björn Schießle
7889f2ef5c
Merge pull request #3687 from owncloud/template_updates
...
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
Jörn Friedrich Dreyer
31f7afe56a
PDOException has no previous(), oh the consistency ...
2013-06-13 13:14:00 +02:00
Thomas Müller
54f3174665
Merge pull request #3640 from infoneo/master
...
Folders with multiple periods problem fix
2013-06-13 03:34:36 -07:00
Georg Ehrke
25981a079a
some whitespace fixes
2013-06-13 09:52:39 +02:00
Thomas Mueller
84a8aea410
restore Updater functionality on non-Windows platforms
2013-06-13 00:09:52 +02:00
Jörn Friedrich Dreyer
54f9477f34
fix another double wrapped array
2013-06-12 23:01:52 +02:00
Jörn Friedrich Dreyer
6d55a062be
remove additional array wrapping
2013-06-12 21:23:34 +02:00
Jörn Friedrich Dreyer
d3eadcde56
use executeAudited in files cache
2013-06-12 20:11:53 +02:00
Björn Schießle
7a575cc2d7
short explanation about OC_Defaults
2013-06-12 16:33:09 +02:00
Björn Schießle
839bce80c6
make main menu aware of the different owncloud editions
2013-06-12 16:20:23 +02:00
Björn Schießle
5c6a854489
add default doc url
2013-06-12 16:19:28 +02:00
Georg Ehrke
f89a23b463
implement unknown preview backend
2013-06-12 16:18:16 +02:00
Jörn Friedrich Dreyer
f7dc07602b
minor cleanup for exception handling
2013-06-12 15:48:22 +02:00
Björn Schießle
e1e798c623
make footer and urls aware of ownCloud editions
2013-06-12 15:44:11 +02:00
Björn Schießle
b29e01d5cf
keep all strings in one place to make it easier to change them
2013-06-12 15:15:08 +02:00
eMerzh
e33f68ecb6
Correct escaping
2013-06-12 14:36:28 +02:00
Brice Maron
edc255421c
Try connection with specified db when postgres does not work
...
Conflicts:
lib/setup.php
2013-06-12 14:36:07 +02:00
Georg Ehrke
1f52ad0363
work on powerpoint fallback
2013-06-12 13:20:59 +02:00
Thomas Müller
1abce78cb8
Merge pull request #3654 from owncloud/clean_up_exceptions
...
Introduce more robust SQL execution and exception handling
2013-06-12 04:13:12 -07:00
Georg Ehrke
228e084e65
finish implementation of Excel preview fallback
2013-06-12 11:40:01 +02:00
Jörn Friedrich Dreyer
0eed1c980d
Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
...
fix fetchRow checks to also work with MDB2
2013-06-11 06:20:27 -07:00
Jörn Friedrich Dreyer
e238eeef6f
Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
...
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-11 05:34:55 -07:00
Björn Schießle
118f2b3283
createUser() needs to return something; the user object or false
2013-06-11 13:48:17 +02:00
Georg Ehrke
67816da0bf
save current work state of office fallback
2013-06-11 13:15:24 +02:00
Georg Ehrke
28cf63d37d
check if imagick is loaded in office.php, not in libreoffice-cl.php
2013-06-11 11:00:44 +02:00
Georg Ehrke
2ff97917e9
code optimization
2013-06-11 10:56:16 +02:00
Georg Ehrke
0e4f5001d5
don't crop Y axis
2013-06-11 10:45:50 +02:00
Thomas Mueller
74a170f2a5
[Fixing unit tests in Windows]
...
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below
2013-06-10 19:28:55 +02:00
Thomas Mueller
c0b25a4375
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
2013-06-10 18:47:36 +02:00
Thomas Mueller
073306eaa2
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
error logging has been added in case the given 4path is not found within self::correctFolder
2013-06-10 18:35:47 +02:00
Michael Gapczynski
969e43c87b
Can't determine if debug mode is defined until we read the config
2013-06-10 12:07:25 -04:00
Jörn Friedrich Dreyer
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02:00
Michael Gapczynski
b7b6075d55
Fix potential glob error
2013-06-10 11:42:20 -04:00
Thomas Mueller
988b539dd7
Let's just use '/' as we do almost everywhere - this change fixes two failing unit tests
2013-06-10 17:27:21 +02:00
Morris Jobke
1da112750e
Merge pull request #3647 from owncloud/missing_backticks
...
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
Jörn Friedrich Dreyer
86c5243be5
remove duplicate logging from db.php, now happens in entrypoints
2013-06-10 14:03:12 +02:00
Jörn Friedrich Dreyer
8dc6bdd96b
clean up usage of DatabaseSetupException and catch Exceptions in entrypoints
2013-06-10 13:45:19 +02:00
Jörn Friedrich Dreyer
c0bdbd9d81
introduce and use executeAudited in db.php
2013-06-10 12:56:45 +02:00
Jörn Friedrich Dreyer
d264d0a79d
Merge pull request #3648 from owncloud/sql_limit_as_param
...
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
Björn Schießle
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
Georg Ehrke
25e8ac1c2f
implement previews for single shared files
2013-06-10 11:01:12 +02:00
Jörn Friedrich Dreyer
5ec13742b3
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-10 10:33:02 +02:00
Georg Ehrke
a2bb0faec6
Merge branch 'master' into oc_preview
2013-06-10 10:15:53 +02:00
Jörn Friedrich Dreyer
307f1626e8
convert LIMIT to parameter
2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
infoneo
b39113ae3e
Update mapper.php
...
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
Jenkins for ownCloud
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
Robin Appelman
94ca576c9a
use a getter for the storage loader to ensure the instance is created
2013-06-07 17:50:10 +02:00
Robin Appelman
2708ab09ab
storage loader needs to be accessible by apps
2013-06-07 17:40:19 +02:00
Robin Appelman
85a9b7f094
Storage wrapper: provide access to the wrapped storage
2013-06-07 17:12:45 +02:00
Robin Appelman
f35578ec54
merge master into storage-wrapper
2013-06-07 17:12:16 +02:00
Robin Appelman
bd67512409
manage creating and wrapping storages in it's own class
2013-06-07 17:07:13 +02:00
Michael Gapczynski
9ef989f917
Merge pull request #2919 from owncloud/hook-improvements
...
Hook improvements
2013-06-07 06:35:50 -07:00
Georg Ehrke
8114537310
Merge branch 'master' into oc_preview
2013-06-07 09:46:13 +02:00
Jenkins for ownCloud
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
Robin Appelman
85abede9bf
actually return result
2013-06-07 00:22:05 +02:00
Robin Appelman
0470a5ba94
fix variable name
2013-06-07 00:17:51 +02:00
Robin Appelman
cf7321915d
seperate mimetype guessing from filename
2013-06-06 23:51:44 +02:00
Björn Schießle
fdaab7372e
always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not
2013-06-06 13:30:18 +02:00
Georg Ehrke
85ecec8b01
Merge branch 'master' into oc_preview
2013-06-06 11:13:55 +02:00
Jenkins for ownCloud
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
Georg Ehrke
f80aba4893
use tmpdir var instead of hardcoded /tmp
2013-06-05 12:58:39 +02:00
Georg Ehrke
21cc4f6960
make libreoffice preview backend work :D
2013-06-05 12:45:20 +02:00
Georg Ehrke
8c5fceba29
fix syntax error
2013-06-05 11:13:13 +02:00
Georg Ehrke
bab8b20cbd
use ->cmd instead of hardcoded libreoffice
2013-06-05 11:06:36 +02:00
Georg Ehrke
f437673f1a
update require_once block in preview.php
2013-06-05 10:55:57 +02:00
Georg Ehrke
749c33f39d
escape tmppath shell arg
2013-06-05 10:53:16 +02:00
Georg Ehrke
bcc4fca257
save current work state of libreoffice preview backend
2013-06-05 10:50:20 +02:00
Jenkins for ownCloud
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
Thomas Tanghus
9cd6645037
Move comment and set requesttoken.
2013-06-05 00:38:08 +02:00
Michael Gapczynski
cb9fe475c4
Merge branch 'master' into hook-improvements
...
Conflicts:
lib/files/view.php
2013-06-04 18:19:08 -04:00
Michael Gapczynski
e0359b0b24
One more style fix
2013-06-03 18:17:32 -04:00
Michael Gapczynski
1c61732193
Merge branch 'master' into convert-oc_config
2013-06-03 18:06:13 -04:00
Michael Gapczynski
d50d663928
Style and comment fixes
2013-06-03 18:05:38 -04:00
Arthur Schiwon
c8a2beccb0
Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374
2013-06-03 22:36:36 +02:00
Jörn Friedrich Dreyer
96b1e54d4a
Merge pull request #3444 from owncloud/share-fix
...
Fix undefined index for share mount point retrieval
2013-06-03 11:35:06 -07:00
icewind1991
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
Thomas Tanghus
2572c9a6b7
Merge pull request #3578 from owncloud/ocdialog
...
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-03 06:37:27 -07:00
Robin Appelman
0ce2b2708c
also clear cached users when removing a single backend
2013-06-03 14:19:17 +02:00
Robin Appelman
2a82964830
use caching for userExists
2013-06-03 13:46:05 +02:00
Robin Appelman
83fbdc903f
cast result to bool
2013-06-03 13:39:34 +02:00
Robin Appelman
eb2a1e0f8a
move phpdoc comments
2013-06-03 13:33:56 +02:00
Robin Appelman
1a4021a0fe
User: return backend result
2013-06-03 13:19:01 +02:00
Robin Appelman
fbe3213fec
User: consisten variable naming
2013-06-03 13:17:03 +02:00
Robin Appelman
00b4bfcbf5
User: remove determineDisplayName
2013-06-03 13:15:42 +02:00
Jörn Friedrich Dreyer
b76725c1fa
Merge pull request #3560 from owncloud/init-order-session
...
initialize the session earlier
2013-06-03 03:21:05 -07:00
Georg Ehrke
34decf3576
save current work state
2013-06-03 11:24:37 +02:00
Robin Appelman
38bd234686
make sure the filesystem is setup before doing mount operations
2013-06-02 22:09:44 +02:00
Thomas Tanghus
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
Robin Appelman
b5e817d638
fix clearing mounts when filesystem isn't initialized yet
2013-06-02 21:44:24 +02:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Thomas Müller
1b3c9fe5ae
Merge pull request #3454 from owncloud/fix_hasInternetConnection
...
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
2013-05-31 17:05:45 -07:00
Thomas Mueller
3e00a3603c
adding PHPDoc comment to getManager()
...
adding PHPDoc comment for $user within the hooks callbacks
fixing PHPDoc comment on isLoggedIn()
2013-06-01 00:49:06 +02:00
Robin Appelman
2c69403fd6
fix namespacing error
2013-06-01 00:39:59 +02:00
Robin Appelman
82fd15706e
fix undefined variables
2013-06-01 00:39:59 +02:00
Robin Appelman
e430f442b5
use single quotes
2013-06-01 00:39:59 +02:00
Thomas Mueller
dd4a07321a
fix method naming
2013-05-31 23:24:09 +02:00
icewind1991
94a6622bcd
Merge pull request #3459 from owncloud/fix_for_2377
...
fix problems with german "Umlaut" in folder name
2013-05-31 14:00:02 -07:00
Florin Peter
b840de4e01
user should set into session before postLogin hook otherwise it will break not only the files_encryption app
2013-05-31 21:30:13 +02:00
Robin Appelman
cdb2f559a8
Fix postLogin hook
2013-05-31 19:58:31 +02:00
Robin Appelman
473f3c6916
fix typo
2013-05-31 18:18:13 +02:00
Robin Appelman
f00844a003
fix caching of user objects
2013-05-31 17:42:51 +02:00
Robin Appelman
b8b0b7606a
initialize the session earlier
2013-05-31 17:31:52 +02:00
Robin Appelman
a8fb803319
cache instances of \OC\User\User
2013-05-31 17:31:27 +02:00
Robin Appelman
542bcf9156
Merge branch 'master' into user
2013-05-31 16:35:51 +02:00
Georg Ehrke
a11a40d9a9
add backend for microsoft office 2007 documents
2013-05-31 12:23:51 +02:00
FlorinPeter
d636e168a6
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
...
File encryption external storage fixes
2013-05-31 03:21:46 -07:00
Thomas Tanghus
ad5c4bf771
Cleanup hacke v.2
2013-05-31 00:53:57 +02:00
Thomas Tanghus
e21649ccff
Revert "Clean up hack."
...
This reverts commit 138c7f615b
.
2013-05-31 00:53:15 +02:00
Thomas Tanghus
138c7f615b
Clean up hack.
2013-05-31 00:28:03 +02:00
Michael Gapczynski
bd0d189f6f
Merge branch 'master' into googledrive
2013-05-30 11:20:22 -04:00
Georg Ehrke
f7c80a391d
load getID3 only if needed
2013-05-30 15:29:38 +02:00
Jörn Friedrich Dreyer
476747ee89
Merge pull request #3509 from owncloud/update_jquery_to_1_10
...
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
2013-05-30 06:00:52 -07:00
icewind1991
aa1c5a5d63
Merge pull request #3529 from owncloud/folder-permissions
...
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-30 05:54:29 -07:00
Georg Ehrke
b944b1c5d2
add javascript preview backend
2013-05-30 11:12:12 +02:00
Georg Ehrke
a014662c52
improve imagick error handling
2013-05-30 11:06:52 +02:00
Georg Ehrke
5433a50461
validate size of file
2013-05-30 10:44:27 +02:00
Jenkins for ownCloud
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
Florin Peter
313631edf6
Merge branch 'master' into file_encryption_external_storage_fixes
...
Conflicts:
apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
Michael Gapczynski
dbbf195727
Only retrieve the current user's permissions
2013-05-29 18:08:18 -04:00
Florin Peter
1337f48d64
fixes for pgsql
2013-05-29 20:41:07 +02:00
Morris Jobke
5c04b3a63a
fix wrong signature delimiter - fix #3523
2013-05-29 20:21:48 +02:00
Florin Peter
f1b884aa5d
changed deprecated class
2013-05-29 20:15:04 +02:00
Florin Peter
353d19d183
fixes if cache returns false
2013-05-29 20:11:13 +02:00
Florin Peter
c8d1cd224d
fix $parent/$source typo
2013-05-29 19:58:05 +02:00
Michael Gapczynski
5bbc583b56
Merge pull request #3532 from owncloud/scan-update
...
Only update metadata that has changed
2013-05-29 10:23:41 -07:00
Florin Peter
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
Michael Gapczynski
59655e9afd
Style fixes
2013-05-29 10:56:28 -04:00
Michael Gapczynski
ea55367678
Organize conditionals in a better order
2013-05-29 10:40:05 -04:00
Michael Gapczynski
04805d0be9
Only update metadata that has changed
2013-05-29 10:19:03 -04:00
Robin Appelman
24a401a548
Cache mimetype icons
2013-05-29 15:43:41 +02:00
Björn Schießle
ae0f37e9e2
fix indention
2013-05-29 15:37:27 +02:00
Robin Appelman
44d217c425
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-29 15:25:42 +02:00
Björn Schießle
8587f565d2
remove unnecessary variable
2013-05-29 15:14:15 +02:00
Björn Schießle
63a2bec6e5
use public API for error handling; improved while condition
2013-05-29 14:40:47 +02:00
Björn Schießle
893a1ed6f5
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
2013-05-29 14:19:18 +02:00
Georg Ehrke
d8008ae421
Merge branch 'master' into oc_preview
2013-05-29 13:24:14 +02:00
Georg Ehrke
a76360347c
fix c&p fail
2013-05-29 13:13:47 +02:00
Björn Schießle
672811c103
if one public link share was found, we don't have to check it for the other folders
2013-05-29 13:12:30 +02:00
Georg Ehrke
1e252b6763
more style fixes
2013-05-29 13:11:43 +02:00
Björn Schießle
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
Georg Ehrke
6b90416891
add php preview backend
2013-05-29 13:09:38 +02:00
Georg Ehrke
7408ab660a
respect coding style guidelines
2013-05-29 13:03:33 +02:00
Georg Ehrke
268246fac8
namespace fix
2013-05-29 12:48:21 +02:00
Georg Ehrke
fa6b96090a
move to OC namespace
2013-05-29 12:46:54 +02:00
Georg Ehrke
eebc15dce0
connect preview lib to filesystem hooks
2013-05-29 12:01:43 +02:00
Jenkins for ownCloud
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
Robin Appelman
8320f41dbe
Emit leacgy OC_User hooks
2013-05-29 01:05:49 +02:00
Robin Appelman
3e7e2c8a5c
fix setting getting active userid
2013-05-29 00:47:55 +02:00
Robin Appelman
198655f109
fix User->setHome when the backend action fails
2013-05-29 00:47:44 +02:00
Robin Appelman
4b688db612
implement old user api on top of the new one
2013-05-29 00:32:10 +02:00
Robin Appelman
955bda1842
New user management classes
2013-05-29 00:31:55 +02:00
kondou
1d799f22c1
Default to localhost, if nothing is entered.
2013-05-28 17:34:57 +02:00
Robin Appelman
57f712f8a9
implement ArrayInterface with Session
2013-05-28 16:52:40 +02:00
Georg Ehrke
a03787bc42
make preview cache work with encryption and improve error handling
2013-05-28 16:04:39 +02:00
Robin Appelman
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
Georg Ehrke
08a022aaa4
don't give ffmpeg wanted size, cause it doesn't care about aspect ratio
2013-05-28 12:09:46 +02:00
Georg Ehrke
55b00fe819
make pdf backend work with encryption
2013-05-28 11:59:20 +02:00
Georg Ehrke
738cc48a85
make mp3 backend work with encryption
2013-05-28 11:49:18 +02:00
Georg Ehrke
4d52dfb0a0
make movie backend work with encryption
2013-05-28 11:48:02 +02:00
Georg Ehrke
7555332d58
remove whitespace
2013-05-28 11:31:48 +02:00
Georg Ehrke
5ae1333c76
add preview backend for text based files
2013-05-28 11:29:01 +02:00
Georg Ehrke
707f52f1db
check if the imagick extension is loaded
2013-05-28 10:23:40 +02:00
Georg Ehrke
005d8e9870
update images.php
2013-05-28 10:21:02 +02:00
Jenkins for ownCloud
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
Robin Appelman
040045cc2e
provide a dummy session for CLI
2013-05-28 01:15:38 +02:00
Robin Appelman
f547b66d6b
check fix if session start is successfull
2013-05-28 01:13:36 +02:00
Robin Appelman
e73c04501e
Fix session not working error
2013-05-28 01:10:18 +02:00
Robin Appelman
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
Robin Appelman
76d13120ea
Abstract the session away in a class
2013-05-28 00:50:00 +02:00
Robin Appelman
9e65f40d1b
Add PublicEmitter class
2013-05-27 20:20:06 +02:00
kondou
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
Georg Ehrke
557cc4c1ab
make method names camelCase
2013-05-27 19:24:31 +02:00
Georg Ehrke
d69b7e24d2
update comment
2013-05-27 19:20:29 +02:00
Georg Ehrke
58c9175a56
move check if internet connection is disabled on purpose to a dedicated method
2013-05-27 19:19:17 +02:00
Michael Gapczynski
16925672e8
Merge branch 'master' into googledrive
2013-05-27 11:35:57 -04:00
Michael Gapczynski
0953b68556
Return null if file size is negative for WebDAV, fix #2013
2013-05-27 11:35:31 -04:00
Michael Gapczynski
6151c0d310
Merge pull request #3412 from owncloud/fix_2013
...
Don't set Content-Length header if size is unknown
2013-05-27 07:44:35 -07:00
Georg Ehrke
62411965f9
make svg preview backend work with encryption
2013-05-27 11:09:55 +02:00
Georg Ehrke
f78e002096
make image preview backend work with encryption
2013-05-27 10:45:21 +02:00
Jenkins for ownCloud
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
Jenkins for ownCloud
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
Florin Peter
adcafbde34
Merge branch 'master' into fix_for_2377
2013-05-25 20:37:28 +02:00
Florin Peter
505a300776
we should also normalize on update and search because the database layer will not do this for us
2013-05-25 20:35:12 +02:00
Michael Gapczynski
0fdf3a7e63
Merge pull request #3388 from roha4000/master
...
Duplicate DB entries in filecache table when renaming folder in WebUI #2
2013-05-25 11:18:20 -07:00
Michael Gapczynski
c870aed1b6
Merge pull request #3493 from owncloud/bumpversion
...
Bump version for files_encryption changes
2013-05-25 10:20:42 -07:00
Michael Gapczynski
2893bb9543
Bump version for files_encryption changes
2013-05-25 11:42:28 -04:00
Michael Gapczynski
0a29d2029a
Clear opcode caches after writing to the config file, fixes #3372
2013-05-25 11:25:43 -04:00
Florin Peter
c245f5a99f
added more places where normalization is needed
2013-05-25 14:56:00 +02:00
Florin Peter
f6bf9de6de
prevent for returning while false normalize string
2013-05-25 14:54:36 +02:00
Georg Ehrke
af57996d1e
Merge branch 'master' into oc_preview
2013-05-25 12:16:25 +02:00
Thomas Tanghus
e66f609a64
Hack base.php to make Basic Auth work
2013-05-25 05:51:51 +03:00
Jenkins for ownCloud
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
Bart Visscher
d12e44f96a
Merge branch 'master' into doctrine
...
Conflicts:
lib/MDB2/Driver/sqlite3.php
lib/base.php
lib/db.php
2013-05-24 21:46:42 +02:00
Florin Peter
946e9ccc0a
Merge branch 'master' into fix_for_2377
2013-05-24 20:54:13 +02:00
Florin Peter
736f10039d
changed builtin normalizer to \OC_Util::normalizeUnicode
2013-05-24 20:36:20 +02:00
Florin Peter
661b5501b0
added normalizeUnicode() method to OC_Util
2013-05-24 20:35:01 +02:00
Thomas Müller
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
Alessandro Cosentino
3fbfe3c06a
small typo in the comments
2013-05-23 20:59:02 -04:00
Michael Gapczynski
a98d6c4be6
Merge pull request #3425 from owncloud/move-storages
...
Support for moving/copying folders between storages
2013-05-23 17:35:11 -07:00
Jenkins for ownCloud
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
Florin Peter
d4b700ef4e
revert previous fix and added normalizer to cache class
2013-05-23 20:29:46 +02:00
Michael Gapczynski
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
Michael Gapczynski
3b6d850e59
Switch to calling deleteAll via storage to avoid emitting delete hook
2013-05-23 10:23:16 -04:00
Florin Peter
85e0c78166
fix problems with german "Umlaut" in folder name
2013-05-23 01:21:36 +02:00
Björn Schießle
ee53bd1aa3
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
Georg Ehrke
00985068ca
add previews for public files
2013-05-22 15:13:02 +02:00
Jörn Friedrich Dreyer
1f1abe595d
cleanup codestyle
2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer
cbd5eb9a1a
use to_char only for oracle, whitespace
2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
eceb3c8ed5
add debug output
2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
1b68c0c0cd
allow install when only oracle is available
2013-05-22 13:56:57 +02:00
Georg Ehrke
efb2e69230
fix return value of OC_Util::isinternetconnectionworking()
2013-05-22 12:21:11 +02:00
Morris Jobke
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Roland Hager
2ea2abf11e
Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users.
2013-05-22 08:18:57 +02:00
Michael Gapczynski
7a0c592f93
Fix undefined index for share mount point retrieval
2013-05-21 20:21:19 -04:00
Florin Peter
28d72b822d
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
Thomas Müller
e2444ec9c5
Merge pull request #3266 from owncloud/hooks
...
New hook system
2013-05-21 15:21:25 -07:00
Robin Appelman
81fd1badc3
merge master into filecache_mtime
2013-05-21 23:35:19 +02:00
Jörn Friedrich Dreyer
fb4d8ddf0a
Merge pull request #3335 from owncloud/prevent-scan-loop
...
Prevent backgroundScan() from looping
2013-05-21 09:15:22 -07:00
Michael Gapczynski
c62f230ddb
Merge branch 'master' into move-maint-start
2013-05-21 11:26:56 -04:00
Björn Schießle
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
Georg Ehrke
13c6ef1ba9
add svg backend
2013-05-21 12:23:31 +02:00
Michael Gapczynski
09ff46eda2
Remove user name addition to paths in deleteAll
2013-05-20 10:21:55 -04:00
Thomas Tanghus
c38dc36665
Remove debug output
2013-05-20 13:56:57 +02:00