summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-30872-197275/+6969
|\
| * Merge pull request #147 from owncloud/htaccess-upgrade-checkSam Tuke2012-10-291-0/+10
| |\
| | * Don't use OC_Setup as it will show up the installerLukas Reschke2012-10-291-1/+5
| | * Generate .htaccess when upgrading from old versionsLukas Reschke2012-10-291-0/+6
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-3029-88/+114
| * | Merge pull request #136 from scambra/users-fixesBart Visscher2012-10-291-2/+2
| |\ \
| | * | fix settings routesscambra2012-10-291-2/+2
| * | | Merge pull request #133 from fmms/checkstyle02Lukas Reschke2012-10-297-102/+102
| |\ \ \
| | * | | NoSpaceAfterCommaFelix Moeller2012-10-287-102/+102
| * | | | Merge pull request #142 from denis-b/patch-2blizzz2012-10-291-1/+1
| |\ \ \ \
| | * | | | Update apps/files/ajax/move.phpdenis-b2012-10-291-1/+1
| | | |_|/ | | |/| |
| * | | | Merge pull request #141 from denis-b/patch-1blizzz2012-10-291-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update apps/files/index.phpdenis-b2012-10-291-1/+1
| |/ / /
| * | | Generate only one CSRF tokenLukas Reschke2012-10-291-31/+19
| * | | Fix a typoLukas Reschke2012-10-291-1/+1
| * | | Use files remote webdav in compatibility files/webdav.phpBart Visscher2012-10-292-22/+5
| * | | Move loading setting routing to OC_RouterBart Visscher2012-10-292-3/+3
| * | | Change search to use routingBart Visscher2012-10-293-6/+7
| * | | Move and fix app setting navigation detectBart Visscher2012-10-293-6/+4
| * | | Remove fixme, problem is solved alreadyBart Visscher2012-10-291-4/+1
| * | | Remove subnavigation key, not usedBart Visscher2012-10-291-3/+0
| * | | Add ETag caching for Javascript routesBart Visscher2012-10-291-11/+36
| * | | Move generating cache key from files from OC_Minimizer to OC_CacheBart Visscher2012-10-292-6/+12
| | |/ | |/|
| * | Fix MySQL install, bug fix for issue 132Michael Gapczynski2012-10-281-2/+2
| * | Check if error_report() is equal to 0, so suppressed errors aren't logged e.g...Michael Gapczynski2012-10-281-0/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-2992-3182/+3240
| |/
| * Try to fix shared status icons againMichael Gapczynski2012-10-281-10/+5
| * Fix shared status iconsMichael Gapczynski2012-10-283-38/+38
| * Merge pull request #129 from fmms/checkstyle01Lukas Reschke2012-10-284-100/+100
| |\
| | * NoSpaceAfterCommaFelix Moeller2012-10-282-59/+59
| | * NoSpaceAfterCommaFelix Moeller2012-10-282-41/+41
| |/
| * disble breaking test cases for nowThomas Müller2012-10-281-4/+4
| * properly replace fileaction icons with pngs when neededRobin Appelman2012-10-281-2/+2
| * fix running app testsRobin Appelman2012-10-281-2/+0
| * add svg mimetype to default htaccessRobin Appelman2012-10-282-0/+8
| * don't move file into subdirectory if a file with the same name already exists...Georg Ehrke2012-10-281-0/+5
| * check if RUNTIME_NOAPPS is set before using itArthur Schiwon2012-10-281-1/+1
| * added some visual feedback is password was setBjörn Schießle2012-10-281-0/+1
| * set password if user leaves password field (issue #57)Björn Schießle2012-10-281-9/+7
| * deny the usage of dots in database nameGeorg Ehrke2012-10-282-1/+4
| * make sure all filesystem apps are loaded when setupFS is proceeded, to make s...Arthur Schiwon2012-10-281-0/+5
| * remove whitespaces, no code changeArthur Schiwon2012-10-281-4/+4
| * added functions for printing escaped and unescaped valuesBernhard Posselt2012-10-281-0/+16
| * use css to show/hide fileactionsRobin Appelman2012-10-283-31/+14
| * code styleRobin Appelman2012-10-281-93/+101
| * add 3rdparty folder to gitignoreJan-Christoph Borchardt2012-10-281-0/+1
| * remove 3rdparty filesGeorg Ehrke2012-10-28639-200511/+0
| * ->l expects two parametersLukas Reschke2012-10-282-3/+4
| * Revert "Fix a typo"Lukas Reschke2012-10-282-2/+2
| * Fix a typoLukas Reschke2012-10-282-2/+2