summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11862 from nextcloud/bugfix/ensure_cache_it_initblizzz2018-10-171-1/+3
|\ | | | | Double check for failed cache with a shared storage
| * Double check for failed cache with a shared storageRoeland Jago Douma2018-10-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | When obtaining the SourceRootInfo we can call init. If this fails the cache is set to a failed cache and the storage to a failed storage. However we did not check for this. Which means that if the storage was invalid it would fail later on. Now we will properly error out. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11870 from nextcloud/fix/noid/proper-column-name-escapingMorris Jobke2018-10-163-3/+3
|\ \ | | | | | | Properly quote column name in "createFunction" call
| * | Properly escape column name in "createFunction" callMorris Jobke2018-10-163-3/+3
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #11839 from nextcloud/csp/files_dropRoeland Jago Douma2018-10-164-12/+38
|\ \ | |/ |/| Move files_drop to compiled handlebars
| * Move files_drop to compiled handlebarsRoeland Jago Douma2018-10-164-12/+38
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11358 from Zulan/fix-welcome-l10nMorris Jobke2018-10-163-75/+4
|\ \ | |/ |/| Fix welcome l10n
| * Get l10n within NewUserMailHelper to ensure it always uses the new user's ↵zulan2018-10-153-75/+4
| | | | | | | | | | | | | | | | | | language. Some related tests had to be changed because they relied on internals, see also from the PHPUnit documentation: "Exercise caution when using [the at] matcher as it can lead to brittle tests which are too closely tied to specific implementation details." Signed-off-by: Zulan <git@zulan.net>
* | Merge pull request #11849 from nextcloud/csp/fileactionsmenuRoeland Jago Douma2018-10-154-23/+56
|\ \ | | | | | | Move fileactionsmenu to compiled handlebars
| * | Tests: Properly compare the file action labelJulius Härtl2018-10-151-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move fileactionsmenu to compiled handlebarsRoeland Jago Douma2018-10-153-22/+55
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Move workflowengine to compiled handlebarsRoeland Jago Douma2018-10-156-72/+179
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and ↵Morris Jobke2018-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | actively cast it to a boolean This was the error message that we have seen: ``` Argument 1 passed to OC\\Share20\\Share::setSendPasswordByTalk() must be of the type boolean, null given, called in apps/sharebymail/lib/ShareByMailProvider.php on line 981 ``` Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Make activity events strictJoas Schilling2018-10-121-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #11759 from nextcloud/feature/11504/sharing-faviconMorris Jobke2018-10-121-1/+1
|\ \ | | | | | | Use default favicon on sharing pages
| * | Use default favicon on sharing pagesJulius Härtl2018-10-111-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10778 from suntorytimed/patch-1Roeland Jago Douma2018-10-111-0/+4
|\ \ \ | |/ / |/| | check for empty string
| * | Adding a check to see if keyFileContents is empty:Stefan Weiberg2018-08-211-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | * this fixes a download error and an exception if the data content for encryption is empty * #3958: for recovering encrypted files with a damaged signature this is necessary in addition to turning the signature check off Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
* | | Merge pull request #11719 from ↵Morris Jobke2018-10-102-83/+24
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/techdebt/noid/allow-to-mock-new-datetime Allow to inject/mock `new \DateTime()` similar to time()
| * | | Fix mock of ITimeFactoryJoas Schilling2018-10-102-83/+24
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-10-10604-1768/+1780
| | | |
* | | | Merge pull request #11716 from ↵Morris Jobke2018-10-097-24/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/use-numeric-placeholders-for-rtl-translations Use numeric placeholders if there are multiple, so that RTL languages…
| * | | | Use numeric placeholders if there are multiple, so that RTL languages can ↵Joas Schilling2018-10-097-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operate better Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Revert "in 14 the click action gets lost in the Backbone view."Morris Jobke2018-10-092-2/+3
| |/ / / |/| | |
* | | | Merge pull request #11709 from nextcloud/refactor/jquery-beforeunloadMorris Jobke2018-10-091-1/+1
|\ \ \ \ | | | | | | | | | | Fix depracted jQuery.bind call
| * | | | Fix depracted jQuery.bind callChristoph Wurst2018-10-091-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* / / / Fix usage of deprecated OC.webrootChristoph Wurst2018-10-0913-69/+69
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2018-10-092-4/+4
| | |
* | | Merge pull request #11664 from ↵Roeland Jago Douma2018-10-082-30/+16
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/has-been-interrupted-throw-exception Syntactic sugar for hasBeenInterrupted
| * | | Rename method to abortIfInterruptedDaniel Kesselberg2018-10-082-9/+9
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Adjust code for changed method signatureDaniel Kesselberg2018-10-072-30/+16
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #11679 from nextcloud/refactor/remove-ie8-apisMorris Jobke2018-10-082-2/+0
|\ \ \ \ | | | | | | | | | | Remove IE8 APIs
| * | | | Remove OC.scaleFixForIE8Christoph Wurst2018-10-082-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #11518 from nextcloud/feature/noid/save-s3-requestsMorris Jobke2018-10-081-9/+59
|\ \ \ \ \ | | | | | | | | | | | | S3 reuse information from listObject and skip headObject
| * | | | | Remove value from cache on delete/clearDaniel Kesselberg2018-10-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Use helper method for content length and last modifiedDaniel Kesselberg2018-10-011-11/+54
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Reuse information from ListObjects for stat / filetypeDaniel Kesselberg2018-09-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #11682 from ↵Morris Jobke2018-10-081-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/refactor/remove-deprecated-unused-fileDownloadPath Remove deprecated and unused fileDownloadPath
| * | | | | | Remove deprecated and unused fileDownloadPathChristoph Wurst2018-10-081-5/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #11680 from nextcloud/refactor/remove-deprecated-svg-apisMorris Jobke2018-10-082-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove deprecated SVG helpers for old IEs
| * | | | | | Remove deprecated SVG helpers for old IEsChristoph Wurst2018-10-082-6/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #10782 from nextcloud/fix/10774/deadtagactionMorris Jobke2018-10-082-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | in 14 the click action gets lost in the Backbone view.
| * | | | | | in 14 the click action gets lost in the Backbone view.Arthur Schiwon2018-08-212-3/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #10839 from nextcloud/bugfix/10212/use_class_implementationMorris Jobke2018-10-081-8/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | adjust Calendar resource / room interfaces to use class implementation
| * | | | | adjust Calendar resource / room interfaces to use class implementationGeorg Ehrke2018-10-081-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #11599 from nextcloud/feature/7136/workflow-engine-filenameMorris Jobke2018-10-083-0/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add FileName to Workflow engine
| * | | | | | Fix typoDaniel Kesselberg2018-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | Ignore case for is and !isDaniel Kesselberg2018-10-051-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | Change placeholderDaniel Kesselberg2018-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | | Remove unused importDaniel Kesselberg2018-10-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>