summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make knowledge base url configurableBjoern Schiessle2015-07-293-1/+27
* Merge pull request #17950 from owncloud/config-dontdetectfschangesinrootbydef...Robin McCorkell2015-07-293-2/+5
|\
| * Fix watcher tests to explicitly set policyVincent Petry2015-07-291-0/+3
| * Disable filesystem_check_changes by defaultVincent Petry2015-07-292-2/+2
* | Merge pull request #17923 from owncloud/fix-17921blizzz2015-07-291-8/+0
|\ \
| * | remove unused varblizzz2015-07-291-2/+0
| * | Remove Log info when no group filter is set, fixes #17921blizzz2015-07-281-6/+0
* | | Merge pull request #17813 from owncloud/update-underscoreMorris Jobke2015-07-294-561/+768
|\ \ \
| * | | update underscore to 1.8.3Morris Jobke2015-07-274-561/+768
* | | | Merge pull request #17946 from owncloud/settings-users-apprenderedforsearchboxMorris Jobke2015-07-291-0/+4
|\ \ \ \
| * | | | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
| | |_|/ | |/| |
* | | | Merge pull request #17908 from rullzer/docker_mysqlRobin McCorkell2015-07-291-11/+44
|\ \ \ \
| * | | | Add possible use of docker instance for MariaDBRoeland Jago Douma2015-07-291-11/+44
| | |/ / | |/| |
* | | | Merge pull request #17464 from owncloud/fix-17232blizzz2015-07-299-98/+340
|\ \ \ \
| * | | | fix test after rebasingArthur Schiwon2015-07-271-1/+1
| * | | | fix uncaught exception on not permitted file types when setting avatar, fixes...Arthur Schiwon2015-07-271-1/+7
| * | | | add integration tests for avatar updateArthur Schiwon2015-07-275-2/+144
| * | | | refactor integration tests to make it easier to add new onesArthur Schiwon2015-07-274-95/+189
| | |/ / | |/| |
* | | | Merge pull request #17489 from owncloud/fix-share-time-as-stringMorris Jobke2015-07-292-0/+37
|\ \ \ \
| * | | | tests for _parseTime with hex and empty stringsMorris Jobke2015-07-282-0/+6
| * | | | Fix parsing of sharetime as stringMorris Jobke2015-07-282-0/+31
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-2970-0/+86
* | | | | Merge pull request #17912 from owncloud/detect-old-openssl-versionsRobin McCorkell2015-07-284-11/+221
|\ \ \ \ \
| * | | | | Detect old NSS and OpenSSL versionsLukas Reschke2015-07-284-11/+221
* | | | | | Merge pull request #17922 from owncloud/smb-storageiddoubleslashRobin McCorkell2015-07-282-1/+16
|\ \ \ \ \ \
| * | | | | | Double slash for SMB storage id for compatibilityVincent Petry2015-07-282-1/+16
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #17927 from owncloud/fix_17925Vincent Petry2015-07-282-13/+177
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add unit testsLukas Reschke2015-07-282-13/+176
| * | | | | set logger in constructorBjoern Schiessle2015-07-281-0/+1
|/ / / / /
* | | | | Merge pull request #15543 from rullzer/mimetypedetectorMorris Jobke2015-07-286-90/+521
|\ \ \ \ \
| * | | | | Pass config dir as parameter to detection classRoeland Jago Douma2015-07-273-12/+214
| * | | | | Proper deprecate methodsRoeland Jago Douma2015-07-272-14/+5
| * | | | | Loading of mapping/aliases is done in classRoeland Jago Douma2015-07-273-34/+48
| * | | | | Move mimetypedetection to files/type/detectionRoeland Jago Douma2015-07-274-172/+64
| * | | | | Added mimetype detectorRoeland Jago Douma2015-07-276-1/+333
| | |_|/ / | |/| | |
* | | | | Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_fileRoeland Douma2015-07-282-0/+49
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added testRoeland Jago Douma2015-07-151-0/+36
| * | | | Cannot share the same file multiple times with remote userRoeland Jago Douma2015-07-151-0/+13
* | | | | Merge pull request #17910 from owncloud/fix-modified-tooltipMorris Jobke2015-07-282-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | fixed tooltip for modified dateHendrik Leppelsack2015-07-272-2/+3
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-2828-6/+226
| |_|_|/ |/| | |
* | | | Merge pull request #17902 from owncloud/fix_17898Vincent Petry2015-07-271-1/+2
|\ \ \ \
| * | | | get header size before we open the file to avoid locking exceptionBjoern Schiessle2015-07-271-1/+2
* | | | | Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryptionThomas Müller2015-07-275-4/+159
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add condition to update queryBjoern Schiessle2015-07-271-1/+1
| * | | | Add an update script to reset the valueJoas Schilling2015-07-243-2/+98
| * | | | Add a unit test for the disabled encryption caseJoas Schilling2015-07-231-1/+60
| * | | | Only set is encrypted when encryption is enabledJoas Schilling2015-07-231-1/+1
* | | | | Merge pull request #17879 from owncloud/scan-check-pathThomas Müller2015-07-272-0/+31
|\ \ \ \ \
| * | | | | Add unit testsLukas Reschke2015-07-271-0/+28