1
0
Fork 0
mirror of synced 2024-09-09 22:27:06 +12:00
Commit graph

3718 commits

Author SHA1 Message Date
Damodar Lohani
1da3f7770f feat (projects): auth session limit
Add endpoint on project to set max number of sessions for project users.
2022-12-06 10:45:04 +00:00
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
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
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
b819381bed
Merge branch 'master' into fix-623-locale-api-unknown-continent 2022-11-23 18:52:39 +01:00
Torsten Dittmann
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
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
a231a9853f
Merge branch 'appwrite:master' into null-failure 2022-11-22 17:10:55 -03:00
gepd
64ba896738
bug fix: failure status shoudn't be nulled 2022-11-22 17:05:04 -03: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
Jake Barnby
4a61718cff
Enable HSTS for all HTTPS requests 2022-11-21 16:49:45 +13:00
Jake Barnby
5a84a37a9e
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-11-18 12:41:48 +13:00
Torsten Dittmann
8d3903cd37 fix: remove layout 2022-11-17 13:37:59 +01: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
Torsten Dittmann
1b533daeaa fix: remove manifest endpoint 2022-11-15 16:30:53 +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
Torsten Dittmann
c784cab798 fix: remove asterik 2022-11-14 16:26:10 +01: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
a19e668d79 Update storage.php 2022-11-14 13:11:43 +00: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
7723762dd1 cache buster added to cache key 2022-11-11 12:41:41 +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
9f384e016f Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-09 15:47:23 +01: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
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
4b5d537eee
Apply suggestions from code review
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-11-02 15:41:50 +05:45
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
Damodar Lohani
8baa95db1c Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-01 04:54:48 +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
Jake Barnby
03f85c3b74
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
#	composer.json
#	composer.lock
#	src/Appwrite/Utopia/Response/Model/Provider.php
2022-11-01 11:07:51 +13:00
geisterfurz007
e891424c17 fix: empty payload deleting single user session 2022-10-31 21:01:49 +01: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
d8717a4a16 fix: console build 2022-10-31 11:50:19 +01:00
Torsten Dittmann
0049a76565 feat: submodule 2022-10-31 09:53:36 +01:00
Torsten Dittmann
4f3188c63f Merge branch 'rebase-1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-10-31 09:47:35 +01: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
Damodar Lohani
7433a260db fix formatting 2022-10-30 05:16:51 +00:00
Damodar Lohani
0d29968169 refactor database listener callback 2022-10-30 05:14:46 +00: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
Steven Nguyen
719aa67afa
Remove PDO rethrow
The PDOException was rethrown in general.php so that it could be caught
in the catch block of http.php. However, [a change in
utopia-php/framework](9d37326851)
caused the exception to be masked as an Exception rather than the
underlying PDOException. As such, the `$th instanceof PDOException` in
http.php is always false and `$db = null` is never executed. Since these
snippets of code aren't doing anything or adding value, they should be
removed.

In addition, the `$db = null` may have been added to ensure the
connection was added back to the pool and/or reset if needed, but it
seems like that's not a problem anymore.
2022-10-25 10:05:52 -07:00
Jake Barnby
2f444ead34
Revert "Review revert unrelated change"
This reverts commit bf064fa5c9.
2022-10-25 18:31:51 +13:00
Jake Barnby
e3b5919e40
Review doc fixes 2022-10-25 15:53:15 +13:00
Jake Barnby
34bd0fe93d
Review remove redundant registry injection 2022-10-25 15:45:08 +13:00
Jake Barnby
bf064fa5c9
Review revert unrelated change 2022-10-25 15:44:19 +13:00
Torsten Dittmann
461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Vincent (Wen Yu) Ge
9a1f54baf1
Merge branch 'master' into doc-unique-id 2022-10-21 17:43:52 -04:00
Damodar Lohani
dfa35e0a0b fix periods on usage endpoints 2022-10-21 05:45:25 +00:00
Damodar Lohani
d35b438255 fix collection and document counts 2022-10-21 01:50:03 +00:00
Damodar Lohani
a7e1e5f25f fix period 2022-10-21 01:40:33 +00: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