summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-06236-1711/+1700
|
* ownCloud 6 beta 3v6.0.0beta3Frank Karlitschek2013-11-061-2/+2
|
* Merge pull request #5399 from frisco82/fixDownloadOverQuotaMorris Jobke2013-11-061-35/+30
|\ | | | | Do not count the size of shared folder on total
| * Do not count the size of shared folder on totalRamiro Aparicio2013-11-061-35/+30
| | | | | | | | | | | | Changed all array access to dot notation Split comment in a second line
* | Merge pull request #5718 from owncloud/fixLdapBgJobVincent Petry2013-11-061-4/+4
|\ \ | | | | | | LDAP: resolve namespace harakiri, fixes background job
| * | LDAP: resolve namespace harakiri, fixes background jobArthur Schiwon2013-11-061-4/+4
|/ /
* | Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperationsMorris Jobke2013-11-064-14/+59
|\ \ | | | | | | Fixes for "max upload size" value showed in the UI
| * | Fixed storage stats to be based on current directoryVincent Petry2013-11-063-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 uploadVincent Petry2013-11-063-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-foldericonforhomestorageVincent Petry2013-11-061-1/+1
|\ \ \ | | | | | | | | Fixed folder icon for home storage
| * | | Fixed folder icon for home storageVincent Petry2013-11-061-1/+1
|/ / / | | | | | | | | | Fixes #5713
* | | Merge pull request #5716 from owncloud/full-nameVincent Petry2013-11-063-5/+5
|\ \ \ | |/ / |/| | change 'Display Name' to more understandable 'Full Name', fix #5612
| * | change 'Display Name' to more understandable 'Full Name', fix #5612Jan-Christoph Borchardt2013-11-063-5/+5
|/ /
* | Merge pull request #5692 from miicha/patch-2VicDeo2013-11-051-1/+1
|\ \ | | | | | | allow empty user-dn and password
| * | allows agent and password or neither agent nor passwordmiicha2013-11-051-1/+1
| | | | | | | | | this contribution is MIT licensed
| * | allow empty user-dn and passwordmiicha2013-11-051-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-documentationblizzz2013-11-051-1/+1
|\ \ \ | | | | | | | | move to oc6 documentation
| * | | move to oc6 documentationThomas Müller2013-11-041-1/+1
| |/ /
* | | Merge pull request #5696 from owncloud/fixing-5670-masterAndreas Fischer2013-11-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | decode arguments as array * owncloud/fixing-5670-master: decode arguments as array
| * | | decode arguments as arrayThomas Müller2013-11-051-1/+1
| | | |
* | | | Merge pull request #5699 from owncloud/fixing-4606-masterThomas Müller2013-11-051-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üller2013-11-051-17/+19
| |/ / / | | | | | | | | | | | | requires a user to be logged in
* | | | Merge pull request #5695 from owncloud/fixing-dropbox-masterThomas Müller2013-11-051-1/+1
|\ \ \ \ | |/ / / |/| | | fixing dropbox require path
| * | | fixing dropbox require pathThomas Müller2013-11-051-1/+1
| | | |
* | | | Merge pull request #5582 from owncloud/files-previewcachingThomas Müller2013-11-0511-47/+80
|\ \ \ \ | | | | | | | | | | Append file etag to preview URLs
| * | | | Added missing comma to make the next diff cleanerVincent Petry2013-10-311-1/+1
| | | | |
| * | | | Fixed preview URL + size while dragging an existing fileVincent Petry2013-10-282-3/+5
| | | | |
| * | | | Append file etag to preview URLsVincent Petry2013-10-2810-44/+75
| | | | | | | | | | | | | | | | | | | | Fixes #5534
* | | | | Merge pull request #5673 from owncloud/oc6-windows-server-mssql-masterThomas Müller2013-11-054-12/+7
|\ \ \ \ \ | |_|/ / / |/| | | | Oc6 windows server mssql master
| * | | | Inherit lastInsertId() from Adapter.Andreas Fischer2013-11-041-5/+0
| | | | |
| * | | | adding test for binary file to test \OC_Helper::streamCopy()Thomas Mueller2013-11-041-0/+1
| | | | |
| * | | | ignore test filesThomas Mueller2013-11-041-0/+2
| | | | |
| * | | | WIN: fixing unit test for testStreamCopy()Thomas Mueller2013-11-021-1/+1
| | | | |
| * | | | WIN: fixing Fatal error: Call to a member function logicToPhysical() on a ↵Thomas Mueller2013-11-021-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() implementationThomas Mueller2013-11-021-4/+2
| | | | |
* | | | | Merge pull request #5540 from owncloud/scanner-enhancments-masterThomas Müller2013-11-043-3/+21
|\ \ \ \ \ | |_|_|/ / |/| | | | Scanner enhancments master
| * | | | use ===Thomas Müller2013-11-041-1/+1
| | | | |
| * | | | set log level to DEBUGThomas Müller2013-11-041-2/+4
| | | | |
| * | | | using array_diff_assoc to detect diffs in values as wellThomas Müller2013-10-251-1/+1
| | | | |
| * | | | cast storage_mtime to intThomas Müller2013-10-251-0/+1
| | | | |
| * | | | adding storage_mtime handling to SharedCacheThomas Müller2013-10-251-0/+4
| | | | |
| * | | | log the data arraysThomas Müller2013-10-241-1/+3
| | | | |
| * | | | some logging added ....Thomas Müller2013-10-241-2/+11
| | |_|/ | |/| |
* | | | Merge pull request #5683 from owncloud/no-coverage-with-php-v53-masterThomas Müller2013-11-041-1/+6
|\ \ \ \ | | | | | | | | | | adding environment variable to control coverage reporting
| * | | | keep junit xml reportsThomas Müller2013-11-041-1/+1
| | | | |
| * | | | adding environment variable to control coverage reportingThomas Müller2013-11-041-1/+6
|/ / / /
* | | | Merge pull request #5544 from owncloud/fixing-3593-2-masterThomas Müller2013-11-042-1/+17
|\ \ \ \ | | | | | | | | | | Add FileId header and switch fileid and instance id
| * | | | add header 'OC-FileId' on PUTThomas Müller2013-10-251-0/+16
| | | | |
| * | | | switch instance id and file idThomas Müller2013-10-251-1/+1
| | | | |
* | | | | Merge pull request #5656 from owncloud/fix-wizard-typoAndreas Fischer2013-11-041-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in LDAP wizard * owncloud/fix-wizard-typo: Excpetion->Exception