aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow setupchecks to specify a warning levelRoeland Jago Douma2015-07-304-12/+56
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-30112-172/+144
|
* Merge pull request #17814 from owncloud/update-moment-jsRobin McCorkell2015-07-295-3493/+4078
|\ | | | | update moment.js to 2.10.3
| * update moment.js to 2.10.3Morris Jobke2015-07-225-3493/+4078
| |
* | Merge pull request #17966 from owncloud/remove-mssqlThomas Müller2015-07-2914-284/+11
|\ \ | | | | | | Remove remainings of mssql
| * | fix unit testsMorris Jobke2015-07-291-2/+2
| | |
| * | Remove remainings of mssqlThomas Müller2015-07-2914-282/+9
| | |
* | | Merge pull request #17969 from owncloud/fix-log-file-checkRobin McCorkell2015-07-291-1/+4
|\ \ \ | | | | | | | | [admin settings] only retrieve log file size if file exists
| * | | [admin settings] only retrieve log file size if file existsMorris Jobke2015-07-291-1/+4
|/ / / | | | | | | | | | * fixes #17467
* | | Merge pull request #17965 from owncloud/theme-colorMorris Jobke2015-07-293-0/+3
|\ \ \ | | | | | | | | add theme-color for better Android browser integration
| * | | add theme-color for better Android browser integrationJan-Christoph Borchardt2015-07-293-0/+3
| |/ /
* | | Merge pull request #17960 from owncloud/inline-buttonMorris Jobke2015-07-293-2/+10
|\ \ \ | |/ / |/| | use inline confirm button style for password-protected links, ref #15176
| * | use inline confirm button style for password-protected links, ref #15176Jan-Christoph Borchardt2015-07-293-2/+10
| | |
* | | Merge pull request #17950 from ↵Robin McCorkell2015-07-293-2/+5
|\ \ \ | |/ / |/| | | | | | | | owncloud/config-dontdetectfschangesinrootbydefault Disable filesystem_check_changes by default
| * | Fix watcher tests to explicitly set policyVincent Petry2015-07-291-0/+3
| | |
| * | Disable filesystem_check_changes by defaultVincent Petry2015-07-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent detecting remote changes done in the data folder / root storage by default. In the rare cases where the data folder is shared with other apps/users outside ownCloud and change detection is needed, the admin will have to set the option explicitly from now on. Note that this doesn't affect external storages which have their own setting in the mount options.
* | | Merge pull request #17923 from owncloud/fix-17921blizzz2015-07-291-8/+0
|\ \ \ | | | | | | | | Remove Log info when no group filter is set, fixes #17921
| * | | remove unused varblizzz2015-07-291-2/+0
| | | |
| * | | Remove Log info when no group filter is set, fixes #17921blizzz2015-07-281-6/+0
| | | | | | | | | | | | The log message is superfluous and too noisy. If an admin decides not to use groups, he does not need to be reminded about it on almost every request.
* | | | Merge pull request #17813 from owncloud/update-underscoreMorris Jobke2015-07-294-561/+768
|\ \ \ \ | | | | | | | | | | update underscore to 1.8.3
| * | | | 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 page
| * | | | | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | This will properly update the controls bar width and display the search box initially.
* | | | | Merge pull request #17908 from rullzer/docker_mysqlRobin McCorkell2015-07-291-11/+44
|\ \ \ \ \ | | | | | | | | | | | | Add use of docker instance for MariaDB
| * | | | | 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 uncaught exception on not permitted file types when setting avatar, fixes #17232
| * | | | | fix test after rebasingArthur Schiwon2015-07-271-1/+1
| | | | | |
| * | | | | fix uncaught exception on not permitted file types when setting avatar, ↵Arthur Schiwon2015-07-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | fixes #17232
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Fix parsing of sharetime as string
| * | | | | tests for _parseTime with hex and empty stringsMorris Jobke2015-07-282-0/+6
| | | | | |
| * | | | | Fix parsing of sharetime as stringMorris Jobke2015-07-282-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the ajax/share.php will return the share time as string. If this is the case it would get parsed completely wrong and cause the share dropdown to not work anymore. This change will properly cast the string to an interger and also fallback if this is not possible.
* | | | | | [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 versions
| * | | | | | Detect old NSS and OpenSSL versionsLukas Reschke2015-07-284-11/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will detect old NSS and OpenSSL versions and show appropriate errors in the admin interface. Fixes https://github.com/owncloud/core/issues/17901
* | | | | | | Merge pull request #17922 from owncloud/smb-storageiddoubleslashRobin McCorkell2015-07-282-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Double slash for SMB storage id for compatibility
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | set logger in constructor
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Mimetypedetector
| * | | | | | Pass config dir as parameter to detection classRoeland Jago Douma2015-07-273-12/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to properly test the mimetype function: * constructor takes path to configdir * Added unit tests for mimetype (only if vfsStream is available)
| * | | | | | 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
| | |_|/ / / | |/| | | | | | | | | | | | | | | | * Copied unit tests from old functions
* | | | | | Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_fileRoeland Douma2015-07-282-0/+49
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Remote shares should be uique
| * | | | | Added testRoeland Jago Douma2015-07-151-0/+36
| | | | | |
| * | | | | Cannot share the same file multiple times with remote userRoeland Jago Douma2015-07-151-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for #17183 It should not be possible to create multiple remote shares from user A to user B of the same file/folder.