1
0
Fork 0
mirror of synced 2024-07-10 17:06:17 +12:00
Commit graph

1297 commits

Author SHA1 Message Date
fogelito 789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
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
Jake Barnby 7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Matej Bačo 32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
Khushboo Verma a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Jake Barnby 9fc68d23a0
Fix delete type for expired targets 2024-01-19 17:23:44 +13:00
Jake Barnby 59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
Feat message scheduling
2024-01-19 16:55:49 +13:00
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
Khushboo Verma e9aab8d9ee Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-18 15:21:55 +05:30
Steven Nguyen d670c07ca4
Delete subscribers and update topic totals when deleting target 2024-01-17 22:56:56 +00:00
Matej Bačo 39997c817f Fix failing tests 2024-01-15 14:37:47 +00:00
Jake Barnby 189406635a
Use internal ID for subquery 2024-01-15 18:25:34 +13:00
loks0n 56fe939713 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-13 09:55:44 +00:00
Khushboo Verma d443602cbc resolve merge conflicts 2024-01-12 01:55:32 +05:30
Jake Barnby 322dae626a
Merge branch '1.5.x' into feat-message-scheduling 2024-01-11 22:29:49 +13:00
Jake Barnby 320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 2024-01-11 19:59:59 +13:00
Jake Barnby b9892b857a
Make const int easier to read 2024-01-11 15:54:44 +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
Khushboo Verma 6b018d2f16 Add const for max file size 2024-01-09 01:41:48 +05:30
loks0n 5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
Khushboo Verma bbd551cf0d Reset attempts to 0 on successful request 2024-01-05 17:54:20 +05:30
Khushboo Verma fb9e393c97 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-04 16:42:47 +05:30
Khushboo Verma 431e26c153 Allow certain domains to skip validation 2024-01-04 16:37:15 +05:30
Steven Nguyen 0c3ed13ad3
Fix _APP_CONSOLE_HOSTNAMES check
Ensure invalid hostnames such as empty strings are not added as a
hostname.
2024-01-03 20:39:19 +00:00
Steven Nguyen faf39fcc81
Fix _APP_CONSOLE_HOSTNAMES check
Ensure invalid hostnames such as empty strings are not added as a
hostname.
2024-01-03 19:30:49 +00:00
Damodar Lohani 640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Torsten Dittmann a29cef2334
feat: console hostname env variable 2024-01-02 19:53:20 +00: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
Damodar Lohani a2ad870084 use compression constant from utopia/storage 2023-12-31 11:46:45 +00:00
Torsten Dittmann 9b2fbc5c52 feat: console hostname env variable 2023-12-29 21:52:50 +01:00
Steven Nguyen 3d1b61d20d
Bump console to version 3.3.15 2023-12-29 19:27:44 +00:00
Steven Nguyen 643f5e845a
Bump console to version 3.3.14 2023-12-29 19:16:57 +00:00
fogelito 5d41442838 getPDOAttributes 2023-12-24 11:55:51 +02:00
fogelito 91b53c2a7f remove ATTR_ERRMODE 2023-12-23 17:48:28 +02:00
Matej Bačo 8c1363529e Add Hooks 2023-12-15 23:19:43 +01: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
fogelito 4ce312560b Connection problem 2023-12-14 18:17:19 +02:00
Jake Barnby 5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
loks0n 78878c6ba0 chore: fmt 2023-12-13 10:36:49 +00:00
loks0n fe0001350d feat: use x-appwrite-session header 2023-12-12 15:39:24 +00:00
德华 刘 11a9583c72 feat: update cache buster 2023-11-30 21:16:17 +00:00
prateek banga 739cc36fdc updated providerType wherever left to update 2023-11-29 15:22:26 +05:30
Jake Barnby 4bc23afc65
Add constants for message types 2023-11-29 17:05:37 +13:00
shimon 21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
prateek banga b2381798ab migrates enum attribute size to 255 2023-11-20 22:01:20 +05:30
Jake Barnby 0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
Steven Nguyen a96e571258 Bump appwrite version to 1.4.13 2023-11-17 20:11:56 +00:00
Steven Nguyen 926e1f3fc8 Bump console to version 3.2.8 2023-11-17 19:34:33 +00:00