Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,238 Commits 1,269 Branches 495 Tags
__stream
Commit Graph

109 Commits

Author SHA1 Message Date
shimon d28803e2e7 Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	composer.json
	composer.lock
 2023-06-12 17:34:19 +03:00
Jake Barnby bab804b8e1 Fix tests 
(cherry picked from commit 0661f1f889)
 2023-05-30 18:29:20 +12:00
shimon f3508e1701 Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	Dockerfile
	app/config/services.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/console
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/teams.php
	composer.json
	composer.lock
	src/Appwrite/Utopia/Response.php
 2023-05-07 11:43:29 +03:00
Torsten Dittmann 6e5b8fab4b fix: implement new framework changes 2023-03-01 17:30:36 +05:30
shimon b9fa699c03 video tests 2023-02-22 13:16:33 +02:00
shimon a1918d1512 video tests 2023-02-21 11:21:47 +02:00
shimon ca90711c30 realtime events 2023-02-20 10:02:51 +02:00
shimon 4ac062edfe Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	Dockerfile
	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/console
	composer.lock
 2023-02-19 10:51:50 +02:00
fogelito c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2 
 Conflicts:
	app/init.php
	composer.json
	composer.lock
 2023-01-16 10:24:37 +02:00
shimon 1af48bd895 Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.gitmodules
	app/config/errors.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
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Extend/Exception.php
 2023-01-11 16:31:26 +02:00
fogelito b301a64dc4 clean up some use classes not in use 2022-12-21 10:02:22 +02:00
fogelito dfd122efaa Change Client data hint 2022-12-19 13:25:01 +02:00
fogelito 91e17e4e94 remove static $dateValidator 2022-12-19 13:21:32 +02:00
fogelito 91db596b42 remove static $dateValidator 2022-12-19 13:21:09 +02:00
fogelito bdc3e9f935 $dateValidator 2022-12-15 10:51:27 +02:00
fogelito f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
shimon 19a38cd06a Merge branch 'master' of github.com:appwrite/appwrite into __stream 
 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/workers/deletes.php
	composer.json
	composer.lock
	docker-compose.yml
 2022-11-20 13:37:03 +02: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
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
Damodar Lohani cde374b505 add region in test 2022-09-20 13:21:05 +00: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
shimon c9b0c6f906 sync with 0.16 2022-09-08 15:01:33 +03:00
shimon 1aed3a1db5 Merge branch '0.16.x' of github.com:appwrite/appwrite into __stream 
 Conflicts:
	.env
	app/config/collections.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/account.php
	app/controllers/api/storage.php
	app/init.php
	composer.json
	composer.lock
	docker-compose.yml
	phpunit.xml
	src/Appwrite/Extend/Exception.php
	src/Appwrite/Utopia/Response.php
 2022-09-06 11:14:11 +03:00
Jake Barnby 22f0468c8e Merge remote-tracking branch 'origin/0.16.x' into feat-allow-automatic-test-retries 
# Conflicts:
#	app/controllers/api/teams.php
#	package-lock.json
#	package.json
#	tests/e2e/Services/Teams/TeamsBase.php
 2022-08-30 23:14:28 +12:00
Jake Barnby bbeeb356ab Allow flaky tests to be automatically retried with an attribute 2022-08-26 21:21:08 +12: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
shimon ebe794926c addressing comments 2022-08-23 17:17:40 +03:00
shimon 9ffd52d030 tests 2022-08-22 09:58:42 +03:00
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
shimon 1bcd2d6bd5 draft 2022-07-25 14:37:45 +03:00
shimon 076f333f77 update 2022-07-25 11:37:23 +03:00
shimon 9f4ebcf208 logger moved to App::shutdown 2022-07-11 11:22:43 +03:00
shimon bc43989aa4 Merge branch 'master' of github.com:appwrite/appwrite into __stream 2022-07-05 14:33:28 +03:00
shimon dc38b63160 small fix 2022-07-05 14:02:23 +03:00
shimon 5e903daf6f small fix 2022-07-05 13:51:28 +03:00
Damodar Lohani 69a036b2b7 fix linter 2022-07-03 01:09:11 +00: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
Jake Barnby f85169452a Add session ID to scope user state 2022-06-30 21:23:38 +12:00
Damodar Lohani 7a58814c61 WIP 2022-06-30 04:27:11 +00:00
Damodar Lohani 8f14f5aa21 Database layer (#3338) 
* database response model

* database collection config

* new database scopes

* database service update

* database execption codes

* remove read write permission from database model

* updating tests and fixing some bugs

* server side tests are now passing

* databases api

* tests for database endpoint

* composer update

* fix error

* formatting

* formatting fixes

* get database test

* more updates to events and usage

* more usage updates

* fix delete type

* fix test

* delete database

* more fixes

* databaseId in attributes and indexes

* more fixes

* fix issues

* fix index subquery

* fix console scope and index query

* updating tests as required

* fix phpcs errors and warnings

* updates to review suggestions

* UI progress

* ui updates and cleaning up

* fix type

* rework database events

* update tests

* update types

* event generation fixed

* events config updated

* updating context to support multiple

* realtime updates

* fix ids

* update context

* validator updates

* fix naming conflict

* fix tests

* fix lint errors

* fix wprler and realtime tests

* fix webhooks test

* fix event validator and other tests

* formatting fixes

* removing leftover var_dumps

* remove leftover comment

* update usage params

* usage metrics updates

* update database usage

* fix usage

* specs update

* updates to usage

* fix UI and usage

* fix lints

* internal id fixes

* fixes for internal Id

* renaming services and related files

* rename tests

* rename doc link

* rename readme

* fix test name

* tests: fixes for 0.15.x sync

Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
 2022-06-22 12:51:49 +02:00
Torsten Dittmann 6dd41b52c3 Merge branch '0.15.x' of https://github.com/appwrite/appwrite into feat-phone-authentication 2022-06-20 13:38:39 +02:00
Torsten Dittmann 8d465c67c2 feat: account sessions for emails 2022-06-14 10:17:50 +02:00
shimon 54f6556204 sign webhook flow 2022-06-07 18:11:07 +03:00
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Torsten Dittmann 2f9b9445dd sync with devices 2022-04-04 08:30:07 +02:00
Christy Jacob 3c65d40234 Merge branch '0.13.x' of github.com:appwrite/appwrite into feat-functions-refactor-merge 2022-02-18 15:16:10 +04:00
Christy Jacob 4ad47061dd Merge branch 'master' of github.com:appwrite/appwrite into feat-functions-refactor 2022-02-18 13:38:54 +04:00
Damodar Lohani d73d3015eb Merge branch 'master' into feat-storage-buckets 2022-02-10 01:20:16 +00:00
Matej Baco 3aa62b439b Implemented refresh token endpoint 2022-02-01 16:54:20 +01:00