1
0
Fork 0
mirror of synced 2024-08-04 13:01:45 +12:00
Commit graph

202 commits

Author SHA1 Message Date
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
Christy Jacob
aeeb7e1d55 fix: failing tests 2023-12-09 00:36:01 +01:00
Christy Jacob
75e1779921 fix: failing tests 2023-12-09 00:29:14 +01:00
Christy Jacob
731e7b86a7 fix: failing tests 2023-12-09 00:17:13 +01:00
Jake Barnby
458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main 2023-11-13 16:46:05 +13:00
Jake Barnby
2292143750
Add service/all test 2023-11-06 12:34:44 +13:00
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
Prateek Banga
11a458f1df change providers to authProviders in remaining places 2023-09-13 00:06:18 +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
Jake Barnby
18f86b057d
Test fixes 2023-08-30 01:31:21 -04:00
Jake Barnby
a1d0b67c6b
Fix SMTP 2023-08-30 00:30:44 -04:00
Jake Barnby
2d2c392bce
Fix template test 2023-08-29 10:50:52 -04:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby
0f36245f78
Fix message checks 2023-08-23 16:42:16 -04:00
Jake Barnby
e8ae7fb49a
Fix test wrong depends 2023-08-23 01:17:14 -04:00
Jake Barnby
a1d62d8d42
Fix project test 2023-08-22 22:12:15 -04:00
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Jake Barnby
e388f1f8e2
Remove redundant tests 2023-08-18 14:14:52 -04:00
prateek banga
92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
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
prateek banga
5baa0d674a rename providers.php to authProviders.php in docs and test 2023-08-07 14:17:02 +05:30
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Steven Nguyen
5be6d8e90b
Update Project providers to also include the provider key
Pass the provider key and name back so that a nicely formatted name
can be shown in the Appwrite Console.
2023-07-20 16:53:33 -07:00
Christy Jacob
c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Christy Jacob
6cdc8a97b7 chore: update tests 2023-07-20 17:12:41 +04:00
Eldad A. Fux
66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Damodar Lohani
6e54b79812 fix 2023-07-20 01:35:01 +00:00
Damodar Lohani
cb8341fa5b fix test 2023-07-20 01:33:27 +00:00
Damodar Lohani
0c2848bece using maildev for smtp test 2023-07-20 01:32:19 +00:00
Christy Jacob
4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00
Christy Jacob
43ee8e1ed4 fix: update tests 2023-07-20 02:17:16 +04:00
Christy Jacob
e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Damodar Lohani
4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani
8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Christy Jacob
e0aa3db21e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-07-11 19:36:37 +00:00
Damodar Lohani
f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
Christy Jacob
9f2bf844c7
Merge pull request #5580 from appwrite/fix-project-deletion-master
remove password required for project deletion
2023-06-22 22:52:59 +05:30
Christy Jacob
a9e2eca8a4
Merge pull request #5683 from appwrite/master
Update 1.4.x from Master
2023-06-12 13:20:26 +05:30
Damodar Lohani
fcf558b58b fix team 2023-06-05 07:11:44 +00:00
Christy Jacob
44fd41d2ea Merge branch 'master' of https://github.com/appwrite/appwrite into 1.3.x 2023-05-30 16:58:22 +00:00
Jake Barnby
edce3cceed
Fix tests
(cherry picked from commit 0661f1f889)
(cherry picked from commit bab804b8e1)

# Conflicts:
#	tests/e2e/Client.php
2023-05-30 19:01:46 +12:00
Jake Barnby
bab804b8e1
Fix tests
(cherry picked from commit 0661f1f889)
2023-05-30 18:29:20 +12:00
Damodar Lohani
6c38bcc270 fix typo 2023-05-25 01:26:13 +00:00
Damodar Lohani
6813d53e06 remove password required for project deletion 2023-05-25 00:32:49 +00:00
Christy Jacob
0839822a66 Apply suggestions from code review 2023-05-23 14:39:26 +00:00
Christy Jacob
9a712686f2 chore: add tests 2023-05-23 14:39:16 +00:00
Damodar Lohani
0c012f91aa update tests to account for new project 2023-05-10 06:46:30 +00:00
Damodar Lohani
860e0203b0
Update ProjectsConsoleClientTest.php 2023-05-04 07:11:03 +05:45