Commit graph

1147 commits

Author SHA1 Message Date
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
d14fbde9e7 removes provider sub query 2023-09-13 00:40:51 +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
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
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
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
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
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
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
9fc75e5535 moves messaging collection to common, adds subqueryTargets 2023-08-16 18:48:38 +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
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
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
Steven
3f9cedcc44
Prepare 1.3.8 release 2023-07-19 22:49:51 -07:00