1
0
Fork 0
mirror of synced 2024-08-02 03:52:01 +12:00
Commit graph

304 commits

Author SHA1 Message Date
shimon
69066cfc5e timestamp -> datetime on file cache 2022-08-30 15:44:37 +03:00
Jake Barnby
e25fbd1c2a Fix default for usage params 2022-08-25 23:51:59 +12: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
Jake Barnby
8841f8fe76 Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-22 21:13:29 +12:00
Damodar Lohani
fa165a735b linter fix 2022-08-21 10:16:55 +00:00
Damodar Lohani
0d57c67cc0 use same method to parse usage params labels 2022-08-21 02:10:42 +00: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
3e43424129 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-18 00:49:31 +00:00
shimon
9fc2e4c3a5 sync with 0.16 2022-08-17 17:29:22 +03:00
shimon
cc9a166146 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/storage.php
	app/controllers/shared/api.php
2022-08-17 17:08:54 +03:00
Damodar Lohani
c0119e6a0d fix formatting 2022-08-17 11:10:17 +00:00
Damodar Lohani
6b11fa26ce rename and remove unused param 2022-08-17 10:55:01 +00:00
shimon
9c68cff317 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	composer.json
	composer.lock
2022-08-17 11:16:09 +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
shimon
1abd57567f linter fix 2022-08-16 18:02:17 +03:00
shimon
5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03:00
Christy Jacob
51cb03a93e feat: linter fix 2022-08-16 17:58:30 +05:30
shimon
8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03: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
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
df0bdeb8a3 some fixes 2022-08-15 16:55:11 +03:00
shimon
67d12d3120 some fixes 2022-08-15 15:16:32 +03:00
shimon
edecd8dc22 some fixes 2022-08-15 13:52:20 +03:00
shimon
0dc485d8d7 some fixes 2022-08-15 12:05:41 +03:00
Damodar Lohani
246d9b94b7
null safety 2022-08-15 13:27:02 +05:45
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
1109004727 some fixes 2022-08-14 22:27:43 +03:00
shimon
ab27e0a74d some fixes 2022-08-14 18:01:34 +03:00
Damodar Lohani
5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00:00
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
shimon
d132202662 some fixes 2022-08-13 20:29:33 +03:00
shimon
af56db4048 some fixes 2022-08-13 18:36:44 +03:00
shimon
51e3fc8cab some fixes 2022-08-13 12:59:34 +03:00
Christy Jacob
3ded17badf fix: linter 2022-08-13 13:40:39 +05:30
shimon
45c46c1794 sync with 0.16 2022-08-13 11:02:00 +03:00
Damodar Lohani
792d657a4f formatting fixes 2022-08-13 05:10:34 +00:00
Eldad Fux
3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Damodar Lohani
be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00:00
shimon
1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
shimon
90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
shimon
e86aab5e88 ident 2022-08-11 16:47:53 +03:00
shimon
b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
shimon
6a4fee641d clean 2022-08-11 12:04:05 +03:00
shimon
2d8abac0e3 clean 2022-08-11 11:47:18 +03:00
Damodar Lohani
f0827fef38 formatting issues 2022-08-11 07:02:40 +00:00
Damodar Lohani
d05e1fdfb3 enable ignoring stats on admin requests 2022-08-11 06:16:10 +00:00
Damodar Lohani
63371ce76e functions usage stats using route labels 2022-08-11 05:25:39 +00:00
shimon
ac827f6861 cache ver updated 2022-08-10 13:13:05 +03:00
Damodar Lohani
cb369dd326 update account routes usage labels 2022-08-10 08:45:10 +00:00
shimon
f9b8a0a661 disabling route from cache 2022-08-10 10:08:48 +03:00
Damodar Lohani
8aa7486e71 database usage stats working via labels 2022-08-10 02:33:46 +00:00
Damodar Lohani
16fe9e241a Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-10 01:49:27 +00:00
shimon
d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
shimon
a261dcd171 init from master 2022-08-09 16:43:37 +03:00
shimon
092e682591 Merge branch 'master' of github.com:appwrite/appwrite into feat-file-cache-cleanup
 Conflicts:
	app/controllers/shared/api.php
2022-08-09 15:02:29 +03:00
shimon
a937cde7a3 init 2022-08-09 14:57:33 +03:00
shimon
eb9ca5d7e3 leftovers 2022-08-09 09:49:55 +03:00
Damodar Lohani
bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
shimon
9eb1c3a731 leftovers 2022-08-08 18:44:45 +03:00
shimon
2d7a2bb57f leftovers 2022-08-08 18:23:45 +03:00
shimon
8a79748b6d leftovers 2022-08-08 17:48:51 +03:00
Bradley Schofield
bf050ece0f Fix Exceptions 2022-08-08 15:44:07 +01:00
shimon
62ef532801 leftovers 2022-08-08 17:32:54 +03:00
shimon
89f164bdd7 resource namespace 2022-08-08 15:19:41 +03:00
shimon
a6a9ad8cc0 databases controller 2022-08-08 11:14:27 +03:00
shimon
e9ef94e8af account controller 2022-08-07 18:49:30 +03:00
shimon
c8196c41d4 api::payload 2022-08-07 18:09:37 +03:00
shimon
ec39ff267c api::parseLabel 2022-08-07 17:30:47 +03:00
shimon
f4c1a5ea35 response::send 2022-08-07 14:01:00 +03:00
Damodar Lohani
51a6db995a groups at the top in hooks 2022-08-02 01:10:48 +00:00
shimon
1d38b2ce6a Reference comments 2022-07-31 13:20:56 +03:00
shimon
39d2f6b981 Reference comments 2022-07-30 21:55:36 +03:00
shimon
5511a93e9c Expires header returned to the endpoints 2022-07-28 18:24:18 +03:00
Damodar Lohani
13bcb062b2 ordering 2022-07-28 07:06:39 +00:00
shimon
ae80607248 response changes 2022-07-26 16:13:12 +03:00
shimon
d09bf306ce response changes 2022-07-26 15:50:33 +03:00
Jake Barnby
fd79922284 Per project keys 2022-07-25 16:26:46 +12:00
shimon
966765dac7 tidy up 2022-07-24 18:25:33 +03:00
shimon
16ed2c1572 tidy up 2022-07-24 18:22:31 +03:00
shimon
f214ead6f6 tidy up 2022-07-24 12:49:51 +03:00
shimon
64050337cf tidy up 2022-07-24 10:05:24 +03:00
shimon
02907f12f1 cache logic moved to api::init & api::shutdown 2022-07-23 20:42:42 +03:00
Damodar Lohani
b168dde502 implementing new Utopia hooks 2022-07-22 06:00:42 +00:00
fogelito
169fb4d6f4 audit + abuse datetime changes 2022-07-19 17:52:06 +03:00
shimon
59627ea9ef logger moved to App::shutdown 2022-07-09 21:24:28 +03:00
Jake Barnby
5b3c4921d6 Add schema group shutdown hook to set dirty flag in register 2022-07-08 17:43:20 +12:00
shimon
9968bebed2 logger moved to App::shutdown 2022-07-07 21:35:27 +03:00
shimon
eeca43014a logger moved to App::shutdown 2022-07-07 18:45:24 +03:00
shimon
a0cfc2110a logger moved to App::shutdown 2022-07-07 17:51:22 +03:00
Damodar Lohani
8f14f5aa21
Database layer (#3338)
* database response model

* database collection config

* new database scopes

* database service update

* database execption codes

* remove read write permission from database model

* updating tests and fixing some bugs

* server side tests are now passing

* databases api

* tests for database endpoint

* composer update

* fix error

* formatting

* formatting fixes

* get database test

* more updates to events and usage

* more usage updates

* fix delete type

* fix test

* delete database

* more fixes

* databaseId in attributes and indexes

* more fixes

* fix issues

* fix index subquery

* fix console scope and index query

* updating tests as required

* fix phpcs errors and warnings

* updates to review suggestions

* UI progress

* ui updates and cleaning up

* fix type

* rework database events

* update tests

* update types

* event generation fixed

* events config updated

* updating context to support multiple

* realtime updates

* fix ids

* update context

* validator updates

* fix naming conflict

* fix tests

* fix lint errors

* fix wprler and realtime tests

* fix webhooks test

* fix event validator and other tests

* formatting fixes

* removing leftover var_dumps

* remove leftover comment

* update usage params

* usage metrics updates

* update database usage

* fix usage

* specs update

* updates to usage

* fix UI and usage

* fix lints

* internal id fixes

* fixes for internal Id

* renaming services and related files

* rename tests

* rename doc link

* rename readme

* fix test name

* tests: fixes for 0.15.x sync

Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-06-22 12:51:49 +02:00
Everly Precia Suresh
746dc72439 fix merge conflicts 2022-05-31 11:32:46 +00:00
Torsten Dittmann
ce84dd1377
Merge pull request #3290 from appwrite/refactor-api
Refactor `api.php`
2022-05-31 11:04:39 +02:00
Everly Precia Suresh
e6941e76a1 change param type from bool to string 2022-05-27 10:01:00 +00:00
Everly Precia Suresh
e845b2f3a6 refactor-api 2022-05-26 11:51:08 +00:00
Everly Precia Suresh
7f0ecf59d0 refactor web.php 2022-05-26 11:31:47 +00:00
Everly Precia Suresh
19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Torsten Dittmann
0bd62bf4f8 fix: payload duplicates 2022-05-10 14:08:40 +02:00
Torsten Dittmann
fdb64de616 docs: add comments to events passing 2022-05-09 14:36:29 +02:00
Torsten Dittmann
7790d72c0c fix: realtime, tests and webhooks 2022-04-18 18:21:45 +02:00