Richard
0dc553f31d
Merge branch 'main' into docs-clarify-optional-url
2024-06-18 09:12:32 -04:00
Damodar Lohani
a93dcfa1b3
Update storage.php
2024-06-18 11:46:31 +05:45
Steven Nguyen
4b24848f22
Merge pull request #8236 from 2002Bishwajeet/fix-user-model
...
Fix: Don't set the target field if the existing target document is false
2024-06-17 17:11:27 -07:00
Binyamin Yawitz
6cfada946f
Merge branch '1.6.x' into feat-func-deploy-type
2024-06-17 13:53:21 -04:00
loks0n
2f0f7bf9c7
fix: test
2024-06-17 13:44:12 +01:00
Damodar Lohani
3dcd1314f5
fix file size multiplier
2024-06-17 04:50:22 +00:00
Christy Jacob
9e1541d96a
Merge branch 'main' of https://github.com/appwrite/appwrite into mock-numbers
2024-06-16 07:28:22 +00:00
Christy Jacob
a912bbe374
chore: update variable name
2024-06-16 07:19:10 +00:00
Luke B. Silver
9341c9d76b
Merge branch '1.6.x' into feat-scheduled-executions
2024-06-14 14:07:41 +01:00
choir27
84d9b4befe
docs: fix hyperlink in storage code snippet
2024-06-13 09:59:20 -04:00
loks0n
865b12ba9d
chore: exception type
2024-06-13 09:24:51 +01:00
choir27
897ae1c859
docs: update text description in request table
2024-06-12 10:47:48 -04:00
loks0n
0a78d41ecb
chore: remove endTime
2024-06-12 13:50:18 +01:00
loks0n
7559c9af68
chore: us spelling of canceled
2024-06-12 11:21:48 +01:00
Bishwajeet Parhi
eca2bbdb5d
Merge branch 'main' into fix-user-model
2024-06-11 21:18:11 +05:30
Bishwajeet Parhi
190560b8ef
chore: append attributes instead of replace
2024-06-11 21:17:25 +05:30
loks0n
1269397475
chore: fmt
2024-06-11 15:50:50 +01:00
loks0n
853ffe804e
feat: improve duration calc
2024-06-11 15:48:55 +01:00
loks0n
67b32ecb05
test: cancel deployment
2024-06-11 15:41:13 +01:00
Jake Barnby
a4c1275764
Add abuse limit for update password
2024-06-10 18:09:30 +12:00
Jake Barnby
3c123d372a
Merge pull request #8244 from appwrite/1.5.x
...
Sync 1.5.x into refactor-usage-sn
2024-06-10 12:22:16 +12:00
Damodar Lohani
c179e89fdf
update to use latest platform with module
2024-06-09 01:03:40 +00:00
Damodar Lohani
00a633759e
Merge pull request #7936 from appwrite/feat-upgrade-platform-with-module
...
Use latest Platform and add Core module
2024-06-09 06:40:13 +05:45
Steven Nguyen
a09a09a7a9
fix(auth): fix MFA verification for OAuth2 sessions
...
Before this, users who only signed in with OAuth2 were not able to
verify their sessions with MFA because their session already used an
email factor and they couldn't use an additional email factor.
This commit changes the OAuth2 session to include 2 factors: email and
oauth2. This second special factor is used to bypass MFA checks. It is
fine to bypass MFA checks because OAuth2 is supposed to handle the
entire authentication process, verifying who the user is and we, as the
resource provider, only need to trust the OAuth2 provider.
2024-06-07 16:45:14 -07:00
Matej Bačo
b8b81a9bd1
WIP: Schedulded executions
2024-06-07 19:05:29 +00:00
Khushboo Verma
97786a05ff
Updated cancelled build duration
2024-06-07 20:29:24 +05:30
Khushboo Verma
d233f1ac64
Update duration and endTime
2024-06-07 16:53:33 +05:30
Khushboo Verma
c2c6d337ed
Resolved merge conflict
2024-06-06 19:39:16 +05:30
Christy Jacob
3e47b43908
Merge pull request #8214 from appwrite/chore-update-create-build-endpoint
...
Remove build id from api endpoint
2024-06-06 17:53:05 +05:30
Damodar Lohani
f44ed18b05
remove worker index
2024-06-06 08:45:15 +00:00
Jake Barnby
9e487b8ccf
Revert "Merge pull request #8237 from appwrite/revert-8193-feat-remove-random-shared-tables"
...
This reverts commit 930ae6ded0
, reversing
changes made to 1f6417b156
.
2024-06-06 20:11:19 +12:00
Christy Jacob
ff6efc2855
Revert "Feat remove random shared tables"
2024-06-06 00:11:56 +05:30
Bishwajeet Parhi
cccda2a46c
fix: Don't set target attribute if no existing Target found
2024-06-05 23:34:01 +05:30
Eldad A. Fux
f91a68c8a0
Merge pull request #8207 from appwrite/feat-users-create-jwt
...
Feat: users.createJWT()
2024-06-04 07:00:32 -04:00
Damodar Lohani
fef769271f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-upgrade-platform-with-module
2024-06-04 08:00:19 +00:00
Matej Bačo
9279468c27
Merge branch '1.6.x' into feat-users-create-jwt
2024-06-04 09:43:14 +02:00
Matej Bačo
c279745259
Merge branch '1.6.x' into feat-projects-createJWT
2024-06-04 09:43:12 +02:00
Jake Barnby
f459a5c458
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-remove-random-shared-tables
...
# Conflicts:
# docker-compose.yml
2024-06-04 17:43:14 +12:00
Damodar Lohani
66ac96580b
Merge branch 'main' into feat-security-emails
2024-06-04 06:51:24 +05:45
Khushboo Verma
d7a40e2b4d
Remove the code to fetch build document
2024-06-02 23:14:41 +05:30
Navjot Singh
c07c7889d3
Merge branch 'main' into bug-7880-location_hk_issue
2024-06-01 17:29:57 +05:30
Khushboo Verma
beb3fe1d2b
Merge branch '1.6.x' into chore-update-create-build-endpoint
2024-05-31 14:17:34 +05:30
Khushboo Verma
1beaeba214
Merge branch '1.6.x' into feat-cancel-build-deployment
2024-05-31 14:16:14 +05:30
Khushboo Verma
0eabff5faf
Refactor builds document creation
2024-05-31 01:53:29 +05:30
Khushboo Verma
cfec6c974f
Updated spec
2024-05-30 22:40:09 +05:30
Khushboo Verma
d3c2e9db1f
Add comment for clarity
2024-05-30 22:33:37 +05:30
loks0n
61336be50d
doc: update _APP_SMS_FROM
2024-05-30 16:51:48 +01:00
Steven Nguyen
4b5e86cc05
chore(sdks): bump major version since there are breaking changes
2024-05-29 13:59:59 -07:00
Binyamin Yawitz
ca7f222640
feat: Adding cli to the function deployment type
2024-05-29 12:55:14 -04:00
Khushboo Verma
94e7669b41
Remove build id from api endpoint
2024-05-29 17:48:52 +05:30
Matej Bačo
49b2bcf462
Implement JWT dynamic keys test
2024-05-29 09:33:39 +00:00
Bradley Schofield
d4db55ab77
Fix failed queue param in failed jobs
2024-05-29 18:11:58 +09:00
Matej Bačo
b0317fb19d
Implement project dynamic (JWT) keys
2024-05-29 08:57:25 +00:00
Matej Bačo
3b8799353d
PR review changes
2024-05-29 07:51:51 +00:00
Matej Bačo
d9745ca249
Merge branch '1.6.x' into feat-users-create-jwt
2024-05-29 09:33:09 +02:00
Matej Bačo
2dac8bc7ed
Update app/controllers/api/users.php
...
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-05-29 09:31:08 +02:00
Binyamin Yawitz
ccafc06d93
Merge branch '1.6.x' into feat-unified-app-logger-config
2024-05-28 10:18:39 -04:00
Binyamin Yawitz
b98930e5a0
feat(logger): Adding fallback comment
2024-05-28 10:18:29 -04:00
Khushboo Verma
a465b23716
Merge branch '1.6.x' into feat-cancel-build-deployment
2024-05-28 19:06:09 +05:30
Khushboo Verma
0b3c188bbf
Add metrics for successful and failed builds
2024-05-28 18:29:28 +05:30
Matej Bačo
711e26c605
Relay on lib to verify JWT expiry
2024-05-28 10:59:53 +00:00
Matej Bačo
b1ff989c3f
Implement tests, fix JWT maxAge
2024-05-28 09:25:54 +00:00
Matej Bačo
613677e9f7
Implement users.createJWT
2024-05-27 20:04:50 +00:00
Khushboo Verma
63a5b9eed3
Revert changes in app/console
2024-05-27 18:25:11 +05:30
Khushboo Verma
b880a0a7b2
Remove :buildId from endpoint as discussed
2024-05-27 18:21:28 +05:30
Khushboo Verma
4e8855fad3
Merge branch '1.6.x' into feat-cancel-build-deployment
2024-05-27 18:03:59 +05:30
Christy Jacob
1c79ccd231
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x
2024-05-27 11:26:32 +00:00
Damodar Lohani
2b8bf3b252
Merge pull request #8120 from appwrite/chore-error-requests-count
...
Chore:usage requests count on error
2024-05-26 07:04:33 +05:45
Christy Jacob
3a63ee834a
Merge branch '1.5.x' into prepare-1.5.7
2024-05-24 19:55:59 +04:00
Christy Jacob
c76dbaaadb
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into prepare-1.5.7
2024-05-24 15:53:43 +00:00
loks0n
d73a9e75cd
refactor: remove version format const
2024-05-24 16:27:13 +01:00
loks0n
ad3cc4e68f
fix: typo
2024-05-24 16:16:57 +01:00
Luke B. Silver
a92713d3a2
Merge branch '1.5.x' into feat-add-version-header
2024-05-24 16:08:11 +01:00
loks0n
cb4c15ce0a
ui: improve warning message
2024-05-24 16:07:22 +01:00
Christy Jacob
e55f0adab2
Merge pull request #8185 from ItzNotABug/fix-robots-txt
...
Fix: Don't Override `robots.txt` for Other Domains
2024-05-24 17:15:34 +04:00
Christy Jacob
0e7c417d67
Merge pull request #8089 from appwrite/feat-improve-header-demo-values
...
feat: improve header demo values
2024-05-24 17:09:09 +04:00
Christy Jacob
0fcb76570d
Merge branch '1.5.x' into prepare-1.5.7
2024-05-24 17:07:57 +04:00
Matej Bačo
1109782af0
Update console
2024-05-24 15:06:52 +02:00
Christy Jacob
cd5f6f58a2
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main
2024-05-24 12:43:56 +00:00
Christy Jacob
ac49f7497a
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into prepare-1.5.7
2024-05-24 12:43:03 +00:00
Matej Bačo
8dd883a312
Add comments
2024-05-24 13:04:30 +02:00
Christy Jacob
99a6e81b0d
chore: update specs
2024-05-24 11:03:49 +00:00
Christy Jacob
8c851ecdfb
chore: remove specs
2024-05-24 10:58:06 +00:00
Christy Jacob
c2215ef171
chore: update console
2024-05-24 10:57:31 +00:00
Christy Jacob
344f926c8e
chore: update console
2024-05-24 10:55:34 +00:00
Luke B. Silver
b52de356e9
Merge branch '1.5.x' into feat-improve-header-demo-values
2024-05-24 11:17:28 +01:00
loks0n
6eae908e5e
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-improve-header-demo-values
2024-05-24 11:16:54 +01:00
Christy Jacob
75de5b0332
chore: update specs
2024-05-24 09:35:57 +00:00
Jake Barnby
bbb4b0bc12
Remove shared table headers
2024-05-24 20:29:25 +12:00
Jake Barnby
e19b465ce2
Move shared tables db to env var from const
2024-05-24 20:10:47 +12:00
Navjot Singh
ade0472a5f
Merge branch 'main' into bug-7880-location_hk_issue
2024-05-24 12:24:08 +05:30
Jake Barnby
074b807d8d
Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud
2024-05-24 16:56:57 +12:00
Jake Barnby
7d18de95ce
Merge pull request #7870 from appwrite/fix-setting-secrets
...
Fix not hiding tokens for clients via realtime
2024-05-24 16:53:36 +12:00
Jake Barnby
4ed125f7c8
Remove random shared tables assignment in preparation of setting as override instead
2024-05-24 16:53:09 +12:00
Jake Barnby
a895ce4270
Remove redundant backup checks
2024-05-24 16:51:29 +12:00
Jake Barnby
aa8460cfb9
Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud
2024-05-24 16:40:18 +12:00
Jake Barnby
75d6a7e2a0
Wrap realtime stats in an edition check
2024-05-24 16:34:43 +12:00
Jake Barnby
fc7a676dbb
Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud
2024-05-24 15:47:12 +12:00
Jake Barnby
15ebad5548
Merge pull request #8190 from appwrite/chore-update-executor-host-default-var
...
Chore update executor host default var
2024-05-24 15:46:35 +12:00
Jake Barnby
3da213434f
Update to 4.3.3 to match cloud
2024-05-24 15:40:42 +12:00
Jake Barnby
96bc307fcd
Checkout 4.3.2
2024-05-24 15:39:26 +12:00
Jake Barnby
3eec8317d4
Improve variable desc copy
2024-05-24 15:31:17 +12:00
Jake Barnby
e65cc78234
Update executor default var to match new container hostname
2024-05-24 15:30:14 +12:00
Jake Barnby
5510a25066
Merge pull request #8148 from appwrite/chore-remove-compose-version
...
chore: remove compose version
2024-05-24 13:47:40 +12:00
Christy Jacob
4a4d5109e2
Merge branch '1.5.x' into sync-1.5.x-with-cloud
2024-05-23 23:36:13 +04:00
Binyamin Yawitz
ebe386acd9
feat(logger): Unifying logger environment variable and adapting to the latest Logger version
2024-05-23 12:44:19 -04:00
shimon
a2ef77f0f5
lint
2024-05-23 16:47:37 +03:00
shimon
c996dbcdc9
lint
2024-05-23 16:39:23 +03:00
shimon
a22d98296c
lint
2024-05-23 16:33:40 +03:00
Khushboo Verma
f0de4c6eac
Resolved merge conflict
2024-05-23 18:34:48 +05:30
navjotNSK
fcbab74f04
All translations added.
2024-05-23 15:55:57 +05:30
ItzNotABug
81e8502a78
fix: dont override humans.txt
too.
2024-05-23 15:54:12 +05:30
navjotNSK
2621d948c6
All translations added.
2024-05-23 15:53:59 +05:30
ItzNotABug
5462b83d3c
fix: don't override robots.txt
for other domains.
2024-05-23 14:47:59 +05:30
shimon
2414438ded
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into chore-error-requests-count
...
Conflicts:
app/controllers/shared/api.php
composer.json
2024-05-23 11:01:28 +03:00
shimon
87cf7776df
lint
2024-05-23 10:59:19 +03:00
Jake Barnby
9bb9f1eee7
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
...
# Conflicts:
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-05-23 15:37:13 +12:00
Steven Nguyen
9db92698dc
fix(cache): use the same cache key when loading and saving files
2024-05-22 23:23:16 +00:00
Christy Jacob
aa76862692
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x
2024-05-22 19:43:31 +00:00
Steven Nguyen
8d5583f0c6
fix(cache): fix invalid cache document id
...
The document ID should not have special characters like "*" or it will
cause problems with things like cursor based pagination which is done
in migrations.
We did have the cache buster inside the md5 call before, but when the
usage code was reverted and whatnot, the change wasn't added back
properly.
Related: https://github.com/appwrite/appwrite/issues/7887
2024-05-22 19:16:34 +00:00
shimon
355e2dc266
updating composer
2024-05-22 16:45:30 +03:00
shimon
d201b0b099
updating composer
2024-05-22 16:44:30 +03:00
shimon
5b1a2038bf
updating composer
2024-05-22 16:43:35 +03:00
shimon
7c71e44250
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-get-env-sn
2024-05-22 16:39:42 +03:00
shimon
6639714a1b
updating composer
2024-05-22 16:37:45 +03:00
shimon
6e79d33ca2
Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-get-arg
...
Conflicts:
composer.lock
2024-05-22 16:01:40 +03:00
shimon
074eab3d63
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
...
Conflicts:
composer.json
composer.lock
2024-05-22 15:51:24 +03:00
navjotNSK
c29fc5e72e
hk added till cs.json
2024-05-22 16:43:40 +05:30
Jake Barnby
329b2e151d
Merge pull request #8169 from appwrite/remove-pdo-exception
...
Remove throw PdoException in Error hook
2024-05-22 22:43:21 +12:00
loks0n
e1e4cb44f3
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-improve-header-demo-values
2024-05-22 10:52:06 +01:00
Jake Barnby
680cd5194d
Fix returning hashed secrets
2024-05-22 14:11:06 +12:00
Jake Barnby
c7106b9147
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
2024-05-22 12:50:58 +12:00
Binyamin Yawitz
e1863053ad
refactor(messaging worker): Adding volume and volume variables
2024-05-21 15:51:32 -04:00
Binyamin Yawitz
ab0d6f7c19
refactor(messaging worker): Refactoring local device to worker only
2024-05-21 15:48:53 -04:00
Steven Nguyen
cc6129fd20
Merge branch '1.5.x' into chore-bump-console-4.3.2
2024-05-21 12:45:29 -07:00
Steven Nguyen
c2c4171d36
Bump console to version 4.3.2
2024-05-21 18:26:39 +00:00
Steven Nguyen
69f53492fd
Merge branch '1.5.x' into chore-release-sdks
2024-05-21 08:47:18 -07:00
Steven Nguyen
bc74d1eee7
Bump console to version 4.3.1
2024-05-21 14:40:31 +00:00
Matej Bačo
a115f878b3
Merge remote-tracking branch 'origin/1.6.x' into feat-function-tokens
2024-05-21 10:28:21 +00:00
Christy Jacob
90bfd77483
Merge pull request #8067 from appwrite/fix-dont-publish-max-users-exceed
...
Fix don't publish max users exceed
2024-05-21 14:25:12 +04:00
Khushboo Verma
df340c0e5b
Update code to 400
2024-05-21 15:53:38 +05:30
fogelito
795b595052
Remove throw
2024-05-21 10:18:13 +03:00
Steven Nguyen
f0f2e5217c
chore: bump SDK versions
2024-05-20 15:54:37 -07:00
Steven Nguyen
99a9c809ed
chore: regenerate specs
2024-05-20 15:30:11 -07:00
Steven Nguyen
1269294ff5
Bump appwrite version to 1.5.6
2024-05-20 15:27:52 -07:00
loks0n
ff1cabdbf7
chore: refactor finally clause
2024-05-20 22:35:40 +01:00
Steven Nguyen
47ed708293
Merge branch 'main' into chore-sync-with-main
2024-05-20 19:03:54 +00:00
Steven Nguyen
91748b1bd5
Merge branch 'main' into fix-5516-in-team-membership-allow-adding-user-over-limit-from-console-or-apikey
2024-05-20 11:40:58 -07:00
Steven Nguyen
722f3291fa
Merge branch 'main' into chore-sync-with-main
2024-05-20 18:33:52 +00:00
loks0n
6bd407eae9
chore: refactor finally block
2024-05-20 18:55:15 +01:00