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 |
|