summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-23122-270/+174
|
* Merge pull request #17815 from owncloud/update-blueimp-md5Thomas Müller2015-07-222-11/+12
|\ | | | | Update blueimp-md5 to 1.1.0
| * Update blueimp-md5 to 1.1.0Morris Jobke2015-07-222-11/+12
| | | | | | | | | | | | Yes this is pretty empty, but it's the truth: https://github.com/blueimp/JavaScript-MD5/compare/1.0.3...1.1.0
* | Merge pull request #17807 from owncloud/improve_apps_templateBjörn Schießle2015-07-221-4/+4
|\ \ | | | | | | make sure that there is a space between user- and admin-documentation
| * | use arrow to indicate external link, use correct quotes and capitalizationJan-Christoph Borchardt2015-07-221-2/+2
| | |
| * | make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-221-4/+4
| | |
* | | Merge pull request #17413 from owncloud/public-api-querybuilderMorris Jobke2015-07-2230-175/+4488
|\ \ \ | | | | | | | | Add public api for Doctrine QueryBuilder and ExpressionBuilder
| * | | Add a log message when the Doctrine Query Builder is retrievedJoas Schilling2015-07-214-24/+39
| | | |
| * | | Comment out LIMIT 0 case because of the mixed resultsJoas Schilling2015-07-212-1/+6
| | | |
| * | | Fix tests for setFirstResult and setMaxResults on oracleJoas Schilling2015-07-213-44/+66
| | | |
| * | | Set a limit until doctrine released a version that fixes SqliteJoas Schilling2015-07-211-0/+4
| | | | | | | | | | | | | | | | See https://github.com/doctrine/dbal/pull/782 for more info
| * | | Correctly count the number of items (rowCount is Update/Insert/Delete only)Joas Schilling2015-07-211-13/+22
| | | |
| * | | Can not test the string, thanks oracle....Joas Schilling2015-07-211-10/+32
| | | |
| * | | Fix existing usages by removing the quotesJoas Schilling2015-07-219-103/+109
| | | |
| * | | Add unit tests and automatic quotingJoas Schilling2015-07-2120-157/+2039
| | | |
| * | | Use the public interface and our method instead of the doctrine thingJoas Schilling2015-07-2111-72/+71
| | | |
| * | | Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappersJoas Schilling2015-07-219-0/+2349
| | | |
* | | | Merge pull request #17806 from owncloud/enc_improved_app_descriptionRobin McCorkell2015-07-221-13/+8
|\ \ \ \ | |_|_|/ |/| | | improved app description for the default encryption module
| * | | improved app description and adjust it to the way the new encryption module ↵Bjoern Schiessle2015-07-221-13/+8
| | |/ | |/| | | | | | | works
* | | Merge pull request #17792 from szepeviktor/masterRobin McCorkell2015-07-222-24/+25
|\ \ \ | | | | | | | | Fixing line comments and indentation, closes #17781
| * | | Fixing line comments and indentationViktor Szépe2015-07-212-24/+25
| | |/ | |/|
* | | Merge pull request #17342 from rullzer/test_preview_conditionsRoeland Douma2015-07-222-0/+5
|\ \ \ | |/ / |/| | Only run some preview unit tets if imagemagick is available
| * | Only run some preview unit tets if imagemagick is availableRoeland Jago Douma2015-07-022-0/+5
| | |
* | | Merge pull request #17381 from owncloud/fix_sharing_add_to_groupMorris Jobke2015-07-214-32/+206
|\ \ \ | | | | | | | | [sharing] fix addToGroup hook
| * | | intproduce pre_addToGroup hook. we need to calculate the possible uniqueBjoern Schiessle2015-07-063-28/+196
| | | | | | | | | | | | | | | | | | | | targets before the user was added to the group otherwise we will always detect a name collision
| * | | use the correct user if we update the share tableBjoern Schiessle2015-07-031-4/+10
| | | |
* | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detectionJoas Schilling2015-07-212-4/+81
|\ \ \ \ | | | | | | | | | | fix system wide mount point detection on migration
| * | | | fix mount point detectionBjoern Schiessle2015-07-202-4/+81
| | |_|/ | |/| |
* | | | Merge pull request #17766 from owncloud/escape-ampersandRoeland Douma2015-07-211-1/+1
|\ \ \ \ | | | | | | | | | | Escape ampersand in logout URL
| * | | | Escape ampersand in logout URLMorris Jobke2015-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | * fixes #17757
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-218-4/+20
|/ / / /
* | | | Merge pull request #17743 from owncloud/return-proper-statuscodesBernhard Posselt2015-07-203-11/+91
|\ \ \ \ | |/ / / |/| | | Return proper status code in case of a CORS exception
| * | | Return proper status code in case of a CORS exceptionLukas Reschke2015-07-203-11/+91
| | | | | | | | | | | | | | | | | | | | | | | | When returning a 500 statuscode external applications may interpret this as an error instead of handling this more gracefully. This will now make return a 401 thus. Fixes https://github.com/owncloud/core/issues/17742
* | | | Merge pull request #17701 from owncloud/fix_repeated_migrationBjörn Schießle2015-07-206-25/+124
|\ \ \ \ | | | | | | | | | | don't move keys if the key where already moved in a previous migration run
| * | | | unit testsBjoern Schiessle2015-07-171-2/+36
| | | | |
| * | | | don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-176-24/+89
| | | | |
* | | | | Merge pull request #17723 from owncloud/fix-17631blizzz2015-07-202-125/+133
|\ \ \ \ \ | | | | | | | | | | | | fix runtime caching in ldap's user manager, fixes #17631
| * | | | | fix indentation. no code changes, whitespace only.Arthur Schiwon2015-07-201-126/+126
| | | | | |
| * | | | | fix runtime caching in ldap's user manager, fixes #17631Arthur Schiwon2015-07-172-2/+10
| | | | | |
* | | | | | Merge pull request #16935 from ↵Joas Schilling2015-07-2029-181/+1348
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/allow-app-check-code-for-deprecated-classes Allow app check code for deprecated classes
| * | | | | | PR #17046 deprecated OCP\Util::mb_(sub)str_replace()Joas Schilling2015-07-172-1/+3
| | | | | | |
| * | | | | | Only decorate the type when it was matchedJoas Schilling2015-07-179-79/+194
| | | | | | |
| * | | | | | Allow specifying the checkers used in app:check-codeRobin McCorkell2015-07-171-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, all are enabled, but specific ones can be selected through command line options.
| * | | | | | Use the decorator patternJoas Schilling2015-07-1713-92/+334
| | | | | | |
| * | | | | | Restructor the code into different classes instead of extendingJoas Schilling2015-07-1711-222/+408
| | | | | | |
| * | | | | | Use non-zero exit codeJoas Schilling2015-07-171-1/+2
| | | | | | |
| * | | | | | Check for methods as good as possibleJoas Schilling2015-07-1710-61/+171
| | | | | | |
| * | | | | | Allow checking for functionsJoas Schilling2015-07-1713-34/+109
| | | | | | |
| * | | | | | Add support for deprecated constantsJoas Schilling2015-07-179-8/+202
| | | | | | |
| * | | | | | Add deprecation version to the listJoas Schilling2015-07-172-9/+14
| | | | | | |