Jake Barnby
b6723b7c83
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# app/init.php
2022-12-06 20:38:09 +13:00
shimon
7ea695937b
Merge branch 'master' of github.com:appwrite/appwrite into __stream
...
Conflicts:
.gitmodules
app/console
2022-11-27 20:05:28 +02:00
shimon
7daa198f99
updates
2022-11-27 20:03:30 +02:00
Christy Jacob
77d4627d42
feat: use constants in switch case
2022-11-26 19:45:29 +04:00
Jake Barnby
f44a642998
Get from env in param call
2022-11-25 17:27:19 +13:00
Jake Barnby
cefd5660b9
Merge remote-tracking branch 'origin/master' into fix-region-parameter
...
# Conflicts:
# CHANGES.md
2022-11-25 10:42:27 +13:00
Jake Barnby
de38fed306
Fix empty check
2022-11-25 10:29:22 +13:00
Matej Bačo
8b71e318c2
Fix tests bug
2022-11-24 11:55:49 +00:00
Matej Bačo and GitHub
efe093ce3c
Fix unsaved changes in team inv
2022-11-24 12:35:26 +01:00
Jake Barnby
bb01a6d817
Get default region param from env
2022-11-24 11:23:59 +13:00
Steven Nguyen
01556184c7
Fix the default oauth paths to match the route
2022-11-23 09:57:49 -08:00
Torsten Dittmann and GitHub
b819381bed
Merge branch 'master' into fix-623-locale-api-unknown-continent
2022-11-23 18:52:39 +01:00
Torsten Dittmann and GitHub
991d8749b2
Merge pull request #4757 from gepd/null-failure
...
bug fix: failure status shoudn't be nulled
2022-11-23 18:51:02 +01:00
Torsten Dittmann and GitHub
2e9087285d
Merge branch 'master' into fix-function-status-missing
2022-11-23 18:47:15 +01:00
Jake Barnby
bd0139ef3b
Make region optional with default of 'default'
2022-11-23 18:16:57 +13:00
Alex Patterson
ad1587872b
remove dup line
2022-11-22 18:49:31 -05:00
gepd and GitHub
64ba896738
bug fix: failure status shoudn't be nulled
2022-11-22 17:05:04 -03:00
shimon
89f325fe87
updates
2022-11-22 11:43:56 +02:00
shimon
19ad9914a3
updates
2022-11-22 11:15:48 +02:00
shimon
5546de13e3
aligning with master
2022-11-21 19:03:56 +02:00
Matej Bačo
d2362aeab0
Improve performance
2022-11-21 11:43:20 +00:00
Matej Bačo
831960245f
Permission bug fix
2022-11-21 11:20:52 +00:00
Matej Bačo
0ee49e7895
Fix missing execution status
2022-11-21 09:38:36 +00: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
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
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
a19e668d79
Update storage.php
2022-11-14 13:11:43 +00:00
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
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 and GitHub
42cedf8ed0
Merge pull request #3909 from appwrite/feat-usage-refactor
...
new stats to count resources
2022-11-10 11:05:36 +02:00
Bradley Schofield
a0ab934328
Fix another null warning
2022-11-09 13:23:14 +00:00
Bradley Schofield
29c30a361b
Fix null warnings
...
- Fixed Avatars isset operator
- Added isset operator to openSSL data in files
- dns_get_record does not throw errors, instead it logs a warning and returns false. Altered code accordingly. PHP Bug Report: https://bugs.php.net/bug.php?id=73149
-
2022-11-09 11:45:15 +00:00