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 |
|
Matej Bačo
|
3adca4588c
|
Update lock files
|
2022-08-16 09:46:00 +00:00 |
|
|
Matej Bačo
|
17600deace
|
Merge branch '0.16.x' into feat-password-hash-algos
|
2022-08-16 09:35:20 +00:00 |
|
|
shimon
|
8f8f033d1a
|
fill gaps from merge
|
2022-08-16 12:00:28 +03:00 |
|
Jake Barnby
|
fd76332aca
|
Merge pull request #3691 from appwrite/datetime-attributes-merge
Datetime attributes merge
|
2022-08-16 20:20:41 +12:00 |
|
|
Jake Barnby
|
39231f8cf9
|
Lint
|
2022-08-16 19:26:40 +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
|
6dd6436291
|
Merge pull request #3690 from appwrite/revert-3667-feat-reorder-endpoints-2
Revert "Fix Endpoint Order"
|
2022-08-16 12:35:32 +05:30 |
|
|
Christy Jacob
|
5b7b39a300
|
Revert "Fix Endpoint Order"
|
2022-08-16 12:29:03 +05:30 |
|
Damodar Lohani
|
4fb743e934
|
fix lint errors
|
2022-08-16 05:23:51 +00:00 |
|
|
Damodar Lohani
|
94d9bb8a18
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs
|
2022-08-16 04:42:03 +00:00 |
|
|
Damodar Lohani
|
e59f00fcd0
|
update runtime package
|
2022-08-16 04:37:54 +00:00 |
|
|
Damodar Lohani
|
078b1ec377
|
updating to use if condition
|
2022-08-16 04:34:49 +00:00 |
|
|
shimon
|
9770f10a8c
|
fill gaps from merge
|
2022-08-15 20:33:44 +03:00 |
|
|
shimon
|
f091774afd
|
fill gaps from merge
|
2022-08-15 20:04:23 +03:00 |
|
|
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 |
|
|
shimon
|
f64c82a8cb
|
addressing comments
|
2022-08-15 17:03:03 +03:00 |
|
|
shimon
|
f12ccfa02a
|
prefix removed from storage audits label
|
2022-08-15 16:59:58 +03:00 |
|
|
shimon
|
a3a9def48d
|
composer
|
2022-08-15 16:56:50 +03:00 |
|
|
shimon
|
df0bdeb8a3
|
some fixes
|
2022-08-15 16:55:11 +03:00 |
|
|
Christy Jacob
|
4f80bb87c2
|
Merge pull request #3667 from appwrite/feat-reorder-endpoints-2
Fix Endpoint Order
|
2022-08-15 19:23:05 +05:30 |
|
|
shimon
|
67d12d3120
|
some fixes
|
2022-08-15 15:16:32 +03:00 |
|
|
shimon
|
edecd8dc22
|
some fixes
|
2022-08-15 13:52:20 +03:00 |
|
|
Christy Jacob
|
51afc8bdfb
|
feat: generate latest specs
|
2022-08-15 14:37:41 +05:30 |
|
|
shimon
|
0dc485d8d7
|
some fixes
|
2022-08-15 12:05:41 +03:00 |
|
Eldad A. Fux
|
72e524963c
|
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
|
2022-08-15 11:30:58 +03:00 |
|
|
Christy Jacob
|
7723c633a0
|
feat: fix tests
|
2022-08-15 13:24:54 +05:30 |
|
|
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 |
|
|
Eldad Fux
|
6f74c565e8
|
Fixed docblock
|
2022-08-15 09:55:37 +03:00 |
|
|
Christy Jacob
|
794f07c3b0
|
feat: accounts test
|
2022-08-15 12:13:09 +05:30 |
|
|
shimon
|
5e476a2e5a
|
some fixes
|
2022-08-15 07:29:44 +03:00 |
|
|
Eldad A. Fux
|
1210b4f59a
|
Merge pull request #3675 from appwrite/feat-datetime-attributes-with-database-query-update
Update database query syntax
|
2022-08-15 07:28:21 +03:00 |
|
Steven
|
6b618a5824
|
Merge branch 'origin/datetime-attributes' into feat-datetime-attributes-with-database-query-update
|
2022-08-15 01:45:56 +00:00 |
|
|
shimon
|
c0d8337417
|
some fixes
|
2022-08-14 23:45:05 +03:00 |
|
|
shimon
|
9d02066615
|
some fixes
|
2022-08-14 23:19:52 +03:00 |
|
|
shimon
|
104e6564f7
|
some fixes
|
2022-08-14 23:06:21 +03:00 |
|
|
shimon
|
cabe989555
|
some fixes
|
2022-08-14 22:42:20 +03:00 |
|
|
shimon
|
1109004727
|
some fixes
|
2022-08-14 22:27:43 +03:00 |
|
|
Eldad Fux
|
f88a64df1c
|
Fix for linter
|
2022-08-14 22:01:58 +03:00 |
|
|
Eldad Fux
|
9b897629ba
|
Fixed code generator
|
2022-08-14 21:57:23 +03:00 |
|
|
shimon
|
6fd01a6721
|
some fixes
|
2022-08-14 21:39:44 +03:00 |
|
|
Eldad Fux
|
fbd5835bd9
|
Fixed test
|
2022-08-14 21:33:52 +03:00 |
|
|
Eldad Fux
|
95181546b4
|
Adpated tests
|
2022-08-14 21:09:24 +03:00 |
|
|
shimon
|
857803e362
|
some fixes
|
2022-08-14 21:02:38 +03:00 |
|
|
Eldad Fux
|
98e2564330
|
Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param
|
2022-08-14 20:22:52 +03:00 |
|
|
Eldad Fux
|
bd77354926
|
Fixed test
|
2022-08-14 20:22:01 +03:00 |
|
|
Eldad A. Fux
|
340cfb0104
|
Update app/controllers/api/users.php
|
2022-08-14 20:01:32 +03:00 |
|
|
Eldad Fux
|
be36b31c4e
|
Added missing test for new codeGenerator
|
2022-08-14 19:53:55 +03:00 |
|
|
Eldad Fux
|
22c38a484f
|
Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param
|
2022-08-14 19:43:53 +03:00 |
|
|
Eldad Fux
|
7d83f9d644
|
Removed import path
|
2022-08-14 19:29:07 +03:00 |
|