Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-06 | 236 | -1711/+1700 |
| | |||||
* | ownCloud 6 beta 3v6.0.0beta3 | Frank Karlitschek | 2013-11-06 | 1 | -2/+2 |
| | |||||
* | Merge pull request #5399 from frisco82/fixDownloadOverQuota | Morris Jobke | 2013-11-06 | 1 | -35/+30 |
|\ | | | | | Do not count the size of shared folder on total | ||||
| * | Do not count the size of shared folder on total | Ramiro Aparicio | 2013-11-06 | 1 | -35/+30 |
| | | | | | | | | | | | | Changed all array access to dot notation Split comment in a second line | ||||
* | | Merge pull request #5718 from owncloud/fixLdapBgJob | Vincent Petry | 2013-11-06 | 1 | -4/+4 |
|\ \ | | | | | | | LDAP: resolve namespace harakiri, fixes background job | ||||
| * | | LDAP: resolve namespace harakiri, fixes background job | Arthur Schiwon | 2013-11-06 | 1 | -4/+4 |
|/ / | |||||
* | | Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperations | Morris Jobke | 2013-11-06 | 4 | -14/+59 |
|\ \ | | | | | | | Fixes for "max upload size" value showed in the UI | ||||
| * | | Fixed storage stats to be based on current directory | Vincent Petry | 2013-11-06 | 3 | -8/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | Previously, the storage statistics were always for the root dir. This means that the upload button would always show the limit for the root dir, even when uploading to a shared dir or external storage. This fix adds a "dir" argument to getstoragestats.php. | ||||
| * | | Update quota value in client after scan and upload | Vincent Petry | 2013-11-06 | 3 | -13/+33 |
| | | | | | | | | | | | | | | | | | | After uploading, the quota value wasn't refreshed. This fix refreshes the quota value after files have been scanned or uploaded. | ||||
* | | | Merge pull request #5717 from owncloud/files-foldericonforhomestorage | Vincent Petry | 2013-11-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed folder icon for home storage | ||||
| * | | | Fixed folder icon for home storage | Vincent Petry | 2013-11-06 | 1 | -1/+1 |
|/ / / | | | | | | | | | | Fixes #5713 | ||||
* | | | Merge pull request #5716 from owncloud/full-name | Vincent Petry | 2013-11-06 | 3 | -5/+5 |
|\ \ \ | |/ / |/| | | change 'Display Name' to more understandable 'Full Name', fix #5612 | ||||
| * | | change 'Display Name' to more understandable 'Full Name', fix #5612 | Jan-Christoph Borchardt | 2013-11-06 | 3 | -5/+5 |
|/ / | |||||
* | | Merge pull request #5692 from miicha/patch-2 | VicDeo | 2013-11-05 | 1 | -1/+1 |
|\ \ | | | | | | | allow empty user-dn and password | ||||
| * | | allows agent and password or neither agent nor password | miicha | 2013-11-05 | 1 | -1/+1 |
| | | | | | | | | | this contribution is MIT licensed | ||||
| * | | allow empty user-dn and password | miicha | 2013-11-05 | 1 | -1/+1 |
| | | | | | | | | | help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings... | ||||
* | | | Merge pull request #5691 from owncloud/switch-to-oc6-documentation | blizzz | 2013-11-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | move to oc6 documentation | ||||
| * | | | move to oc6 documentation | Thomas Müller | 2013-11-04 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #5696 from owncloud/fixing-5670-master | Andreas Fischer | 2013-11-05 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | decode arguments as array * owncloud/fixing-5670-master: decode arguments as array | ||||
| * | | | decode arguments as array | Thomas Müller | 2013-11-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5699 from owncloud/fixing-4606-master | Thomas Müller | 2013-11-05 | 1 | -17/+19 |
|\ \ \ \ | | | | | | | | | | | calling getstoragestats.php only if a user is logged in because this cal... | ||||
| * | | | | calling getstoragestats.php only if a user is logged in because this call ↵ | Thomas Müller | 2013-11-05 | 1 | -17/+19 |
| |/ / / | | | | | | | | | | | | | requires a user to be logged in | ||||
* | | | | Merge pull request #5695 from owncloud/fixing-dropbox-master | Thomas Müller | 2013-11-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | fixing dropbox require path | ||||
| * | | | fixing dropbox require path | Thomas Müller | 2013-11-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5582 from owncloud/files-previewcaching | Thomas Müller | 2013-11-05 | 11 | -47/+80 |
|\ \ \ \ | | | | | | | | | | | Append file etag to preview URLs | ||||
| * | | | | Added missing comma to make the next diff cleaner | Vincent Petry | 2013-10-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed preview URL + size while dragging an existing file | Vincent Petry | 2013-10-28 | 2 | -3/+5 |
| | | | | | |||||
| * | | | | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 10 | -44/+75 |
| | | | | | | | | | | | | | | | | | | | | Fixes #5534 | ||||
* | | | | | Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master | Thomas Müller | 2013-11-05 | 4 | -12/+7 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Oc6 windows server mssql master | ||||
| * | | | | Inherit lastInsertId() from Adapter. | Andreas Fischer | 2013-11-04 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | adding test for binary file to test \OC_Helper::streamCopy() | Thomas Mueller | 2013-11-04 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | ignore test files | Thomas Mueller | 2013-11-04 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | WIN: fixing unit test for testStreamCopy() | Thomas Mueller | 2013-11-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | WIN: fixing Fatal error: Call to a member function logicToPhysical() on a ↵ | Thomas Mueller | 2013-11-02 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311 | ||||
| * | | | | mssql: fixing lastInsertId() implementation | Thomas Mueller | 2013-11-02 | 1 | -4/+2 |
| | | | | | |||||
* | | | | | Merge pull request #5540 from owncloud/scanner-enhancments-master | Thomas Müller | 2013-11-04 | 3 | -3/+21 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Scanner enhancments master | ||||
| * | | | | use === | Thomas Müller | 2013-11-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | set log level to DEBUG | Thomas Müller | 2013-11-04 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | using array_diff_assoc to detect diffs in values as well | Thomas Müller | 2013-10-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | cast storage_mtime to int | Thomas Müller | 2013-10-25 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | adding storage_mtime handling to SharedCache | Thomas Müller | 2013-10-25 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | log the data arrays | Thomas Müller | 2013-10-24 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | some logging added .... | Thomas Müller | 2013-10-24 | 1 | -2/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #5683 from owncloud/no-coverage-with-php-v53-master | Thomas Müller | 2013-11-04 | 1 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | adding environment variable to control coverage reporting | ||||
| * | | | | keep junit xml reports | Thomas Müller | 2013-11-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | adding environment variable to control coverage reporting | Thomas Müller | 2013-11-04 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Merge pull request #5544 from owncloud/fixing-3593-2-master | Thomas Müller | 2013-11-04 | 2 | -1/+17 |
|\ \ \ \ | | | | | | | | | | | Add FileId header and switch fileid and instance id | ||||
| * | | | | add header 'OC-FileId' on PUT | Thomas Müller | 2013-10-25 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | switch instance id and file id | Thomas Müller | 2013-10-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5656 from owncloud/fix-wizard-typo | Andreas Fischer | 2013-11-04 | 1 | -11/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in LDAP wizard * owncloud/fix-wizard-typo: Excpetion->Exception |