summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | added tests for the delete hooks if the trash bin is disabledBjoern Schiessle2014-02-013-65/+300
| * | | don't expect OC_FilesystemView, this is depreciatedBjoern Schiessle2014-01-311-1/+1
| * | | better error detection and don't use glob()Bjoern Schiessle2014-01-311-12/+27
| * | | move unlink proxy to a hook which handles pre and post conditionsBjoern Schiessle2014-01-313-41/+66
* | | | Merge pull request #7011 from owncloud/jshintThomas Müller2014-02-0410-22/+124
|\ \ \ \
| * | | | Fixed file name validation unit test + added newlineVincent Petry2014-01-302-7/+16
| * | | | Added .jshintrcVincent Petry2014-01-3010-15/+108
* | | | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-046-6/+29
|\ \ \ \ \
| * | | | | Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-30192-5750/+12562
| |\| | | |
| * | | | | Use $storageInfo['free']Pellaeon Lin2014-01-292-3/+2
| * | | | | Fix variable namePellaeon Lin2014-01-241-2/+2
| * | | | | Add $freeSpace and $uploadLimit to files_sharingPellaeon Lin2014-01-172-0/+6
| * | | | | Comments to clarifyPellaeon Lin2014-01-161-2/+2
| * | | | | Use t() 's native methodPellaeon Lin2014-01-161-2/+8
| * | | | | Fix namespacePellaeon Lin2014-01-151-1/+1
| * | | | | Contextual upload error messagePellaeon Lin2013-12-111-2/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 17:41:14 +0000