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
Jake Barnby
bb0744842d
Set metadata for all database instantiations
2023-10-18 16:21:10 +13:00
shimon
1036cb406d
some fixes
2023-10-17 21:32:38 +03:00
Prateek Banga
ffeb3f8fcf
review work
2023-10-17 22:53:26 +05:30
Jake Barnby
dbfe5e45aa
Delegate custom deletes
2023-10-17 12:18:51 +13:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
Eldad Fux
c6c7734c29
Merge pull request #6496 from appwrite/fix-readme-cn
...
Update logo in README-CN.md
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change.
You can learn more about contributing to appwrite here: https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md
Happy contributing!
-->
## What does this PR do?
(Provide a description of what this PR does and why it's needed.)
## Test Plan
(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)
## Related PRs and Issues
- (Related PR or issue)
## Checklist
- [ ] Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md )?
- [ ] If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?
2023-10-11 22:01:01 +02:00
shimon
893b1d0ba7
Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.gitmodules
app/controllers/api/functions.php
app/controllers/api/health.php
app/init.php
app/views/install/compose.phtml
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Workers/Builds.php
src/Appwrite/Platform/Workers/Deletes.php
src/Appwrite/Platform/Workers/Functions.php
src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
Prateek Banga
bb52647366
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-10-10 19:06:39 +05:30
Prateek Banga
1e5a2a78aa
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x
2023-10-10 17:46:44 +05:30
Steven Nguyen
071920fb30
Bump version to 1.4.5
2023-10-09 16:39:46 -07:00
Steven Nguyen
2620328810
Bump APP_CACHE_BUSTER to make sure browsers fetch the new console
2023-10-09 16:38:54 -07:00
Prateek Banga
d842191cc6
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-10-06 03:53:16 +05:30
Prateek Banga
d5cc214546
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x
2023-10-06 03:44:36 +05:30
shimon
7f1507f810
sync with 1.4
2023-10-04 11:20:32 +03:00
shimon
75d8741eaa
sync against master
2023-10-01 21:30:52 +03:00
shimon
b02d51c794
migrations worker
2023-10-01 20:39:26 +03:00
Christy Jacob
0c2cd174a5
chore: prep for 1.4.4
2023-09-27 21:28:28 +00:00
shimon
c4bd6e008e
Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.env
app/cli.php
app/config/collections.php
app/console
app/controllers/api/account.php
app/controllers/api/databases.php
app/controllers/api/functions.php
app/controllers/api/projects.php
app/controllers/api/storage.php
app/controllers/api/teams.php
app/controllers/api/users.php
app/controllers/general.php
app/controllers/shared/api.php
app/init.php
app/worker.php
app/workers/audits.php
app/workers/builds.php
app/workers/certificates.php
app/workers/databases.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
bin/worker-usage
composer.json
composer.lock
docker-compose.yml
src/Appwrite/Event/Delete.php
src/Appwrite/Event/Mail.php
src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Prateek Banga
35d842171c
review changes
2023-09-20 23:37:10 +05:30
Prateek Banga
f9030132a5
messaging worker logic to send message to providers batch limit
2023-09-20 17:38:29 +05:30
Prateek Banga
a2e34b5b64
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-20 16:59:07 +05:30
Christy Jacob
27b58fdf1e
chore: increase cache buster
2023-09-14 20:06:10 +00:00
Christy Jacob
1e6b37f980
chore: update appwrite version
2023-09-14 19:53:32 +00:00
Prateek Banga
350549db7d
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-14 02:17:34 +05:30
Prateek Banga
dbd227ed50
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-09-14 02:13:27 +05:30
prateek banga
778056d8e0
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-13 17:08:37 +05:30
Jake Barnby
1f9872b398
Merge remote-tracking branch 'origin/1.5.x' into feat-add-messaging-response-models
2023-09-12 15:40:25 -04:00
Prateek Banga
d14fbde9e7
removes provider sub query
2023-09-13 00:40:51 +05:30
Prateek Banga
720c7300dc
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-12 22:06:31 +05:30
Prateek Banga
497586378f
removes unnecessary config load
2023-09-12 22:05:14 +05:30
Prateek Banga
a69368973b
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-12 21:31:06 +05:30
Prateek Banga
d14a4c2506
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-12 21:23:18 +05:30
Prateek Banga
2f2875e3c0
lint fix
2023-09-12 21:19:21 +05:30
Prateek Banga
b7119a2718
review changes
2023-09-12 21:03:44 +05:30
Prateek Banga
cbea4264ea
merge master
2023-09-12 20:53:16 +05:30
Prateek Banga
899c962061
Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-11 20:30:30 +05:30
Prateek Banga
f4f1aa4b5b
review changes and adds missing subqueries
2023-09-11 19:27:45 +05:30
Christy Jacob
11f2ee8a1c
feat: prep for 1.4.2
2023-09-06 18:22:04 +00:00
Christy Jacob
4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars
...
Fix: Global variables
2023-09-06 13:51:13 -04:00
prateek banga
78a53aee37
adds messaging event and updates messaging worker
2023-09-05 22:40:48 +05:30
Matej Bačo
1a6530fb57
Fix project variables
2023-09-05 10:21:36 +02:00
Matej Bačo
7588a9c4ec
Make v2 functions work again
2023-09-04 19:53:25 +02:00
prateek banga
1762c81b8d
Merge branch 'feat-messages-event-config' into feat-mailgun-provider
2023-08-31 18:32:26 +05:30
prateek banga
e104e6d0f2
Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers
2023-08-31 18:16:48 +05:30
prateek banga
7fd124705c
merge master
2023-08-31 18:11:56 +05:30
Jake Barnby
afbc39b34b
Update version
2023-08-30 15:45:38 -04:00
Jake Barnby
e3a9fae033
Fix maildev auth
2023-08-30 00:56:08 -04:00
Jake Barnby
a1d0b67c6b
Fix SMTP
2023-08-30 00:30:44 -04:00
Jake Barnby
3f3d518f36
Merge remote-tracking branch 'origin/1.4.x' into feat-git-integration
...
# Conflicts:
# docker-compose.yml
2023-08-29 14:40:46 -04:00
Jake Barnby
cfdc9dff1b
Remove cloud specific config
2023-08-29 14:25:00 -04:00
prateek banga
c59887e8fb
fixes issue in sub queries
2023-08-25 15:55:04 +05:30
prateek banga
9be0592dab
lint fix
2023-08-25 04:46:15 +05:30
prateek banga
33f4bd6ac4
adds custom id for provider controlers, fixes subquery
2023-08-25 02:32:51 +05:30
prateek banga
df77f92860
adds sub query for targets and topics, permission for user target
2023-08-25 01:22:16 +05:30
prateek banga
5ca8dc0a73
merge cl-1.4.x
2023-08-24 14:10:26 +05:30
prateek banga
ac33d7828f
Revert "Pint linter ran"
...
This reverts commit bf5f0a8419
.
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419
Pint linter ran
2023-08-23 13:12:43 -04:00
Matej Bačo
8802e318d5
Fix pools resource
2023-08-23 13:52:17 +02:00
Matej Bačo
d3a9766c4f
Sync env & storage setup with 1.4.x
2023-08-23 12:08:48 +02:00
Jake Barnby
39ef0cc3c9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-git-integration-update-migration
...
# Conflicts:
# app/controllers/api/proxy.php
# composer.lock
2023-08-22 18:07:11 -04:00
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/controllers/api/functions.php
# composer.json
# composer.lock
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
Steven Nguyen
a13b7606a2
Fix console db namespace
2023-08-21 15:53:30 -07:00
Steven Nguyen
6bb04ca95e
Bump appwrite version to 1.4.0
2023-08-21 15:53:30 -07:00
prateek banga
5e3065c30a
merge resolve conflicts
2023-08-21 14:07:18 +05:30
shimon
e86286e7e3
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
...
Conflicts:
composer.lock
2023-08-20 18:07:57 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
Matej Bačo
621e49e4b6
Add host to execution detail
2023-08-20 13:43:06 +02:00
Jake Barnby
a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# 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
2023-08-18 13:23:35 -04:00
Bradley Schofield
aa9ea0e013
Increment Version Number
2023-08-18 15:23:47 +01:00
Jake Barnby
a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
...
# 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.lock
2023-08-17 19:51:36 -04:00
prateek banga
c83e4db23d
lint fix
2023-08-17 19:02:07 +05:30
prateek banga
07b7a9db0f
adds controller for creating a user target
2023-08-17 17:24:45 +05:30
Bradley Schofield
7fedac9306
Handle Eldad Suggestions
2023-08-16 19:08:24 +01:00
Bradley Schofield
a0cd65b94b
Fix Migrations Stability
2023-08-16 16:01:56 +01:00
prateek banga
ab655e69e6
Merge branch 'feat-add-messaging-collections-in-config' into feat-messages-event-config
2023-08-16 18:49:00 +05:30
prateek banga
9fc75e5535
moves messaging collection to common, adds subqueryTargets
2023-08-16 18:48:38 +05:30
prateek banga
92e587769a
resolve merge conflicts
2023-08-16 15:16:45 +05:30
prateek banga
4b63a4abbb
resolve merge conflicts
2023-08-14 21:13:47 +05:30
Matej Bačo
897d299ae6
PR review changes, fixes from QA
2023-08-11 15:34:57 +02:00
prateek banga
0304adf872
fix test cases
2023-08-11 16:19:05 +05:30
Christy Jacob
7d60e4272d
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations
2023-08-09 13:59:44 +00:00
Matej Bačo
93735ac4a7
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-09 12:30:45 +02:00
Christy Jacob
347cd4d13f
feat: generte specs
2023-08-08 16:58:06 +00:00
Christy Jacob
82a206d808
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-08-08 16:48:59 +00:00
Christy Jacob
5b42d2c21f
feat: review comments
2023-08-08 16:47:51 +00:00
Matej Bačo
11068696c9
QA changes
2023-08-07 17:37:36 +02:00
Bradley Schofield
e28dd260c3
Update init.php
2023-08-07 16:17:34 +01:00
prateek banga
9057a50a10
rename provider param in config
2023-08-07 15:54:00 +05:30
Matej Bačo
345df3f2ca
More QA fixes
2023-08-06 12:30:38 +02:00
Matej Bačo
906f86fbb8
Merge branch 'cloud-1.4.x' into feat-git-integration
2023-08-06 09:31:32 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
d1c0bccb59
Merge tag '1.3.8' into cloud-1.3.x
2023-08-04 14:12:58 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
prateek banga
867f3e8c08
adds messaging providers rename providers.php to authProviders.php
2023-08-04 19:00:08 +05:30
Matej Bačo
c7605b85e0
Remove vcs prefix
2023-07-30 21:10:25 +02:00
Matej Bačo
a718f09f74
Update execution model, add detection to repository
2023-07-30 09:17:23 +02:00
Matej Bačo
ce98b04348
Address PR reviews
2023-07-28 09:56:07 +02:00
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x
2023-07-26 13:33:49 -07:00
Christy Jacob
882698d6e4
chore: update specs
2023-07-20 17:41:28 +04:00