Commit Graph

11151 Commits

Author SHA1 Message Date
shimon bb172f8a3e refactor worker flow 2022-06-27 16:13:01 +03:00
shimon 48320d40ab Merge remote-tracking branch 'origin/__stream' into __stream
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/video.php
#	app/init.php
#	app/workers/transcoding.php
#	composer.lock
#	src/Appwrite/Event/Transcoding.php
#	src/Appwrite/Utopia/Response.php
#	tests/e2e/Services/Video/VideoCustomServerTest.php
2022-06-27 16:08:17 +03:00
shimon c89b028797 refactor worker flow 2022-06-27 16:06:46 +03:00
shimon c7534760a0 refactor worker flow 2022-06-22 17:44:03 +03:00
shimon d6007b24ec refactor worker flow 2022-06-22 08:56:57 +03:00
shimon c8c282afb2 restore 2022-06-21 11:45:49 +03:00
shimon 6491cea581 restore 2022-06-21 11:45:49 +03:00
shimon 100fb73323 view template 2022-06-21 11:45:49 +03:00
shimon aa6ff513a6 restore 2022-06-20 14:44:04 +03:00
Torsten Dittmann 69c6798aa9 Merge pull request #3402 from everly-gif/fix-yammer-url
fix: 404 OAuth2 docs url for Yammer
2022-06-20 13:24:13 +02:00
Everly Precia Suresh 44dc9346c2 fix oauth docs url for yammer 2022-06-20 09:57:18 +00:00
shimon 56545a7344 restore 2022-06-19 11:52:56 +03:00
shimon e97957d46e Merge branch 'master' of github.com:appwrite/appwrite into __stream 2022-06-19 10:52:30 +03:00
Torsten Dittmann 3c627fdd53 fix: revert cpp prism support 2022-06-17 14:23:02 +02:00
shimon 329c43f860 view template 2022-06-16 23:01:42 +03:00
Torsten Dittmann 062ecddc24 Merge pull request #3374 from appwrite/include-cpp-prismjs-support
Feat: Include C++ PrismJS file
2022-06-16 17:05:34 +02:00
Torsten Dittmann baa2ce9256 Merge pull request #3385 from appwrite/snyk-upgrade-89df12c40650e56730dd293620f5c0d8
[Snyk] Upgrade chart.js from 3.7.1 to 3.8.0
2022-06-16 09:29:27 +02:00
snyk-bot 393b121b08 fix: upgrade chart.js from 3.7.1 to 3.8.0
Snyk has created this PR to upgrade chart.js from 3.7.1 to 3.8.0.

See this package in npm:
https://www.npmjs.com/package/chart.js

See this project in Snyk:
https://app.snyk.io/org/eldadfux/project/8574b5e4-6e89-4ade-bc02-2eaabc43eed0?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-06-16 06:12:59 +00:00
Eldad A. Fux d06af4ff72 Merge pull request #3384 from appwrite/fix-oauth-providers-order
Fix: Correct the order of OAuth providers
2022-06-15 20:37:42 +03:00
Aditya Oberai d21f99d1bf Fix order of OAuth providers 2022-06-15 19:22:21 +05:30
Torsten Dittmann e142d62a26 Merge pull request #3368 from MATsxm/patch-2
Update fr.json
2022-06-13 16:52:06 +02:00
Matej Baco 43fadd6b40 Rebuild JS files 2022-06-13 16:04:49 +02:00
Aditya Oberai 9a8fc49f2e Include C++ PrismJS file 2022-06-13 19:29:25 +05:30
Marc-Antoine Thevenet 7d3fbfb311 Update fr.json
##EASY FIX

following previous [PR #3340](https://github.com/appwrite/appwrite/pull/3340)
Here's a new try for Typo fix + 🇫🇷 t9n updated...

Thanks and hope it will pass the test 😟
2022-06-10 15:53:45 +02:00
Christy Jacob 310ecbb87c Merge pull request #3367 from appwrite/fix-payload-default
Fix: default function payload
2022-06-10 14:57:18 +04:00
Matej Bačo 775721abdb Fix default payload 2022-06-10 10:31:37 +00:00
Torsten Dittmann a8e4d7a71a Merge pull request #3363 from appwrite/fix-attr-null
null on default tests
2022-06-10 09:51:36 +02:00
Torsten Dittmann d66d2cb9d2 Merge pull request #3365 from appwrite/dependabot/composer/guzzlehttp/guzzle-7.4.4
Bump guzzlehttp/guzzle from 7.4.3 to 7.4.4
2022-06-10 09:48:59 +02:00
dependabot[bot] 8b1860d5ec Bump guzzlehttp/guzzle from 7.4.3 to 7.4.4
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.3 to 7.4.4.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.3...7.4.4)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-10 06:53:52 +00:00
Torsten Dittmann a9a00d76ae Merge pull request #3348 from appwrite/fix-first-execution-delay
Fix: Unnecessary execution delays
2022-06-09 21:12:41 +02:00
shimon 6c7a6dcd8b null on default tests 2022-06-09 18:15:34 +03:00
Christy Jacob b5634d507b Merge pull request #3349 from appwrite/fix-gitpod-workspace
Fix: Gitpod workspace
2022-06-08 22:02:58 +05:30
Torsten Dittmann 7b323114e6 Merge pull request #3351 from appwrite/feat-webhook-signature
webhook signature
2022-06-08 12:15:44 +02:00
shimon 40016f48c1 linter fix 2022-06-08 12:21:20 +03:00
Shimon Newman ce6c2d2794 Update src/Appwrite/Utopia/Response/Model/Webhook.php
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-06-08 11:03:19 +03:00
Shimon Newman 41ccb6a72b Update tests/e2e/Services/Webhooks/WebhooksBase.php
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-06-08 11:03:07 +03:00
shimon 9e828ecbe7 Small fix 2022-06-08 10:28:26 +03:00
shimon dea03f5396 Small fix 2022-06-08 10:20:54 +03:00
shimon 64ba33f3aa Small fix 2022-06-08 10:19:50 +03:00
Matej Baco ce59bcce7a Linter fix 2022-06-08 09:10:44 +02:00
Torsten Dittmann fb8c5f6140 Merge pull request #3331 from 2002Bishwajeet/fix-typo-error-dart
fix small typo error dart
2022-06-07 19:15:35 +02:00
Torsten Dittmann c309896620 Merge pull request #3337 from MATsxm/patch-1
Update en.json
2022-06-07 19:14:38 +02:00
shimon 71c7a48075 sign webhook flow 2022-06-07 19:02:39 +03:00
shimon 54f6556204 sign webhook flow 2022-06-07 18:11:07 +03:00
Matej Bačo 5b98547fe1 Fix after testing 2022-06-07 14:00:20 +00:00
Matej Bačo 7c578b38e6 Remove gitpod reference 2022-06-07 13:52:23 +00:00
Matej Bačo 3b71e34aa4 Remove gitpod config (needed no more) 2022-06-07 13:50:05 +00:00
Matej Baco cdc44230cf Fix execution delays 2022-06-07 14:01:12 +02:00
Bishwajeet Parhi abdd612a9b Merge branch 'appwrite:master' into fix-typo-error-dart 2022-06-06 19:54:27 +05:30
Torsten Dittmann e8a9f3f9c4 Merge pull request #3344 from appwrite/fix-linter-issues
fix : linter issues
2022-06-06 15:57:59 +02:00