summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
|\ \ \ \ \ \ \ \
| * | | | | | | | refuse login as long as the initial encryption is runningBjoern Schiessle2014-02-101-1/+8
* | | | | | | | | LDAP: add documentation info in info.xmlArthur Schiwon2014-02-101-0/+3
* | | | | | | | | Merge pull request #7126 from nickvergessen/issue/6683Vincent Petry2014-02-102-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Only add files to file list when uploading to current directoryJoas Schilling2014-02-072-4/+6
* | | | | | | | | | Rephrase and clarify log messageArthur Schiwon2014-02-101-1/+1
* | | | | | | | | | Wizard: enable base DN for editing, if not base DN could have been detected. ...Arthur Schiwon2014-02-101-0/+1
* | | | | | | | | | Wizard: disable LDAP referrals, fixes #6670Arthur Schiwon2014-02-101-0/+1
* | | | | | | | | | throw an info message, when base dn test failedArthur Schiwon2014-02-101-0/+4
* | | | | | | | | | LDAP: extend LDAP wrapper search method for sizelimit, improves performance i...Arthur Schiwon2014-02-102-4/+6
* | | | | | | | | | Merge pull request #7133 from owncloud/fix-implied-evalThomas Müller2014-02-102-7/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix implied evals and doubled definition of variableMorris Jobke2014-02-072-7/+5
| | |/ / / / / / / | |/| | | | | | |
* / | | | | | | | name users after testBjoern Schiessle2014-02-071-2/+2
|/ / / / / / / /
* / / / / / / / replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-072-3/+21
|/ / / / / / /
* | | | | | | Merge pull request #7089 from owncloud/sharing-searchbymimeVincent Petry2014-02-062-9/+164
|\ \ \ \ \ \ \
| * | | | | | | Fixed searchByMime in shared cacheVincent Petry2014-02-052-9/+164
* | | | | | | | Remove unused template variable assignment of files_sharing/template/public.phpPellaeon Lin2014-02-061-5/+0
* | | | | | | | Move template variable assignment to correct placePellaeon Lin2014-02-061-4/+5
* | | | | | | | Merge pull request #7064 from owncloud/files-scrolltopafterupdateJan-Christoph Borchardt2014-02-051-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Scroll to the top after switching dirVincent Petry2014-02-041-5/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #7032 from owncloud/enc_fix_deleteBjörn Schießle2014-02-059-119/+430
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | add function to extract filename from sharekey name + testsBjoern Schiessle2014-02-032-1/+37
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 15:22:40 +0000