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
|
2814a6f680
|
Linter fix
|
2022-08-16 13:03:38 +00:00 |
|
Matej Bačo
|
3088535806
|
Added phone number to UsersAPI createUser + tests
|
2022-08-16 13:02:28 +00:00 |
|
Jake Barnby
|
b09aaabd14
|
Fix teams exception
|
2022-08-17 00:14:22 +12: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 |
|
Jake Barnby
|
e3ec275a51
|
Cleaner permission checks
|
2022-08-16 23:26:38 +12:00 |
|
shimon
|
beaad6c49d
|
fill gaps from merge
|
2022-08-16 13:19:38 +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
|
1aa36b6b2c
|
Simplify permission checks
|
2022-08-16 21:08:14 +12: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
|
5d84d6d43f
|
Lint
|
2022-08-16 20:33:06 +12: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 |
|
Jake Barnby
|
f672269a8c
|
Handle aggregates per resource type at the controller level
|
2022-08-16 17:54:44 +12:00 |
|
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 |
|
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
|
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
|
f12ccfa02a
|
prefix removed from storage audits label
|
2022-08-15 16:59:58 +03:00 |
|
shimon
|
df0bdeb8a3
|
some fixes
|
2022-08-15 16:55:11 +03:00 |
|
Jake Barnby
|
bf2fa212aa
|
Fix setting defaults
|
2022-08-16 01:16:20 +12:00 |
|
Jake Barnby
|
28e7934aeb
|
Update document/file validator allowed permissions
|
2022-08-16 01:02:02 +12:00 |
|
Jake Barnby
|
b53f185ec6
|
Remove permissions processor
|
2022-08-16 00:56:19 +12:00 |
|
shimon
|
67d12d3120
|
some fixes
|
2022-08-15 15:16:32 +03:00 |
|
Jake Barnby
|
77a28a2de7
|
Don't use ID helper with existing ID's
|
2022-08-15 23:24:31 +12:00 |
|
Jake Barnby
|
813e9135c6
|
Review fixes
|
2022-08-15 22:11:17 +12:00 |
|
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 |
|
Jake Barnby
|
33970276b2
|
Self review
|
2022-08-15 19:20:10 +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 |
|
Damodar Lohani
|
c0d05132df
|
fix usage metric typo in database
|
2022-08-15 05:50:36 +00:00 |
|
Damodar Lohani
|
a5aa20ac5c
|
Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates
|
2022-08-15 05:35:14 +00:00 |
|
shimon
|
5e476a2e5a
|
some fixes
|
2022-08-15 07:29:44 +03:00 |
|
Jake Barnby
|
cb4a256d5f
|
Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes
# 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
# public/dist/scripts/app-all.js
# public/dist/scripts/app-dep.js
# public/dist/scripts/app.js
# public/dist/styles/default-ltr.css
# public/dist/styles/default-rtl.css
# public/scripts/dependencies/appwrite.js
|
2022-08-15 12:05:52 +12:00 |
|
shimon
|
c0d8337417
|
some fixes
|
2022-08-14 23:45:05 +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
|
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 |
|