1
0
Fork 0
mirror of synced 2024-07-07 23:46:11 +12:00
Commit graph

8033 commits

Author SHA1 Message Date
Torsten Dittmann 1b533daeaa fix: remove manifest endpoint 2022-11-15 16:30:53 +01:00
Torsten Dittmann 29edecf05d fix: tests 2022-11-15 16:19:13 +01:00
shimon ee0950449a Merge branch '1.1.x' of github.com:appwrite/appwrite into fix-cache-permissions 2022-11-15 17:17:58 +02:00
shimon 18618b8e8b cancel cache via avatar::initials 2022-11-15 17:17:35 +02:00
Torsten Dittmann 006cb4665e
Merge pull request #4674 from appwrite/fix-usage-executions
Fix: usage executions
2022-11-15 15:39:12 +01:00
Torsten Dittmann aff29ed197 fix: update console 2022-11-15 15:36:37 +01:00
Torsten Dittmann ef1e5a9674 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-15 15:36:25 +01:00
Torsten Dittmann 344669db46
Merge pull request #4677 from appwrite/fix-realtime-console-project
chore: prepare release
2022-11-15 15:35:52 +01:00
Torsten Dittmann 35b7a2ee96 fix: linter 2022-11-15 15:22:57 +01:00
Torsten Dittmann 7288520f38 fix: realtime console project 2022-11-15 13:30:18 +01:00
Bradley Schofield a51288da57 Update projects.php 2022-11-15 10:25:34 +00:00
Bradley Schofield 64b725a6f7 Update Defaults 2022-11-15 10:19:35 +00:00
Matej Bačo 8dd5eb09f0 Fix executions usage count 2022-11-15 09:33:07 +00:00
Torsten Dittmann c621b66195 fix: upgrade console 2022-11-14 22:54:38 +01:00
Torsten Dittmann aea13bad72 Merge branch 'chore-prepare-1-1-0' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-14 22:54:23 +01:00
Torsten Dittmann 825738ced9 chore: prepare 1.1.x 2022-11-14 22:42:48 +01:00
Torsten Dittmann 9412013360 feat: remove stuff 2022-11-14 21:58:51 +01:00
Bradley Schofield 3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
Torsten Dittmann c784cab798 fix: remove asterik 2022-11-14 16:26:10 +01:00
Bradley Schofield a14ab321bf
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 15:18:40 +00:00
Torsten Dittmann 310ff90d22 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-14 15:57:40 +01:00
Torsten Dittmann 465dad522e fix: remove unnecessary files 2022-11-14 15:31:24 +01:00
Bradley Schofield 43d4d6fec3 Address Eldad's Comments 2022-11-14 09:57:37 +00:00
Bradley Schofield c76057fd37
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 09:54:49 +00:00
Bradley Schofield 36d4719a3b
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-11-14 09:54:40 +00:00
Bradley Schofield 0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield cdb4c60c3c Run Linter 2022-11-14 09:33:49 +00:00
Bradley Schofield 66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Bradley Schofield f6b7e0392b Give auth duration it's own endpoint 2022-11-14 09:15:55 +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
Christy Jacob 72a37516d3 feat: address review comments: 2022-11-11 13:54:05 +00:00
shimon 180262d166 Merge branch '1.1.x' of github.com:appwrite/appwrite into fix-cache-permissions 2022-11-11 13:18:33 +02:00
shimon 7723762dd1 cache buster added to cache key 2022-11-11 12:41:41 +02:00
Christy Jacob d664549495 fix: use getDevice in deletes worker 2022-11-10 13:48:55 +00:00
shimon f9671ee855 enabling file permissions
via cache preview
2022-11-10 12:08:01 +02:00
Eldad A. Fux 42cedf8ed0
Merge pull request #3909 from appwrite/feat-usage-refactor
new stats to count resources
2022-11-10 11:05:36 +02:00
Torsten Dittmann 9f384e016f Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-09 15:47:23 +01:00
Torsten Dittmann 9565152ced chore: update console 2022-11-09 15:22:38 +01:00
Torsten Dittmann ab5ddc263b Merge branch 'feat-console-rewrite' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-09 15:06:32 +01:00
Torsten Dittmann 4befb19c35 feat: add databases and buckets to projects usage 2022-11-08 13:09:18 +01:00
Bradley Schofield 842185e45d Update projects.php 2022-11-07 11:58:57 +00:00
Bradley Schofield 4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield 4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield 94676a6c16 Alter sessionVerify to remove expire 2022-11-04 09:50:59 +00:00
Jake Barnby a47bfe71bf
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support
# Conflicts:
#	CHANGES.md
#	composer.json
#	composer.lock
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-04 21:32:57 +13:00
Eldad A. Fux 44ca7d9459
Merge pull request #4631 from appwrite/feat-fix-account-naming
Updated titles on account routes
2022-11-03 18:19:41 +02:00
Eldad Fux 103469928e Updated routes 2022-11-03 17:24:32 +02:00
Bradley Schofield 4b8287c097 Remove 'expire' from sessions 2022-11-03 15:03:39 +00:00
Christy Jacob 8e99c44c59 Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 20:39:20 +05:30
Eldad A. Fux 32be6d6816
Merge pull request #4282 from appwrite/doc-unique-id
Update Unique ID references in docs from magic string to ID.unique()
2022-11-02 15:39:46 +02:00
Damodar Lohani 4b5d537eee
Apply suggestions from code review
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-11-02 15:41:50 +05:45
Damodar Lohani 41d31c28d0
remove buildTime from deployments collection 2022-11-02 15:38:59 +05:45
Damodar Lohani b66f932b3b Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-02 08:43:12 +00:00
Christy Jacob 360a51ec20 Merge branch '1.1.x' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 10:16:27 +05:30
Christy Jacob e9239717d7 Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 10:16:16 +05:30
Christy Jacob c074731615
Merge pull request #4590 from rskbansal/master
fixed grammatical and spelling errors
2022-11-02 07:38:45 +05:30
Jake Barnby 0827d59f21
Merge remote-tracking branch 'origin/1.1.x' into fix-missing-deployment-attributes
# Conflicts:
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-02 13:33:10 +13:00
Vincent (Wen Yu) Ge a8a23fb8eb Merge branch 'master' into doc-unique-id 2022-11-01 17:53:48 +00:00
Christy Jacob b2d884e329 Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:21:19 +05:30
Bradley Schofield cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield 5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Christy Jacob 5ea19cd539
Merge pull request #3848 from appwrite/refactor-remove-beta
Remove beta tag from Android, Kotlin, Apple and Swift
2022-11-01 12:35:56 +05:30
Damodar Lohani 8baa95db1c Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-01 04:54:48 +00:00
Jake Barnby 8a4fd3307d
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	composer.json
#	composer.lock
2022-11-01 11:38:23 +13:00
Jake Barnby 03f85c3b74
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
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/Provider.php
2022-11-01 11:07:51 +13:00
Damodar Lohani 11f3474cb8
buildTime attribute to deployment
(cherry picked from commit 7989518eec)
2022-11-01 11:04:27 +13:00
geisterfurz007 e891424c17 fix: empty payload deleting single user session 2022-10-31 21:01:49 +01:00
Christy Jacob 629c1b1686 Merge branch 'test-mysql-adapter' of github.com:appwrite/appwrite into update-db-library 2022-10-31 23:38:58 +05:30
fogelito bf119867e8 change name back to original 'name' 2048 2022-10-31 17:17:37 +02:00
Bradley Schofield d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Christy Jacob aff7c59097 feat: update database library 2022-10-31 12:02:51 +00:00
Torsten Dittmann 983f885b3f fix: builds worker buildTime 2022-10-31 12:47:41 +01:00
Torsten Dittmann d8717a4a16 fix: console build 2022-10-31 11:50:19 +01:00
Damodar Lohani 7989518eec buildTime attribute to deployment 2022-10-31 09:07:06 +00:00
Torsten Dittmann 0049a76565 feat: submodule 2022-10-31 09:53:36 +01:00
Torsten Dittmann 4f3188c63f Merge branch 'rebase-1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-10-31 09:47:35 +01:00
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
Damodar Lohani 4086ba93ad Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-10-31 06:36:26 +00:00
Jake Barnby 049e3a2646
Add missing status, buildStdout, buildStderr to getDeployment 2022-10-31 18:11:55 +13:00
Damodar Lohani 7433a260db fix formatting 2022-10-30 05:16:51 +00:00
Damodar Lohani 0d29968169 refactor database listener callback 2022-10-30 05:14:46 +00:00
Damodar Lohani 80972aa4ce update variables descriptions 2022-10-30 05:07:46 +00:00
Vincent (Wen Yu) Ge afa508cbed undo changes in swagger files 2022-10-28 20:45:13 +00:00
Damodar Lohani 60f2d10a50 update variable namings 2022-10-28 09:54:56 +00:00
Damodar Lohani 4c5273b8b2 document the environment variable usage stats retention 2022-10-28 09:16:36 +00:00
Damodar Lohani a0a0ef2386 update docblock comments and naming 2022-10-28 08:40:04 +00:00
Jake Barnby db49e962f4
Use abuse status instead of dev/prod for graphql abuse check 2022-10-28 20:12:11 +13:00
Jake Barnby 2a96056b8d
Remove redundant import and sort 2022-10-28 10:06:09 +13:00
Jake Barnby 89b4d0026a
Move shutdown hook to graphql controller 2022-10-28 10:04:31 +13:00
Rhythm Bansal 572e5d5f93
Update hi.json 2022-10-27 14:49:58 +05:30
Rhythm Bansal 569c5644fa
Update hi.json 2022-10-27 14:43:59 +05:30
Rhythm Bansal b5a61d949b
fixed grammatical and spelling errors 2022-10-27 14:42:08 +05:30
Jake Barnby e632731c4e
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support 2022-10-27 12:24:57 +13:00
fogelito a5e67db604 fulltext 2022-10-26 23:12:46 +03:00
fogelito 8e8801b11c adapter change 2022-10-26 23:05:25 +03:00
Torsten Dittmann 7f256e5d06 feat: add console repo 2022-10-26 21:23:02 +02:00
fogelito 08e44f0656 some changes 2022-10-26 22:14:39 +03:00
Torsten Dittmann eb31bfb78e
Merge pull request #4418 from appwrite/feat-deployment-buildtime
Add build time to deployments
2022-10-26 18:42:53 +02:00
Torsten Dittmann 32f2333ab6 test: mysql adapter 2022-10-26 16:38:40 +02:00
Jake Barnby 9620dcbc07
Update specs 2022-10-26 16:22:01 +13:00
Jake Barnby c5bda4d2ff
Add REST to platforms and SDKs 2022-10-26 16:19:30 +13:00
Steven Nguyen 719aa67afa
Remove PDO rethrow
The PDOException was rethrown in general.php so that it could be caught
in the catch block of http.php. However, [a change in
utopia-php/framework](9d37326851)
caused the exception to be masked as an Exception rather than the
underlying PDOException. As such, the `$th instanceof PDOException` in
http.php is always false and `$db = null` is never executed. Since these
snippets of code aren't doing anything or adding value, they should be
removed.

In addition, the `$db = null` may have been added to ensure the
connection was added back to the pool and/or reset if needed, but it
seems like that's not a problem anymore.
2022-10-25 10:05:52 -07:00
Jake Barnby 2f444ead34
Revert "Review revert unrelated change"
This reverts commit bf064fa5c9.
2022-10-25 18:31:51 +13:00
Jake Barnby e3b5919e40
Review doc fixes 2022-10-25 15:53:15 +13:00
Jake Barnby 34bd0fe93d
Review remove redundant registry injection 2022-10-25 15:45:08 +13:00
Jake Barnby bf064fa5c9
Review revert unrelated change 2022-10-25 15:44:19 +13:00
Torsten Dittmann 461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Damodar Lohani c8b5301267 update maintenance to delete only hourly metrics older than 3 months 2022-10-23 07:29:13 +00:00
Damodar Lohani bde7fe21c4 remove unused param 2022-10-23 07:03:50 +00:00
Damodar Lohani 8048d24857 deprecate database aggregation 2022-10-23 05:17:50 +00:00
Damodar Lohani 3ed3ef9d71 rename variable 2022-10-23 04:46:23 +00:00
Vincent (Wen Yu) Ge 9a1f54baf1
Merge branch 'master' into doc-unique-id 2022-10-21 17:43:52 -04:00
Damodar Lohani 03f8e20dfd Merge remote-tracking branch 'origin/master' into feat-usage-refactor 2022-10-21 06:27:03 +00:00
Damodar Lohani dfa35e0a0b fix periods on usage endpoints 2022-10-21 05:45:25 +00:00
Jake Barnby 2d6974da82
Fix empty examples 2022-10-21 15:28:06 +13:00
Damodar Lohani d35b438255 fix collection and document counts 2022-10-21 01:50:03 +00:00
Damodar Lohani a7e1e5f25f fix period 2022-10-21 01:40:33 +00:00
Jake Barnby 40be56b35f
Set isSDK false for graphql 2022-10-20 18:52:51 +13:00
Jake Barnby 99b8769151
Fix family 2022-10-20 18:40:34 +13:00
Jake Barnby 455b9ca5df
Add initial 1.2.x specs 2022-10-20 16:22:30 +13:00
Jake Barnby 2eed73395a
Add GraphQL platform 2022-10-20 16:21:16 +13:00
Jake Barnby 6a4f3d6a6b
Merge remote-tracking branch 'origin/master' 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
2022-10-20 12:41:24 +13:00
Eldad A. Fux 61d6b435b3
Merge pull request #4530 from appwrite/feat-bump-api-specs
Update API specs
2022-10-19 09:28:13 +03:00
Bradley Schofield 60e924b62b Run Linter 2022-10-19 02:50:48 +01:00
Bradley Schofield fe4028f588 Add tests and add buildTime to worker 2022-10-19 02:43:40 +01: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 61e5014ff0
Add sdk graphql header to allowed headers list 2022-10-19 13:01:39 +13:00
Steven Nguyen 080116cff8 Update API specs 2022-10-18 21:05:54 +00:00
Damodar Lohani 868e487a59 fix bucket collection name 2022-10-18 07:52:41 +00:00
Damodar Lohani e7c82a28dd more fixes 2022-10-18 07:09:11 +00:00
Damodar Lohani 305dafe2ad update missing stats 2022-10-18 06:53:17 +00:00
Damodar Lohani 5b90c433ab fix collection id 2022-10-17 07:53:55 +00:00
Damodar Lohani 00d194d5d1 fix linters 2022-10-17 07:37:30 +00:00
Damodar Lohani f3c183b563 listen to delete events 2022-10-17 07:10:18 +00:00
Damodar Lohani f78cb09694 Merge remote-tracking branch 'origin/master' into feat-usage-refactor 2022-10-17 06:55:01 +00:00
Damodar Lohani 84f5842c81 document create listener 2022-10-17 06:52:24 +00:00
Jake Barnby e0f6b8c105
Update specs 2022-10-17 14:43:27 +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 019fa11616 setup to use database listeners 2022-10-16 08:50:53 +00:00
Damodar Lohani 90e9e5e7fd
Update app/http.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-10-16 11:49:12 +05:45
Damodar Lohani 00973d4a14 add try catch 2022-10-16 05:58:25 +00:00
vrabe f260836100
Update the name of Eswatini (Swaziland) 2022-10-15 19:14:20 +08:00
Piotr Rogowski 833e3f8ce1
Fix User not found exception 2022-10-14 18:17:00 +02:00
Damodar Lohani e2555e2448 fix metadata creation 2022-10-14 11:25:22 +00:00
Damodar Lohani be3743e227 fix renamed function 2022-10-14 11:24:37 +00:00
Damodar Lohani f86a5b5fcd fix renamed methods 2022-10-14 11:12:59 +00:00
Damodar Lohani 65337bc9e9 fix metadata creation 2022-10-14 11:07:32 +00:00
Torsten Dittmann d0aedf33ba
Merge pull request #4058 from appwrite/fix-deprecate-team-deletion-with-project
Deprecate team deletion with project
2022-10-14 11:19:27 +02:00
Christy Jacob 98bdcfe04e
Merge pull request #4292 from Akshay-Rana-Gujjar/fix-3810-incorrect-error-when-updating-phone-to-existing-number
fixed: wrong error message show on adding duplicate number to a user
2022-10-14 12:02:39 +04:00
Jake Barnby d163217d1f
Remove Appwrite URL dependency from resolvers 2022-10-14 18:04:23 +13:00
Jake Barnby 3f98cef633
Fix spec test 2022-10-14 14:40:34 +13:00
Jake Barnby a99ade13c0
Don't flatten batch results 2022-10-14 14:33:42 +13:00
Jake Barnby 742fc98cfc
Controller cleanup 2022-10-14 14:32:16 +13:00
Jake Barnby 444c68e07e
Remove redundant error 2022-10-14 13:23:21 +13:00
Jake Barnby 44e4f1e05b
Make param errors consistent 2022-10-14 13:18:08 +13:00
Jake Barnby 64ad2211c7
Update specs + sdk generator 2022-10-13 17:42:53 +13:00
Jake Barnby e4673aaa50
Fix requests using x-sdk-graphql header 2022-10-13 17:33:55 +13:00
Jake Barnby 4e60db0598
Use upstream raw payload function 2022-10-13 16:56:12 +13:00
Jake Barnby 143c53cb20
Always set 200 status code to match spec 2022-10-13 14:52:08 +13:00
Jake Barnby a2b532ed22
Set dirty property instead of in registry from shutdown 2022-10-13 12:59:32 +13:00
Steven Nguyen 02ab2b8a63
Update SDK License to match opensource.org
The difference made it so pub.dev was unable to detect the license.
2022-10-12 09:57:54 -07:00
Torsten Dittmann bc66efa1a5 chore: prepare 1.0.3 2022-10-12 12:03:55 +02:00
Jake Barnby 5debe2c13c
Alias + name fixes 2022-10-12 20:20:44 +13:00
Jake Barnby b6621f5e87
Restructure schema building 2022-10-12 14:04:11 +13:00
Steven Nguyen 5542e5b04c Only delete collection data for correct db
Ensure attributes, indexes, and audit for correct database is deleted.
2022-10-11 22:51:10 +00:00
Torsten Dittmann 4210fdcb27 feat: console rewrite 2022-10-11 16:36:39 +02:00
fogelito 4d2e5c3e94 specs recreate 2022-10-11 17:08:06 +03:00
fogelito 778751160b Merge branch '1.1.x' of github.com:appwrite/appwrite into bug_model_metric
 Conflicts:
	app/config/specs/open-api3-latest-console.json
	app/config/specs/swagger2-latest-console.json
2022-10-11 17:06:37 +03:00
fogelito 9ff918ac6b specs 2022-10-11 15:56:09 +03:00
Jake Barnby bf194c30e9
Review updates 2022-10-11 13:38:06 +13:00
Jake Barnby fd8d4f4a1b
Add type property to hash algorithms to allow resolving union type implementation 2022-10-11 12:27:03 +13:00
Bradley Schofield 380a45f987 Add build time to deployment 2022-10-10 16:24:40 +01: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 702710aab1
Fix import 2022-10-10 16:20:46 +13:00
Jake Barnby f93099cbb6
Merge remote-tracking branch 'origin/1.1.x' into feat-integrate-messaging 2022-10-10 14:04:01 +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
Damodar Lohani 9b2db20b3b fix backfill 2022-10-09 06:33:14 +00:00
Damodar Lohani 22b00c019d update usage period on get for databases 2022-10-09 06:30:26 +00:00
Akshay Rana da9133ae85 fixed: wrong error message show on adding duplicate number to a user 2022-10-04 23:48:15 +05:30
Vincent (Wen Yu) Ge 4cee87273c
Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
vrabe 5236b48f34
你 to 您, for consistency 2022-10-04 20:41:46 +08:00
vrabe 018e4fe54b
update zh-tw translation 2022-10-04 20:25:40 +08:00
Torsten Dittmann 120216f715 Merge branch '1.0.x' of https://github.com/appwrite/appwrite into chore-prepare-1-0-2 2022-10-04 12:19:18 +02:00
Vincent (Wen Yu) Ge 55985c47d4 Update specs 2022-10-03 21:21:27 +00:00
Vincent (Wen Yu) Ge ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00
Matej Bačo 3da4b01f4e Deprecate team deletion with project 2022-10-03 08:06:48 +00:00
Matej Bačo a883d3728f Allow teamId queries on listProjects 2022-10-03 07:16:49 +00: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 5d32ddb408 Merge branch '1.0.x' of https://github.com/appwrite/appwrite into chore-prepare-1-0-2 2022-09-30 14:36:53 +02:00
Torsten Dittmann e5271dbda9
Merge branch '1.0.x' into fix-function-vars-null 2022-09-30 14:29:22 +02:00
Torsten Dittmann 0c1222f0f5 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x 2022-09-30 14:23:06 +02: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
Torsten Dittmann 637a97c4de Merge branch '1.0.x' of https://github.com/appwrite/appwrite into fix-function-vars-null 2022-09-30 12:06:32 +02:00
Torsten Dittmann 6c1e2ae537
Merge branch '1.0.x' into fix-boolean-attribute-default-value 2022-09-30 11:56:31 +02:00