summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-09145-361/+3976
|
* Merge pull request #5763 from owncloud/fixing-sharing-ocs-api-masterThomas Müller2013-11-081-0/+8
|\ | | | | the filesystem has to be initialized once we know the user
| * the filesystem has to be initialized once we know the userThomas Müller2013-11-081-0/+8
| |
* | Merge pull request #5762 from owncloud/files-uploaderrordelayJan-Christoph Borchardt2013-11-081-6/+5
|\ \ | |/ |/| Increased upload error delay to 10 seconds
| * Increased upload error delay to 10 secondsVincent Petry2013-11-081-6/+5
| | | | | | | | | | | | | | Fixes #5662 Also made it use OC.Notification instead of directly access the notification HTML element.
* | Merge pull request #5747 from owncloud/scanner-post-hooksMorris Jobke2013-11-071-0/+5
|\ \ | |/ |/| Add post hooks for filesystem scanner
| * Add post hooks for filesystem scannerRobin Appelman2013-11-071-0/+5
| |
* | Now removing stray old cookies from 5.0.12Vincent Petry2013-11-071-0/+5
|/ | | | | | | | | | | Cookies from 5.0.12 seemed to have an extra slash in the path. Firefox doesn't allow to remove them if the trailing slash isn't there, thus making it impossible to logout correctly. This fix adds extra code to delete such stray cookies. Ported from stable5 branch 99e5c6f7eb58404be2cc5448ec380f29c9a71225
* Merge pull request #5737 from owncloud/files-totaldirsnotfoundfixMorris Jobke2013-11-071-2/+2
|\ | | | | Fixed totalDirs JS error
| * Fixed totalDirs JS errorVincent Petry2013-11-071-2/+2
| |
* | Merge pull request #5682 from owncloud/fix5585blizzz2013-11-073-13/+21
|\ \ | |/ |/| LDAP: make buttons on Expert page work again, fixes #5585
| * LDAP Wizard: l10ned Save buttonArthur Schiwon2013-11-061-1/+1
| |
| * LDAP: improve design and placement of Save buttonArthur Schiwon2013-11-042-1/+9
| |
| * LDAP: make buttons on Expert page work again, fixes #5585Arthur Schiwon2013-11-042-13/+13
| |
* | [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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 14:00:01 +0000