Commit Graph

17280 Commits

Author SHA1 Message Date
Prateek Banga 84777eaa95 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config 2023-09-12 20:54:19 +05:30
Prateek Banga cbea4264ea merge master 2023-09-12 20:53:16 +05:30
Prateek Banga 82ba61faa8 review changes and added roles 2023-09-12 14:13:52 +05:30
Prateek Banga f4f1aa4b5b review changes and adds missing subqueries 2023-09-11 19:27:45 +05:30
Prateek Banga ee0f789e37 udpates deliveryError to be an array type 2023-09-09 01:18:26 +05:30
prateek banga 3f95d6abd5 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config 2023-09-05 01:34:02 +05:30
prateek banga ea324262e7 updated messaging collectin 2023-09-05 01:33:50 +05:30
prateek banga 0c76cfcb00 Merge branch '1.5.x' into feat-add-messaging-collections-in-config 2023-08-31 19:50:20 +05:30
Eldad A. Fux 0a289bce43 Merge pull request #6092 from appwrite/sync-master-into-1.5.x
Sync master into 1.5.x
2023-08-31 16:31:49 +03:00
prateek banga 2e89837c13 Merge branch 'master' into sync-master-into-1.5.x 2023-08-31 18:41:32 +05:30
prateek banga 7fd124705c merge master 2023-08-31 18:11:56 +05:30
Jake Barnby aced75fd05 Merge pull request #6072 from appwrite/1.4.x
1.4 Fixes
1.4.1
2023-08-31 00:31:59 -04:00
Jake Barnby 458dd8c97d Merge pull request #6084 from appwrite/chore-update-migrations
Chore update migrations
2023-08-31 00:21:57 -04:00
Jake Barnby ebf942339a Update migrations version 2023-08-31 00:14:34 -04:00
Christy Jacob 60df7af3f7 Merge pull request #6083 from appwrite/refactor-migration-connect-scope
Update firebase connect scope
2023-08-31 06:50:58 +04:00
Jake Barnby fdb7218978 Update firebase connect scope 2023-08-30 22:48:51 -04:00
Jake Barnby 2fb7a1c862 Merge pull request #6081 from appwrite/fix-sender-name
Fix swapped from/to name
2023-08-30 20:55:59 -04:00
Jake Barnby 781aa8025a Fix style typo 2023-08-30 20:39:40 -04:00
Jake Barnby 922332042e Fix template strings 2023-08-30 20:31:11 -04:00
Jake Barnby 7e2e7ce3cb Fix swapped from/to name 2023-08-30 20:20:20 -04:00
Jake Barnby 02c16040ff Merge pull request #6079 from appwrite/fix-500-options-requests
Fix router error
2023-08-30 19:28:45 -04:00
Steven Nguyen ac0b697d52 Add router fix to CHANGES.md 2023-08-30 16:08:17 -07:00
Steven Nguyen 24efa0de82 Fix router error
It's possible for the route to be null (no match) which leads to an
error like:

```
appwrite  | [Error] Timestamp: 2023-08-30T21:39:58+00:00
appwrite  | [Error] Type: Error
appwrite  | [Error] Message: Call to a member function label() on null
appwrite  | [Error] File: /usr/src/code/app/controllers/general.php
appwrite  | [Error] Line: 50
```

This adds a null check to prevent the error.
2023-08-30 16:07:11 -07:00
Jake Barnby 589e4f5c7d Merge pull request #6077 from appwrite/fix-email-templates
fix: missing variable in email templates
2023-08-30 18:47:02 -04:00
Christy Jacob 61e1c3014a fix: incorrect key reference 2023-08-30 18:44:29 -04:00
Christy Jacob 5dbec3d406 chore: remove redundant attribute 2023-08-30 18:43:09 -04:00
Christy Jacob 997cb01142 chore: revert console 2023-08-30 18:42:31 -04:00
Christy Jacob 4e19c94d08 Merge branch '1.4.x' of github.com:appwrite/appwrite into fix-email-templates 2023-08-30 18:40:39 -04:00
Christy Jacob 21dc3b16b0 chore: update changelog 2023-08-30 18:36:40 -04:00
Christy Jacob 861921526e fix: remove redundant name property 2023-08-30 18:34:20 -04:00
Jake Barnby fec3fc3597 Merge pull request #6078 from appwrite/fix-mock-headers
Fix mock headers
2023-08-30 18:05:09 -04:00
Jake Barnby b2f9506130 Update app/controllers/mock.php 2023-08-30 17:57:38 -04:00
Jake Barnby b77d83d246 Add back headers route 2023-08-30 17:55:27 -04:00
Christy Jacob 74012158b3 fix: variable names 2023-08-30 17:54:26 -04:00
Christy Jacob 05615d1449 fix: missing variable in email templates 2023-08-30 17:52:55 -04:00
Christy Jacob 75e957ed4a fix: missing variable in email templates 2023-08-30 17:48:25 -04:00
Jake Barnby 31bff542e9 Merge pull request #6076 from appwrite/fix-domains-migration
Fix domains migration
2023-08-30 17:30:12 -04:00
Steven Nguyen bd89fd4bf5 Fix domains migration
The previous approach tried to migrate the 'rules' collection, but that
didn't work because the data was in the 'domains' collection.

Since the 'domains' collection was removed, the migration is now done
when migrating the 'projects' collection by fetching the domains and
then creating the rule documents.
2023-08-30 14:22:06 -07:00
Jake Barnby f10698aebe Merge pull request #6073 from appwrite/chore-update-version
Chore update version
2023-08-30 16:25:06 -04:00
Jake Barnby 726b13bc66 Merge pull request #6074 from appwrite/chore-sync-master
Chore sync master
2023-08-30 16:24:26 -04:00
Jake Barnby 513d913298 Merge remote-tracking branch 'origin/1.4.x' into chore-sync-master
# Conflicts:
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-latest-console.json
2023-08-30 16:11:48 -04:00
Jake Barnby 24bd21e980 Update version 2023-08-30 16:05:51 -04:00
Jake Barnby e018c29b71 Bump .NET SDK version 2023-08-30 15:48:01 -04:00
Jake Barnby afbc39b34b Update version 2023-08-30 15:45:38 -04:00
Jake Barnby 56da28a180 Merge pull request #6068 from appwrite/feat-upgrade-task
Feat upgrade task
2023-08-30 15:34:28 -04:00
Steven Nguyen 917f2f1d74 Update installation confirmation text
Let the user know a backup will be created.
2023-08-30 12:32:10 -07:00
Jake Barnby 85e8e2045f Merge pull request #6071 from appwrite/fix-scopes
Fix scopes
2023-08-30 15:31:57 -04:00
Steven Nguyen 2d0d036519 Ensure upgrade executable has execute permissions 2023-08-30 12:31:25 -07:00
Jake Barnby a93123e3ac Remove cloud specific config 2023-08-30 14:45:22 -04:00
Jake Barnby fc3ff188b1 Fix VCS + migrations scopes 2023-08-30 14:44:33 -04:00