prateek banga
|
5e3065c30a
|
merge resolve conflicts
|
2023-08-21 14:07:18 +05:30 |
|
prateek banga
|
c0e4149feb
|
Merge branch 'feat-messages-event-config' into feat-target-controllers-account-user
|
2023-08-18 23:35:00 +05:30 |
|
prateek banga
|
cc1311b723
|
Merge branch 'feat-add-messaging-response-models' into feat-messages-event-config
|
2023-08-18 23:33:59 +05:30 |
|
prateek banga
|
a174aca2c8
|
lint fix and rename subscriber model file correctly
|
2023-08-18 23:30:42 +05:30 |
|
prateek banga
|
36a5d1e245
|
adds remaining controllers for target in account and users
|
2023-08-18 23:28:12 +05:30 |
|
Jake Barnby
|
4b07896877
|
Merge pull request #6010 from appwrite/chore-1.4.x-upgrade
Chore 1.4.x upgrade
|
2023-08-18 09:58:41 -04:00 |
|
Jake Barnby
|
a3895b041a
|
Apply suggestions from code review
|
2023-08-17 21:48:21 -04:00 |
|
Jake Barnby
|
a77ff0a9b0
|
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
|
2023-08-17 19:54:25 -04: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 |
|
Jake Barnby
|
92c39470be
|
Merge pull request #5800 from appwrite/fix-team-update-membership
Update method name for `updateMembershipRoles`
|
2023-08-17 19:43:56 -04:00 |
|
Jake Barnby
|
6ef5e8bd7e
|
Fix test
|
2023-08-17 19:08:30 -04:00 |
|
Jake Barnby
|
49b9003b7f
|
FIx test
|
2023-08-17 17:58:04 -04:00 |
|
Jake Barnby
|
861ed521a0
|
Merge branch '1.4.x' into fix-team-update-membership
# Conflicts:
# app/config/specs/open-api3-1.4.x-client.json
# app/config/specs/open-api3-1.4.x-console.json
# app/config/specs/open-api3-1.4.x-server.json
# 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-1.4.x-client.json
# app/config/specs/swagger2-1.4.x-console.json
# app/config/specs/swagger2-1.4.x-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
|
2023-08-17 17:51:24 -04:00 |
|
Jake Barnby
|
a019d01e91
|
Merge pull request #5887 from appwrite/fix-5404-update-document-without-relation-permission
Fix 5404 update document without relation permission
|
2023-08-17 17:48:08 -04:00 |
|
prateek banga
|
f73b3bf272
|
deletes user cache document
|
2023-08-18 01:07:42 +05:30 |
|
prateek banga
|
27df545fb7
|
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into fix-5404-update-document-without-relation-permission
|
2023-08-17 19:15:33 +05:30 |
|
prateek banga
|
860e9958c7
|
lint fix
|
2023-08-17 19:04:41 +05:30 |
|
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 |
|
prateek banga
|
455176d077
|
Merge branch 'feat-add-messaging-collections-in-config' into feat-target-controllers-account-user
|
2023-08-16 20:29:19 +05:30 |
|
prateek banga
|
40f419663c
|
removes id attribute from collections config
|
2023-08-16 20:28:40 +05:30 |
|
prateek banga
|
e53f189b3b
|
lint fix
|
2023-08-16 20:17:36 +05:30 |
|
prateek banga
|
c7dec3762b
|
Adds getTarget and list targets controller to user and account
|
2023-08-16 20:13:38 +05:30 |
|
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
|
37e5cecfb1
|
resolve merge conflicts
|
2023-08-16 18:35:15 +05:30 |
|
prateek banga
|
caad1a07d9
|
resolve merge conflicts
|
2023-08-16 18:21:04 +05:30 |
|
prateek banga
|
e2e4287801
|
resolve merge conflicts
|
2023-08-16 15:19:16 +05:30 |
|
prateek banga
|
45e03d3973
|
Merge branch 'feat-add-messaging-providers' into feat-add-messaging-response-models
|
2023-08-16 15:17:53 +05:30 |
|
prateek banga
|
92e587769a
|
resolve merge conflicts
|
2023-08-16 15:16:45 +05:30 |
|
prateek banga
|
d6f4d76807
|
adds another scenario in test case
|
2023-08-16 14:57:50 +05:30 |
|
Eldad A. Fux
|
279b482f1a
|
Merge pull request #5726 from 2002Bishwajeet/feat-whitelist-enums
Feat: Whitelist enums
|
2023-08-15 10:33:15 +03:00 |
|
Bishwajeet Parhi
|
42f1be0f6c
|
Update tests/e2e/Services/Teams/TeamsBaseServer.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
|
2023-08-15 09:04:05 +05:30 |
|
Jake Barnby
|
04d0e284a1
|
Update specs
|
2023-08-14 22:29:47 -04:00 |
|
Jake Barnby
|
23deb5c4df
|
Apply suggestions from code review
|
2023-08-14 21:57:48 -04:00 |
|
Jake Barnby
|
ff6d3f39b1
|
Remove invalid test
|
2023-08-14 20:47:47 -04:00 |
|
Jake Barnby
|
171f22daa0
|
Merge pull request #5604 from 2002Bishwajeet/feat-add-encrypt-param
feat: add encrypt param to string attribute
|
2023-08-14 20:45:15 -04:00 |
|
Jake Barnby
|
8820d422be
|
Update app/controllers/api/databases.php
|
2023-08-14 20:45:05 -04:00 |
|
Jake Barnby
|
4ddb0ce6a7
|
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param
|
2023-08-14 19:37:37 -04:00 |
|
Jake Barnby
|
68601c5dc2
|
FIx lint
|
2023-08-14 19:35:18 -04:00 |
|
Jake Barnby
|
c00c5119b2
|
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums
|
2023-08-14 19:33:56 -04:00 |
|
Jake Barnby
|
0ca90cee6c
|
Fix test
|
2023-08-14 19:30:11 -04:00 |
|
prateek banga
|
cb6760a957
|
removes unnecessary use statement
|
2023-08-14 22:02:54 +05:30 |
|
prateek banga
|
8e1ef812d3
|
resolve merge conflicts
|
2023-08-14 21:59:24 +05:30 |
|
prateek banga
|
4b63a4abbb
|
resolve merge conflicts
|
2023-08-14 21:13:47 +05:30 |
|
prateek banga
|
296a54d0ce
|
adds messages event config and target attribute in user model
|
2023-08-14 21:11:24 +05:30 |
|
Bishwajeet Parhi
|
ac4701988a
|
generate api specs
|
2023-08-14 17:01:42 +05:30 |
|
Bishwajeet Parhi
|
12a61feed4
|
chore: add PlatformType
|
2023-08-14 14:03:30 +05:30 |
|
Jake Barnby
|
03cdae245e
|
Merge pull request #5923 from appwrite/v19-migration
V19 migration - uid varchar
|
2023-08-11 19:30:17 -04:00 |
|
Jake Barnby
|
efe81f5723
|
Merge branch 'cl-1.4.x' into v19-migration
|
2023-08-11 19:29:12 -04:00 |
|