shimon
7df94fcee6
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
...
Conflicts:
composer.json
composer.lock
2024-04-07 18:17:16 +03:00
Jake Barnby
479ed3d0b1
Inline defaults
2024-04-04 18:51:40 +13:00
Jake Barnby
8974dcfb39
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-reclaim-only-current-connection
...
# Conflicts:
# app/console
# app/init.php
2024-04-04 17:21:16 +13:00
Matej Bačo
d091b37a15
Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x
2024-04-02 18:42:17 +02:00
Damodar Lohani
026f5dde2d
set http version to 1.1 for do spaces
2024-04-02 08:35:14 +00:00
Eldad Fux
beda5293b4
Fix format
2024-04-01 13:08:46 +02:00
Eldad Fux
8ed1da4ea8
Updated getEnv to use system lib
2024-04-01 13:02:47 +02:00
Damodar Lohani
00c45c2507
new environment for certificates and security emails
2024-03-31 03:32:55 +00:00
Steven Nguyen
3c68c7e9cf
Bump console to version 4.0.5
2024-03-25 10:54:33 -07:00
shimon
63a30ed083
maximumFileSize fix
2024-03-19 12:15:39 +02:00
Damodar Lohani
c5512ae010
Update init.php
2024-03-17 15:01:09 +05:45
Jake Barnby
c6ce585fcc
Update version
2024-03-13 11:08:50 +01:00
Steven Nguyen
d167fb3650
Bump appwrite version to 1.5.3
2024-03-11 17:59:12 +01:00
Steven Nguyen
5bbfffff86
Bump console to version 4.0.4
2024-03-11 17:13:50 +01:00
Jake Barnby
9d1ccf78af
Update cache baster and image version
2024-03-09 18:46:14 +01:00
Torsten Dittmann
e75ba0600e
release: 1.5.2
2024-03-08 21:55:25 +01:00
Torsten Dittmann
150681246e
bump: version number
2024-03-08 17:25:10 +01:00
Torsten Dittmann
f51c39cd2b
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-03-08 00:30:02 +01:00
Jake Barnby
664df69a5f
Fix method refs
2024-03-07 17:49:59 +01:00
Jake Barnby
8a73203635
Revert debugs
2024-03-07 14:52:13 +01:00
Jake Barnby
b857fa3cdc
Debug
2024-03-07 14:06:33 +01:00
Jake Barnby
503fb2ca82
Debug
2024-03-07 12:49:54 +01:00
Jake Barnby
2bed17de35
Debug
2024-03-06 21:50:31 +01:00
Jake Barnby
3312ed1c5d
Debug
2024-03-06 21:14:55 +01:00
Torsten Dittmann
0a1d572c72
chore: run formatter
2024-03-06 18:34:21 +01:00
Shimon Newman
5b00737b55
Update app/init.php
...
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2024-03-06 18:09:13 +01:00
Jake Barnby
1b7ce8fc61
Debug
2024-03-06 10:59:05 +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
Jake Barnby
74a3d6531f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
...
# Conflicts:
# composer.json
# composer.lock
# src/Appwrite/Platform/Tasks/CalcTierStats.php
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-03-04 19:50:10 +01:00
Christy Jacob
868bba52aa
Update app/init.php
...
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2024-03-01 22:05:42 +05:30
Torsten Dittmann
b7d3996960
feat: mfa collection restructure
2024-02-29 21:59:49 +01:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints"
2024-02-22 12:21:48 +05:30
Jake Barnby
379c79dae9
Consistent naming for device resources
2024-02-21 03:10:51 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events
2024-02-21 01:06:35 +13:00
Jake Barnby
85b0ec7f77
Temp bump console for SDK fixes
2024-02-19 17:33:47 +13:00
shimon
62ee10493b
usage sms per country code count
2024-02-15 10:10:01 +02:00
Jake Barnby
f28f9df41c
Update geodb
2024-02-13 17:55:32 +13:00
Jake Barnby
37522ea66f
Merge branch '1.5.x' into fix-catch-exception
2024-02-13 12:47:36 +13:00
fogelito
ace75b0786
parseQueries
2024-02-12 18:02:04 +02:00
shimon
70effd1e99
Sync against main
2024-02-12 11:14:26 +02:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
Steven Nguyen
4ace8ed027
Replace catching \Exception with \Throwable
...
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:
} catch (\Exception $e) {
$deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {
As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
Jake Barnby
465bc81071
Add deletes job to delete targets tied to a particular session
2024-02-03 03:06:31 +13:00
Torsten Dittmann
ceb868c9d7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-02-01 11:57:32 +01:00
shimon
13a879c274
Add count for messages(sms) metric
2024-01-30 11:19:10 +02:00
Jake Barnby
ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
...
Labels limit
2024-01-30 19:43:32 +13:00
fogelito
974783f54a
Increase labels max value
2024-01-28 12:51:05 +02:00
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
9070dce6ac
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-01-24 16:32:12 +01: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
5bd106afaf
Implement better cname validation logging
2024-01-23 15:40:32 +00:00
Torsten Dittmann
f1293d2636
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-22 18:32:22 +01:00
Torsten Dittmann
185e4258df
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-22 14:45:07 +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
Torsten Dittmann
1ab3dc2236
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-18 13:10:15 +01: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
Torsten Dittmann
e2a0c2d825
sync: with 1.5.x
2024-01-12 14:04:31 +01: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
Torsten Dittmann
208abe17e7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-08 12:20:08 +01: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
Jake Barnby
4710310629
Check if self-hosted
2023-12-08 18:33:35 +01:00
Jake Barnby
018b7c38bd
Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes
...
# Conflicts:
# src/Appwrite/Platform/Tasks/Hamster.php
2023-12-08 13:34:28 +01:00
德华 刘
11a9583c72
feat: update cache buster
2023-11-30 21:16:17 +00:00
Jake Barnby
7e12da5a2a
Use hard-coded DB name instead of project attribute
2023-11-30 16:32:15 +13:00
Jake Barnby
4f539f1ed4
Update switch to match
2023-11-30 16:04:15 +13: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
Jake Barnby
2c71de1d1b
Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes
...
# Conflicts:
# composer.lock
2023-11-28 00:57:17 +13:00
Jake Barnby
edee5400ba
Fix casing
2023-11-28 00:43:21 +13:00
Jake Barnby
b9ac8e644d
Set/reset tenant on init
2023-11-28 00:26:35 +13:00
Jake Barnby
7b8e37b03d
Update method names
2023-11-27 15:22:05 +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
Jake Barnby
35163ff52a
Check project shareTables status when configuring databases
2023-11-23 01:13:24 +13:00
Jake Barnby
cefc1b6519
Add base share tables check when creating project
2023-11-23 01:11:48 +13:00
Jake Barnby
464b913e90
Update for function name change
2023-11-22 21:32:36 +13: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
德华 刘
37e1e25170
chore: update versions and changelog
2023-11-15 18:31:33 +00:00
Steven Nguyen
31d5b75034
Bump console to version 3.2.7
2023-11-15 17:23:35 +00:00
prateek banga
c5aaa670a9
adds provider details in message search attribute
2023-11-14 15:20:21 +05:30
prateek banga
f84a00dded
adds search attribute filter
2023-11-14 14:07:52 +05:30
Jake Barnby
458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main
2023-11-13 16:46:05 +13:00
Prateek Banga
3ade88897c
Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x
2023-11-10 12:49:05 +05:30
Jake Barnby
4d54e7bb36
Update version + cache buster
2023-11-10 13:09:00 +13:00
德华 刘
f70b418c5c
chore: updates for appwrite 1.4.10
2023-11-09 15:57:37 +00:00
shimon
f64d0ab8a8
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
...
Conflicts:
.gitmodules
CHANGES.md
Dockerfile
composer.lock
src/Appwrite/Migration/Migration.php
2023-11-05 17:03:13 +02:00
Steven Nguyen
755699de8a
Bump appwrite version to 1.4.9
2023-10-31 12:40:45 -07:00
Steven Nguyen
c1df289df7
Bump appwrite version to 1.4.8
2023-10-27 10:31:43 -07:00
Steven Nguyen
3abb74c937
Bump console to version 3.2.5
2023-10-27 09:33:21 -07:00
Jake Barnby
89236955fb
Fix setting metadata
2023-10-26 22:28:23 +13:00
prateek banga
c2cd544948
review changes
2023-10-26 13:46:45 +05:30
prateek banga
fd4a81c4fc
made review changes
2023-10-25 23:03:23 +05:30
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
Jake Barnby
5732171a2a
Merge remote-tracking branch 'origin/1.4.x' into feat-query-metadata
...
# Conflicts:
# app/init.php
# composer.json
# composer.lock
2023-10-25 18:21:16 +13:00
Jake Barnby
d5b6421285
Merge remote-tracking branch 'origin/1.4.x' into sync-1.4.x-to-1.5.x
...
# Conflicts:
# composer.lock
2023-10-24 19:46:57 +13:00
Steven Nguyen
3addf76a2a
Bump appwrite version to 1.4.7
2023-10-23 13:36:29 -07:00
Eldad Fux
f4fedc832e
Fix formating
2023-10-21 08:30:35 -04:00
Eldad A. Fux
e5fca85d88
Merge branch 'main' into feat-reclaim-only-current-connection
2023-10-21 06:42:59 -04:00
prateek banga
e040ecba36
fixed lint error
2023-10-20 15:03:56 +05:30
prateek banga
161bbfb822
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 14:55:17 +05:30
Christy Jacob
01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep
2023-10-19 05:28:02 -04:00
Christy Jacob
4b08729131
Update app/init.php
2023-10-19 05:27:52 -04:00
Christy Jacob
a46b3d088c
Merge branch '1.4.x' into feat-api-db-timeout
2023-10-19 05:15:44 -04:00
Jake Barnby
03b6d65669
Add timeout on vcs project DBs
2023-10-19 17:21:11 +13:00
Jake Barnby
b17e24f645
Use const for timeout
2023-10-19 15:45:32 +13:00
Jake Barnby
389d367fca
Set hard timeouts for API dbs
2023-10-19 15:32:45 +13:00
Steven Nguyen
435b20df77
Bump appwrite version to 1.4.6
2023-10-18 16:07:47 -07:00
Steven Nguyen
9bc6b124c0
Bump console to version 3.2.3
2023-10-18 15:51:13 -07:00
Christy Jacob
be26e4b729
chore: remove resque library and update health check endpoints
2023-10-18 19:44:06 +00:00
Christy Jacob
74e3f3f7d2
fix: remove unused variable
2023-10-18 19:08:21 +00:00
Christy Jacob
066dd6393d
Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes
2023-10-18 18:57:16 +00:00