summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix cachejail->updateRobin Appelman2016-01-281-1/+1
|
* cleanup shared cacheRobin Appelman2016-01-288-547/+70
|
* Merge pull request #21858 from owncloud/getMountsForFileIdThomas Müller2016-01-283-13/+205
|\ | | | | add IUserMountCache->getMountsForFileId
| * Fix failing oracle and postgres testsJoas Schilling2016-01-271-2/+2
| |
| * Use new constantsJoas Schilling2016-01-271-7/+8
| |
| * add IUserMountCache->getMountsForFileIdRobin Appelman2016-01-273-7/+198
| |
* | Merge pull request #21970 from zander/mentionbotThomas Müller2016-01-281-1/+2
|\ \ | | | | | | Stop spamming me.
| * | Stop spamming me.Tom2016-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Honestly, the bot should be improved, if a person hasn't contributed for a long time it really doens't make sense to email him. I would also argue that altering the .gitignore doesn't make me an expert on that file. So classes of files really should not cause the mention bot spamming me.
* | | Merge pull request #21971 from owncloud/notify-meThomas Müller2016-01-281-0/+9
|\ \ \ | | | | | | | | Notify me on activity and notifications for sure
| * | | More more more, kidding, just to be sureJoas Schilling2016-01-281-0/+9
|/ / /
* | | Merge pull request #21957 from owncloud/share2_to_ocpMorris Jobke2016-01-2819-632/+827
|\ \ \ | |/ / |/| | [Share 2.0] Move interfaces to OCP
| * | [Share 2.0] Remove setId and setProviderId from the interfaceRoeland Jago Douma2016-01-282-20/+0
| | | | | | | | | | | | Those should only ever be set by the providers
| * | [Share 2.0] Fix interfaces and commentsRoeland Jago Douma2016-01-2812-207/+213
| | | | | | | | | | | | | | | | | | | | | | | | * Made comments more clear * Removed unneeded methods * IShares shareTime is now a proper DateTime object * IShares getPath -> getNode & setPath -> setNode * Fix unit tests
| * | [Share 2.0] Add getShareManager to OCP\IServerContainerRoeland Jago Douma2016-01-274-2/+15
| | |
| * | [Share 2.0] Create IManger interface for share managerRoeland Jago Douma2016-01-272-2/+214
| | |
| * | [Share 2.0] Move IShare to OCPRoeland Jago Douma2016-01-2713-150/+192
| | |
| * | [Share 2.0] Fix IShareRoeland Jago Douma2016-01-274-108/+50
|/ /
* | Merge pull request #21963 from owncloud/fix-installerThomas Müller2016-01-275-82/+225
|\ \ | | | | | | Check whether ownCloud is installed
| * | Check whether ownCloud is installedLukas Reschke2016-01-275-82/+225
| | | | | | | | | | | | | | | | | | ownCloud might not yet be setup. This causes an issue as the user config requires a setup ownCloud. Thus this needs a block whether ownCloud is installed or not. Fixes https://github.com/owncloud/core/issues/21955
* | | Merge pull request #21959 from owncloud/cache-interface-cleanThomas Müller2016-01-271-15/+0
|\ \ \ | | | | | | | | clean cache interface
| * | | clean cache interfaceRobin Appelman2016-01-271-15/+0
| | |/ | |/|
* | | Merge pull request #21895 from owncloud/calendar-sharingThomas Müller2016-01-2712-132/+912
|\ \ \ | |_|/ |/| | Migrate from CardDAV sharing to more general DAV sharing
| * | Extract sharing functionality into own backend class for reusabilityThomas Müller2016-01-276-96/+203
| | |
| * | Fix server ctor including unit test - this shall never happen againThomas Müller2016-01-272-1/+25
| | |
| * | Migrate from CardDAV sharing to more generalk DAV sharingThomas Müller2016-01-279-36/+685
| | |
* | | Merge pull request #21923 from owncloud/fix-errors-after-installThomas Müller2016-01-272-12/+13
|\ \ \ | | | | | | | | Fix errors after install
| * | | Fix errors after installLukas Reschke2016-01-262-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing ownCloud the first time the first thing that an admin saw was an error message: > Error PHP touch(): Unable to create file owncloud.log because Permission denied at /var/www/owncloud/lib/private/log/owncloud.php#48 Or something related. This lead to a lot confusion as can be seen in our forum and in our issue tracker. This change should make the error messages disappear in most cases (e.g. where the file can actually be written). To test this: 1. On master install ownCloud and check owncloud.log => Error message 2. On this branch install ownCloud and check owncloud.log => No error message Fixes https://github.com/owncloud/core/issues/13736 and https://github.com/owncloud/core/issues/12893
* | | | Merge pull request #21940 from ↵Thomas Müller2016-01-273-9/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/share2_do_not_returned_removed_group_shares [Share 2.0] Properly handle user deleted group shares
| * | | | [Share 2.0] Properly handle user deleted group sharesRoeland Jago Douma2016-01-273-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a user deletes a group share we create a special share entry. To the API this is just a normal group share for that user with permissions 0. But we should not return this.
* | | | | Merge pull request #21950 from owncloud/ignore-gd-jped-warningsThomas Müller2016-01-271-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Ignore GD JPEG warnings
| * | | | Ignore GD JPEG warningsLukas Reschke2016-01-271-0/+1
|/ / / / | | | | | | | | Fixes https://github.com/owncloud/core/issues/21873
* | | | Merge pull request #21942 from owncloud/use-message-if-hint-is-emptyThomas Müller2016-01-271-0/+3
|\ \ \ \ | | | | | | | | | | In case the hint of the HintException is empty we better use the exce…
| * | | | In case the hint of the HintException is empty we better use the exception ↵Thomas Müller2016-01-271-0/+3
| | |_|/ | |/| | | | | | | | | | message
* | | | Merge pull request #21947 from owncloud/oc-backbone-webdav-put-bool-tojsonThomas Müller2016-01-275-18/+63
|\ \ \ \ | | | | | | | | | | Fix system tags proppatch with booleans
| * | | | Fix system tags proppatch with booleansVincent Petry2016-01-275-18/+63
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Backbone webdav adapter now converts booleans and ints to strings. Fixed system tags to use "true" / "false" strings for booleans instead of 1 / 0.
* | | | Merge pull request #21856 from owncloud/sync-federated-cloud-users-in-cronThomas Müller2016-01-2711-39/+246
|\ \ \ \ | |/ / / |/| | | Sync federated clouds using a cron job
| * | | Fix PHPDoc and signatureLukas Reschke2016-01-263-3/+10
| | | |
| * | | Adding unit testsThomas Müller2016-01-256-8/+72
| | | |
| * | | Sync federated clouds using a cron jobThomas Müller2016-01-227-35/+171
| | | |
* | | | Merge pull request #21741 from owncloud/l10n-improvementsThomas Müller2016-01-2716-316/+1167
|\ \ \ \ | | | | | | | | | | Move methods to the factory that are not related to translating, but to guessing/finding the language
| * | | | Move class to legacy folderJoas Schilling2016-01-261-0/+0
| | | | |
| * | | | Fix testsJoas Schilling2016-01-261-3/+5
| | | | |
| * | | | Add tests for findAvailableLanguagesJoas Schilling2016-01-261-0/+22
| | | | |
| * | | | Add tests for findLanguage()Joas Schilling2016-01-263-13/+140
| | | | |
| * | | | Remove tests for wrapperJoas Schilling2016-01-261-43/+0
| | | | |
| * | | | Add tests for the factoryJoas Schilling2016-01-262-8/+209
| | | | |
| * | | | Add tests for the new l10n classJoas Schilling2016-01-261-0/+162
| | | | |
| * | | | Move legacy test file to new locationJoas Schilling2016-01-261-5/+11
| | | | |
| * | | | Fix the testsJoas Schilling2016-01-262-1/+5
| | | | |
| * | | | Deprecate OC_L10N in favor of a namespaces and DI versionJoas Schilling2016-01-264-15/+229
| | | | |