1
0
Fork 0
mirror of synced 2024-07-04 06:00:53 +12:00
Commit graph

1236 commits

Author SHA1 Message Date
Matej Bačo 5dc681377e Temporarly remove clone fix 2023-08-27 14:01:31 +02:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby e8ae7fb49a
Fix test wrong depends 2023-08-23 01:17:14 -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
Eldad A. Fux 8e46bdf7cb
Merge branch 'feat-git-integration' into feat-usage-rollback 2023-08-21 22:46:09 +03:00
Khushboo Verma c016ad7415 Added commitHash to git clone command 2023-08-21 17:03:07 +05:30
shimon d05718e75c rolling back usage flow 2023-08-20 16:56:49 +03:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Matej Bačo 46c7010908 Uprade dependencies 2023-08-20 11:04:42 +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 0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations 2023-08-18 11:18:58 +01:00
Khushboo Verma 00f6785818 Addressed PR comments 2023-08-18 12:25:44 +05:30
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 47b10fa82b
Implement IAM Custom Roles 2023-08-16 18:17:20 +01:00
prateek banga 8e1ef812d3 resolve merge conflicts 2023-08-14 21:59:24 +05:30
Jake Barnby efe81f5723
Merge branch 'cl-1.4.x' into v19-migration 2023-08-11 19:29:12 -04:00
Jake Barnby a8897e6b6f
Update libs 2023-08-10 21:33:40 -04:00
Jake Barnby b0b6f93794
Update libs 2023-08-10 21:28:04 -04:00
prateek banga 8cefc54ca3 merge resolve conflicts 2023-08-10 17:22:15 +05:30
Matej Bačo b9c52d8583 QA after merge fix 2023-08-10 01:44:00 +02:00
Matej Bačo 6abe8a5792 Upgrade vcs version 2023-08-09 22:55:54 +02:00
prateek banga 185d09d764 adds more queries in tests, upgrade db library 2023-08-10 00:11:18 +05:30
Khushboo Verma ced6eed6fa Add urls in deployment details 2023-08-09 23:05:23 +05:30
Bradley Schofield 0d58d20635
Update Migration Lib 2023-08-09 18:08:10 +01:00
Khushboo Verma a63a668601 Add additional deployment info 2023-08-09 21:23:58 +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 9d0eda68d6 Upgrade after conflict 2023-08-09 12:35:04 +02:00
Khushboo Verma c6cdc0c37c Fix broken functions flow 2023-08-09 13:16:17 +05:30
Christy Jacob fe9ed76554 chore: update dependencies 2023-08-08 22:03:18 +00:00
prateek banga 4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +05:30
Christy Jacob c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Bradley Schofield 47ebf77ff0 Continue work on OAuth Firebase last stage 2023-08-08 20:28:38 +01:00
prateek banga 60236b3af6 refactor according to review comments 2023-08-08 04:40:07 +05:30
Matej Bačo 11068696c9 QA changes 2023-08-07 17:37:36 +02:00
Bradley Schofield 893dbead7c Update composer.lock 2023-08-07 16:16:28 +01:00
Matej Bačo 2bbdbaebd3 Upgrade SDKs 2023-08-06 21:14:25 +02:00
Matej Bačo 3b15dccc84 More QA fixes 2023-08-06 15:42:18 +02:00
Matej Bačo e60456cfda QA after merge with 1.4 2023-08-06 10:51:53 +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 aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
prateek banga 91e434b3d6 optimize if condition in response output method 2023-08-04 14:01:08 +05:30
prateek banga f797c2574a resolve merge conflicts with 1.4.x 2023-08-03 17:38:22 +05:30
prateek banga 1d558fa5f5 Add select queries support to list indexes and list attributes endpoint 2023-08-03 17:34:28 +05:30
prateek banga f8ae04f3b9 resolve merge conflicts with 1.4.x branch 2023-08-03 15:25:48 +05:30
prateek banga 838991d68b update db, audit and abuse version 2023-08-03 15:24:08 +05:30
Eldad A. Fux 8ed4029169
Merge pull request #5867 from appwrite/feat-base-image-upgrade
test updated docker-base version
2023-08-03 10:30:04 +03:00
fogelito aaa2f18bf9 uid varchar 2023-08-01 13:23:39 +03:00
prateek banga a639c2737a updates abuse and audit deps 2023-07-27 14:13:15 +05:30
Steven Nguyen 611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Damodar Lohani 844c60f35a upgrade base image and utopia-swoole 2023-07-26 07:23:25 +00:00
Damodar Lohani bd428fc436 update composer versions 2023-07-25 09:37:05 +00:00
Damodar Lohani dc07758f4d fix composer version 2023-07-25 09:10:27 +00:00
Damodar Lohani 8f25c5bff1 upgrade swoole ide helper 2023-07-25 09:04:11 +00:00
Damodar Lohani a8b3367d50 upgrade utopia-swoole version 2023-07-25 06:05:22 +00:00
Damodar Lohani eea593f677 upgrade dependencies 2023-07-23 06:46:23 +00:00
Steven Nguyen 35a25cc2a7
Bump audit version to get rid of userInternalId attribute 2023-07-19 22:49:50 -07:00
Steven Nguyen 2befa60350
Track a user's last activity
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
2023-07-19 22:22:58 -07:00
Steven 803d653e44 Upgrade utopia-php/domains
Version 1.1.0 was an incorrectly named git tag; it was equivalent to
0.2.0. This bump to 0.3.* is safe because it adds Registrar,
but it won't be used in Appwrite yet. Bumping to 0.3.* is necessary to
fix some bugs where valid domains were considered invalid.
2023-07-19 18:29:01 +00: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
Steven Nguyen fcd1be6726
Bump audit version to get rid of userInternalId attribute 2023-07-12 10:06:12 -07:00
shimon d1d1392bb3 small adjustments 2023-07-12 11:12:56 +03:00
shimon 58aa29a4ae cli 2023-07-11 18:47:38 +03:00
Christy Jacob da44f65f2c feat: update composer 2023-07-10 20:41:21 +00:00
shimon 89f0146c45 users addition 2023-07-10 11:03:59 +03:00
Damodar Lohani 6b15e1fd0d composer update 2023-07-10 03:07:30 +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
Aditya Oberai a8bc9e6154 Update sdk-generator version 2023-07-07 20:02:51 +00:00
Jake Barnby 6db141acc9
Merge pull request #5710 from appwrite/feat-db-upgrade
Feat database upgrade
2023-06-22 21:30:06 +12:00
fogelito e5e0719553 Update query merge 2023-06-21 09:44:18 +03:00
Jake Barnby d84223091d
Update database 2023-06-15 18:41:20 +12:00
Jake Barnby c4fc5c90f0
Update dependencies 2023-06-15 12:59:19 +12:00
Christy Jacob 56a337eac4 feat: update console 2023-06-14 15:27:03 +00:00
shimon 785c00ae5c functions/builds/deletes worker 2023-06-12 13:04:47 +03:00
fogelito 29fef07019 composer.lock 2023-06-06 18:45:06 +03:00
shimon 0d2987620c refactor workers 2023-06-04 11:19:49 +03:00
Christy Jacob c696b7264b
Merge pull request #5649 from appwrite/1.3.x
Sync master with 1.3.x
2023-06-04 00:43:03 +05:30
Christy Jacob 9dcf164b2f chore: update composer 2023-06-03 20:14:11 +05:30
Christy Jacob 8b01c61de3 chore: update utopia-php/framework 2023-06-03 20:06:17 +05:30
Christy Jacob 6f9f9ea0e4 chore: update utopia-php/framework 2023-06-03 19:33:51 +05:30
Torsten Dittmann 223663aa89
Merge pull request #5637 from appwrite/1.3.x
sync 1.3.x
2023-06-02 16:30:55 +02:00
Torsten Dittmann a664363525 fix: trailing wildcards 2023-06-02 15:20:58 +02:00
Torsten Dittmann 55ba25ad83 fix: trailing wildcards 2023-06-02 13:18:34 +02:00
Christy Jacob 9e1313d15a feat: update dependencies 2023-05-30 16:59:13 +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
Christy Jacob 927c7c3359 feat: update composer 2023-05-30 16:16:43 +00:00
Christy Jacob a3474f8a3b feat: prepare 1.3.5 release 2023-05-30 16:15:13 +00:00
Jake Barnby dd2bda0d98
Downgrade to framework patch 2023-05-30 19:52:06 +12:00
Jake Barnby 95f299779d
Update platform 2023-05-30 19:23:03 +12:00
Jake Barnby b75d3ff07c
Update to release version of framework
(cherry picked from commit b101404eda)
2023-05-30 19:01:53 +12:00
Jake Barnby 91c5e066ec
Update framework to fix route mismatches
(cherry picked from commit d42f6738a9)

# Conflicts:
#	composer.lock
(cherry picked from commit c2e711b021)

# Conflicts:
#	composer.json
#	composer.lock
2023-05-30 19:00:42 +12:00
Jake Barnby b101404eda
Update to release version of framework 2023-05-30 18:53:58 +12:00
Jake Barnby c2e711b021
Update framework to fix route mismatches
(cherry picked from commit d42f6738a9)

# Conflicts:
#	composer.lock
2023-05-30 18:29:04 +12:00
shimon f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
Jake Barnby f45905e545
Merge pull request #5553 from 2002Bishwajeet/feat-add-enable-param-db
Feat: Add enable param in Database and Collection
2023-05-29 20:35:33 +12:00
Christy Jacob 7d19fe87f5
Merge pull request #5577 from appwrite/feat-improve-logs
Feat: Improve logs
2023-05-25 00:52:47 +05:30
Matej Bačo 3614cb384a Fix error logging 2023-05-24 21:07:41 +02:00
shimon 79ce648211 downgraded csv writer ver 2023-05-24 20:46:39 +03:00
shimon 31e6492dbc downgraded csv writer ver 2023-05-23 21:02:45 +03:00
shimon 3545e0740f downgraded csv writer ver 2023-05-23 21:02:23 +03:00
shimon e79cb913ed calculating users per project task 2023-05-23 18:58:49 +03:00
shimon 543efd6032 re-working worker flow 2023-05-23 16:43:34 +03:00
shimon 98dc1db878 re-working worker flow 2023-05-23 16:43:03 +03:00
Bishwajeet Parhi e384a3d3a1 remove debug config 2023-05-18 18:58:29 +05:30
Christy Jacob a1eb1c1166 feat: update console 2023-05-16 19:28:41 +00:00
Jake Barnby 2eef1cfca5
Update SDK generator + examples 2023-05-16 16:54:34 +12:00
Jake Barnby b9336bfc73
Update SDK generator 2023-05-15 19:15:01 +12:00
Christy Jacob 9bd1d864e9 feat: update console 2023-05-02 10:43:50 +00:00
Steven Nguyen 206553bac7
Bump sdk-generator and specs 2023-04-27 17:00:12 -07:00
Steven Nguyen 11d523b050
Bump utopia abuse, audit, and database 2023-04-27 10:42:55 -07:00
Matej Bačo 2ed495fe3b Add OG assets 2023-04-26 13:06:11 +02:00
Matej Bačo 563f2e22f9 skew for 3d og image 2023-04-25 09:35:48 +02:00
Torsten Dittmann ff82a24a4b feat: migration 2023-04-24 13:00:23 +02:00
Torsten Dittmann 5925d61a9c chore: update composer 2023-04-21 13:04:37 +02:00
Torsten Dittmann 0230671717 chore: upgrade utopia-php/database 2023-04-20 21:10:48 +02:00
Steven Nguyen 471c832a4f
Bump utopia-php/database version 2023-04-19 17:21:41 -07:00
Matej Bačo a3e7fa29f4 WIP: OAuth in console 2023-04-17 14:22:47 +02:00
Jake Barnby 683aa8a325
Update SDK generator 2023-04-12 16:46:53 +12:00
Jake Barnby ffb91eca68
Merge remote-tracking branch 'origin/1.3.x' into feat-update-sdk-generator
# Conflicts:
#	composer.json
#	composer.lock
2023-04-12 01:24:50 +12:00
Jake Barnby 9b7d032eda
Update SDK generator for 1.3.x support 2023-04-12 00:58:12 +12:00
Jake Barnby 7fe14ca10b
Merge remote-tracking branch 'origin/master' into sync-master
# 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
#	app/console
#	app/controllers/api/storage.php
#	composer.lock
2023-04-12 00:50:31 +12:00
Christy Jacob 391e114cdd feat: update docs examples 2023-04-11 08:27:36 +00:00
Christy Jacob 4a314c0a58 Merge branch 'master' of https://github.com/appwrite/appwrite into update-cli-1.2.1 2023-04-11 08:14:52 +00:00
Jake Barnby 9604cd1d94
Update to tagged release 2023-04-11 17:41:21 +12:00
Jake Barnby f00bd7dac7
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2
# Conflicts:
#	composer.lock
2023-04-11 17:25:26 +12:00
Jake Barnby 7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships
# Conflicts:
#	composer.lock
2023-04-11 15:57:35 +12:00
fogelito acbdb06b3c Add .md files 2023-04-10 23:15:18 +03:00
Jake Barnby 93a994a95d
Update console + database 2023-04-10 21:48:50 +12:00
Jake Barnby bb9ae6f326
Update database 2023-04-06 02:43:06 +12:00
Jake Barnby b252fe847f
Add custom delete restricted error 2023-04-06 00:54:44 +12:00
Jake Barnby 08b013353b
Update database 2023-04-05 21:13:28 +12:00
Jake Barnby 1bf15a7cc2
Update database + console 2023-04-05 20:13:51 +12:00
Jake Barnby 13c77b6927
Update database 2023-04-03 21:12:13 +12:00
Jake Barnby af890a4e4b
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2
# Conflicts:
#	composer.lock
2023-04-03 15:55:17 +12:00
Jake Barnby 9010320cd9
Update abuse 2023-03-31 20:57:47 +13:00
Jake Barnby cf122054aa
Update DB and console 2023-03-31 18:07:36 +13:00
Damodar Lohani aef488779d composer update 2023-03-30 08:03:28 +00:00
Damodar Lohani 41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Jake Barnby 72d090f196
Update console 2023-03-30 13:33:40 +13:00
Jake Barnby 275c6bb3a0
Set databaseId for all nested documents 2023-03-27 15:42:36 +13:00
Christy Jacob 8578985515 feat: update readme 2023-03-24 20:16:20 +00:00
Jake Barnby c65800b3a3
Merge remote-tracking branch 'origin/1.3.x' into feat-remove-limits
# Conflicts:
#	composer.json
#	composer.lock
2023-03-24 21:03:18 +13:00
Christy Jacob ab6f777308 feat: update composer dependencies 2023-03-24 06:53:49 +00:00
Christy Jacob 7f493ed510 Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into feat-db-pools-sync 2023-03-24 06:45:58 +00:00
Christy Jacob cdb2d75efa feat: update composer dependencies 2023-03-24 06:45:26 +00:00
Christy Jacob 5f10ff4d3b Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools-sync 2023-03-24 06:35:30 +00:00
Jake Barnby c310434eeb
Update dependencies 2023-03-24 16:39:35 +13:00
Jake Barnby f43ff0d2e9
Update dependencies 2023-03-23 18:40:05 +13:00
fogelito 34467de87d Update relationship get Attribute 2023-03-22 18:44:12 +02:00
Christy Jacob c31d60dc1f feat: sync with master 2023-03-22 20:38:59 +04:00