Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21628 from owncloud/deprecated_secure_random_funcions | Thomas Müller | 2016-01-12 | 11 | -15/+15 |
|\ | | | | | Replace deprecated function calls to SecureRandom | ||||
| * | getMediumStrengthGenerator is deprecated and does not do anything anymore | Roeland Jago Douma | 2016-01-11 | 7 | -9/+9 |
| | | |||||
| * | getLowStrengthGenerator does not do anything anymore | Roeland Jago Douma | 2016-01-11 | 5 | -6/+6 |
| | | |||||
* | | Merge pull request #21624 from owncloud/l10n_deprecated_function | Thomas Müller | 2016-01-12 | 1 | -11/+0 |
|\ \ | |/ |/| | Remove unused deprecated function from l10n.php | ||||
| * | Remove unused deprecated function | Roeland Jago Douma | 2016-01-11 | 1 | -11/+0 |
| | | |||||
* | | Revert "Remove unneeded check if htaccess test file already exists" | Lukas Reschke | 2016-01-11 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #21586 from owncloud/fix-no-minimum-version | Thomas Müller | 2016-01-11 | 1 | -0/+5 |
|\ | | | | | Assume apps from the appstore are compatible with the current version | ||||
| * | Assume apps from the appstore are compatible with the current version | Lukas Reschke | 2016-01-10 | 1 | -0/+5 |
| | | | | | | | | | | | | Filtering is done server-side already so only compatible apps are delivered. Otherwise this leads to a ton of error messages as the info.xml cannot be read at that state. Fixes https://github.com/owncloud/core/issues/21556 | ||||
* | | Remove generateRandomBytes from OC_Util | Roeland Jago Douma | 2016-01-10 | 3 | -14/+2 |
|/ | |||||
* | Use proper class name | Lukas Reschke | 2016-01-09 | 1 | -1/+1 |
| | | | | This has never worked before. Introduced with https://github.com/owncloud/core/pull/18658 | ||||
* | Just query the securerandom from the container | Roeland Jago Douma | 2016-01-09 | 1 | -1/+1 |
| | |||||
* | Properly close db cursors | Roeland Jago Douma | 2016-01-08 | 1 | -3/+6 |
| | |||||
* | Make sure to respect deleted group shares by user | Roeland Jago Douma | 2016-01-08 | 1 | -1/+3 |
| | |||||
* | Moved to the query builder | Roeland Jago Douma | 2016-01-08 | 1 | -17/+56 |
| | | | | Anything to keep Lukas happy | ||||
* | Make sure that permissions stay in sync for share_type 2 | Roeland Jago Douma | 2016-01-08 | 1 | -44/+73 |
| | | | | | | | | | | When a file/folder is shared with a group and one of the group members moves this file/folder an extra entry is created in the share table. When the permission of the group share is updated we used to only sometimes update the shares for individual users. * Added intergration tests | ||||
* | Merge pull request #21447 from owncloud/leave-disabled-apps-off | Thomas Müller | 2016-01-08 | 1 | -2/+3 |
|\ | | | | | Only enable apps that are not intentionally disabled | ||||
| * | Only enable apps that are not intentionally disabled | Joas Schilling | 2016-01-04 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #21494 from owncloud/underscores-in-class-names | Thomas Müller | 2016-01-08 | 4 | -38/+41 |
|\ \ | | | | | | | Remove underscores from class names - part 1 | ||||
| * | | OC_TemplateLayout -> OC\TemplateLayout | Morris Jobke | 2016-01-07 | 2 | -32/+27 |
| | | | |||||
| * | | OC_DB_MDB2SchemaManager -> OC\DB\MDB2SchemaManager | Morris Jobke | 2016-01-07 | 2 | -6/+14 |
| | | | |||||
* | | | Merge pull request #21286 from ↵ | Thomas Müller | 2016-01-08 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/use-owncloud-mail-when-sending-caldav-schedule-mails Adding IMip scheduling which uses ownClouds mail delivery | ||||
| * | | | Adding IMip scheduling which uses ownClouds mail delivery | Thomas Müller | 2016-01-08 | 1 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #21479 from owncloud/fix-broken-state-in-htaccess-test | Thomas Müller | 2016-01-08 | 1 | -4/+0 |
|\ \ \ \ | | | | | | | | | | | Remove unneeded check if htaccess test file already exists | ||||
| * | | | | Remove unneeded check if htaccess test file already exists | Morris Jobke | 2016-01-06 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | * fixes #20199 | ||||
* | | | | | Merge pull request #21292 from owncloud/checkAppEnabled-not-needed-anymore | Thomas Müller | 2016-01-08 | 1 | -14/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | core will handle invalid URLs and redirects properly | ||||
| * | | | | | core will handle invalid URLs and redirects properly | Morris Jobke | 2015-12-18 | 1 | -14/+0 |
| | | | | | | |||||
* | | | | | | Merge pull request #21139 from owncloud/makeswifturltypeconfigurable | Thomas Müller | 2016-01-08 | 1 | -2/+7 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | make url type configurable | ||||
| * | | | | | add isset for optional params | Jörn Friedrich Dreyer | 2016-01-04 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | make url type configurable | Jörn Friedrich Dreyer | 2015-12-11 | 1 | -1/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #21032 from owncloud/router-error-handling | Thomas Müller | 2016-01-08 | 1 | -64/+39 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Router error handling + Base.php | ||||
| * | | | | | | Cleanup router code | Lukas Reschke | 2016-01-07 | 1 | -64/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some functions are entirely broken - PHPDoc etc... | ||||
* | | | | | | | Merge pull request #21527 from owncloud/remove_all_avatars | Thomas Müller | 2016-01-08 | 1 | -6/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Remove all cache avatars on avatar deletion | ||||
| * | | | | | | Remove all cache avatars on avatar deletion | Roeland Jago Douma | 2016-01-07 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #21513 Since we cache the generated avatars. We should also delete the generated sizes when we remove the avatar. | ||||
* | | | | | | | Merge pull request #21498 from owncloud/cleanup-OC_DB | Thomas Müller | 2016-01-07 | 10 | -87/+23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Cleanup OC_DB methods | ||||
| * | | | | | | | Remove OC_DB::getConnection | Morris Jobke | 2016-01-07 | 8 | -18/+12 |
| | | | | | | | | |||||
| * | | | | | | | Remove OC_DB::insertid | Morris Jobke | 2016-01-07 | 3 | -17/+2 |
| | | | | | | | | |||||
| * | | | | | | | Remove beginTransaction, commit, rollback from OC_DB | Morris Jobke | 2016-01-07 | 2 | -24/+3 |
| | | | | | | | | |||||
| * | | | | | | | Remove OC_DB::isError | Morris Jobke | 2016-01-07 | 3 | -20/+7 |
| | | | | | | | | |||||
| * | | | | | | | Remove OC_DB::dropTable | Morris Jobke | 2016-01-07 | 1 | -9/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #21506 from ↵ | Thomas Müller | 2016-01-07 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-20218-min-max-owncloud-version-warning Issue 20218 min max owncloud version warning | ||||
| * | | | | | | | | Add a warning to the app:check-code if the version is missing | Joas Schilling | 2016-01-07 | 1 | -0/+5 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #21502 from owncloud/di_mimetypedetector | Thomas Müller | 2016-01-07 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Add 'OCP\Files\IMimeTypeDetector' to DI container | ||||
| * | | | | | | | Add 'OCP\Files\IMimeTypeDetector' to DI container | Roeland Jago Douma | 2016-01-07 | 1 | -0/+4 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | * Added test to server container as well | ||||
* | | | | | | | Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developers | Thomas Müller | 2016-01-07 | 2 | -1/+15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow downgrades for our brave developers, that switch between branches | ||||
| * | | | | | | | Allow downgrades for our brave developers, that switch between branches | Joas Schilling | 2016-01-07 | 2 | -1/+15 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #20773 from owncloud/share2.0_create | Thomas Müller | 2016-01-07 | 5 | -27/+677 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | [Sharing 2.0] create share | ||||
| * | | | | | | [Sharing 2.0] Some error cases report 404 instead of 403 | Roeland Jago Douma | 2016-01-06 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | [Sharing 2.0] Add L10N instance to manager for translated errors | Roeland Jago Douma | 2016-01-06 | 1 | -7/+18 |
| | | | | | | | |||||
| * | | | | | | [Share 2.0] Make the share manager ready for share creation | Roeland Jago Douma | 2016-01-06 | 1 | -9/+511 |
| | | | | | | | |||||
| * | | | | | | [Share 2.0] Make share provider ready for create shares | Roeland Jago Douma | 2016-01-06 | 2 | -13/+114 |
| | | | | | | |