summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Swap expected and actual.Thomas Tanghus2012-11-041-1/+1
* Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-04239-3281/+3444
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-0429-96/+135
| * check for filename blacklist in OC_Filesystem::isValidPathRobin Appelman2012-11-032-5/+11
| * some tests for the file blacklistRobin Appelman2012-11-031-8/+42
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-03104-306/+422
| * Merge pull request #220 from fmms/checkstyle02Lukas Reschke2012-11-0283-430/+430
| |\
| | * Checkstyle: many fixesFelix Moeller2012-11-0283-430/+430
| * | fix inlude path for template testRobin Appelman2012-11-021-1/+1
| * | fix OC_Filesystem::isValidPath when using \ instead of / in pathsRobin Appelman2012-11-021-0/+1
| |/
| * Fix a typoLukas Reschke2012-11-021-1/+1
| * Add CSRF tokenLukas Reschke2012-11-022-1/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-02124-2534/+2488
| * Merge pull request #203 from owncloud/wording-url-linkLukas Reschke2012-11-011-1/+1
| |\
| | * Files: change wording 'From url' to 'From link'Jan-Christoph Borchardt2012-11-011-1/+1
| |/
| * fix archive tar include pathRobin Appelman2012-11-011-1/+1
| * adapted comments to the code changesBjörn Schießle2012-11-012-2/+2
| * load logging apps for webdav connectionsBjörn Schießle2012-11-012-2/+3
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-0119-77/+92
* | VCategories: Make $categories non-static again.Thomas Tanghus2012-11-041-27/+27
* | VCategories: Swap expected and actual in unit tests.Thomas Tanghus2012-11-041-4/+4
* | VCategories: Use correct variable.Thomas Tanghus2012-11-041-1/+1
* | Update vcategories ajax scripts.Thomas Tanghus2012-11-013-9/+2
* | Add routes for vcategory favorites.Thomas Tanghus2012-11-011-0/+6
* | 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
| |\ \ \ \