1
0
Fork 0
mirror of synced 2024-08-19 04:01:38 +12:00
Commit graph

766 commits

Author SHA1 Message Date
Matej Bačo
27bf18f031 Code formatting 2023-03-14 20:31:23 +01:00
Matej Bačo
72e0ccf6d6 Remove scheduleUpdatedAt 2023-03-14 19:39:40 +01:00
Matej Bačo
a919421b47 Fix scheduler bugs 2023-03-14 15:10:36 +01:00
Matej Bačo
c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
Matej Baco
ed610fcdd4 Address TODOs 2023-03-14 11:13:03 +00:00
Matej Bačo
1f409b4e40 Shared variables 2023-03-11 17:06:02 +01:00
Matej Bačo
541cb010a6 Changes after dev-mode QA 2023-03-10 20:36:39 +01:00
Matej Baco
4b0d6d9826 Bug fixes after proxy QA 2023-03-10 12:20:24 +00:00
shimon
4839dbbfb0 fix 2023-03-09 17:49:03 +02:00
Matej Bačo
83370c21f7 Improve error logs 2023-03-08 20:50:51 +01:00
Matej Bačo
59f5978fa3 Implement rules 2023-03-08 19:30:01 +01:00
Matej Bačo
f223e8b948 Update failed status 2023-03-06 12:16:34 +01:00
Torsten Dittmann
6e5b8fab4b fix: implement new framework changes 2023-03-01 17:30:36 +05:30
Matej Bačo
bf3340a3c6 Add body & headers to sync response 2023-02-27 13:43:10 +01:00
Matej Bačo
69aa59a1d6 Add more log details to execution 2023-02-27 11:24:21 +01:00
Matej Bačo
d7c5d8bb46 Remove response body & headers 2023-02-27 11:20:37 +01:00
Matej Bačo
464f88634c Add function logging toggle 2023-02-24 10:24:20 +01:00
Matej Bačo
068acef0f6 Add unique url generator 2023-02-22 16:07:34 +01:00
Matej Bačo
0cf6a50c3c Code cleanup 2023-02-21 11:31:55 +01:00
Matej Bačo
8dec7e6040 Fix custom ID support 2023-02-21 11:30:16 +01:00
Matej Bačo
2c5367f779 Update specs, add url to functions 2023-02-20 14:11:29 +01:00
Damodar Lohani
5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +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
Matej Bačo
04e734f8af Console UI update 2023-02-15 15:50:18 +01:00
Matej Bačo
f6ae0a05fa Stream response support 2023-02-15 09:36:20 +01:00
Matej Bačo
d2ffa3e7c6 Fix cold-start bug 2023-02-14 11:35:49 +00:00
Matej Bačo
20bc1ab00e Merge remote-tracking branch 'origin/feat-db-pools' into feat-executor-v3 2023-02-14 11:16:28 +00:00
Matej Bačo
e4d784c871 Add new V3 parameters 2023-02-14 11:01:38 +00:00
Damodar Lohani
3215e8d8df Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-14 04:54:02 +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
shimon
5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
Matej Bačo
75c7d94633 Implement Open Runtimes v3 support 2023-02-02 19:21:00 +00:00
shimon
1ac935077b addressing comments 2023-02-02 20:16:01 +02:00
shimon
abdd5f016a addressing comments 2023-02-02 13:55:23 +02:00
Vincent (Wen Yu) Ge
b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
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
shimon
a0554ca91e usage test 2023-01-15 12:25:03 +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
Damodar Lohani
f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
shimon
e533f8f067 minor adjustments 2022-12-25 19:07:03 +02:00
shimon
0ac5e293b6 add internalId to collections 2022-12-25 14:13:52 +02:00
shimon
586c7fac7c add internalId to collections 2022-12-25 14:07:54 +02:00
shimon
f3dcd6a79f add internalId to collections 2022-12-25 13:06:25 +02:00
shimon
a8fe99def0 add internalId to collections 2022-12-25 12:17:49 +02:00
shimon
b89e04f561 add internalId to collections 2022-12-22 19:18:54 +02:00
shimon
20f9b0c655 refactor usage worker 2022-12-22 15:02:41 +02:00
shimon
c02ef7b340 adding build.storage usage 2022-12-21 11:22:29 +02:00
shimon
c6b3fb39b1 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats
 Conflicts:
	app/console
	app/workers/builds.php
	docker-compose.yml
	src/Appwrite/Usage/Stats.php
2022-12-21 09:58:22 +02:00
Bradley Schofield
c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Bradley Schofield
284ce42177 Merge branch 'feat-db-pools' into refactor-schedulers-workers 2022-12-20 13:01:27 +00:00
Christy Jacob
ff9bccf1ff
Revert "Feat: Build output size" 2022-12-20 18:26:56 +05:30
Bradley Schofield
886a1a2abb Port Deletes and Builds worker 2022-12-20 12:22:58 +00:00
shimon
18f192ed65 benchmarks 2022-12-19 10:25:49 +02:00
Matej Bačo
8f363eae7a Fix bugs 2022-12-18 08:35:16 +01:00
shimon
7601c9047b e2e tests 2022-12-15 11:45:43 +02:00
shimon
285bfe9fd7 e2e tests 2022-12-15 09:56:06 +02: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
shimon
141d55bd36 build+functions worker 2022-12-13 09:35:05 +02:00
Jake Barnby
5e9eccacd1
Allow create deployment from explorer 2022-12-13 19:49:20 +13:00
shimon
4c6b6d00e8 functions api usage 2022-12-07 19:56:38 +02:00
shimon
5d63d2f199 functions api usage 2022-12-07 19:01:25 +02:00
shimon
d3bc4da15c Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats 2022-12-04 10:35:56 +02:00
Christy Jacob
f239296059 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools 2022-11-23 19:05:19 +00:00
Eldad Fux
95e835a902 Deprecated Usage stats 2022-11-23 19:08:42 +02:00
Matej Bačo
d2362aeab0 Improve performance 2022-11-21 11:43:20 +00:00
Matej Bačo
831960245f Permission bug fix 2022-11-21 11:20:52 +00:00
Matej Bačo
0ee49e7895 Fix missing execution status 2022-11-21 09:38:36 +00:00
Christy Jacob
080abbbb79 Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console 2022-11-17 20:26:10 +05:30
Christy Jacob
a233a30d28
Merge pull request #4691 from appwrite/feat-schedules-deletions
Deleted functions
2022-11-16 20:49:14 +05:30
shimon
c67852a7fb Deleted functions
schedules clean up
2022-11-16 14:51:43 +02:00
Matej Baco
3e325afb61 Revert unnessessary changes 2022-11-16 13:44:14 +01:00
Matej Baco
44875e2d18 QA review changes 2022-11-16 11:33:11 +01:00
shimon
6b88f66d14 removed pools injection in functions controller 2022-11-16 10:46:47 +02:00
shimon
4e3bcd6cd0 Authorization::skip added 2022-11-16 10:41:57 +02:00
Christy Jacob
8b0a78bb36 fix: function events and linter 2022-11-16 11:00:57 +05:30
Christy Jacob
4a92db4dc3 feat: check async execution 2022-11-16 09:47:46 +05:30
Matej Baco
6bf370a058 QA bug fixes 2022-11-15 19:43:40 +01:00
Matej Baco
44a82de09b Refactor func event triggering 2022-11-15 19:13:17 +01:00
Matej Baco
eb47894970 Merge branch 'refactor-scheduler' into refactor-functions-worker 2022-11-15 17:37:04 +01:00
shimon
0d79f19dcd addressing some comments 2022-11-15 18:14:52 +02:00
shimon
8bcf349c38 addressing some comments 2022-11-15 18:03:42 +02:00
shimon
390fbc52eb minor changes 2022-11-15 16:33:43 +02:00
Christy Jacob
98fbe18ac4 Merge branch 'feat-db-pools' of https://github.com/appwrite/appwrite into refactor-scheduler 2022-11-15 12:13:44 +00:00
Bradley Schofield
3c71164741 Merge branch '1.1.x' into feat-implement-session-length-api 2022-11-14 15:30:38 +00:00
shimon
745ae7a4c8 Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-scheduler 2022-11-10 20:07:32 +02:00
shimon
aef565c8ff addressing comments 2022-11-10 18:40:12 +02:00
shimon
1761b77d0f function worker 2022-11-09 19:01:43 +02:00
shimon
9d641b985a tidy up 2022-11-08 16:00:39 +02:00
Matej Bačo
940eee0562 Merge remote-tracking branch 'origin/feat-decouple-executor' into feat-db-pools-opr 2022-11-08 12:39:25 +00:00
Matej Bačo
d275fa0111 Fix tests 2022-11-08 12:34:14 +00:00
Matej Bačo
a52ff7372a Add Open Runtimes Executor 2022-11-08 08:49:45 +00:00
shimon
3a651adea5 replacing offset with pagination 2022-11-07 17:42:08 +02:00
shimon
711d8061a6 replacing offset with pagination 2022-11-07 17:30:22 +02:00
shimon
6f9dcae858 queue 2022-11-07 12:37:07 +02:00
shimon
ef7b53fbc7 queue 2022-11-06 23:41:33 +02:00
shimon
ed505fba7c queue 2022-11-06 15:10:26 +02:00
Christy Jacob
b7a24da288 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-11-05 18:06:44 +05:30
shimon
bc631d926e ticker 2022-11-04 07:12:08 +02:00
Damodar Lohani
b66f932b3b Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-11-02 08:43:12 +00:00
Jake Barnby
0827d59f21
Merge remote-tracking branch 'origin/1.1.x' into fix-missing-deployment-attributes
# Conflicts:
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-02 13:33:10 +13:00
Damodar Lohani
4086ba93ad Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor 2022-10-31 06:36:26 +00:00
Jake Barnby
049e3a2646
Add missing status, buildStdout, buildStderr to getDeployment 2022-10-31 18:11:55 +13:00
Damodar Lohani
dfa35e0a0b fix periods on usage endpoints 2022-10-21 05:45:25 +00:00
Eldad Fux
27c4e24fa5 Unused classes 2022-10-21 08:41:17 +03:00
Bradley Schofield
380a45f987 Add build time to deployment 2022-10-10 16:24:40 +01: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
Torsten Dittmann
e5271dbda9
Merge branch '1.0.x' into fix-function-vars-null 2022-09-30 14:29:22 +02: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
Torsten Dittmann
637a97c4de Merge branch '1.0.x' of https://github.com/appwrite/appwrite into fix-function-vars-null 2022-09-30 12:06:32 +02:00
Torsten Dittmann
65b4c9f931 fix: default value for optional function vars 2022-09-30 11:52:35 +02:00
Torsten Dittmann
b1197d581a
Merge pull request #3908 from appwrite/fix-function-schedule-loops
Fix schedule loop triggering
2022-09-30 11:45:11 +02:00
Bradley Schofield
eeb6ee0821 Update functions.php 2022-09-29 09:42:46 +01:00
Matej Bačo
0159079608 Fix schedule loop triggering 2022-09-23 06:12:17 +00:00
Christy Jacob
ba0be549e3
Merge pull request #3881 from appwrite/fix-null-required-param
Fix: Null required ID params
2022-09-23 00:37:17 +05:30
Matej Bačo
89afad1a32 Replace nulls with empty strings 2022-09-19 11:58:41 +00:00
Matej Bačo
a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Steven Nguyen
00a4929301 Fix date format for usage APIs 2022-09-15 23:48:09 +00:00
Matej Bačo
20bbbfc493 Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling 2022-09-13 20:14:42 +00:00
Christy Jacob
554be364d6
Merge pull request #3755 from appwrite/feat-audits-label-desc-decoupling
audit event decoupling
2022-09-13 22:56:02 +04:00
Christy Jacob
efbe21d433 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into matej-qa-3 2022-09-13 18:21:44 +00:00
shimon
1d382cc542 small fix 2022-09-13 10:42:42 +03:00
shimon
b86f7689ec Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling 2022-09-13 10:29:16 +03:00
Matej Bačo
ec5a0b8cde Remove queries from listVariables; add enabled to createFunction 2022-09-12 09:02:14 +00:00
Matej Bačo
a315f43039 Fix functon scheduling loop logic, and double-loop prevention 2022-09-11 12:20:26 +00:00
Christy Jacob
cb50220b60 feat: rename time attribute to duration 2022-09-09 16:02:04 +04:00
Matej Bačo
b41aaefc7e Implement 'enabled' attribute for functions 2022-09-09 08:49:18 +00:00
Matej Bačo
fd6a3ed30c Fix listVariables returing all variables 2022-09-09 08:05:33 +00: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 A. Fux
30e18d43a2
Merge pull request #3781 from appwrite/fix-async-default-value
Update createExecution param default value
2022-09-07 21:39:46 +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
Matej Bačo
e9c29a4812 Update createExecution param default value 2022-09-07 08:24:49 +00:00
Jake Barnby
27af4e3b7c
Merge remote-tracking branch 'origin/0.16.x' into fix-write-permission-not-allowed
# Conflicts:
#	composer.lock
2022-09-06 12:28:57 +12: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
Matej Bačo
ae2826ad1f Bug fixes 2022-09-02 14:19:36 +00:00
Christy Jacob
0438e830b0
Merge pull request #3634 from appwrite/feat-variables-api
Implement Function Variable API
2022-08-31 14:37:30 +02:00
Christy Jacob
5a58312b53
Merge pull request #3741 from appwrite/refactor-guest-rate-limits
Refactor guest rate limits
2022-08-31 10:41:23 +02:00
Matej Bačo
0897cd0fe4
Merge branch '0.16.x' into feat-variables-api 2022-08-31 09:37:47 +02:00
Matej Bačo
3fc2e70007 updateVariable 'key' param marked as required 2022-08-31 07:33:43 +00:00
Jake Barnby
190d9684f0
Use consts for rate limit count + period 2022-08-31 11:34:17 +12:00
Jake Barnby
1d4866c5b5
Use IP + User ID as abuse key for create routes 2022-08-31 11:33:19 +12:00
Jake Barnby
b9148d380b
Fix only variables can passed by reference errors 2022-08-31 11:31:43 +12:00
Matej Bačo
1e95346205 PR review changes 2022-08-30 12:30:52 +00: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
Matej Bačo
2534e9ad8f Remove unnessessary internal queries 2022-08-30 08:20:54 +00:00
Matej Bačo
087b7df52a Failure tests for variables 2022-08-30 07:53:16 +00:00
Matej Bačo
677121edca
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:29:30 +02:00
Matej Bačo
471cac8187
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:29:20 +02:00
Matej Bačo
ce334b9518
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:29:09 +02:00
Matej Bačo
8620b1f3a0
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:48 +02:00
Matej Bačo
e5a63a5078
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:37 +02:00
Matej Bačo
8ec8843a09
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:27 +02:00
Matej Bačo
6cf3cdcadb
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:20 +02:00
Matej Bačo
4b50fe3f15
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:09 +02:00
Matej Bačo
ce5c8d6817
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:28:01 +02:00
Matej Bačo
3e2a7e2941
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:27:54 +02:00
Matej Bačo
883207240c
Update app/controllers/api/functions.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2022-08-30 09:27:44 +02:00
Matej Bačo
951ed70fb0 Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-29 08:56:14 +00: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
c531213a5f Doc updates 2022-08-27 15:19:00 +12:00
Matej Bačo
dca0b211f6 Implement queries into list variables 2022-08-26 13:38:39 +00:00
Matej Bačo
3b7ac045d7 Merge remote-tracking branch 'origin/feat-list-endpoints-queries' into feat-variables-api 2022-08-26 07:51:54 +00:00
Matej Bačo
7f0507473d Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-26 07:47:42 +00:00
Matej Bačo
78f65401e8 Attempt to fix usage tests 2022-08-25 14:56:15 +00:00
Matej Bačo
e44efb43d1 Fix exception params 2022-08-25 10:13:36 +00:00
Matej Baco
8513bb2dbe Merge branch 'feat-list-endpoints-queries' into feat-variables-api 2022-08-25 11:14:42 +02: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
cb6a186c5d PR review changes 2022-08-24 15:07:18 +00:00
Matej Bačo
4b01ff3f51 Use new query methods 2022-08-24 14:10:56 +00:00
Matej Bačo
17e41eee1d Upgrade listExecutions queries 2022-08-23 09:26:34 +00:00
Matej Bačo
a92f96bf80 Upgrade listDeployments queries 2022-08-23 09:12:48 +00:00
Matej Bačo
1eee0baa28 Upgrade listFunctions queries 2022-08-23 09:02:06 +00:00
Damodar Lohani
2205ecd9c6 null safety checks 2022-08-20 11:20:31 +00:00
Bradley Schofield
0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01: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
Damodar Lohani
0d97580361 fix usage params in execution 2022-08-17 10:13:50 +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
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
80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Eldad A. Fux
69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs
Functions Console Logs Capture
2022-08-16 23:23:53 +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
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
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
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
613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00