summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* 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-261-0/+10
|\ \ | | | | | | Users are available under it's own principal resource named 'principa…
| * | Introduce \OCP\IUser::getEMailAddress()Thomas Müller2015-11-251-0/+10
| | |
* | | Merge pull request #20393 from owncloud/querybuilder-select-with-aliasThomas Müller2015-11-261-0/+24
|\ \ \ | | | | | | | | Add a method to select a field or value with alias
| * | | Add a method to select a field or value with aliasJoas Schilling2015-11-231-0/+24
| | | |
* | | | Untangle the linkToDocs method in OC_HelperMorris Jobke2015-11-264-15/+11
| | | | | | | | | | | | | | | | | | | | * now uses the proper URLGenerator interface * add comment about DI problems
* | | | Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanupThomas Müller2015-11-263-14/+2
|\ \ \ \ | | | | | | | | | | 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-262-2/+2
| | |/ / | |/| | | | | | | | | | * 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-261-31/+0
| |/ / / |/| | | | | | | | | | | | | | | * 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
* / | | Make sure that object id can be a stringJoas Schilling2015-11-232-10/+14
|/ / /
* | | Merge pull request #20679 from owncloud/fixphpdocThomas Müller2015-11-231-1/+1
|\ \ \ | | | | | | | | p() supports string as argument
| * | | p() supports string as argumentMorris Jobke2015-11-231-1/+1
| | | |
* | | | Merge pull request #20617 from owncloud/fix-usage-of-lastInsertIdThomas Müller2015-11-233-18/+5
|\ \ \ \ | | | | | | | | | | lastInsertId() is properly working with Oracle if the table name is p…
| * | | | Throw an exception in case no table name is passed into lastInsertId of the ↵Thomas Müller2015-11-232-2/+4
| | | | | | | | | | | | | | | | | | | | Oracle adapter
| * | | | lastInsertId() is properly working with Oracle if the table name is properly ↵Thomas Müller2015-11-231-16/+1
| |/ / / | | | | | | | | | | | | passed in
* | | | Merge pull request #20543 from owncloud/share2.0_fix_hooksThomas Müller2015-11-233-49/+93
|\ \ \ \ | |_|_|/ |/| | | Move hook and delete children logic to share manager
| * | | [Sharing 2.0] Move hook and delete children logic to share managerRoeland Jago Douma2015-11-233-49/+93
| |/ / | | | | | | | | | | | | | | | | | | To make sure hooks are always fired and child entries are always cleaned. This logic is moved to the share manager. * Updated unit tests
* / / Use a DateTime object instead of a timestampJoas Schilling2015-11-232-22/+23
|/ /
* | Merge pull request #16902 from owncloud/jsocclientThomas Müller2015-11-232-3/+13
|\ \ | | | | | | Web UI uses Webdav instead of ajax/* calls
| * | also match ie11 with Request::USER_AGENT_IERobin Appelman2015-11-221-1/+1
| | |
| * | Now using IE8 workaround of davclient.js for all IE versionsVincent Petry2015-11-221-2/+2
| | |
| * | Fix undefined HTTP_USER_AGENTThomas Müller2015-11-221-0/+3
| | |
| * | Add evert's davclient.js + es6-promise + IE8 workaroundVincent Petry2015-11-221-2/+9
| | | | | | | | | | | | | | | | | | - Add davclient.js lib - Add es6-promise required by that lib - Wrote IE8 workaround lib/shim for davclient.js
* | | Merge pull request #20524 from owncloud/pgsql-version-check-errorThomas Müller2015-11-231-6/+3
|\ \ \ | |/ / |/| | assume pgsql >=9 if checking the version fails
| * | assume pgsql >=9 if checking the version failsRobin Appelman2015-11-161-6/+3
| | |
* | | Merge pull request #20614 from ↵Thomas Müller2015-11-205-12/+21
|\ \ \ | | | | | | | | | | | | | | | | owncloud/use-mocks-when-testing-isSharingDisabledForUser Use mocks when testing isSharingDisabledForUser
| * | | Adjust PHPDoc as suggestedThomas Müller2015-11-202-2/+2
| | | |
| * | | Fix failing unit test :skull:Thomas Müller2015-11-191-1/+1
| | | |
| * | | Use mocks when testing isSharingDisabledForUserThomas Müller2015-11-194-10/+19
| | |/ | |/|