Jake Barnby
|
163cbc5052
|
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
# composer.json
# composer.lock
|
2022-11-17 21:41:56 +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 |
|
|
Jake Barnby
|
dd6c5c056f
|
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
# CHANGES.md
|
2022-11-16 19:31:40 +13:00 |
|
Torsten Dittmann
|
912636b54c
|
Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite
|
2022-11-15 18:22:49 +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
|
ef1e5a9674
|
Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite
|
2022-11-15 15:36:25 +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 |
|
|
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 |
|
|
Bradley Schofield
|
3c71164741
|
Merge branch '1.1.x' into feat-implement-session-length-api
|
2022-11-14 15:30:38 +00: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
|
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 |
|
|
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
|
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
|
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 |
|
Damodar Lohani
|
b66f932b3b
|
Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor
|
2022-11-02 08:43:12 +00:00 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
Jake Barnby
|
db49e962f4
|
Use abuse status instead of dev/prod for graphql abuse check
|
2022-10-28 20:12:11 +13:00 |
|
|
Jake Barnby
|
89b4d0026a
|
Move shutdown hook to graphql controller
|
2022-10-28 10:04:31 +13:00 |
|
|
Jake Barnby
|
e632731c4e
|
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
|
2022-10-27 12:24:57 +13: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 |
|