Torsten Dittmann
|
f51c39cd2b
|
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
|
2024-03-08 00:30:02 +01:00 |
|
Khushboo Verma
|
8f1aaf69d4
|
Merge branch 'main' into feat-disable-api
|
2024-03-07 18:22:34 +01:00 |
|
Torsten Dittmann
|
dfef0e732c
|
sync: main -> 1.5.x
|
2024-03-07 17:16:39 +01:00 |
|
Torsten Dittmann
|
0a1d572c72
|
chore: run formatter
|
2024-03-06 18:34:21 +01:00 |
|
Torsten Dittmann
|
a53e630536
|
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2
|
2024-03-05 10:31:51 +01:00 |
|
Khushboo Verma
|
d3b0b00917
|
Allow users to disable APIs
|
2024-03-04 23:12:54 +01:00 |
|
Torsten Dittmann
|
01e1a43106
|
fix: wrong namespace
|
2024-03-01 03:08:30 +01:00 |
|
Torsten Dittmann
|
b7d3996960
|
feat: mfa collection restructure
|
2024-02-29 21:59:49 +01:00 |
|
Jake Barnby
|
6fb1e929cd
|
Use group hook to block recreating sessions
|
2024-02-27 22:08:39 +13:00 |
|
Christy Jacob
|
7ae09ba795
|
Revert "Revert "usage/usage-dump queue health endpoints""
|
2024-02-25 13:42:28 +05:30 |
|
Luke B. Silver
|
f285173f4e
|
Merge branch '1.5.x' into feat-ssr-dx
|
2024-02-22 13:22:41 +00:00 |
|
Christy Jacob
|
a8098831a3
|
Revert "usage/usage-dump queue health endpoints"
|
2024-02-22 12:21:48 +05:30 |
|
Jake Barnby
|
942847cf3a
|
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
# app/config/collections.php
# app/config/errors.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/account.php
# app/controllers/api/teams.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/init.php
# app/worker.php
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Platform/Services/Tasks.php
# src/Appwrite/Platform/Tasks/Maintenance.php
# src/Appwrite/Platform/Workers/Certificates.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Messaging.php
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
# src/Appwrite/Specification/Format/OpenAPI3.php
# src/Appwrite/Specification/Format/Swagger2.php
# tests/e2e/Services/Account/AccountConsoleClientTest.php
|
2024-02-22 01:29:28 +13:00 |
|
Jake Barnby
|
b265106af2
|
Fix tests
|
2024-02-21 02:20:09 +13:00 |
|
Jake Barnby
|
bbce53cda5
|
Auto trigger messaging events
|
2024-02-21 01:06:35 +13:00 |
|
loks0n
|
fa28496b32
|
feat: ssr dx changes
|
2024-02-20 11:45:11 +00:00 |
|
Jake Barnby
|
2f711c84ed
|
Remove callback resources from workers
|
2024-02-21 00:40:55 +13:00 |
|
Torsten Dittmann
|
b500c085e1
|
revert: unnecessary style changes
|
2024-02-16 18:00:49 +00:00 |
|
Torsten Dittmann
|
de0e83f703
|
fix: move user and project logic from general to api hook
|
2024-02-16 17:58:51 +00:00 |
|
Torsten Dittmann
|
5193a97ddb
|
fix: move user logic from general to api hook
|
2024-02-16 16:26:50 +00:00 |
|
Jake Barnby
|
014464506e
|
Remove redundant hook
|
2024-02-13 17:45:03 +13:00 |
|
shimon
|
6b6f04d2d3
|
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
Conflicts:
app/config/collections.php
app/controllers/shared/api.php
|
2024-02-12 10:55:53 +02:00 |
|
Jake Barnby
|
8ed2b1f3a5
|
Fix tests
|
2024-02-12 18:35:05 +13:00 |
|
Jake Barnby
|
18f7168160
|
Merge main
|
2024-02-12 14:18:19 +13:00 |
|
Khushboo Verma
|
d40a51b50a
|
Only disallow console requests
|
2024-02-02 20:01:54 +05:30 |
|
Khushboo Verma
|
d96d84201e
|
Add auth group to create email token endpoint
|
2024-02-02 14:03:20 +05:30 |
|
Khushboo Verma
|
851e5c5154
|
Remove restrict group and add logic to auth group
|
2024-02-01 17:40:41 +05:30 |
|
Khushboo Verma
|
dadb94c499
|
Merge branch '1.5.x' into feat-block-countries
|
2024-01-31 12:24:21 +05:30 |
|
Matej Bačo
|
738a696ca9
|
Add proejct ID abuse protection
|
2024-01-29 20:38:01 +00:00 |
|
Matej Bačo
|
0a518cd47e
|
Fix failing tests
|
2024-01-29 20:03:14 +00:00 |
|
Christy Jacob
|
47fc6efb0d
|
chore: update endpoint
|
2024-01-29 17:48:12 +00:00 |
|
Christy Jacob
|
0ff6e99354
|
chore: update auth group
|
2024-01-29 17:42:14 +00:00 |
|
Khushboo Verma
|
2f88320d4f
|
Add null check
|
2024-01-29 18:47:14 +05:30 |
|
Khushboo Verma
|
f4426d553c
|
Throw 451 exception
|
2024-01-29 16:49:13 +05:30 |
|
Khushboo Verma
|
4cd5999bb3
|
Merge branch '1.5.x' into feat-block-countries
|
2024-01-29 16:25:31 +05:30 |
|
fogelito
|
a782e20315
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
Conflicts:
app/controllers/api/account.php
composer.json
composer.lock
src/Appwrite/Platform/Tasks/CalcTierStats.php
tests/e2e/Services/Account/AccountBase.php
|
2024-01-25 17:44:05 +02:00 |
|
Khushboo Verma
|
51d1a38f0f
|
Added test case
|
2024-01-24 18:24:48 +05:30 |
|
Khushboo Verma
|
e2cf8c696a
|
Add restrict group to some APIs
|
2024-01-24 16:08:51 +05:30 |
|
Torsten Dittmann
|
9f5a0312cf
|
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
|
2024-01-24 11:24:59 +01:00 |
|
Khushboo Verma
|
c07a3889e6
|
WIP: Add new group to api.php
|
2024-01-24 14:41:35 +05:30 |
|
Jake Barnby
|
a3096bc209
|
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
# app/controllers/api/messaging.php
|
2024-01-19 15:54:21 +13:00 |
|
loks0n
|
f1664c1cd7
|
fix: remove token auth.type
|
2024-01-17 12:09:15 +00:00 |
|
Jake Barnby
|
513ed9de05
|
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
# Conflicts:
# app/controllers/api/messaging.php
# tests/e2e/Services/Messaging/MessagingBase.php
|
2024-01-11 13:06:15 +13:00 |
|
Jake Barnby
|
51b2019ab6
|
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
# composer.lock
|
2024-01-09 13:56:01 +13:00 |
|
loks0n
|
5c803f6eff
|
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
|
2024-01-08 11:41:55 +00:00 |
|
shimon
|
03f2041913
|
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
|
2024-01-07 18:09:48 +02:00 |
|
shimon
|
99f1543f1b
|
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
Conflicts:
.gitmodules
Dockerfile
app/console
app/init.php
composer.lock
src/Appwrite/Platform/Services/Workers.php
src/Appwrite/Platform/Tasks/Hamster.php
|
2024-01-02 11:49:23 +02:00 |
|
Torsten Dittmann
|
d9b300051a
|
Merge pull request #7292 from appwrite/fix-7147-user-last-activity-not-updating
Fix user last activity not updating
|
2023-12-28 01:59:23 +01:00 |
|
Steven Nguyen
|
6d17f8e877
|
Fix user last activity not updating
Add back a section of code that was mistakenly removed.
|
2023-12-15 21:37:26 +00:00 |
|
Jake Barnby
|
121521d7c5
|
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
# composer.lock
# src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
# src/Appwrite/Platform/Tasks/Hamster.php
|
2023-12-15 18:22:08 +13:00 |
|