1
0
Fork 0
mirror of synced 2024-08-02 20:12:01 +12:00
Commit graph

1246 commits

Author SHA1 Message Date
Prateek Banga
a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Christy Jacob
27b58fdf1e chore: increase cache buster 2023-09-14 20:06:10 +00:00
Christy Jacob
1e6b37f980 chore: update appwrite version 2023-09-14 19:53:32 +00:00
Prateek Banga
350549db7d Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-14 02:17:34 +05:30
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
778056d8e0 Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-13 17:08:37 +05:30
Jake Barnby
1f9872b398
Merge remote-tracking branch 'origin/1.5.x' into feat-add-messaging-response-models 2023-09-12 15:40:25 -04:00
Prateek Banga
d14fbde9e7 removes provider sub query 2023-09-13 00:40:51 +05:30
Prateek Banga
720c7300dc Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 22:06:31 +05:30
Prateek Banga
497586378f removes unnecessary config load 2023-09-12 22:05:14 +05:30
Prateek Banga
a69368973b Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 21:31:06 +05:30
Prateek Banga
d14a4c2506 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-12 21:23:18 +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
Prateek Banga
899c962061 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-11 20:30:30 +05:30
Prateek Banga
f4f1aa4b5b review changes and adds missing subqueries 2023-09-11 19:27:45 +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
prateek banga
78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30
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
prateek banga
1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +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
prateek banga
7fd124705c merge master 2023-08-31 18:11:56 +05:30
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
prateek banga
c59887e8fb fixes issue in sub queries 2023-08-25 15:55:04 +05:30
prateek banga
9be0592dab lint fix 2023-08-25 04:46:15 +05:30
prateek banga
33f4bd6ac4 adds custom id for provider controlers, fixes subquery 2023-08-25 02:32:51 +05:30
prateek banga
df77f92860 adds sub query for targets and topics, permission for user target 2023-08-25 01:22:16 +05:30
prateek banga
5ca8dc0a73 merge cl-1.4.x 2023-08-24 14:10:26 +05:30
prateek banga
ac33d7828f Revert "Pint linter ran"
This reverts commit bf5f0a8419.
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419 Pint linter ran 2023-08-23 13:12:43 -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
prateek banga
5e3065c30a merge resolve conflicts 2023-08-21 14:07:18 +05:30
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
prateek banga
c83e4db23d lint fix 2023-08-17 19:02:07 +05:30
prateek banga
07b7a9db0f adds controller for creating a user target 2023-08-17 17:24:45 +05:30
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
ab655e69e6 Merge branch 'feat-add-messaging-collections-in-config' into feat-messages-event-config 2023-08-16 18:49:00 +05:30
prateek banga
9fc75e5535 moves messaging collection to common, adds subqueryTargets 2023-08-16 18:48:38 +05:30
prateek banga
92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
prateek banga
4b63a4abbb resolve merge conflicts 2023-08-14 21:13:47 +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
prateek banga
9057a50a10 rename provider param in config 2023-08-07 15:54:00 +05:30
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
prateek banga
867f3e8c08 adds messaging providers rename providers.php to authProviders.php 2023-08-04 19:00:08 +05:30
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
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
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
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
Steven
e26062ca87 Prepare 1.3.8 release 2023-07-18 22:21:58 +00:00
Torsten Dittmann
74308b445e
Merge pull request #5587 from appwrite/feat-user-labels
Add a new labels attribute to the Users collection
2023-07-18 14:59:18 +02: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
Steven Nguyen
8258d70b78
Update user's search attribute using database filter
Using a database filter is the cleanest approach because it ensures
the logic is applied whenever the user is updated regardless of
whichever endpoint was used.
2023-07-05 12:17:47 -07:00
Matej Bačo
1b4036078b Improve response models for console 2023-06-18 16:08:53 +02:00
Matej Bačo
a174562c4e vcs.createRepository() 2023-06-18 13:38:37 +02:00
Matej Bačo
0128e73079 Formatting 2023-06-15 12:38:03 +02:00
Jake Barnby
031f8270ff
Merge remote-tracking branch 'origin/1.4.x' into validator-mv
# Conflicts:
#	composer.lock
2023-06-15 12:28:32 +12:00
shimon
57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
Matej Bačo
6522d86fa9 Update installation, certificate & repository response models 2023-06-08 17:24:27 +02:00
Matej Bačo
5e221e285f Update naming convention, add new VCS endpoints, support silent mode and rootDirectory 2023-06-07 17:50:32 +02:00
Matej Bačo
084c50fc97 Fix DO droplet deployment 2023-06-06 11:06:04 +02:00
shimon
62c619434e functions/builds/deletes worker 2023-06-05 19:13:00 +03:00
Steven Nguyen
f7f14695f0
Don't default to console project
Defaulting to the console project leads to misleading error messages.
For example, you can get a CORS error saying you haven't configured
a platform yet, but the actual error is missing project ID.
2023-06-05 09:06:29 -07:00
Christy Jacob
329b6b93bf chore: update changelog 2023-06-03 20:11:01 +05:30