Matej Bačo
a8cd99873f
Add cache, fix miss-align
2023-04-26 11:10:06 +02:00
Jake Barnby
7fe14ca10b
Merge remote-tracking branch 'origin/master' into sync-master
...
# 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/console
# app/controllers/api/storage.php
# composer.lock
2023-04-12 00:50:31 +12:00
Steven Nguyen
a86c1c0a2b
Fix yasd so that the debugger works
...
* Update the base image since the yasd extension wasn't installed correctly
* Fix the path to the yasd_init.php file
* Use `host.docker.internal` as the remote host because that should always work inside docker
* Mount the dev folder into the appwrite container so the yasd_init.php file is picked up.
2023-03-29 18:04:24 -07:00
Matej Bačo
3916e4c0c5
Fix usage with Proxy
2023-03-24 09:26:21 +01:00
Christy Jacob
5f10ff4d3b
Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools-sync
2023-03-24 06:35:30 +00:00
Jake Barnby
b6cfe43681
Clean up
2023-03-24 16:46:02 +13:00
Matej Bačo
55d94302db
Update docker-compose.yml
2023-03-22 08:45:38 +01:00
Christy Jacob
39388e9b92
feat: use env vars for the hamster time
2023-03-20 12:58:11 +05:30
fogelito
eee29940bb
Some tests
2023-03-19 19:09:17 +02:00
Christy Jacob
42ebaf6541
feat: store token in env var
2023-03-17 21:37:29 +05:30
fogelito
00c1418246
Update response Model.php
2023-03-16 13:48:27 +02:00
fogelito
28af0669f6
docker-compose.yml temp mount
2023-03-16 11:11:04 +02:00
fogelito
44de884ee5
convert relatedOptions to options
2023-03-16 09:31:48 +02:00
Matej Bačo
d10c7c7775
Merge branch 'feat-db-pools-master' into feat-executor-v3-sync
2023-03-15 08:59:42 +01:00
Matej Bačo
c01fcb130c
Merge branch 'feat-db-pools-master' into feat-db-pools-sync
2023-03-14 12:58:54 +01:00
Christy Jacob
5a8cab8de7
feat: update console branch
2023-02-22 17:57:44 +00:00
Christy Jacob
ad2c068e75
feat: update console mode
2023-02-22 12:46:54 +05:30
Matej Bačo
e1dd796d01
Add wildcard support
2023-02-21 10:35:43 +01:00
Damodar Lohani
5acd78463a
Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync
2023-02-16 00:44:29 +00:00
Shimon Newman
d1153ee0d7
Update docker-compose.yml
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-02-15 21:20:25 +02:00
Matej Bačo
fef5082253
Merge remote-tracking branch 'origin/feat-executor-v3' into feat-appwrite-router
2023-02-14 12:18:39 +00:00
Matej Bačo
e4d784c871
Add new V3 parameters
2023-02-14 11:01:38 +00:00
Damodar Lohani
71d2c45a92
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-02-14 04:35:19 +00:00
Matej Bačo
eea635fe4b
Basic implementation for Open Runtimes V2
2023-02-09 15:27:11 +01:00
Christy Jacob
38d7401aa9
feat: automate hamster
2023-02-06 15:23:33 +05:30
shimon
5850a454e0
addressing comments
2023-02-05 22:07:46 +02:00
Matej Bačo
75c7d94633
Implement Open Runtimes v3 support
2023-02-02 19:21:00 +00:00
shimon
1ac935077b
addressing comments
2023-02-02 20:16:01 +02:00
shimon
abdd5f016a
addressing comments
2023-02-02 13:55:23 +02:00
Christy Jacob
e654ec2720
Merge pull request #4889 from appwrite/feat-aggregate-stats
...
feat: aggregate stats
2023-01-26 16:31:34 +05:30
Christy Jacob
c97e7ce328
feat: update scripts
2023-01-26 02:26:33 +05:30
Damodar Lohani
4356af621a
fix env variables
2023-01-20 10:40:06 +00:00
Christy Jacob
30690f6bc4
Merge pull request #4885 from appwrite/revert-4844-feat-build-size
...
Revert "Feat: Build output size"
2023-01-19 15:04:35 +05:30
shimon
68f7756601
usage test
2023-01-16 10:55:51 +02:00
shimon
a852672bff
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats
2023-01-15 17:18:32 +02:00
Aayush Bisen
4975a769e7
add restart policy in root compose file
...
Fixes #4986
2023-01-14 09:39:29 +00:00
Damodar Lohani
85570112c2
fix typo
2023-01-12 09:53:54 +00:00
Damodar Lohani
6a4cfff0e3
fix error from merge
2023-01-12 09:00:54 +00:00
Damodar Lohani
f41e3b1e8f
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-01-12 07:25:23 +00:00
Christy Jacob
d7104d9cd6
feat: add tests
2023-01-11 17:54:37 +05:30
Matej Bačo
614d7d878f
Add missing ENV var to docker compose
2022-12-26 11:14:35 +01:00
shimon
c02ef7b340
adding build.storage usage
2022-12-21 11:22:29 +02:00
shimon
c6b3fb39b1
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats
...
Conflicts:
app/console
app/workers/builds.php
docker-compose.yml
src/Appwrite/Usage/Stats.php
2022-12-21 09:58:22 +02:00
Bradley Schofield
284ce42177
Merge branch 'feat-db-pools' into refactor-schedulers-workers
2022-12-20 13:01:27 +00:00
Christy Jacob
ff9bccf1ff
Revert "Feat: Build output size"
2022-12-20 18:26:56 +05:30
Christy Jacob
708994d4a6
Merge pull request #4844 from appwrite/feat-build-size
...
Feat: Build output size
2022-12-20 17:22:43 +05:30
Matej Bačo
b014eda788
PR review changes
2022-12-20 12:48:11 +01:00
Bradley Schofield
a09e23d0b9
Start work on porting webhooks
2022-12-20 11:07:49 +00:00
shimon
18f192ed65
benchmarks
2022-12-19 10:25:49 +02:00
Christy Jacob
ff73939855
feat: update console and build args
2022-12-18 15:23:18 +05:30
Matej Bačo
ab68bb4ea1
Merge branch 'feat-db-pools' into feat-build-size
2022-12-18 08:21:41 +01:00
Matej Bačo
c5da386d67
PR review changes
2022-12-18 08:20:50 +01:00
Matej Bačo
11b3abebd1
Remove tcp setup
2022-12-14 09:58:45 +01:00
shimon
141d55bd36
build+functions worker
2022-12-13 09:35:05 +02:00
Jake Barnby
4868b8f8ec
Update explorer image
2022-12-13 01:47:07 +13:00
Matej Bačo
b513c2fbad
Store build output size to DB
2022-12-12 13:40:04 +01:00
shimon
2f34c566e5
addressing comments
2022-12-12 11:37:10 +02:00
shimon
93c3b73291
usage cleanup
2022-12-12 10:16:09 +02:00
shimon
205372519c
usage cleanup
2022-12-11 20:09:52 +02:00
shimon
308a9afe22
usage cleanup
2022-12-11 20:07:05 +02:00
shimon
0348472345
usage cleanup
2022-12-11 19:15:38 +02:00
shimon
b71bba2a9c
updates
2022-12-04 19:06:23 +02:00
Christy Jacob
c99ed47e63
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-usage-refactor-fo-db-pools
2022-11-22 22:05:18 +05:30
Matej Baco
2ef43e3249
Improvements during QA
2022-11-22 16:36:15 +01:00
Christy Jacob
210b4558c6
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-usage-refactor-fo-db-pools
2022-11-22 19:52:44 +05:30
Matej Bačo
f055adc05f
Fix pool sharing logic
2022-11-22 07:17:56 +00:00
Matej Bačo
e20b2f3340
Upgrade OPR images
2022-11-21 14:55:57 +00:00
Matej Bačo
202e4c01d8
Add new executor env vars
2022-11-21 14:23:43 +00:00
Damodar Lohani
14ea8b2197
Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-usage-refactor-fo-db-pools
2022-11-21 14:12:22 +00:00
Christy Jacob
9698dc2115
fix: volume sync
2022-11-18 22:18:27 +05:30
Christy Jacob
948936dcff
Merge pull request #4697 from appwrite/fix-init-retry
...
Fix: Failing errors
2022-11-18 19:53:43 +05:30
Matej Baco
0075956c6c
Introduce ENV to disable console invites, fix outdated code after merge
2022-11-18 09:51:28 +01:00
Matej Baco
715273798e
More bug fixing around failing tests
2022-11-18 09:22:04 +01:00
Jake Barnby
7dc5617339
Remove volume sync container
2022-11-18 21:09:11 +13:00
Christy Jacob
57dd721a61
chore: update volume names
2022-11-18 01:08:43 +05:30
Christy Jacob
373e230ab0
fix: issues with usage
2022-11-18 00:28:57 +05:30
Christy Jacob
e0c363e8e5
feat: add new console
2022-11-17 22:51:55 +05:30
Christy Jacob
080abbbb79
Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console
2022-11-17 20:26:10 +05:30
Christy Jacob
261830c122
Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-support-dsn
2022-11-17 06:43:49 +00:00
Christy Jacob
d75831380b
feat: review comments
2022-11-17 06:36:41 +00:00
Damodar Lohani
96e67f968f
Merge remote-tracking branch 'origin/feat-db-pools' into feat-usage-refactor-fo-db-pools
2022-11-17 00:31:57 +00:00
Christy Jacob
a233a30d28
Merge pull request #4691 from appwrite/feat-schedules-deletions
...
Deleted functions
2022-11-16 20:49:14 +05:30
shimon
c67852a7fb
Deleted functions
...
schedules clean up
2022-11-16 14:51:43 +02:00
Matej Baco
fdbb5b9810
QA bug fixing
2022-11-16 13:19:29 +01:00
Matej Baco
83639ea6f8
Merge branch 'feat-db-pools' into refactor-functions-worker
2022-11-16 12:29:42 +01:00
Christy Jacob
cf4be51094
feat: review comments
2022-11-16 10:43:26 +00:00
shimon
0d61a7fcf5
resetting workers-number
2022-11-16 11:00:11 +02:00
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
Christy Jacob
98fbe18ac4
Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into refactor-scheduler
2022-11-15 12:13:44 +00: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
e750c19660
Remove tcp read buffer auto-size disabling
2022-11-15 20:52:08 +13:00
Jake Barnby
447f3f6756
Add missing env to image
2022-11-15 15:45:18 +13:00
shimon
83e19a37ee
minor changes
2022-11-14 11:36:22 +02:00
Matej Bačo
f5fe47535d
Fix realtime startup
2022-11-14 07:49:36 +00:00
Jake Barnby
702bb413dc
Merge remote-tracking branch 'origin/feat-mysql-test' into feat-realtime-dbpools
...
# Conflicts:
# .env
# app/config/variables.php
# app/init.php
# app/realtime.php
# composer.lock
2022-11-14 11:21:58 +13:00
Matej Bačo
f468248f45
Fix typo
2022-11-12 12:51:54 +00:00
shimon
745ae7a4c8
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-scheduler
2022-11-10 20:07:32 +02:00
shimon
aef565c8ff
addressing comments
2022-11-10 18:40:12 +02:00
Matej Bačo
902bcfc3be
Increase OPR version
2022-11-10 14:23:11 +00:00
Matej Bačo
192cf2e20d
PR review changes + fix test
2022-11-10 12:04:49 +00:00
Matej Bačo
6c6e1caefc
Improve ENV vars documentation
2022-11-10 09:37:49 +00:00
Jake Barnby
def7fb71f1
Increase Traefik files limits
2022-11-10 20:01:18 +13:00
Jake Barnby
d3ea95b60e
Remove uneccessary process limits
2022-11-10 19:57:05 +13:00
Jake Barnby
ee69a306a9
Merge remote-tracking branch 'origin/fix-realtime-connections' into feat-cloud-jake
2022-11-10 13:26:19 +13:00
Jake Barnby
be18943fa4
Merge branch 'feat-cloud-test-jake' into feat-cloud-jake
2022-11-09 18:16:20 +13:00
Jake Barnby
4fe2289e7f
Add max connections variable
2022-11-09 16:24:42 +13:00
Damodar Lohani
5bd4b6e59d
Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-usage-refactor-fo-db-pools
2022-11-09 01:21:04 +00:00
Matej Bačo
f6b738fddd
Add proxy and fix bugs
2022-11-08 17:30:18 +00:00
Matej Bačo
940eee0562
Merge remote-tracking branch 'origin/feat-decouple-executor' into feat-db-pools-opr
2022-11-08 12:39:25 +00:00
Matej Bačo
d275fa0111
Fix tests
2022-11-08 12:34:14 +00:00
Matej Bačo
80b49452f4
Fix executor bugs, Add Open Runtimes Proxy
2022-11-08 10:02:22 +00:00
Matej Bačo
a52ff7372a
Add Open Runtimes Executor
2022-11-08 08:49:45 +00:00
Jake Barnby
eef2fdb72c
Allow up to 65K realtime connections through Traefik
2022-11-08 21:33:13 +13:00
Christy Jacob
f5484d4548
feat: update mariadb images
2022-11-07 19:54:50 +05:30
Christy Jacob
f5bf48baa7
feat: update volume sync
2022-11-07 17:36:42 +05:30
Christy Jacob
0c6107990d
feat: update volume sync
2022-11-07 17:17:51 +05:30
Christy Jacob
1d4afd2f6c
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-mysql-test
2022-11-07 16:45:28 +05:30
shimon
6f9dcae858
queue
2022-11-07 12:37:07 +02:00
Jake Barnby
a6ffab09df
WIP fix too many connections
2022-11-07 23:31:54 +13:00
shimon
ef7b53fbc7
queue
2022-11-06 23:41:33 +02:00
shimon
ed505fba7c
queue
2022-11-06 15:10:26 +02:00
Damodar Lohani
5756a7e117
Merge remote-tracking branch 'origin/feat-fixes-for-pools' into feat-usage-refactor-fo-db-pools
2022-11-06 08:10:01 +00:00
shimon
bc631d926e
ticker
2022-11-04 07:12:08 +02:00
Eldad Fux
de610855fe
Updates
2022-11-03 17:19:55 +02:00
Christy Jacob
0aac303d51
feat: rename rsync to volume-sync worker
2022-11-02 20:38:13 +05:30
Christy Jacob
d162c6b0b2
Merge branch 'feat-mysql-test' of github.com:appwrite/appwrite into feat-mysql-test
2022-11-02 20:28:28 +05:30
Christy Jacob
8ced55bf46
feat: add new rsync worker
2022-11-02 20:26:03 +05:30
Damodar Lohani
fee0ec9609
remove vendor framework mount
2022-11-02 01:35:07 +00:00
Christy Jacob
4331e1ef03
feat: update PR
2022-11-01 04:55:13 +00:00
Damodar Lohani
982a449143
Merge remote-tracking branch 'origin/feat-db-pools' into feat-usage-refactor-fo-db-pools
2022-10-31 06:49:37 +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
Christy Jacob
269266127d
feat: update db library
2022-10-28 14:30:31 +05:30
Damodar Lohani
1e5c94c2c6
Merge branch 'master' into feat-usage-refactor
2022-10-28 13:17:52 +05:45
Jake Barnby
323c0c5ab7
Revert debug changes
2022-10-28 10:25:59 +13:00
Jake Barnby
2469a42d1d
Merge remote-tracking branch 'origin/master' into feat-graphql-support
2022-10-27 12:25:37 +13:00
Christy Jacob
9165da14b7
feat: add support for the new DSN class
2022-10-26 12:16:22 +05:30
Christy Jacob
73bce1d7d0
Merge pull request #4309 from appwrite/fix-update-docker-compose
...
fix: docker compose syntax
2022-10-26 09:48:06 +05:30
Jake Barnby
c8b19bd84d
Update lock
2022-10-26 16:21:24 +13:00
Christy Jacob
2d6a00e56f
Merge branch 'feat-mysql-test' of github.com:appwrite/appwrite into feat-db-pools
2022-10-25 19:26:23 +05:30
Christy Jacob
503bd53a47
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-mysql-test
2022-10-25 13:48:59 +00:00
Damodar Lohani
8048d24857
deprecate database aggregation
2022-10-23 05:17:50 +00:00
Damodar Lohani
d1b3ca5178
comment database worker
2022-10-21 01:29:13 +00:00
fogelito
1b776f7fdc
some changes
2022-10-20 23:59:00 +03:00
Eldad Fux
a1157fb49b
Env vars clean ups
2022-10-19 15:59:13 +03: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
Eldad Fux
7484656be3
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools-eldad
2022-10-15 22:08:16 +03:00
Eldad Fux
95a9ded28f
Adjusted compose files and tests
2022-10-15 21:17:03 +03:00
Eldad Fux
0e9c6db759
Added new connections
2022-10-15 16:49:37 +03:00
Steven Nguyen
0fdfdcf09c
Re-use same image for all appwrite containers during dev and CI
2022-10-12 11:34:30 -07: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
Christy Jacob
643b2f1bb4
fix: docker compose synatx
2022-10-06 18:48:50 +05:30
Christy Jacob
1a9c4e3756
fix: mysql indexes issue
2022-10-06 18:41:15 +05:30
Torsten Dittmann
4bb44ad315
Merge pull request #3757 from appwrite/feat-github-non-self-hosted
...
ci: update github actions to use github hosted runners
2022-10-04 12:06:42 +02:00
Jake Barnby
6ac4d4f490
Handle response model union type rules
2022-09-30 19:59:20 +13:00
Christy Jacob
a847064093
fix: failing tests
2022-09-28 00:59:51 +05:30
Christy Jacob
3b802e9ba6
Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools
2022-09-27 20:59:50 +05:30
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
Toir Tuychiev
ca318c1842
Fixed typo in docker-compose.yml
...
Fixed typo in docker-compose.yml
2022-09-17 20:35:33 +05:00
Torsten Dittmann
5fd0de842f
ci: fix build args
2022-09-14 17:52:52 +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
Christy Jacob
c3205b8266
feat: update environment vars
2022-08-24 21:45:39 +05:30
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
shimon
73095a325e
addressing comments
2022-08-17 16:02:01 +03:00
shimon
bb4390e089
addressing comments
2022-08-17 14:18:22 +03:00
shimon
4729444622
fix
2022-08-17 12:52:50 +03: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
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
Eldad Fux
95181546b4
Adpated tests
2022-08-14 21:09:24 +03: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
shimon
36fd693728
some fixes
2022-08-14 14:48:51 +03:00
shimon
91345e3f9b
some fixes
2022-08-14 10:45:42 +03:00
shimon
02f57cd69d
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
...
Conflicts:
composer.lock
2022-08-13 18:45:29 +03:00
shimon
af56db4048
some fixes
2022-08-13 18:36:44 +03:00
Torsten Dittmann
d9c7bbd3d2
fix: scripts for filters and charts
2022-08-09 16:05:34 +02:00
Damodar Lohani
ebac3f5547
usage containers updated
2022-08-09 05:52:53 +00:00
Damodar Lohani
c2b016cb5f
update usage interval environment variables
2022-08-09 05:29:24 +00:00
fogelito
ba40ac4e90
Change models Class name
2022-07-28 13:26:22 +03:00
Christy Jacob
da16c0159b
feat: rename environment variable
2022-07-27 09:17:00 +05:30
Torsten Dittmann
3f51595d25
feat: upgrade mariadb and redis
2022-07-25 15:54:15 +02:00
Christy Jacob
2baeac04d1
feat: comment redis-commander
2022-07-16 11:04:59 +05:30
Christy Jacob
42f0bddd60
feat: merge and fix conflicts
2022-07-15 13:54:27 +04:00
Christy Jacob
662800cc67
Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools
2022-07-14 03:42:26 +04:00
Christy Jacob
392775b9ab
feat: update dbPool class
2022-07-14 03:33:25 +04:00
Jake Barnby
d862de8e7f
Remove redundant env var
2022-07-13 22:30:24 +12:00
shimon
59627ea9ef
logger moved to App::shutdown
2022-07-09 21:24:28 +03:00
shimon
7b429bdcd7
cache cleanup
2022-07-03 12:36:59 +03:00
Christy Jacob
3ab4dcb7c1
feat: refactor DatabasePool class
2022-07-01 15:43:38 +02:00
fogelito
e07e5b5cf8
changing datetime from timestamp to datetime
2022-07-01 15:01:14 +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
b5e599fac5
Update docker-compose.yml
2022-06-27 19:23:34 +02:00
Torsten Dittmann
6c186447d7
Update docker-compose.yml
2022-06-27 19:23:29 +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
Christy Jacob
bab788111a
Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools
2022-06-23 10:51:13 +02:00