1
0
Fork 0
mirror of synced 2024-07-06 07:00:56 +12:00
Commit graph

551 commits

Author SHA1 Message Date
Damodar Lohani f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
Matej Bačo ccc9432219 Merge branch 'master' into fix-1.2.x-conflicts 2022-12-27 08:29:10 +01:00
Jake Barnby 9694b79f03
Update changelog 2022-12-22 19:59:29 +13:00
Steven 9167b10c81
Merge branch 'master' into fix-4782-email-body-fr-translation 2022-12-21 11:45:50 -08:00
Matej Bačo ab68bb4ea1 Merge branch 'feat-db-pools' into feat-build-size 2022-12-18 08:21:41 +01:00
Christy Jacob 90e93f3255 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools 2022-12-16 15:42:40 +00:00
Matej Bačo 2f53260197 Update CHANGES.md 2022-12-12 13:45:07 +01:00
Christy Jacob 69d5a25c62 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-12-07 15:39:44 +04:00
Jake Barnby b6723b7c83
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-12-06 20:38:09 +13:00
Matej Bačo ea58cb4aff Update changelog 2022-12-05 14:57:24 +00:00
P.O.M 0cd67229a1 Fix : translation french "emails.recovery.body"
Wrong reference to project variable
2022-11-26 13:04:44 +01:00
Jake Barnby cefd5660b9
Merge remote-tracking branch 'origin/master' into fix-region-parameter
# Conflicts:
#	CHANGES.md
2022-11-25 10:42:27 +13:00
Jake Barnby 9d0cbd3b68
Update changelog 2022-11-25 10:39:53 +13:00
Christy Jacob 30eda18ac1
Merge pull request #4776 from appwrite/fix-team-invite-verification-main
Fix: unsaved changes in team invitation
2022-11-24 19:18:47 +05:30
Matej Bačo 5e872f2fe5
Update changelog 2022-11-24 12:36:14 +01:00
Christy Jacob f239296059 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools 2022-11-23 19:05:19 +00:00
Torsten Dittmann b44a100439 Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-1-2 2022-11-23 19:00:15 +01:00
Steven Nguyen 01556184c7
Fix the default oauth paths to match the route 2022-11-23 09:57:49 -08:00
Torsten Dittmann dcbdbfa053 Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-1-2 2022-11-23 18:53:51 +01:00
Torsten Dittmann b819381bed
Merge branch 'master' into fix-623-locale-api-unknown-continent 2022-11-23 18:52:39 +01:00
Torsten Dittmann 20c538ec83
chore: update changelog 2022-11-23 18:52:09 +01:00
Torsten Dittmann 2e9087285d
Merge branch 'master' into fix-function-status-missing 2022-11-23 18:47:15 +01:00
Torsten Dittmann b382031ae7 chore: release 1.1.1 2022-11-23 18:43:48 +01:00
Torsten Dittmann 0d0de17d15
Merge branch 'master' into fix-session-expiry 2022-11-23 17:51:51 +01:00
Jake Barnby 1e1ab2a8ae
Update changelog 2022-11-23 18:22:44 +13:00
Alex Patterson 5f80f87ba9 fixed continent spelling 2022-11-22 19:00:07 -05:00
Alex Patterson 56d8c176dd add update to changelog 2022-11-22 18:54:50 -05:00
Matej Bačo eda112755a Update changelogs 2022-11-21 14:26:59 +00:00
Matej Bačo 8feb3dc43c Update changelog 2022-11-21 09:40:50 +00:00
Jake Barnby 5a84a37a9e
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-11-18 12:41:48 +13:00
Christy Jacob 080abbbb79 Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console 2022-11-17 20:26:10 +05:30
Torsten Dittmann a252c7e469 chore: update changelog 2022-11-17 13:39:16 +01:00
Torsten Dittmann e7189efcff chore: update changelog 2022-11-17 12:38:39 +01:00
Torsten Dittmann 6567b23c85 chore: update changelog 2022-11-17 12:26:58 +01:00
Torsten Dittmann 00ec95fc9f chore: add changelog 2022-11-17 11:35:29 +01:00
Jake Barnby 163cbc5052
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-17 21:41:56 +13:00
Christy Jacob 17a36dbce3 feat: update changelog 2022-11-16 11:15:24 +00:00
Christy Jacob 956eab5ab5 Merge branch 'master' of https://github.com/appwrite/appwrite into fix-deletes-worker 2022-11-16 11:11:15 +00:00
Christy Jacob 08a986e433 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into fix-deletes-worker 2022-11-16 11:10:39 +00:00
Christy Jacob cf4be51094 feat: review comments 2022-11-16 10:43:26 +00:00
Christy Jacob 5ca7b5ffe8
Update CHANGES.md 2022-11-16 15:47:40 +05:30
Christy Jacob 8411e81e28
Update CHANGES.md 2022-11-16 15:43:07 +05:30
Jake Barnby c46ba06c51
Update env var name 2022-11-16 19:57:12 +13:00
Jake Barnby f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/init.php
#	app/tasks/sdks.php
#	composer.lock
#	docker-compose.yml
2022-11-16 19:37:35 +13:00
Jake Barnby dd6c5c056f
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	CHANGES.md
2022-11-16 19:31:40 +13:00
Torsten Dittmann 522ae8d538 feat: migration for 1.1.x 2022-11-15 13:59:35 +01:00
Jake Barnby 702657ebb4
Merge remote-tracking branch 'origin/feat-db-pools' into feat-realtime-dbpools
# Conflicts:
#	.env
#	CHANGES.md
#	composer.json
#	composer.lock
2022-11-15 21:22:14 +13:00
Jake Barnby b8b78adfdc
Update changelog 2022-11-15 21:05:52 +13:00
Bradley Schofield 3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
Christy Jacob b4bf0cf8d0 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into fix-deletes-worker 2022-11-14 08:11:26 +00:00