Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'owncloud/master' into db-convert-tool | Andreas Fischer | 2014-04-09 | 46 | -121/+228 |
|\ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-09 | 2 | -9/+18 |
| * | Merge pull request #8117 from owncloud/fix-hard-coded-uman-str | Thomas Müller | 2014-04-08 | 1 | -5/+6 |
| |\ | |||||
| | * | Make hardcoded exception messages translatable | Volkan Gezer | 2014-04-08 | 1 | -5/+6 |
| * | | Merge pull request #7643 from owncloud/chainable_response | Thomas Müller | 2014-04-08 | 3 | -0/+22 |
| |\ \ | | |/ | |/| | |||||
| | * | Add @return PHPDocs | Thomas Tanghus | 2014-03-10 | 3 | -0/+7 |
| | * | Chainable Response in AppFramework | Thomas Tanghus | 2014-03-09 | 3 | -0/+15 |
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-08 | 2 | -0/+17 |
| * | | using array_key_exists() instead of isset() - required because in case the va... | Thomas Müller | 2014-04-07 | 1 | -1/+1 |
| * | | fixing undefined exception classes | Thomas Müller | 2014-04-07 | 1 | -3/+3 |
| * | | Merge pull request #8088 from owncloud/fix-personal.js | Thomas Müller | 2014-04-07 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | reduce code duplication, fix parse error, prevent page reload on hitting ente... | Thomas Müller | 2014-04-07 | 1 | -0/+1 |
| * | | | Merge pull request #8083 from owncloud/fix-link-to-sync | Thomas Müller | 2014-04-07 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Switch to HTTPS | Lukas Reschke | 2014-04-06 | 1 | -1/+1 |
| | * | | Remove wrong whitespace from URL and use HTTPS | Lukas Reschke | 2014-04-06 | 1 | -1/+1 |
| * | | | Merge pull request #8017 from Raydiation/master | blizzz | 2014-04-07 | 1 | -7/+7 |
| |\ \ \ | |||||
| | * | | | Remove dependency on container, removing service locator antipattern | Bernhard Posselt | 2014-04-02 | 1 | -7/+7 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-07 | 1 | -0/+6 |
| * | | | | Merge pull request #8064 from owncloud/remove-not-existing-functions | Lukas Reschke | 2014-04-06 | 1 | -27/+0 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Removed two unused functions | Lukas Reschke | 2014-04-04 | 1 | -27/+0 |
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-06 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #8055 from owncloud/getfileinfo-exists | icewind1991 | 2014-04-04 | 1 | -0/+3 |
| |\ \ \ | |||||
| | * | | | dont scan not existing files in View->getFileInfo | Robin Appelman | 2014-04-04 | 1 | -0/+3 |
| * | | | | Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey | Vincent Petry | 2014-04-04 | 1 | -5/+0 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Do not expire chunks while checking for their existence | Vincent Petry | 2014-04-03 | 1 | -5/+0 |
| | |/ / | |||||
| * | | | Merge pull request #8015 from owncloud/storageinfo-reuse | Vincent Petry | 2014-04-04 | 1 | -3/+6 |
| |\ \ \ | |||||
| | * | | | Allow reusing FileInfo for getStorageInfo | Robin Appelman | 2014-04-02 | 1 | -3/+6 |
| | |/ / | |||||
| * | | | Merge pull request #7476 from owncloud/type-hinting | Thomas Müller | 2014-04-03 | 15 | -32/+26 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'master' into type-hinting | Bart Visscher | 2014-03-31 | 132 | -3136/+3938 |
| | |\ \ | |||||
| | * | | | More PHPDoc updates | Bart Visscher | 2014-02-28 | 4 | -7/+8 |
| | * | | | Type is with a small letter | Bart Visscher | 2014-02-28 | 1 | -1/+1 |
| | * | | | More PHPDoc fixes, using scrutinizer patches as hints | Bart Visscher | 2014-02-28 | 10 | -19/+14 |
| | * | | | Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N | Bart Visscher | 2014-02-28 | 4 | -27/+26 |
| * | | | | Merge pull request #8006 from wakeup/master | Morris Jobke | 2014-04-02 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix admin-dir_permissions redirection when cannot write warning | Volkan Gezer | 2014-04-02 | 1 | -1/+1 |
| * | | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled | Morris Jobke | 2014-04-02 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 1 | -3/+3 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithroot | Vincent Petry | 2014-04-02 | 1 | -2/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Allow using "/" in "overwritewebroot" | Vincent Petry | 2014-03-31 | 1 | -2/+3 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop | Vincent Petry | 2014-04-02 | 1 | -6/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added missing fclose in file_get_contents and file_put_contents | Vincent Petry | 2014-04-01 | 1 | -1/+4 |
| | * | | | | | Correctly read the full stream in file_get_contents | Vincent Petry | 2014-04-01 | 1 | -5/+2 |
| | |/ / / / | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-02 | 2 | -1/+7 |
| * | | | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available | Thomas Müller | 2014-04-01 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | idn_to_ascii is only used if available | Thomas Müller | 2014-03-26 | 1 | -0/+3 |
| * | | | | | | Merge pull request #7935 from owncloud/getpath-shared | Vincent Petry | 2014-04-01 | 2 | -6/+31 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Improve phpdoc | Robin Appelman | 2014-03-31 | 1 | -1/+3 |
| | * | | | | | Give storages the option to implement the getById behaviour for View->getPath | Robin Appelman | 2014-03-28 | 2 | -6/+29 |
| * | | | | | | Merge pull request #7696 from owncloud/chunk-remainingspacefix | Vincent Petry | 2014-04-01 | 2 | -3/+48 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fixed chunking and insufficient storage check | Vincent Petry | 2014-03-17 | 2 | -3/+48 |