summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Show svg mime icons when no preview is availableRobin Appelman2014-02-193-13/+20
* Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_pr...Jan-Christoph Borchardt2014-02-191-11/+8
|\
| * cleanup and actually execute the queryJörn Friedrich Dreyer2013-11-011-4/+8
| * use doctrine to construct concat expressionJörn Friedrich Dreyer2013-11-011-8/+1
| * Concatenate string in SQL instead of PHPJörn Friedrich Dreyer2013-11-011-10/+10
* | Merge pull request #7274 from owncloud/scrutinizer-patch-1Morris Jobke2014-02-1912-13/+36
|\ \
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-1912-13/+36
* | | Merge pull request #7257 from owncloud/filelist-fileinfoVincent Petry2014-02-193-26/+6
|\ \ \ | |/ / |/| |
| * | use a FileInfo object of the directory when generting the filelistRobin Appelman2014-02-183-26/+6
* | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1825-89/+228
|\ \ \
| * \ \ Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-1813-31/+43
| |\ \ \
| | * | | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-1313-31/+43
| * | | | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Style fixesBart Visscher2014-02-121-1/+1
| * | | | Merge pull request #7235 from DavidVentura/masterJan-Christoph Borchardt2014-02-171-1/+1
| |\ \ \ \
| | * | | | small change for compatibilityDavid2014-02-171-1/+1
| * | | | | Merge pull request #7211 from mattcaron/masterVincent Petry2014-02-171-1/+4
| |\ \ \ \ \
| | * | | | | Consolidate two sections, per code review. Issue #1648Matthew Caron2014-02-171-6/+2
| | * | | | | Fit shared videos to viewer, just like images. Issue #1648Matthew Caron2014-02-141-0/+7
| | |/ / / /
| * | | | | LDAP: improve wizard strings, fixes #5567Arthur Schiwon2014-02-173-3/+3
| * | | | | don't block login forever if we are stuck in the middle of the initial encryp...Bjoern Schiessle2014-02-175-10/+24
| * | | | | catch errors during decryptionBjoern Schiessle2014-02-172-16/+105
| * | | | | catch errors during initial encryptionBjoern Schiessle2014-02-172-26/+47
| |/ / / /
* | | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1426-61/+142
|\| | | |
| * | | | fileinfo is no longer a arrayBjoern Schiessle2014-02-141-1/+1
| * | | | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-144-15/+15
| |\ \ \ \
| | * \ \ \ merge master into fileinfoRobin Appelman2014-01-2973-5091/+10487
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fileinfoRobin Appelman2014-01-1713-35/+64
| | |\ \ \ \ \
| | * | | | | | remove more is_array from encryptionRobin Appelman2014-01-173-13/+13
| | * | | | | | Don't use is_array on FileInfoRobin Appelman2014-01-172-3/+3
| * | | | | | | Merge pull request #6726 from owncloud/fix_6630Vincent Petry2014-02-144-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed double file encoding for previewsVincent Petry2014-01-302-2/+2
| | * | | | | | | don't urldecode get var, php does this automaticallyGeorg Ehrke2014-01-302-2/+2
| * | | | | | | | Merge pull request #7183 from owncloud/remove-force-lowercaseThomas Müller2014-02-141-3/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | remove forced lowercase from extension, fix #4747, also coding style fixesJan-Christoph Borchardt2014-02-131-3/+20
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #7168 from owncloud/issue/7152Vincent Petry2014-02-141-4/+12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Send correct path on file upload when using public appJoas Schilling2014-02-121-4/+12
| * | | | | | | | Merge pull request #7178 from owncloud/issue/6277Thomas Müller2014-02-121-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | External FTP Storage should request hostname instead of URLJoas Schilling2014-02-121-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge pull request #6964 from owncloud/storagestatistics-reuseicewind19912014-02-121-4/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' into storagestatistics-reuseRobin Appelman2014-02-1022-161/+660
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ merge master into storagestatistics-reuseRobin Appelman2014-02-0528-216/+532
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Reuse the calculated free_space in buildFileStorageStatisticsRobin Appelman2014-01-271-4/+4
| * | | | | | | | | | Merge pull request #7085 from owncloud/quick-fix-7019-masterThomas Müller2014-02-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Load authentication apps to get users from all backends - fixes #7019Thomas Müller2014-02-051-0/+1
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | LDAP: improve debug messageArthur Schiwon2014-02-101-1/+2
| * | | | | | | | | LDAP: also try MS AD's thumbnailPhoto when looking for an avatar imageArthur Schiwon2014-02-101-6/+24
| * | | | | | | | | Merge pull request #7134 from owncloud/issue/5794Morris Jobke2014-02-101-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Make google drive client secret and dropbox api secret a password fieldJoas Schilling2014-02-071-2/+2
| * | | | | | | | | Merge pull request #7140 from owncloud/enc_dont_login_during_encryptionMorris Jobke2014-02-101-1/+8
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 20:08:39 +0000