summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-2067-82/+390
|\
| * 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-206-4/+53
| |\ \ \
| | * | | 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-183-0/+33
| * | | | 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-1961-63/+134
| |\ \ \ \
| | * | | | fix wrong removesMorris Jobke2014-02-191-1/+24
| | * | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-1961-85/+133
| * | | | | 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
* | | | | | | integrate assetic for asset pipeline-ingThomas Müller2014-02-201-25/+88
* | | | | | | enable static delivery of css filesThomas Müller2014-02-201-1/+1
* | | | | | | kill references to core.js and core.cssThomas Müller2014-02-201-2/+0
* | | | | | | kill old minimizer codeThomas Müller2014-02-204-145/+4
|/ / / / / /
* | | | | | 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-19116-265/+528
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1821-169/+272
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1433-156/+869
| |\ \ \ \ \ \
| * | | | | | | Fix more documentation failesJoas Schilling2014-02-0816-141/+111
| * | | | | | | 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-06116-150/+448
* | | | | | | | 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-1727-170/+1002
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into migration_unit_testsBart Visscher2014-02-1057-257/+705
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'fix-5388-master' into migration_unit_teststomneedham2014-01-073-108/+31
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-mastertomneedham2014-01-0465-256/+502
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | 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-168-118/+168
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-mastertomneedham2013-12-1177-150/+720
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-masterThomas Mueller2013-11-2411-20/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-5388-masterThomas Müller2013-11-229-23/+145
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Change OC_Migrate from MDB2 to DoctrineBart Visscher2013-11-223-107/+26
* | | | | | | | | | | | | | | | | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-185-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |