1
0
Fork 0
mirror of synced 2024-08-03 12:32:28 +12:00
Commit graph

924 commits

Author SHA1 Message Date
Torsten Dittmann
d387f198db Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
Jake Barnby
2d6974da82
Fix empty examples 2022-10-21 15:28:06 +13:00
Jake Barnby
a2b1941a47
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	CONTRIBUTING.md
#	composer.json
#	composer.lock
#	docs/references/teams/list-teams.md
2022-10-19 13:17:56 +13:00
Jake Barnby
fb5d2fc25c
Abstract setting params to init 2022-10-17 13:27:15 +13:00
Jake Barnby
fb68ed377e
Fix imports 2022-10-17 12:13:35 +13:00
Jake Barnby
cecc6dada2
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
# Conflicts:
#	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
#	composer.json
#	composer.lock
2022-10-17 12:04:13 +13:00
Damodar Lohani
be3743e227 fix renamed function 2022-10-14 11:24:37 +00:00
Jake Barnby
d163217d1f
Remove Appwrite URL dependency from resolvers 2022-10-14 18:04:23 +13:00
Jake Barnby
a2b532ed22
Set dirty property instead of in registry from shutdown 2022-10-13 12:59:32 +13:00
Torsten Dittmann
bc66efa1a5 chore: prepare 1.0.3 2022-10-12 12:03:55 +02:00
Jake Barnby
b6621f5e87
Restructure schema building 2022-10-12 14:04:11 +13:00
Jake Barnby
575b882b30
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	.github/workflows/tests.yml
#	composer.lock
2022-10-10 18:41:40 +13:00
Jake Barnby
608f1532a6
Merge remote-tracking branch 'origin/1.0.x' into feat-integrate-messaging
# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-10 14:01:59 +13:00
Jake Barnby
2fbc40e966
Merge fixes 2022-10-03 13:42:53 +13:00
Jake Barnby
2bb8854f61
WIP integrate messaging library
(cherry picked from commit 9a25f77e3e7e76f6c93cc3ce1985f43426a0debf)

# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-03 13:28:30 +13:00
Torsten Dittmann
fbbb150e86 Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"
This reverts commit 2117fa53f0, reversing
changes made to c634d12ef4.
2022-09-30 14:22:11 +02:00
Torsten Dittmann
e0b9f57d85
Revert "Feat app region" 2022-09-30 12:32:58 +02:00
Torsten Dittmann
757a3f8651 chore: prepare 1.0.2 2022-09-30 12:27:26 +02:00
Jake Barnby
63a4853563
Fix list complexity calculations 2022-09-23 15:53:25 +12:00
Jake Barnby
e9f75d32a1
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	Dockerfile
#	app/config/errors.php
#	app/config/roles.php
#	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/controllers/api/graphql.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Migration/Migration.php
2022-09-20 15:43:09 +12:00
Damodar Lohani
e80e65946b Merge branch 'master' of https://github.com/appwrite/appwrite into feat-app-region 2022-09-19 12:01:56 +00:00
Matej Bačo
6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Torsten Dittmann
95d322dc36 feat: prepare 1.0.1 release 2022-09-14 21:03:00 +02:00
Torsten Dittmann
78cd9ea71a chore: prepare 1.0.0 release 2022-09-14 11:00:13 +02:00
Damodar Lohani
ed81ff1263 regions using config instead 2022-09-08 07:19:14 +00:00
Matej Bačo
ae2826ad1f Bug fixes 2022-09-02 14:19:36 +00:00
Matej Bačo
432bfe96ac New version preparation 2022-09-01 04:41:50 +00:00
Christy Jacob
e5a9195e66
Merge pull request #3736 from appwrite/refactor-cache-date
Refactor cache date
2022-08-31 19:00:36 +02:00
Damodar Lohani
8fe365d66e Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support 2022-08-31 13:21:45 +00:00
shimon
94ad09b53f const update 2022-08-31 16:11:23 +03:00
Christy Jacob
0438e830b0
Merge pull request #3634 from appwrite/feat-variables-api
Implement Function Variable API
2022-08-31 14:37:30 +02:00
Damodar Lohani
67f38d0644 compression type constants 2022-08-31 09:51:20 +00:00
Matej Bačo
0897cd0fe4
Merge branch '0.16.x' into feat-variables-api 2022-08-31 09:37:47 +02:00
Jake Barnby
190d9684f0
Use consts for rate limit count + period 2022-08-31 11:34:17 +12:00
Christy Jacob
25d9c8e501 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-27 20:03:15 +00:00
Matej Baco
8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02:00
Jake Barnby
625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	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/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Matej Bačo
4b01ff3f51 Use new query methods 2022-08-24 14:10:56 +00:00
Jake Barnby
8841f8fe76 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-22 21:13:29 +12:00
Bradley Schofield
0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01:00
Christy Jacob
2a750eaa73 Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:32:22 +00:00
Christy Jacob
278afd77c0 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys 2022-08-19 09:20:08 +00:00
Jake Barnby
cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby
7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# Conflicts:
#	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/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Damodar Lohani
3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
Damodar Lohani
a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
shimon
9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.json
	composer.lock
2022-08-17 11:16:09 +03:00
Damodar Lohani
80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Christy Jacob
4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00
Jake Barnby
bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby
fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
shimon
0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Jake Barnby
cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	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
#	composer.lock
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
#	public/dist/styles/default-ltr.css
#	public/dist/styles/default-rtl.css
#	public/scripts/dependencies/appwrite.js
2022-08-15 12:05:52 +12:00
Eldad Fux
22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux
25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Jake Barnby
9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
Jake Barnby
6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby
b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Christy Jacob
c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
Christy Jacob
b4e944e9ba feat: run linter 2022-08-10 19:19:58 +05:30
Christy Jacob
741824ef87 feat: move server list to app resource 2022-08-10 19:15:04 +05:30
Bradley Schofield
6882ffaa00 Merge branch '0.16.x' into feat-variables-api 2022-08-09 13:37:24 +01:00
Bradley Schofield
603cb1db34 Update init.php 2022-08-09 13:32:33 +01:00
shimon
092e682591 Merge branch 'master' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	app/controllers/shared/api.php
2022-08-09 15:02:29 +03:00
Damodar Lohani
bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
Christy Jacob
8cae6bb627 feat: review comments 2022-08-09 11:26:53 +05:30
Christy Jacob
82e39ccf52 feat: review comments 2022-08-09 01:12:13 +05:30
Bradley Schofield
43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
Torsten Dittmann
a4588cc848 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:49:28 +02:00
Torsten Dittmann
7b95c46cf5 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:40:45 +02:00
Torsten Dittmann
bd550f8a1e feat: ui for datetime attribute 2022-07-28 14:38:54 +02:00
Torsten Dittmann
0bf39bd152
Merge pull request #3603 from appwrite/0.15.x
master <- 0.15.x
2022-07-26 11:22:23 +02:00
fogelito
b58c04c28b Add attribute datetime 2022-07-25 11:53:41 +03:00
Jake Barnby
fd79922284 Per project keys 2022-07-25 16:26:46 +12:00
shimon
64050337cf tidy up 2022-07-24 10:05:24 +03:00
Torsten Dittmann
80258efc7f feat: prepare 0.15.3 2022-07-22 17:53:50 +02:00
Bradley Schofield
40022decb4 Start working on simplifying exceptions 2022-07-22 15:38:06 +01:00
Matej Bačo
183a18f618 Implement functions CRUD operations 2022-07-20 07:18:49 +00:00
Jake Barnby
1dc557042f Fix lazy matching route replacement parameters 2022-07-18 14:52:41 +12:00
Jake Barnby
0b7b5496f3 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-07-14 20:13:41 +12:00
Jake Barnby
221e7b59c4 Add abuse test 2022-07-14 20:11:39 +12:00
Jake Barnby
814298c549 Remove redundant injections 2022-07-14 01:38:16 +12:00
Jake Barnby
a656699fa7 Code cleanup 2022-07-13 21:34:56 +12:00
Aditya Oberai
f63c1c95fe Create Vonage phone auth adapter 2022-07-12 15:45:22 +00:00
Jake Barnby
10a5c24a63 Format and lint 2022-07-12 09:52:00 +12:00
Jake Barnby
7259f21cf1 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.lock
2022-07-12 09:18:58 +12:00
shimon
59627ea9ef logger moved to App::shutdown 2022-07-09 21:24:28 +03:00
Dineshkumar
817524de4b Renamed Msg91Flow to Msg91 2022-07-09 19:34:57 +05:30
Jake Barnby
da71aec774 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/controllers/api/databases.php
#	composer.lock
2022-07-08 17:50:16 +12:00
Jake Barnby
a589681c3d WIP caching and lazy re-building schema 2022-07-08 17:48:00 +12:00
shimon
a0cfc2110a logger moved to App::shutdown 2022-07-07 17:51:22 +03:00
Torsten Dittmann
6683e5f8ec prepare: 0.15.2 2022-07-06 13:25:42 +02:00
shimon
0c2c030b71 restore 2022-07-05 10:46:41 +03:00
shimon
7b429bdcd7 cache cleanup 2022-07-03 12:36:59 +03:00
Jake Barnby
9d134a949f Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/general.php
#	app/init.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
2022-07-01 00:05:44 +12:00
Torsten Dittmann
2bc6587e84 chore: increase chache buster 2022-06-29 13:56:56 +02:00
Torsten Dittmann
95181b0a7f prepare: 0.15.1 release 2022-06-29 13:36:35 +02:00
Torsten Dittmann
4d2101b092 chore: update geo db 2022-06-27 14:16:35 +02:00
Jake Barnby
d019937e4f Merge remote-tracking branch 'origin/fix-role-clobbering' into feat-graphql-support
# Conflicts:
#	composer.lock
2022-06-27 14:52:39 +12:00