1
0
Fork 0
mirror of synced 2024-09-06 21:01:55 +12:00
Commit graph

13305 commits

Author SHA1 Message Date
fogelito
778751160b Merge branch '1.1.x' of github.com:appwrite/appwrite into bug_model_metric
 Conflicts:
	app/config/specs/open-api3-latest-console.json
	app/config/specs/swagger2-latest-console.json
2022-10-11 17:06:37 +03:00
Torsten Dittmann
e9ef7c0ecd
Merge pull request #4424 from appwrite/master
sync: 1.1.x <- master
2022-10-11 16:03:43 +02:00
fogelito
9ff918ac6b specs 2022-10-11 15:56:09 +03:00
fogelito
88a19f4bd3 composer.lock 2022-10-11 15:43:56 +03:00
fogelito
0a4b582dd9 Model MODEL_METRIC changes 2022-10-11 14:35:54 +03:00
fogelito
4250234231 Model MODEL_METRIC changes 2022-10-11 13:34:42 +03:00
Christy Jacob
75c029c462
Merge pull request #4073 from appwrite/christyjacob4-patch-2
Update PULL_REQUEST_TEMPLATE.md
2022-10-11 13:06:17 +04:00
Torsten Dittmann
92778baf99
Merge pull request #4042 from Sooraj-s-98/master
sanitized url in url Validation
2022-10-10 22:42:49 +02:00
Eldad A. Fux
8f3f00fe00
Merge pull request #4055 from appwrite/feat-integrate-messaging
Feat integrate messaging
2022-10-10 09:53:32 +03:00
Jake Barnby
77fccc950a
Merge remote-tracking branch 'origin/1.1.x' into feat-integrate-messaging 2022-10-10 17:30:33 +13:00
Eldad A. Fux
0733909d04 Merge pull request #4346 from appwrite/master
Sync 1.1.x
2022-10-10 07:27:26 +03:00
Jake Barnby
702710aab1
Fix import 2022-10-10 16:20:46 +13:00
Jake Barnby
2fc22998cf
Merge remote-tracking branch 'origin/master' into feat-integrate-messaging 2022-10-10 14:04:51 +13:00
Jake Barnby
f93099cbb6
Merge remote-tracking branch 'origin/1.1.x' into feat-integrate-messaging 2022-10-10 14:04:01 +13:00
Jake Barnby
608f1532a6
Merge remote-tracking branch 'origin/1.0.x' into feat-integrate-messaging
# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-10 14:01:59 +13:00
Jake Barnby
a247cc614f
Increase sleep 2022-10-10 11:28:26 +13:00
Eldad A. Fux
17d7bcca78
Merge pull request #4057 from appwrite/feat-project-queries-by-team
Feat: teamId queries on listProjects
2022-10-09 16:19:19 +03:00
sooraj
5958577a6e camel case update 2022-10-08 06:31:28 +05:30
sooraj
49c0c2d996 change test case 2022-10-07 07:39:22 +05:30
sooraj
3a2d6da052 sanitized_url add in parse url 2022-10-07 06:11:38 +05:30
Sooraj S
81fc5ee6b3
Merge pull request #1 from appwrite/master
new
2022-10-06 09:01:55 +05:30
sooraj
62f63923c1 new test case 2022-10-05 19:40:05 +05:30
Torsten Dittmann
676709e706
Merge pull request #4289 from appwrite/1.0.x
master <- 1.0.x
2022-10-04 16:15:46 +02:00
Torsten Dittmann
68df98eaaa
Merge pull request #4043 from appwrite/chore-prepare-1-0-2
chore: prepare 1.0.2
2022-10-04 15:36:45 +02:00
Torsten Dittmann
77e8ffe500 chore: update changelog 2022-10-04 15:29:15 +02:00
Torsten Dittmann
120216f715 Merge branch '1.0.x' of https://github.com/appwrite/appwrite into chore-prepare-1-0-2 2022-10-04 12:19:18 +02:00
Torsten Dittmann
0c99ceda92 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x 2022-10-04 12:18:43 +02:00
Torsten Dittmann
7a9b25889b Merge branch 'master' of https://github.com/appwrite/appwrite into chore-prepare-1-0-2 2022-10-04 12:07:09 +02:00
Torsten Dittmann
4bb44ad315
Merge pull request #3757 from appwrite/feat-github-non-self-hosted
ci: update github actions to use github hosted runners
2022-10-04 12:06:42 +02:00
Torsten Dittmann
b83a215885 chore: update changelog 2022-10-04 11:32:31 +02:00
Torsten Dittmann
6c10a75c6a chore: update changelog 2022-10-04 11:31:17 +02:00
Torsten Dittmann
b6321a8bed
ci: remove php image pre pull 2022-10-04 11:05:52 +02:00
Torsten Dittmann
3e69d8203e chore: update composer lock 2022-10-04 11:04:32 +02:00
Christy Jacob
73c144a75f
Update .github/PULL_REQUEST_TEMPLATE.md
Co-authored-by: Matej Bačo <matejbacocom@gmail.com>
2022-10-04 12:29:52 +05:30
Eldad A. Fux
052d35fe59
Update README.md 2022-10-04 08:54:53 +03:00
Christy Jacob
0bae88311e
Update PULL_REQUEST_TEMPLATE.md 2022-10-03 15:30:47 +05:30
Matej Bačo
a55b149d6f Fix test 2022-10-03 07:54:55 +00:00
Matej Bačo
a883d3728f Allow teamId queries on listProjects 2022-10-03 07:16:49 +00:00
Jake Barnby
2fbc40e966
Merge fixes 2022-10-03 13:42:53 +13:00
Jake Barnby
5c6caf5603
Update to messaging lib to tagged release
(cherry picked from commit 580eafffd2a90fb9dccc4554ac9ce388864f1e8d)

# Conflicts:
#	composer.lock
2022-10-03 13:29:24 +13:00
Jake Barnby
2bb8854f61
WIP integrate messaging library
(cherry picked from commit 9a25f77e3e7e76f6c93cc3ce1985f43426a0debf)

# Conflicts:
#	app/workers/messaging.php
#	src/Appwrite/SMS/Adapter/Mock.php
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-10-03 13:28:30 +13:00
Torsten Dittmann
146793c42c
Merge pull request #3885 from appwrite/fix-function-vars-null
Fix: Function null variables
2022-09-30 15:38:27 +02:00
sooraj
91f16121d1 adding a test 2022-09-30 18:10:02 +05:30
Torsten Dittmann
5d32ddb408 Merge branch '1.0.x' of https://github.com/appwrite/appwrite into chore-prepare-1-0-2 2022-09-30 14:36:53 +02:00
Torsten Dittmann
e5271dbda9
Merge branch '1.0.x' into fix-function-vars-null 2022-09-30 14:29:22 +02:00
Torsten Dittmann
6c2fbec22b chore: add changelog 2022-09-30 14:27:46 +02:00
Torsten Dittmann
0c1222f0f5 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x 2022-09-30 14:23:06 +02:00
Torsten Dittmann
fbbb150e86 Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"
This reverts commit 2117fa53f0, reversing
changes made to c634d12ef4.
2022-09-30 14:22:11 +02:00
Torsten Dittmann
2117fa53f0
Merge pull request #4041 from appwrite/revert-3789-feat-app-region
Revert "Feat app region"
2022-09-30 14:19:30 +02:00
Torsten Dittmann
1d3bd4e26a
Merge pull request #4040 from appwrite/fix-boolean-attribute-default-value
fix: boolean attribute default value
2022-09-30 13:29:44 +02:00