Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6968 from owncloud/files-ajaxload | Morris Jobke | 2014-04-03 | 42 | -1378/+2449 |
|\ | |||||
| * | Correctly set svg for crumb divider | Vincent Petry | 2014-04-03 | 1 | -1/+1 |
| * | Fixed dirInfo check for non existing dir in files ajax call | Vincent Petry | 2014-04-03 | 1 | -1/+1 |
| * | Fixed mime type attribute access in file overwrite dialog | Vincent Petry | 2014-04-03 | 1 | -1/+1 |
| * | Removed redundant free space and upload limit in public page | Vincent Petry | 2014-04-03 | 1 | -4/+0 |
| * | Files, trashbin, public apps use ajax/JSON for the file list | Vincent Petry | 2014-04-02 | 41 | -1369/+2359 |
| * | Fixed parseQueryString to handle empty values and plus signs | Vincent Petry | 2014-04-01 | 2 | -7/+92 |
* | | Exclude javascript specs from code analysis | Thomas Müller | 2014-04-03 | 1 | -0/+1 |
* | | Merge pull request #7476 from owncloud/type-hinting | Thomas Müller | 2014-04-03 | 18 | -37/+34 |
|\ \ | |||||
| * \ | Merge branch 'master' into type-hinting | Bart Visscher | 2014-03-31 | 1700 | -54653/+94701 |
| |\ \ | |||||
| * | | | More PHPDoc updates | Bart Visscher | 2014-02-28 | 5 | -9/+10 |
| * | | | 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 | 12 | -22/+20 |
| * | | | Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N | Bart Visscher | 2014-02-28 | 4 | -27/+26 |
* | | | | Merge pull request #7969 from Xenopathic/files_external_fix | Vincent Petry | 2014-04-03 | 1 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Fix error log spam | Robin McCorkell | 2014-04-03 | 1 | -4/+4 |
* | | | | | Merge pull request #7970 from owncloud/webdav-upload-hash | Thomas Müller | 2014-04-03 | 2 | -2/+21 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix uploading files containing a # in the path for webdav | Robin Appelman | 2014-03-31 | 2 | -2/+21 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-03 | 40 | -119/+145 |
* | | | | | Merge pull request #8014 from owncloud/uploadsize-reuse | icewind1991 | 2014-04-02 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Reuse known free space in the files app | Robin Appelman | 2014-04-02 | 1 | -1/+1 |
* | | | | | | Merge pull request #7978 from owncloud/enc_cleanup | Vincent Petry | 2014-04-02 | 1 | -45/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | there is no need to re-calculate the shares after a touch | Bjoern Schiessle | 2014-03-31 | 1 | -45/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #7995 from owncloud/fix-h3-styles | Morris Jobke | 2014-04-02 | 2 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | fix h3 style, move out from settings to apps CSS | Jan-Christoph Borchardt | 2014-04-02 | 2 | -2/+3 |
* | | | | | | Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib | Vincent Petry | 2014-04-02 | 27 | -723/+1287 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Upgraded phpseclib to version 0.3.6 | Vincent Petry | 2014-04-02 | 27 | -723/+1287 |
* | | | | | | | 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 | 3 | -13/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 3 | -13/+11 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithroot | Vincent Petry | 2014-04-02 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Allow using "/" in "overwritewebroot" | Vincent Petry | 2014-03-31 | 2 | -3/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop | Vincent Petry | 2014-04-02 | 3 | -8/+48 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | 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 | 3 | -7/+44 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-02 | 180 | -3035/+3004 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #7989 from owncloud/files-deletefileregressionfix | Thomas Müller | 2014-04-01 | 2 | -8/+20 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed broken delete file action | Vincent Petry | 2014-04-01 | 2 | -8/+20 |
* | | | | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available | Thomas Müller | 2014-04-01 | 2 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | idn_to_ascii is only used if available | Thomas Müller | 2014-03-26 | 2 | -0/+12 |
* | | | | | | | Merge pull request #7935 from owncloud/getpath-shared | Vincent Petry | 2014-04-01 | 4 | -14/+120 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve phpdoc | Robin Appelman | 2014-03-31 | 2 | -1/+10 |
| * | | | | | | | Implement getPath for shared files | Robin Appelman | 2014-03-28 | 2 | -8/+82 |
| * | | | | | | | Give storages the option to implement the getById behaviour for View->getPath | Robin Appelman | 2014-03-28 | 2 | -6/+29 |
* | | | | | | | | Merge pull request #7817 from owncloud/app-navigation-for-apps | Morris Jobke | 2014-04-01 | 4 | -60/+50 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | apply proposed change | Morris Jobke | 2014-04-01 | 1 | -2/+2 |
| * | | | | | | | | merge CSS rules | Morris Jobke | 2014-03-31 | 1 | -4/+2 |
| * | | | | | | | | Removes highlighting of selected items, padding from apps management. | raghunayyar | 2014-03-30 | 2 | -3/+3 |
| * | | | | | | | | Adds Style changes to app-navigation in core/css/apps.css | raghunayyar | 2014-03-24 | 2 | -4/+13 |