summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'owncloud/master' into db-convert-toolAndreas Fischer2014-04-0946-121/+228
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2014-04-092-9/+18
| * Merge pull request #8117 from owncloud/fix-hard-coded-uman-strThomas Müller2014-04-081-5/+6
| |\
| | * Make hardcoded exception messages translatableVolkan Gezer2014-04-081-5/+6
| * | Merge pull request #7643 from owncloud/chainable_responseThomas Müller2014-04-083-0/+22
| |\ \ | | |/ | |/|
| | * Add @return PHPDocsThomas Tanghus2014-03-103-0/+7
| | * Chainable Response in AppFrameworkThomas Tanghus2014-03-093-0/+15
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-04-082-0/+17
| * | using array_key_exists() instead of isset() - required because in case the va...Thomas Müller2014-04-071-1/+1
| * | fixing undefined exception classesThomas Müller2014-04-071-3/+3
| * | Merge pull request #8088 from owncloud/fix-personal.jsThomas Müller2014-04-071-0/+1
| |\ \
| | * | reduce code duplication, fix parse error, prevent page reload on hitting ente...Thomas Müller2014-04-071-0/+1
| * | | Merge pull request #8083 from owncloud/fix-link-to-syncThomas Müller2014-04-071-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Switch to HTTPSLukas Reschke2014-04-061-1/+1
| | * | Remove wrong whitespace from URL and use HTTPSLukas Reschke2014-04-061-1/+1
| * | | Merge pull request #8017 from Raydiation/masterblizzz2014-04-071-7/+7
| |\ \ \
| | * | | Remove dependency on container, removing service locator antipatternBernhard Posselt2014-04-021-7/+7
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-071-0/+6
| * | | | Merge pull request #8064 from owncloud/remove-not-existing-functionsLukas Reschke2014-04-061-27/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Removed two unused functionsLukas Reschke2014-04-041-27/+0
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-061-1/+1
| |/ / /
| * | | Merge pull request #8055 from owncloud/getfileinfo-existsicewind19912014-04-041-0/+3
| |\ \ \
| | * | | dont scan not existing files in View->getFileInfoRobin Appelman2014-04-041-0/+3
| * | | | Merge pull request #8039 from owncloud/chunking-removeexpireinhaskeyVincent Petry2014-04-041-5/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Do not expire chunks while checking for their existenceVincent Petry2014-04-031-5/+0
| | |/ /
| * | | Merge pull request #8015 from owncloud/storageinfo-reuseVincent Petry2014-04-041-3/+6
| |\ \ \
| | * | | Allow reusing FileInfo for getStorageInfoRobin Appelman2014-04-021-3/+6
| | |/ /
| * | | Merge pull request #7476 from owncloud/type-hintingThomas Müller2014-04-0315-32/+26
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into type-hintingBart Visscher2014-03-31132-3136/+3938
| | |\ \
| | * | | More PHPDoc updatesBart Visscher2014-02-284-7/+8
| | * | | Type is with a small letterBart Visscher2014-02-281-1/+1
| | * | | More PHPDoc fixes, using scrutinizer patches as hintsBart Visscher2014-02-2810-19/+14
| | * | | Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10NBart Visscher2014-02-284-27/+26
| * | | | Merge pull request #8006 from wakeup/masterMorris Jobke2014-04-021-1/+1
| |\ \ \ \
| | * | | | Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
| * | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-021-3/+3
| |\ \ \ \ \
| | * | | | | always encrypt files to ownerBjoern Schiessle2014-03-311-3/+3
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithrootVincent Petry2014-04-021-2/+3
| |\ \ \ \ \
| | * | | | | Allow using "/" in "overwritewebroot"Vincent Petry2014-03-311-2/+3
| | |/ / / /
| * | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloopVincent Petry2014-04-021-6/+6
| |\ \ \ \ \
| | * | | | | Added missing fclose in file_get_contents and file_put_contentsVincent Petry2014-04-011-1/+4
| | * | | | | Correctly read the full stream in file_get_contentsVincent Petry2014-04-011-5/+2
| | |/ / / /
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-022-1/+7
| * | | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-availableThomas Müller2014-04-011-0/+3
| |\ \ \ \ \
| | * | | | | idn_to_ascii is only used if availableThomas Müller2014-03-261-0/+3
| * | | | | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-012-6/+31
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Improve phpdocRobin Appelman2014-03-311-1/+3
| | * | | | | Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-03-282-6/+29
| * | | | | | Merge pull request #7696 from owncloud/chunk-remainingspacefixVincent Petry2014-04-012-3/+48
| |\ \ \ \ \ \
| | * | | | | | Fixed chunking and insufficient storage checkVincent Petry2014-03-172-3/+48