summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7260 from owncloud/watcher-policyicewind19912014-02-193-14/+91
|\
| * add unit tests for watcher policiesRobin Appelman2014-02-191-1/+55
| * Allow setting the frequency of which the file watcher checks for updatesRobin Appelman2014-02-182-13/+36
* | Merge pull request #7257 from owncloud/filelist-fileinfoVincent Petry2014-02-194-34/+7
|\ \
| * | use a FileInfo object of the directory when generting the filelistRobin Appelman2014-02-184-34/+7
| |/
* | Merge pull request #7114 from owncloud/scrutinizer_documentation_patchesThomas Müller2014-02-19150-341/+730
|\ \
| * \ Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1862-310/+1638
| |\ \
| * \ \ Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1469-226/+1130
| |\ \ \
| * | | | Fix more documentation failesJoas Schilling2014-02-0819-155/+119
| * | | | remove duplicate param lines for OCP\User::getUsers()Jörn Friedrich Dreyer2014-02-071-2/+0
| * | | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-06150-219/+649
* | | | | Merge pull request #7252 from owncloud/autocomplete-autocapitalize-autocorrectTom Needham2014-02-183-16/+32
|\ \ \ \ \
| * | | | | do not autocapitalize fields on mobile, fix user name input. Also disable aut...Jan-Christoph Borchardt2014-02-183-16/+32
* | | | | | Merge pull request #7253 from owncloud/preferences-cachingicewind19912014-02-182-89/+86
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | remove some unneeded isset'sRobin Appelman2014-02-181-5/+3
| * | | | | Fix some phpdocRobin Appelman2014-02-181-1/+9
| * | | | | Add caching to OC\PreferencesRobin Appelman2014-02-182-89/+80
| |/ / / /
* | | | | Merge pull request #6796 from owncloud/statementwrapper-bindparamThomas Müller2014-02-181-0/+14
|\ \ \ \ \
| * | | | | Add bindParam to statement wrapperRobin Appelman2014-01-161-0/+14
* | | | | | Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-1817-40/+55
|\ \ \ \ \ \
| * | | | | | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-1317-40/+55
* | | | | | | Merge pull request #6650 from owncloud/migration_unit_testsTom Needham2014-02-184-112/+120
|\ \ \ \ \ \ \
| * | | | | | | Remove unused variablestomneedham2014-02-181-4/+0
| * | | | | | | Fix poor spellingtomneedham2014-02-181-3/+3
| * | | | | | | Merge branch 'master' into migration_unit_teststomneedham2014-02-1758-285/+1575
| |\ \ \ \ \ \ \
| * | | | | | | | Finish basic testing of user exporttomneedham2014-02-171-6/+63
| * | | | | | | | Merge branch 'master' into migration_unit_testsBart Visscher2014-02-10304-6752/+19604
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'fix-5388-master' into migration_unit_teststomneedham2014-01-074-108/+31
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-mastertomneedham2014-01-04563-7076/+15968
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix migration import of user filesBart Visscher2013-12-201-1/+1
| | * | | | | | | | | | Wrap the import/export db in a wrapper to make it compatible with the old styleBart Visscher2013-12-202-0/+4
| | * | | | | | | | | | Merge branch 'master' into fix-5388-masterBart Visscher2013-12-16144-709/+1105
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-mastertomneedham2013-12-11900-19907/+33355
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-masterThomas Mueller2013-11-24137-381/+451
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | ref 3rdparty branch without MDB2 codeThomas Müller2013-11-221-0/+0
| | * | | | | | | | | | | | | Merge branch 'master' into fix-5388-masterThomas Müller2013-11-2212-24/+162
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Change OC_Migrate from MDB2 to DoctrineBart Visscher2013-11-223-107/+26
| * | | | | | | | | | | | | | | Add WIP unit test for migrationtomneedham2014-01-071-0/+32
* | | | | | | | | | | | | | | | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-188-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | $default of OC_Config::[gs]etValue can have more then string as typeBart Visscher2014-02-124-8/+8
| * | | | | | | | | | | | | | | Style fixesBart Visscher2014-02-122-2/+3
| * | | | | | | | | | | | | | | number as numberBart Visscher2014-02-122-2/+2
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #7243 from owncloud/core-sessionlifetimedefaultThomas Müller2014-02-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Now using PHP session lifetime as default value for the JS configVincent Petry2014-02-171-1/+1
* | | | | | | | | | | | | | | | Merge pull request #7239 from owncloud/cbr-filetype-iconThomas Müller2014-02-183-0/+778
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | add cbr/cbz file type icon, fix #6953Jan-Christoph Borchardt2014-02-173-0/+778
* | | | | | | | | | | | | | | | Merge pull request #7235 from DavidVentura/masterJan-Christoph Borchardt2014-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | small change for compatibilityDavid2014-02-171-1/+1
* | | | | | | | | | | | | | | | | Merge pull request #7240 from owncloud/mimetype-fallbackicewind19912014-02-171-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | use file icon as fallback instead of application icon, fix #7237Jan-Christoph Borchardt2014-02-171-0/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 06:24:52 +0000