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 |
|
Torsten Dittmann
|
0c1222f0f5
|
Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x
|
2022-09-30 14:23:06 +02:00 |
|
Matej Bačo
|
46c91899e7
|
Merge branch '0.16.x' into feat-improve-sms-e2e-tests
|
2022-09-23 08:23:29 +02:00 |
|
Christy Jacob
|
7abb426e3f
|
fix: hash phone auth code
|
2022-09-23 03:55:17 +05:30 |
|
Matej Bačo
|
a983e792d8
|
Refactor required param values
|
2022-09-19 10:05:42 +00:00 |
|
Matej Bačo
|
6e8a4cc97b
|
Update sms mock to use request catcher
|
2022-09-19 08:09:48 +00:00 |
|
Christy Jacob
|
626e4b1b8a
|
feat: update getSessions to listSessions in users and accounts API
|
2022-09-14 03:43:04 +05:30 |
|
Christy Jacob
|
937674a373
|
feat: update getLogs to listLogs in users and account API
|
2022-09-14 02:35:03 +05:30 |
|
shimon
|
342c4a3253
|
audits.resource label update
|
2022-09-08 16:06:16 +03:00 |
|
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
|
01fb4045bd
|
Sync with 0.16
|
2022-09-07 14:11:10 +03:00 |
|
Eldad Fux
|
1f17fb34e4
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax
|
2022-09-07 14:07:40 +03:00 |
|
Eldad Fux
|
0895a25615
|
Fixed response syntax with new FW version
|
2022-09-07 14:02:36 +03:00 |
|
shimon
|
1362902082
|
audit event name reformation
|
2022-09-05 11:00:08 +03:00 |
|
shimon
|
db715f3e7d
|
decouple audits log from events
|
2022-09-04 13:31:38 +03:00 |
|
shimon
|
8e1dc84a48
|
account labels
|
2022-09-04 10:32:56 +03:00 |
|
Matej Bačo
|
63c02677a0
|
PR review changes
|
2022-08-30 13:55:23 +02:00 |
|
Matej Bačo
|
889eaff418
|
Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries
|
2022-08-29 08:52:28 +00:00 |
|
Jake Barnby
|
82bea82d94
|
Update passwordUpdate check
|
2022-08-27 15:17:48 +12:00 |
|
Matej Bačo
|
c85363f355
|
Fix bugs after merge
|
2022-08-25 09:59:28 +00:00 |
|
Matej Baco
|
fd1068a600
|
Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries
|
2022-08-25 10:56:06 +02:00 |
|
Jake Barnby
|
625608804e
|
Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# 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/databases.php
# app/controllers/api/storage.php
# app/workers/builds.php
# src/Appwrite/Stats/Usage.php
# src/Appwrite/Usage/Calculators/Database.php
|
2022-08-25 18:21:15 +12:00 |
|
Matej Bačo
|
2d82eed4be
|
Linter fix
|
2022-08-23 13:10:27 +00:00 |
|
Matej Bačo
|
b1348dbdd8
|
Upgrade account logs queries
|
2022-08-23 13:06:59 +00:00 |
|
Damodar Lohani
|
6af467398b
|
update usage labels
|
2022-08-21 02:04:52 +00:00 |
|
Jake Barnby
|
24875e352d
|
Merge fixes
|
2022-08-19 17:05:39 +12: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
|
5f990ecb6d
|
Fix imports
|
2022-08-19 16:28:40 +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 |
|
Damodar Lohani
|
db9faebcc9
|
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2022-08-18 16:04:19 +05:45 |
|
Damodar Lohani
|
4d482ebb81
|
fix accounts PR
|
2022-08-18 00:31:56 +00:00 |
|
Damodar Lohani
|
a1e6f7bdf4
|
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
|
2022-08-17 09:34:40 +00:00 |
|
shimon
|
cc887beae9
|
sync with 0.16
|
2022-08-17 10:32:42 +03: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 |
|
Damodar Lohani
|
3bc0aa8dca
|
fix merge issues
|
2022-08-17 02:35:55 +00:00 |
|
Damodar Lohani
|
80dfa85c82
|
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
|
2022-08-17 00:45:07 +00:00 |
|
shimon
|
7ad7d1807e
|
fill gaps from merge
|
2022-08-16 17:56:05 +03:00 |
|
shimon
|
5d284b8c27
|
fill gaps from merge
|
2022-08-16 16:20:35 +03:00 |
|
Matej Bačo
|
1e96f8c3d9
|
Revert changes regarding AccountAPI createAccount
|
2022-08-16 12:05:46 +00:00 |
|
shimon
|
de42895096
|
fill gaps from merge
|
2022-08-16 14:27:50 +03: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
|
326220762e
|
Exception fixes
|
2022-08-16 21:07:30 +12:00 |
|
shimon
|
8f8f033d1a
|
fill gaps from merge
|
2022-08-16 12:00:28 +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 |
|
Damodar Lohani
|
34fd6763e1
|
Update app/controllers/api/account.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
|
2022-08-16 11:14:55 +05:45 |
|
shimon
|
f091774afd
|
fill gaps from merge
|
2022-08-15 20:04:23 +03:00 |
|