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
Damodar Lohani
41d22fb50b
Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2
2023-03-30 08:02:31 +00:00
Vincent (Wen Yu) Ge
19d5ea03b9
Updates links for query page
2023-03-29 19:38:39 +00:00
Torsten Dittmann
c1ba898cec
feat: rename update team sdk method
2023-03-23 13:04:16 +01:00
Damodar Lohani
893d305453
fix template issues
2023-03-17 00:55:00 +00:00
Torsten Dittmann
08d588aeb1
fix: remove unnecessary owner check
2023-03-15 11:55:21 +01:00
Damodar Lohani
c7db44b45f
default sms template
2023-03-14 09:07:42 +00:00
Torsten Dittmann
bfdb7830d0
fix: update team prefs endpoint
2023-03-14 04:40:17 +05:30
Damodar Lohani
82498459db
update project smtp using hook
2023-03-13 09:21:16 +00:00
Damodar Lohani
07010a5192
set SMTP config from project
2023-03-12 02:14:03 +00:00
Torsten Dittmann
10150aad3e
feat: only owners are allowed to update attributes
2023-03-10 21:57:13 +05:30
Torsten Dittmann
01edc57806
Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs
2023-03-09 16:04:20 +05:30
Steven Nguyen
85a2d623a6
Update APIs to check X-Appwrite-Timestamp header
...
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
2023-03-07 10:54:52 -08:00
Torsten Dittmann
496da61cd9
feat: team preferences
2023-03-06 19:54:02 +05:30
Torsten Dittmann
ae32536be2
Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-3-console-sdk
2023-02-28 14:45:34 +05:30
Steven Nguyen
c5ebcbab2b
Add offline support labels on endpoints
2023-02-23 14:47:45 -08:00
Damodar Lohani
4948aedfb5
Merge remote-tracking branch 'origin/master' into 1.3.x
2023-02-20 03:51:54 +00:00
Damodar Lohani
171f30adb1
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-02-16 00:29:37 +00:00
Damodar Lohani
71d2c45a92
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-02-14 04:35:19 +00:00
Jake Barnby
f6fc9a8d8c
Merge remote-tracking branch 'origin/master' into feat-technical-debt-2
...
# Conflicts:
# composer.lock
2023-02-14 14:22:08 +13:00
Christy Jacob
e5a6db6133
Merge pull request #4890 from appwrite/doc-clarify-permission
...
Update permission and ID param descriptions for grammar and clarity.
2023-01-28 04:15:20 +05:30
Vincent (Wen Yu) Ge
b25dc38a63
clarify custom ID vs unique ID
2023-01-20 22:22:16 +00:00
Damodar Lohani
1466e7b770
Update app/controllers/api/teams.php
...
Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>
2023-01-18 09:33:47 +05:45
fogelito
c4ae047833
Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
...
Conflicts:
app/init.php
composer.json
composer.lock
2023-01-16 10:24:37 +02:00
Vincent (Wen Yu) Ge
45aea5b941
Update branch with master
2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge
92a384e31c
Fix descriptions for ID and regen 1.2.x specs
2023-01-13 14:27:08 -05:00
Bradley Schofield
31b718d829
Replace Appwrite Validators with backported Utopia ones
...
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
2023-01-13 15:28:04 +00:00
Damodar Lohani
afaa64b54b
fix invitation after merge
2023-01-13 06:05:16 +00:00
Damodar Lohani
3146ec363d
Merge branch 'master' into feat-team-invite-improvements
2023-01-13 11:39:20 +05:45
Damodar Lohani
f41e3b1e8f
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-01-12 07:25:23 +00:00
Damodar Lohani
b06ce91297
fix formatting
2023-01-09 11:11:55 +00:00
Damodar Lohani
8d40220114
remove var dumps
2023-01-09 11:10:50 +00:00
Damodar Lohani
11b3739360
fix when either email or phone were empty
2023-01-09 11:10:02 +00:00
Damodar Lohani
a2642ecc67
send phone invite only if email is empty
2023-01-09 10:59:28 +00:00
Damodar Lohani
34b2280207
fix format
2023-01-09 09:18:13 +00:00
Damodar Lohani
8f351ad7b2
set email and phone attribute once user found
2023-01-09 09:17:39 +00:00
Damodar Lohani
bc7b98821a
fix error
2023-01-09 08:56:18 +00:00
Damodar Lohani
32b8a1edfe
fix param order in action
2023-01-09 08:44:02 +00:00
Damodar Lohani
29ef377b60
refactor privileged/app user check
2023-01-09 08:29:33 +00:00
Damodar Lohani
63a981591d
fix error and param order
2023-01-09 08:25:15 +00:00
Damodar Lohani
a812bfb686
format fix
2023-01-09 05:55:07 +00:00
Damodar Lohani
2e154c06bc
different test and messaging integration as well
2023-01-09 05:46:02 +00:00
Damodar Lohani
b7d17e82da
fix: membership invite email
2022-12-16 06:15:23 +00:00
Damodar Lohani
495da1bfd4
fix: template path
2022-12-16 06:11:12 +00:00
Damodar Lohani
5d195659bd
refactor: mails refactor
2022-12-15 09:22:05 +00:00
fogelito
8ade726932
Changing Role + Permissions namespace
2022-12-14 18:04:06 +02:00
fogelito
f96128e14f
Changing Id
2022-12-14 17:42:25 +02:00
Christy Jacob
69d5a25c62
Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools
2022-12-07 15:39:44 +04:00
Matej Bačo
8b71e318c2
Fix tests bug
2022-11-24 11:55:49 +00:00
Matej Bačo
efe093ce3c
Fix unsaved changes in team inv
2022-11-24 12:35:26 +01:00
Christy Jacob
080abbbb79
Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console
2022-11-17 20:26:10 +05:30
Bradley Schofield
0b883df5ec
Fix Tests
2022-11-14 09:42:18 +00:00
Bradley Schofield
66b805829c
Move authDuration into auths attribute in project
2022-11-14 09:30:45 +00:00
Christy Jacob
b7a24da288
Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools
2022-11-05 18:06:44 +05:30
Bradley Schofield
4dfafd1169
Merge branch 'master' into feat-implement-session-length-api
2022-11-04 16:11:38 +00:00
Bradley Schofield
e1f9a8e0ce
Clean up a couple things and fix tests
2022-11-04 14:48:29 +00:00
Bradley Schofield
4cfc3b3a7f
Update authDuration fallback value
2022-11-04 10:12:02 +00:00
Bradley Schofield
cddacfbb78
Handle Eldad's Comments
2022-11-01 14:43:18 +00:00
Bradley Schofield
5dc8a2dee0
Add Tests and fix bugs
2022-11-01 11:15:45 +00:00
Bradley Schofield
d34359fd49
Implement Variable Session Duration
2022-10-31 14:54:15 +00:00
Eldad Fux
54469e9b4d
Unused classes
2022-10-21 08:41:12 +03:00
Vincent (Wen Yu) Ge
4cee87273c
Merge branch 'master' into doc-unique-id
2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge
ae2100244f
Update unique() to be ID.unique()
2022-10-03 20:22:28 +00:00
Christy Jacob
54d14a5151
Merge pull request #3883 from appwrite/fix-get-membership-response
...
Fix: Get Membership response
2022-09-23 11:42:33 +05:30
Matej Bačo
c42bf2d8da
Fix documentation response model
2022-09-19 11:43:21 +00:00
Matej Bačo
a983e792d8
Refactor required param values
2022-09-19 10:05:42 +00:00
Christy Jacob
105e5fe71c
feat: rename getMemberships to listMemberships
2022-09-14 01:44:56 +05:30
shimon
834e4e03e3
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
...
Conflicts:
app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Eldad Fux
c442a5bce2
Fix linter test
2022-09-07 14:23:57 +03:00
Eldad Fux
c22c28bc67
Fixed indentation
2022-09-07 14:14:53 +03:00
Eldad Fux
01fb4045bd
Sync with 0.16
2022-09-07 14:11:10 +03:00
shimon
1362902082
audit event name reformation
2022-09-05 11:00:08 +03:00
shimon
5d16c39d5f
account labels
2022-09-04 11:13:44 +03:00
Jake Barnby
b9148d380b
Fix only variables can passed by reference errors
2022-08-31 11:31:43 +12:00
Christy Jacob
7591f68970
Merge pull request #3702 from appwrite/feat-list-endpoints-queries
...
Feat: List endpoint queries
2022-08-30 14:56:09 +02:00
Matej Bačo
63c02677a0
PR review changes
2022-08-30 13:55:23 +02:00
Matej Bačo
2b3dc48bf1
PR review changes
2022-08-30 08:21:34 +00:00
Jake Barnby
44970cc628
Sync master
2022-08-28 11:01:46 +12:00
Matej Baco
fd1068a600
Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries
2022-08-25 10:56:06 +02:00
Matej Bačo
65d09705ac
Simplify class name
2022-08-24 18:25:15 +00:00
Jake Barnby
ea4b177b83
Fix team permissions
2022-08-24 20:26:47 +12:00
Matej Bačo
531d57feff
Upgrade listMemberships queries
2022-08-23 13:16:46 +00:00
Matej Bačo
2d82eed4be
Linter fix
2022-08-23 13:10:27 +00:00
Matej Bačo
79560c13e6
Upgrade teamListLogs queries
2022-08-23 12:50:52 +00:00
Matej Bačo
6c971f6ece
Upgrade listTeams queries
2022-08-23 08:56:28 +00:00
Jake Barnby
cb6fc7f618
Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
...
# Conflicts:
# .gitignore
# app/config/collections.php
# app/controllers/api/account.php
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# app/controllers/api/users.php
# composer.lock
# tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby
7019be987c
Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
...
# 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/controllers/api/account.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/workers/deletes.php
# composer.lock
# docker-compose.yml
# phpunit.xml
# src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Jake Barnby
66539bbe3a
Review updates for role helper usage
2022-08-19 16:04:33 +12:00
shimon
2dc8fba40a
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/account.php
app/controllers/api/users.php
composer.json
composer.lock
2022-08-17 10:05:37 +03:00
Jake Barnby
b09aaabd14
Fix teams exception
2022-08-17 00:14:22 +12:00
shimon
923a741c5a
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/account.php
app/controllers/api/functions.php
app/controllers/api/users.php
2022-08-16 12:47:51 +03:00
Jake Barnby
bbf7f8d8c3
Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
...
# Conflicts:
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby
fb34ecfa7d
Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
...
# Conflicts:
# app/controllers/api/account.php
# app/controllers/api/databases.php
# app/controllers/api/functions.php
# app/controllers/api/projects.php
# app/controllers/api/storage.php
# app/controllers/api/teams.php
# app/controllers/api/users.php
# app/controllers/general.php
# app/controllers/shared/api.php
2022-08-16 19:20:26 +12:00
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order"
2022-08-16 12:29:03 +05:30
shimon
590c1467bc
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
...
Conflicts:
app/controllers/api/account.php
app/controllers/api/functions.php
app/controllers/api/users.php
2022-08-15 18:19:59 +03:00
Jake Barnby
77a28a2de7
Don't use ID helper with existing ID's
2022-08-15 23:24:31 +12:00
Christy Jacob
509f9083c9
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2
2022-08-15 12:43:24 +05:30
Jake Barnby
66f518b531
Fix team membership delete
2022-08-15 18:04:00 +12:00
Eldad Fux
98fc8669e1
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos
2022-08-14 19:23:30 +03:00
Jake Barnby
613a0f8006
ID and test fixes
2022-08-15 02:22:38 +12:00