summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20789 from owncloud/scanner-skip-not-availableRobin Appelman2015-11-271-2/+17
|\ | | | | Skip unavailable storages in scanner
| * also log exceptionRobin Appelman2015-11-271-0/+1
| |
| * Skip unavailable storages in scannerRobin Appelman2015-11-271-2/+16
| |
* | Merge pull request #20792 from owncloud/autoloader-absolute-pathsThomas Müller2015-11-271-1/+5
|\ \ | | | | | | Dont bother with stream_resolve_include_path if the path is already absolute
| * | Dont bother with stream_resolve_include_path if the path is already absoluteRobin Appelman2015-11-271-1/+5
| |/
* | Merge pull request #20782 from mitar/better-httpsThomas Müller2015-11-271-1/+2
|\ \ | | | | | | Also allow empty value for no-HTTPS
| * | Also allow empty value for no-HTTPS.Mitar2015-11-271-1/+2
| |/ | | | | | | This makes it work better with old version of Nginx.
* / Add full interface of server container as aliasMorris Jobke2015-11-261-0/+1
|/
* Merge pull request #20602 from owncloud/fix-installed-appsThomas Müller2015-11-261-0/+6
|\ | | | | Always installed apps includes the hardcoded ones from shipped.json
| * Always installed apps includes the hardcoded ones from shipped.jsonMorris Jobke2015-11-191-0/+6
| | | | | | | | * fixes #20568
* | Merge pull request #20702 from owncloud/move-user-principal-into-subfolderThomas Müller2015-11-262-0/+18
|\ \ | | | | | | Users are available under it's own principal resource named 'principa…
| * | Introduce \OCP\IUser::getEMailAddress()Thomas Müller2015-11-252-0/+18
| | |
* | | Merge pull request #20393 from owncloud/querybuilder-select-with-aliasThomas Müller2015-11-262-0/+42
|\ \ \ | | | | | | | | Add a method to select a field or value with alias
| * | | Add a method to select a field or value with aliasJoas Schilling2015-11-232-0/+42
| | | |
* | | | Merge pull request #20746 from owncloud/untangle-linkToDocsThomas Müller2015-11-265-17/+16
|\ \ \ \ | | | | | | | | | | Untangle the linkToDocs method in OC_Helper
| * | | | Untangle the linkToDocs method in OC_HelperMorris Jobke2015-11-265-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | * now uses the proper URLGenerator interface * add comment about DI problems
* | | | | Merge pull request #20562 from owncloud/comments-interfacesThomas Müller2015-11-264-0/+378
|\ \ \ \ \ | |/ / / / |/| | | | public interfaces for Comments
| * | | | proper description for IllegalIDChangeExceptionArthur Schiwon2015-11-261-1/+1
| | | | |
| * | | | missing setters for setChildrenCount and setLatestChildDateTime (formerly ↵Arthur Schiwon2015-11-231-5/+23
| | | | | | | | | | | | | | | | | | | | …Timestamp)
| * | | | give creation datetime setter and getter a more meaningful and less ↵Arthur Schiwon2015-11-231-5/+5
| | | | | | | | | | | | | | | | | | | | misleading name
| * | | | public interfaces for CommentsArthur Schiwon2015-11-234-0/+360
| | | | |
* | | | | Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanupThomas Müller2015-11-264-15/+3
|\ \ \ \ \ | | | | | | | | | | | | Remove last occurences of OC_Helper::getMimeType()
| * | | | | remove unused methodMorris Jobke2015-11-261-12/+0
| | | | | |
| * | | | | Remove last occurences of OC_Helper::getMimeType()Morris Jobke2015-11-263-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | * ref #4774
* | | | | Merge pull request #20731 from owncloud/per-storage-updaterThomas Müller2015-11-265-114/+144
|\ \ \ \ \ | | | | | | | | | | | | Make Cache\Updater per storage
| * | | | | Make Cache\Updater per storageRobin Appelman2015-11-255-114/+144
| | | | | |
* | | | | | Remove unused internal methodsMorris Jobke2015-11-262-33/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | * removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace * keeps public interface wrapper working as expected
* | | | | Merge pull request #20691 from owncloud/share2.0_di_fixesThomas Müller2015-11-255-85/+64
|\ \ \ \ \ | | | | | | | | | | | | [Sharing 2.0] di fixes
| * | | | | [Sharing 2.0] Fix phpdoc etcRoeland Jago Douma2015-11-245-40/+47
| | | | | |
| * | | | | [Sharing 2.0] Default share provider only generic DIRoeland Jago Douma2015-11-241-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [Sharing 2.0] Removed unused DI stuffRoeland Jago Douma2015-11-241-36/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The share manager etc should not care about filtering stuff. They should return what is asked for them.
* | | | | | Merge pull request #20705 from owncloud/fix_20648Thomas Müller2015-11-251-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix overriding function from 3rdparty warning
| * | | | | Fix overriding function from 3rdparty warningRoeland Jago Douma2015-11-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #20648
* | | | | | Merge pull request #20439 from owncloud/etag-propagate-in-storageThomas Müller2015-11-258-110/+242
|\ \ \ \ \ \ | | | | | | | | | | | | | | Take submount etag into account for folder etags
| * | | | | | take the etag of child mounts into account for the folder etagRobin Appelman2015-11-198-21/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this replaces shared etag propagation
| * | | | | | Fix scanning of incomplete foldersRobin Appelman2015-11-191-1/+1
| | | | | | |
| * | | | | | use relative pathRobin Appelman2015-11-191-1/+1
| | | | | | |
| * | | | | | fix fileinfo for non existing filesRobin Appelman2015-11-191-0/+4
| | | | | | |
| * | | | | | Some more cleanup for getFIleInfo/getDirectoryContentRobin Appelman2015-11-192-39/+42
| | | | | | |
| * | | | | | Split getting cache entry and checking update to a seperate methodRobin Appelman2015-11-191-58/+46
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #20636 from owncloud/savre-3.0Thomas Müller2015-11-241-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | sabre/dav 3.0 and related
| * | | | | | Adjust sabre changes in coreThomas Müller2015-11-241-3/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #20692 from owncloud/federation_auto_add_serversThomas Müller2015-11-241-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | auto-add ownClouds to the list of trusted servers
| * | | | | use hooks to auto add server to the list of trusted servers once a federated ↵Björn Schießle2015-11-241-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | share was created
* | | | | Merge pull request #20693 from owncloud/phpdoc_nodeThomas Müller2015-11-241-8/+0
|\ \ \ \ \ | | | | | | | | | | | | Consistent interface declaration OCP\Files\Node
| * | | | | Consistent interface declarationRoeland Jago Douma2015-11-231-8/+0
| |/ / / /
* | | | | Merge pull request #20682 from owncloud/objectid-to-stringThomas Müller2015-11-242-10/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | Make sure that object id can be a string
| * | | | Make sure that object id can be a stringJoas Schilling2015-11-232-10/+14
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-11-2484-158/+6
|/ / /
* | | Merge pull request #20679 from owncloud/fixphpdocThomas Müller2015-11-231-1/+1
|\ \ \ | | | | | | | | p() supports string as argument