summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-201-5/+5
|\
| * mount: make location of mount.json configurableTigran Mkrtchyan2014-01-291-5/+5
* | Merge pull request #6935 from owncloud/fix_urlGeneratorBjörn Schießle2014-02-201-1/+2
|\ \
| * | Test if $url is already prefixed by '/'Thomas Tanghus2014-02-071-1/+2
| * | Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840Thomas Tanghus2014-01-241-1/+1
* | | Merge pull request #7289 from owncloud/fix-filetype-iconsLukas Reschke2014-02-202-65/+106
|\ \ \
| * \ \ merge masterJan-Christoph Borchardt2014-02-201-1/+8
| |\ \ \
| * | | | fix filetype icons for gzip, tex, perl, csv, shJan-Christoph Borchardt2014-02-202-1/+8
| * | | | coding style: spaces around =>Jan-Christoph Borchardt2014-02-191-66/+66
| * | | | fix lots of file type icons for archives, js, flash, ics, fonts, code, ...Jan-Christoph Borchardt2014-02-192-2/+36
* | | | | Merge pull request #6519 from nhirokinet/masterLukas Reschke2014-02-202-1/+1
|\ \ \ \ \
| * | | | | Update user.php to fix duplicate session-duplicatenhirokinet2013-12-221-1/+0
| * | | | | Security Update: session fixationNARUKAWA Hiroki2013-12-201-0/+1
* | | | | | Merge pull request #7301 from owncloud/fix-fuckupicewind19912014-02-201-0/+1
|\ \ \ \ \ \
| * | | | | | fix master - #7274 brokes itMorris Jobke2014-02-201-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #7247 from owncloud/sharing_cleanup_step1Björn Schießle2014-02-201-0/+160
|\ \ \ \ \ \
| * | | | | | clean up the sharing ajax calls, add mail notification classBjoern Schiessle2014-02-191-0/+160
* | | | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfixLukas Reschke2014-02-204-4/+41
|\ \ \ \ \ \ \
| * | | | | | | Added file name check in webdav connectorVincent Petry2014-02-183-4/+20
| * | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.phpVincent Petry2014-02-181-0/+21
* | | | | | | | Hardening: Remove dangerous characters + Subdirectory CheckLukas Reschke2014-02-191-2/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #7195 from owncloud/files-selectallVincent Petry2014-02-191-1/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Do not send file list for select all on Download/deleteVincent Petry2014-02-131-1/+8
* | | | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1Morris Jobke2014-02-1951-52/+103
|\ \ \ \ \ \ \
| * | | | | | | fix wrong removesMorris Jobke2014-02-191-1/+24
| * | | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-1951-74/+102
* | | | | | | | Merge pull request #7260 from owncloud/watcher-policyicewind19912014-02-191-13/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow setting the frequency of which the file watcher checks for updatesRobin Appelman2014-02-181-13/+33
* | | | | | | | | Merge pull request #7257 from owncloud/filelist-fileinfoVincent Petry2014-02-191-8/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | use a FileInfo object of the directory when generting the filelistRobin Appelman2014-02-181-8/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #7114 from owncloud/scrutinizer_documentation_patchesThomas Müller2014-02-1991-187/+421
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1815-158/+135
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1427-151/+616
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix more documentation failesJoas Schilling2014-02-0810-94/+73
| * | | | | | | | | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-0691-106/+364
* | | | | | | | | | | Merge pull request #7253 from owncloud/preferences-cachingicewind19912014-02-181-37/+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-181-37/+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-183-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-133-8/+11
* | | | | | | | | | | | Merge pull request #6650 from owncloud/migration_unit_testsTom Needham2014-02-183-112/+31
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unused variablestomneedham2014-02-181-4/+0
| * | | | | | | | | | | | Merge branch 'master' into migration_unit_teststomneedham2014-02-1719-159/+617
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into migration_unit_testsBart Visscher2014-02-1048-228/+537
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-5388-master' into migration_unit_teststomneedham2014-01-073-108/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-mastertomneedham2014-01-0425-136/+276
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix migration import of user filesBart Visscher2013-12-201-1/+1