mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
28,547 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

10468 Commits

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