Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-23 | 122 | -270/+174 |
| | |||||
* | Merge pull request #17815 from owncloud/update-blueimp-md5 | Thomas Müller | 2015-07-22 | 2 | -11/+12 |
|\ | | | | | Update blueimp-md5 to 1.1.0 | ||||
| * | Update blueimp-md5 to 1.1.0 | Morris Jobke | 2015-07-22 | 2 | -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_template | Björn Schießle | 2015-07-22 | 1 | -4/+4 |
|\ \ | | | | | | | make sure that there is a space between user- and admin-documentation | ||||
| * | | use arrow to indicate external link, use correct quotes and capitalization | Jan-Christoph Borchardt | 2015-07-22 | 1 | -2/+2 |
| | | | |||||
| * | | make sure that there is a space between user- and admin-documentation | Bjoern Schiessle | 2015-07-22 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #17413 from owncloud/public-api-querybuilder | Morris Jobke | 2015-07-22 | 30 | -175/+4488 |
|\ \ \ | | | | | | | | | Add public api for Doctrine QueryBuilder and ExpressionBuilder | ||||
| * | | | Add a log message when the Doctrine Query Builder is retrieved | Joas Schilling | 2015-07-21 | 4 | -24/+39 |
| | | | | |||||
| * | | | Comment out LIMIT 0 case because of the mixed results | Joas Schilling | 2015-07-21 | 2 | -1/+6 |
| | | | | |||||
| * | | | Fix tests for setFirstResult and setMaxResults on oracle | Joas Schilling | 2015-07-21 | 3 | -44/+66 |
| | | | | |||||
| * | | | Set a limit until doctrine released a version that fixes Sqlite | Joas Schilling | 2015-07-21 | 1 | -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 Schilling | 2015-07-21 | 1 | -13/+22 |
| | | | | |||||
| * | | | Can not test the string, thanks oracle.... | Joas Schilling | 2015-07-21 | 1 | -10/+32 |
| | | | | |||||
| * | | | Fix existing usages by removing the quotes | Joas Schilling | 2015-07-21 | 9 | -103/+109 |
| | | | | |||||
| * | | | Add unit tests and automatic quoting | Joas Schilling | 2015-07-21 | 20 | -157/+2039 |
| | | | | |||||
| * | | | Use the public interface and our method instead of the doctrine thing | Joas Schilling | 2015-07-21 | 11 | -72/+71 |
| | | | | |||||
| * | | | Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers | Joas Schilling | 2015-07-21 | 9 | -0/+2349 |
| | | | | |||||
* | | | | Merge pull request #17806 from owncloud/enc_improved_app_description | Robin McCorkell | 2015-07-22 | 1 | -13/+8 |
|\ \ \ \ | |_|_|/ |/| | | | improved app description for the default encryption module | ||||
| * | | | improved app description and adjust it to the way the new encryption module ↵ | Bjoern Schiessle | 2015-07-22 | 1 | -13/+8 |
| | |/ | |/| | | | | | | | works | ||||
* | | | Merge pull request #17792 from szepeviktor/master | Robin McCorkell | 2015-07-22 | 2 | -24/+25 |
|\ \ \ | | | | | | | | | Fixing line comments and indentation, closes #17781 | ||||
| * | | | Fixing line comments and indentation | Viktor Szépe | 2015-07-21 | 2 | -24/+25 |
| | |/ | |/| | |||||
* | | | Merge pull request #17342 from rullzer/test_preview_conditions | Roeland Douma | 2015-07-22 | 2 | -0/+5 |
|\ \ \ | |/ / |/| | | Only run some preview unit tets if imagemagick is available | ||||
| * | | Only run some preview unit tets if imagemagick is available | Roeland Jago Douma | 2015-07-02 | 2 | -0/+5 |
| | | | |||||
* | | | Merge pull request #17381 from owncloud/fix_sharing_add_to_group | Morris Jobke | 2015-07-21 | 4 | -32/+206 |
|\ \ \ | | | | | | | | | [sharing] fix addToGroup hook | ||||
| * | | | intproduce pre_addToGroup hook. we need to calculate the possible unique | Bjoern Schiessle | 2015-07-06 | 3 | -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 table | Bjoern Schiessle | 2015-07-03 | 1 | -4/+10 |
| | | | | |||||
* | | | | Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection | Joas Schilling | 2015-07-21 | 2 | -4/+81 |
|\ \ \ \ | | | | | | | | | | | fix system wide mount point detection on migration | ||||
| * | | | | fix mount point detection | Bjoern Schiessle | 2015-07-20 | 2 | -4/+81 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #17766 from owncloud/escape-ampersand | Roeland Douma | 2015-07-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Escape ampersand in logout URL | ||||
| * | | | | Escape ampersand in logout URL | Morris Jobke | 2015-07-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | * fixes #17757 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-21 | 8 | -4/+20 |
|/ / / / | |||||
* | | | | Merge pull request #17743 from owncloud/return-proper-statuscodes | Bernhard Posselt | 2015-07-20 | 3 | -11/+91 |
|\ \ \ \ | |/ / / |/| | | | Return proper status code in case of a CORS exception | ||||
| * | | | Return proper status code in case of a CORS exception | Lukas Reschke | 2015-07-20 | 3 | -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_migration | Björn Schießle | 2015-07-20 | 6 | -25/+124 |
|\ \ \ \ | | | | | | | | | | | don't move keys if the key where already moved in a previous migration run | ||||
| * | | | | unit tests | Bjoern Schiessle | 2015-07-17 | 1 | -2/+36 |
| | | | | | |||||
| * | | | | don't move keys if the key where already moved in a previous migration run | Bjoern Schiessle | 2015-07-17 | 6 | -24/+89 |
| | | | | | |||||
* | | | | | Merge pull request #17723 from owncloud/fix-17631 | blizzz | 2015-07-20 | 2 | -125/+133 |
|\ \ \ \ \ | | | | | | | | | | | | | fix runtime caching in ldap's user manager, fixes #17631 | ||||
| * | | | | | fix indentation. no code changes, whitespace only. | Arthur Schiwon | 2015-07-20 | 1 | -126/+126 |
| | | | | | | |||||
| * | | | | | fix runtime caching in ldap's user manager, fixes #17631 | Arthur Schiwon | 2015-07-17 | 2 | -2/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #16935 from ↵ | Joas Schilling | 2015-07-20 | 29 | -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 Schilling | 2015-07-17 | 2 | -1/+3 |
| | | | | | | | |||||
| * | | | | | | Only decorate the type when it was matched | Joas Schilling | 2015-07-17 | 9 | -79/+194 |
| | | | | | | | |||||
| * | | | | | | Allow specifying the checkers used in app:check-code | Robin McCorkell | 2015-07-17 | 1 | -15/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, all are enabled, but specific ones can be selected through command line options. | ||||
| * | | | | | | Use the decorator pattern | Joas Schilling | 2015-07-17 | 13 | -92/+334 |
| | | | | | | | |||||
| * | | | | | | Restructor the code into different classes instead of extending | Joas Schilling | 2015-07-17 | 11 | -222/+408 |
| | | | | | | | |||||
| * | | | | | | Use non-zero exit code | Joas Schilling | 2015-07-17 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Check for methods as good as possible | Joas Schilling | 2015-07-17 | 10 | -61/+171 |
| | | | | | | | |||||
| * | | | | | | Allow checking for functions | Joas Schilling | 2015-07-17 | 13 | -34/+109 |
| | | | | | | | |||||
| * | | | | | | Add support for deprecated constants | Joas Schilling | 2015-07-17 | 9 | -8/+202 |
| | | | | | | | |||||
| * | | | | | | Add deprecation version to the list | Joas Schilling | 2015-07-17 | 2 | -9/+14 |
| | | | | | | |