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
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
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
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
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
aa1a0a15ea
Fix use statements
2015-11-30 10:12:15 +01:00
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
6816b36cdb
Add backticks inside function to escape the column
2015-11-30 10:07:00 +01:00
6b7e748245
cache resized avatars
2015-11-28 17:33:16 +01:00
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
4c4331982c
Merge pull request #20789 from owncloud/scanner-skip-not-available
...
Skip unavailable storages in scanner
2015-11-27 22:57:47 +01:00
b666367a79
Added system tags data structure and PHP side managers
...
Added SystemTagManager and SystemTagObjectMapper
2015-11-27 17:54:29 +01:00
b05c8faba8
Dont die when we're missing a route
2015-11-27 14:29:06 +01:00
816cd66b4b
also log exception
2015-11-27 14:28:15 +01:00
bdbefe17d6
Merge pull request #20782 from mitar/better-https
...
Also allow empty value for no-HTTPS
2015-11-27 14:24:23 +01:00
ae71f80f4a
Skip unavailable storages in scanner
2015-11-27 14:02:50 +01:00
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
7aed592957
Add full interface of server container as alias
2015-11-26 18:20:25 +01:00
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
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
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
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
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
5a33390a69
Merge pull request #20731 from owncloud/per-storage-updater
...
Make Cache\Updater per storage
2015-11-26 12:01:44 +01:00
0b8296a756
remove unused method
2015-11-26 10:58:30 +01:00
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
9318606faf
Remove last occurences of OC_Helper::getMimeType()
...
* ref #4774
2015-11-26 10:18:32 +01:00
b799e42b4e
Introduce \OCP\IUser::getEMailAddress()
2015-11-25 22:23:34 +01:00
9ec2f8886e
Merge pull request #20691 from owncloud/share2.0_di_fixes
...
[Sharing 2.0] di fixes
2015-11-25 15:25:50 +01:00
afe76840f8
Merge pull request #20705 from owncloud/fix_20648
...
Fix overriding function from 3rdparty warning
2015-11-25 15:24:20 +01:00
b025f07fb7
Make Cache\Updater per storage
2015-11-25 14:16:00 +01:00
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
89b9f5518b
Merge pull request #20636 from owncloud/savre-3.0
...
sabre/dav 3.0 and related
2015-11-24 16:20:48 +01:00
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
ae36c01b95
Adjust sabre changes in core
2015-11-24 15:11:54 +01:00
cfdf2b9976
Fix overriding function from 3rdparty warning
...
Fixes #20648
2015-11-24 13:25:50 +01:00
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
85976b7293
[Sharing 2.0] Fix phpdoc etc
2015-11-24 10:26:36 +01:00
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
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
018bd3ee24
Make sure that object id can be a string
2015-11-23 14:18:15 +01:00
728648ad77
Replace new occurences of ini_get with IniWrapper methods
2015-11-23 14:12:36 +01:00
9caf4ffbfc
Replacing ini_get instances with inigetwrapper usages
2015-11-23 14:12:31 +01:00
021137d7ae
Merge pull request #20679 from owncloud/fixphpdoc
...
p() supports string as argument
2015-11-23 13:32:46 +01:00
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
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
1c7d7288c4
Add a method to select a field or value with alias
2015-11-23 13:28:31 +01:00
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
7138659080
p() supports string as argument
2015-11-23 12:11:23 +01:00
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
9f69021691
lastInsertId() is properly working with Oracle if the table name is properly passed in
2015-11-23 11:44:08 +01:00
a370c29068
Use a DateTime object instead of a timestamp
2015-11-23 11:41:48 +01:00
1835462ec4
reuse code
2015-11-23 11:02:46 +01:00
79bbda994b
Merge pull request #16902 from owncloud/jsocclient
...
Web UI uses Webdav instead of ajax/* calls
2015-11-23 09:38:01 +01:00
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
2d7c9f0ba9
also match ie11 with Request::USER_AGENT_IE
2015-11-22 16:05:52 +01:00
a05e40932c
Now using IE8 workaround of davclient.js for all IE versions
2015-11-22 16:05:52 +01:00
358858c9e3
Fix undefined HTTP_USER_AGENT
2015-11-22 16:05:50 +01:00
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
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
c86483f3ed
Adjust PHPDoc as suggested
2015-11-20 14:38:29 +01:00
c565a7b042
Fix failing unit test 💀
2015-11-19 16:44:43 +01:00
9ec2850c78
Use mocks when testing isSharingDisabledForUser
2015-11-19 15:36:16 +01:00
ca6bd5cacd
Follow the interface again
2015-11-19 14:34:59 +01:00
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
d006a7c723
Fix scanning of incomplete folders
2015-11-19 13:30:50 +01:00
02f847bc66
use relative path
2015-11-19 13:30:50 +01:00
d5061b8139
fix fileinfo for non existing files
2015-11-19 13:30:50 +01:00
1736c70075
Some more cleanup for getFIleInfo/getDirectoryContent
2015-11-19 13:30:50 +01:00
02be8a3a12
Split getting cache entry and checking update to a seperate method
2015-11-19 13:29:12 +01:00
1189528e1f
Always installed apps includes the hardcoded ones from shipped.json
...
* fixes #20568
2015-11-19 09:11:14 +01:00
71b86c0ed4
Handle non existing users as owner in the view
2015-11-18 17:08:18 +01:00
8d74e28af6
Merge pull request #20438 from owncloud/memcache-key-length-fix
...
Handle errors on memcached level
2015-11-18 14:20:57 +01:00
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
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
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
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
e2cfcd992c
Allow storage wrappers to through a forbidden exception with retry information
2015-11-17 10:39:52 +01:00
2fde6a77d7
Add tests for the "return $this" and fix it on the new method
2015-11-17 09:26:13 +01:00
705d208a8a
Merge pull request #20539 from owncloud/notification-api-adjustment
...
Notification api update
2015-11-17 08:39:06 +01:00
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
6ffd042a64
fixes #20538
2015-11-16 16:29:21 +01:00
40d5d55124
Remove the icon for now
2015-11-16 16:17:23 +01:00
1666af89c2
Add "is primary action" to actions
2015-11-16 16:14:52 +01:00
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
1e9fc33212
[Share2.0] OCS Share API getShare uses new code
2015-11-16 13:32:28 +01:00
cc1db4ba87
assume pgsql >=9 if checking the version fails
2015-11-16 13:11:32 +01:00
7ab56de58b
move form styles from styles.css to inputs.css
2015-11-13 00:19:57 +01:00
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
d0464bf772
enable microseconds in log timestamps
2015-11-12 10:33:20 +01:00
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
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
c9753655dc
Do not use the asset pipeline when doing updates
2015-11-11 18:18:33 +01:00
c9b671a12f
Handle errors on memcached level - fixes #17397
2015-11-10 15:58:17 +01:00
331ef0e3c0
Add getOwner to FileInfo
2015-11-10 10:55:29 +01:00
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
960c8cb5bc
Merge pull request #16604 from owncloud/cache-escape-like
...
escape like parameter in cache operations
2015-11-10 09:45:00 +01:00
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
402e0afbc5
Fix Error message when sharing outside of group
...
For #19788
2015-11-09 15:52:17 +01:00
045ea4eb2b
Use native CSPRNG if available
...
Unfortunately only PHP 7…
2015-11-09 15:04:22 +01:00
fe04451cb1
Do not allow two different version requirements
2015-11-09 11:10:37 +01:00
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
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
292dc553c3
Make sure that group names are strings not integers
2015-11-06 10:40:09 +01:00
d36e1bbab2
escape like parameter for move queries
2015-11-05 16:41:33 +01:00
d514200b56
Add escapeLikeParameter to IDBConnection
2015-11-05 16:41:30 +01:00
b05e1b6ed3
define escape character for like statements on oracle
2015-11-05 16:29:35 +01:00
b394fe8709
define escape character for like statements on sqlite
2015-11-05 16:28:54 +01:00
236c3c62cc
move from OC_DB to IDBConnection
2015-11-05 16:25:02 +01:00
0be05fdddd
Add unshare hooks
2015-11-05 15:59:09 +01:00
6624fa212a
The new sharing code now handles deletion
...
OCS -> ShareManager -> DefaultShareProvider
2015-11-05 15:59:09 +01:00
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
51ead4e59b
subadmin methods should not return any null user or group
2015-11-05 11:50:57 +01:00
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
a2cfbd975a
mark path as checked
2015-11-04 16:34:39 +01:00
c487f0f138
when a file is locked use old cache data
2015-11-04 14:45:10 +01:00
bb216feeb2
Merge pull request #18361 from owncloud/sharing_performance_improvements
...
improve calculation of share recipients
2015-11-04 14:44:31 +01:00
0a56313ca4
fix whitespace
2015-11-04 14:41:03 +01:00
6d0a324144
make sure that we update the unencrypted size for the versions
2015-11-04 10:59:05 +01:00
c59ca9203d
Merge pull request #18821 from owncloud/global-classes
...
Global classes in core CSS
2015-11-04 10:30:10 +01:00
4719305e3b
cache result from parent folders
2015-11-04 09:27:29 +01:00
fc7f7e5c37
only lock in getDirectoryContent if we need to update the cache
2015-11-03 18:23:22 +01:00
4f2656993e
only lock in getFileInfo if we need to update the cache
2015-11-03 18:23:22 +01:00
0397871f7e
Split checkUpdate
2015-11-03 18:23:22 +01:00
b2a437ffff
Add a new core capability which tells the clients which url to use
2015-11-03 14:27:36 +01:00
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
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
b6ca23afe1
Merge pull request #20189 from owncloud/use-get-http-protocol
...
Use getHttpProtocol instead of $_SERVER
2015-11-02 10:13:41 +01:00
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
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
bafb86fb9f
Use getHttpProtocol instead of $_SERVER
2015-10-30 18:05:30 +01:00
ef76998eda
Add warning for broken l10n json files
...
* makes it easier to spot broken l10n files
2015-10-30 09:10:16 +01:00
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
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
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
01d3393b7b
include the final update in the transaction when moving a folder in the cache
2015-10-29 12:34:49 +01:00
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
c6f6a8758b
Drop OC_SubAdmin and replace usages
2015-10-29 11:31:18 +01:00
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
33eb13e415
The root of a storage always exists
2015-10-29 11:21:50 +01:00
6feb31bf96
Allow separate templates for internal and external share notifications
2015-10-29 10:24:24 +01:00
e5a7e3124a
Add a repair step that checks for group membership on shares
2015-10-29 09:26:26 +01:00
8ad3df9b9e
Merge pull request #19182 from cweiske/support-bzip2
...
Fix #19181 : Support .bz2 app archives
2015-10-28 14:05:11 +01:00
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
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
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
8f09d5b67c
Update license headers
2015-10-26 14:04:01 +01:00
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
2038b2ec34
Fail hard if shipped.json is missing
2015-10-26 09:53:04 +01:00
5a5bcccd0d
Don't show apps which are always enabled in the app manager
2015-10-26 09:53:04 +01:00
Thomas Müller
Lukas Reschke
Joas Schilling
Robin Appelman
Robin Appelman
Vincent Petry
Mitar
Morris Jobke
Roeland Jago Douma
Björn Schießle
Clark Tomlinson
Individual IT Services
Hendrik Leppelsack
Christian Schnidrig
Arthur Schiwon
Bjoern Schiessle
Raghu Nayyar
Stephen Colebrook