Commit Graph
795 Commits
Author SHA1 Message Date
wess 7ebd6e92bc Removes more dev volumes 2022-11-21 09:58:36 -05:00
wess 9a88909e24 resolve conflicts from master 2022-11-16 11:30:43 -05:00
wess 9ee4792bd1 Fixes up conflicts 2022-11-15 10:04:52 -05:00
Torsten Dittmann 310ff90d22 Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-14 15:57:40 +01:00
Torsten Dittmann 9f384e016f Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite 2022-11-09 15:47:23 +01:00
Torsten Dittmann a2570f5568 chore: update composer 2022-11-09 15:34:26 +01:00
wess 69c37a72be Comment out HTTPTest cause torsten told me to
Updates some tests with sleep to ensure workers have created things, like attributes

Updated init.php to use new mongo driver/mongo adapter setup
2022-11-04 10:23:08 -04:00
wess 5763a3901a Getting mongo working 2022-11-02 14:39:36 -04:00
Damodar Lohani b66f932b3b Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-02 08:43:12 +00:00
Christy Jacob b2d884e329 Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:21:19 +05:30
Damodar Lohani 8baa95db1c Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-01 04:54:48 +00:00
Christy Jacob 629c1b1686 Merge branch 'test-mysql-adapter' of github.com:appwrite/appwrite into update-db-library 2022-10-31 23:38:58 +05:30
fogelito 1e92bda18b composer changes 2022-10-31 16:50:54 +02:00
fogelito eaf59693b7 composer.json 2022-10-31 15:26:40 +02:00
Christy Jacob aff7c59097 feat: update database library 2022-10-31 12:02:51 +00:00
Torsten Dittmann 0049a76565 feat: submodule 2022-10-31 09:53:36 +01:00
Torsten Dittmann d387f198db Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x 2022-10-31 09:45:51 +01:00
Damodar Lohani 4086ba93ad Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-10-31 06:36:26 +00:00
Damodar Lohani bd83da3331 upgrade databases 2022-10-31 04:30:19 +00:00
fogelito 08e44f0656 some changes 2022-10-26 22:14:39 +03:00
wess e0a1cdb886 Adds mongo adapter and client (specifically) where required
Updates tests to do in_array with map isntead of index specifics

Updates Dockerfile for update instead of install because _composer_
2022-10-26 11:27:23 -04:00
Damodar Lohani 03f8e20dfd Merge remote-tracking branch 'origin/master' into feat-usage-refactor 2022-10-21 06:27:03 +00:00
wess 5f5c9d7a27 fixe for composer 2022-10-19 10:53:46 -04:00
wess 26ac039ae3 Testing mongo/db 2022-10-19 09:09:02 -04:00
Vincent (Wen Yu) Ge f7904af0ed Remove references to admin mode 2022-10-17 20:45:17 +00:00
Damodar Lohani e96c0b1127 fix composer 2022-10-17 08:57:12 +00:00
Damodar Lohani f71eb5a169 database listeners 2022-10-17 08:04:12 +00:00
Damodar Lohani f78cb09694 Merge remote-tracking branch 'origin/master' into feat-usage-refactor 2022-10-17 06:55:01 +00:00
Damodar Lohani b29e2c1808 use database from master 2022-10-16 08:08:38 +00:00
Damodar Lohani f27ccf4212 upgrade database version 2022-10-14 11:40:59 +00:00
Torsten Dittmann 788abad42e chore: upgrade utopia-php/framework 2022-10-14 12:44:52 +02:00
Damodar Lohani 0316710ee4 update database 2022-10-14 08:51:37 +00:00
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
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
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
wess e68fabc135 Merging from master 2022-10-07 10:54:24 -04:00
Torsten Dittmann 3e69d8203e chore: update composer lock 2022-10-04 11:04:32 +02: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 d45464c6c8 fix: boolean attribute default value 2022-09-30 11:27:19 +02:00
Jake Barnby 7c3732e277 Update SDK generator version 2022-09-22 21:23:51 +12:00
Christy Jacob a0910a7f58 chore: update sdk generator 2022-09-22 08:39:20 +05:30
wess a86dff030c Merge remote-tracking branch 'origin/master' into feat-experiment-mongo 2022-09-15 13:21:15 -04:00
Christy Jacob 0b767c15a6 feat: update examples 2022-09-14 14:41:08 +05:30
Jake Barnby ef144dbc24 Update lock 2022-09-14 19:24:50 +12:00
Jake Barnby d28afc21a6 Update db to tag 2022-09-14 18:11:42 +12:00
Jake Barnby 696c4bfde3 Merge remote-tracking branch 'origin/0.16.x' into feat-grant-verified-dimension 2022-09-14 17:31:23 +12:00
Jake Barnby 25fc9c2dc4 Update lock 2022-09-14 02:39:35 +12:00