summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Switch expectation and result in unit tests.Thomas Tanghus2012-10-311-9/+12
* Added some more error checking on db queries.Thomas Tanghus2012-10-311-5/+37
* Added unit tests for OC_VCategories.Thomas Tanghus2012-10-311-0/+114
* Cast object ids to integers.Thomas Tanghus2012-10-311-2/+2
* Added unit test testinsertIfNotExistDontOverwrite.Thomas Tanghus2012-10-311-0/+37
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-3143-321/+578
|\
| * Merge pull request #112 from libasys/Fix-strange-Isue-IE8Thomas Tanghus2012-10-311-17/+21
| |\
| | * UPDATE oc-dialogs.js and Fix some small Bugs Added in the description of form...libasys2012-10-311-4/+4
| | * Fix for problems using for() function instead of $.each for arrays with IE8libasys2012-10-261-15/+19
| * | Merge pull request #155 from owncloud/token-expired-IEJörn Friedrich Dreyer2012-10-311-0/+2
| |\ \
| | * | Change IE8 to "older IE versions"Lukas Reschke2012-10-301-1/+1
| | * | Send the requesttoken as form valueLukas Reschke2012-10-301-0/+2
| * | | Merge pull request #152 from scambra/webdav-quotaThomas Müller2012-10-312-0/+60
| |\ \ \
| | * | | code style changesscambra2012-10-301-4/+6
| | * | | fix checking quota in webdav, adding a sabredav pluginscambra2012-10-302-0/+58
| * | | | fixing Test_TemplateFunctionsThomas Mueller2012-10-311-1/+1
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-3137-303/+420
| * | | | Merge pull request #146 from Raydiation/masterThomas Müller2012-10-301-0/+71
| |\ \ \ \
| | * | | | fixed copy paste error. 4th test will now test print_unescaped instead of pBernhard Posselt2012-10-301-2/+2
| | * | | | splitted two tests with two assertions each into four tests with one assertionBernhard Posselt2012-10-301-4/+8
| | * | | | assert in proper orderBernhard Posselt2012-10-291-4/+4
| | * | | | added tests for p and print_unescapedBernhard Posselt2012-10-291-0/+67
| * | | | | Merge pull request #153 from butonic/masterLukas Reschke2012-10-301-1/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | check for database error in userExistsJörn Friedrich Dreyer2012-10-301-1/+4
| |/ / / /
* | | | | 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
| |/ /