Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | Merge pull request #7975 from owncloud/fix-7973-master-2 | Vincent Petry | 2014-04-01 | 1 | -5/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | remove pl_PL - fixes #7973 | Thomas Müller | 2014-03-31 | 1 | -5/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #7966 from owncloud/url_generation_hack | Morris Jobke | 2014-04-01 | 1 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Check if web root has already been appended | Thomas Tanghus | 2014-03-31 | 1 | -1/+6 |
| |/ / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-01 | 2 | -0/+3 |
* | | | | | | select statement always need to contain file_source respectively item_source | Bjoern Schiessle | 2014-03-31 | 1 | -2/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #7939 from owncloud/wring_redirect_on_login | Vincent Petry | 2014-03-31 | 2 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -1/+1 |
| * | | | | | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -2/+1 |
| * | | | | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 | Thomas Tanghus | 2014-03-28 | 1 | -4/+5 |
* | | | | | | Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master | Morris Jobke | 2014-03-28 | 1 | -3/+11 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | adding @method annotation to declare methods which can be called on the wrapp... | Thomas Müller | 2014-03-28 | 1 | -3/+11 |
* | | | | | | Emit event after setting a new expiration for a share | Morris Jobke | 2014-03-28 | 1 | -1/+8 |
* | | | | | | Merge pull request #7824 from owncloud/hash-parameter-order | Thomas Müller | 2014-03-28 | 3 | -4/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix temporary file based common hash | Robin Appelman | 2014-03-21 | 1 | -2/+1 |
| * | | | | | | Fix parameter order for Storage\Local::hash | Robin Appelman | 2014-03-20 | 2 | -2/+2 |
* | | | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 6 | -1699/+2019 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-25 | 1 | -2/+4 |
| * | | | | | | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-25 | 1 | -2/+7 |
| * | | | | | | | don't assign variables in if condition | Bjoern Schiessle | 2014-03-25 | 1 | -18/+17 |
| * | | | | | | | add todo | Bjoern Schiessle | 2014-03-25 | 1 | -1/+1 |
| * | | | | | | | always return an array | Bjoern Schiessle | 2014-03-25 | 1 | -11/+4 |
| * | | | | | | | seperate formatResults() | Bjoern Schiessle | 2014-03-25 | 1 | -18/+31 |
| * | | | | | | | don't assign variables in if conditions | Bjoern Schiessle | 2014-03-25 | 1 | -2/+4 |
| * | | | | | | | use variable | Bjoern Schiessle | 2014-03-25 | 1 | -6/+5 |
| * | | | | | | | seperate transformDBResults | Bjoern Schiessle | 2014-03-25 | 1 | -24/+33 |
| * | | | | | | | seperate creation of select statement | Bjoern Schiessle | 2014-03-25 | 1 | -38/+44 |