summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* fix the RST syntax of config.sample.phpMorris Jobke2014-10-171-3/+5
|
* read config.sample.php options and whitespace fixesMorris Jobke2014-10-171-4/+6
|
* Merge pull request #11521 from owncloud/configsamplephpLukas Reschke2014-10-161-11/+28
|\ | | | | small corrections to config.sample.php
| * commented out instanceid and passwordsaltCarla Schroder2014-10-141-3/+5
| |
| * some small tweaksCarla Schroder2014-10-141-9/+18
| |
| * small corrections to config.sample.phpCarla Schroder2014-10-101-6/+12
| |
* | Set overwritemailurl* configs on setupJoas Schilling2014-10-141-0/+7
|/ | | | | | | | | | | | Correctly use overwritemailurl value when generating absolute urls in CLI Fix #11500 Rename the config to *cli Add overwrite.cli.url to the sample config Revert separator fix, fixes unit test
* Additional changes to config.sample.php and typo fixesMorris Jobke2014-10-091-29/+32
|
* apply @carlaschroder's changes from owncloud/documentation#594Morris Jobke2014-10-091-160/+216
|
* Fixes in config.sample.phpMorris Jobke2014-10-081-15/+31
| | | | | | | | | * owncloud -> ownCloud * add default value * proper comment style * fix line wrapping and minor typo * remove duplication * add Vincents proposals
* re-arrange the config options and sort them in a semantical wayMorris Jobke2014-10-081-172/+278
|
* unify style of config.sample.phpMorris Jobke2014-10-081-215/+455
| | | | | | | * use ' instead of " for config option * place default parameters where useful into sample * use proper comment block * limit line size to 80 characters
* New generic class for Imagemagick conversionsOlivier Paroz2014-10-041-1/+4
|
* Clear up confusion of log_rotate_size config valueDan Bartram2014-09-271-1/+2
| | | | | | Remove the second comment which could be confused with suggesting an invalid value: `// 100 MiB`. To keep the easily readable example value, it has been moved into the comment header for the config item.
* Clarify possible preview providers for type OfficeLukas Reschke2014-09-241-1/+5
| | | | a
* Merge pull request #11242 from owncloud/fix-10284Lukas Reschke2014-09-231-1/+1
|\ | | | | Use non-empty defaults for preview cmd line
| * Use non-empty defaultsVictor Dubiniuk2014-09-221-1/+1
| |
* | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-221-0/+23
|/
* Reword the descriptionLukas Reschke2014-09-161-1/+1
| | | The old one was just horrible wrong.
* Merge branch 'master' into securityutilsLukas Reschke2014-08-311-0/+6
|\ | | | | | | | | Conflicts: lib/private/util.php
| * Add support for getting the real client IP behind proxiesLukas Reschke2014-08-271-0/+6
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/10624 Fix copy paste fail Add unittest for comma separated headers Revert 3rdparty
* | Add some security utilitiesLukas Reschke2014-08-271-0/+3
|/ | | | | | | | | | | | | | | | | | | | | | | This adds some security utilities to core including: - A library for basic crypto operations (e.g. to encrypt passwords) - A better library for cryptographic actions which allows you to specify the charset - A library for secure string comparisions Remove .htaccess Remove .htaccess Fix typo Add public API Use timing constant comparision Remove CBC constant Adjust code Remove confusing $this
* Merge pull request #9818 from owncloud/fix-mount-file-configRobin McCorkell2014-08-241-1/+1
|\ | | | | Comment out mount_file config option
| * Comment out mount_file config optionRobin McCorkell2014-08-201-1/+1
| | | | | | | | Prevents sample config issues with external storages. Fixes #9734
* | Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinkingLukas Reschke2014-08-191-0/+4
|\ \ | | | | | | Add a copied_sample_config switch
| * | Add a copied_sample_config switchLukas Reschke2014-08-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Hopefully this will stop people from copying the sample config. I'm so annoyed by all those wrong bug reports... Add some explanation about this switch Move check to init
* | | Merge pull request #10425 from owncloud/set_default_share_folderBjörn Schießle2014-08-191-0/+5
|\ \ \ | | | | | | | | Set default share folder
| * | | make share folder configurableBjoern Schiessle2014-08-181-0/+5
| |/ /
* | | Make skeleton directory configurable.Stefan Rado2014-08-161-0/+5
| | |
* | | Move authentication failed logging to checkPasswordLukas Reschke2014-08-151-3/+0
|/ / | | | | | | Fixes https://github.com/owncloud/core/issues/10366
* / support aes 256Bjoern Schiessle2014-07-231-0/+3
|/
* update appstore api urlFrank Karlitschek2014-07-171-1/+1
|
* Add comment to overwrite* configs about CLI/cron problemsJoas Schilling2014-07-071-4/+4
|
* Support for multiple default appsVincent Petry2014-07-011-1/+5
| | | | | If a default app isn't visible for the user, try the next one. Else fallback to the "files" app.
* add disclaimer to objectstore example configJörn Friedrich Dreyer2014-06-231-1/+5
|
* add autocreate config option for containers, implement autocreate and delete ↵Jörn Friedrich Dreyer2014-06-181-0/+1
| | | | of containers, use generated container names for tests
* add 'objectstore' configuration exampleJörn Friedrich Dreyer2014-06-181-0/+23
|
* if file doesn't exist, check parent folderBjoern Schiessle2014-06-141-0/+0
|
* Merge pull request #9018 from owncloud/dbms-socket-supportFrank Karlitschek2014-06-131-1/+1
|\ | | | | Refactor OC_DB::connect() to properly support sockets.
| * Update notes on dbhostjosh4trunks2014-06-051-1/+1
| |
* | Added experimental switch to count external storage data in quotaVincent Petry2014-06-041-1/+3
|/ | | | | | | This includes all mountpoints except the Shared one in the used space calculation. Added unit tests for ext storage inclusion in quota calculation
* Merge pull request #8607 from owncloud/filescan_app_hookOwen Winkler2014-05-301-1/+4
|\ | | | | Allow apps to control via a hook skipping add/remove a file during filescan
| * Updates per comments on PR:ringmaster2014-05-301-2/+2
| | | | | | | | | | | | * Use "filesystem_cache_readonly" config setting, update comment in config.sample * Use $this->cacheActive to cache config setting * Add public Scanner::setCacheActive() to set $cacheActive programmatically
| * Use 'filesystem_check_enable' as a config option.ringmaster2014-05-271-1/+4
| |
* | fix wordingVolkan Gezer2014-05-301-1/+1
| |
* | Add a warning to the configuration fileLukas Reschke2014-05-291-0/+6
|/ | | | | Some people believe that they should copy the sample config to the "real" config. I noticed this several times in IRC and on the bugtracker. I guess this warning should be enough to avoid this in the future.
* Add a config option fro setting the filesystem watcher policyRobin Appelman2014-05-231-1/+10
|
* Merge pull request #8440 from wakeup/masterAndreas Fischer2014-05-031-2/+2
|\ | | | | | | | | | | | | | | Minor changes in config.sample * wakeup/master: Update config.sample.php Minor changes in config.sample
| * Update config.sample.phpVolkan Gezer2014-05-031-1/+1
| |
| * Minor changes in config.sampleVolkan Gezer2014-05-031-2/+2
| | | | | | | | | | | | * appcodechecker accepts boolean. * using different ports in trusted domains Partially fixes #330