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

10494 commits

Author SHA1 Message Date
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
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
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