1
0
Fork 0
mirror of synced 2024-07-04 22:20:45 +12:00
Commit graph

276 commits

Author SHA1 Message Date
Jake Barnby 9819088563 Lint 2022-08-19 16:05:00 +12:00
Jake Barnby 66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
fogelito c21b563614 Merge branch 'refactor-permissions-inc-console-fix' of github.com:appwrite/appwrite into datetime-jake-tz
 Conflicts:
	app/controllers/general.php
	composer.json
	composer.lock
2022-08-17 21:04:23 +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
fogelito 9b85a89e71 Projects tests 2022-08-15 20:37:26 +03:00
Jake Barnby 33970276b2 Self review 2022-08-15 19:20:10 +12:00
Jake Barnby 9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
Jake Barnby 6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Christy Jacob a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12: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
Steven 1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Bradley Schofield bf050ece0f Fix Exceptions 2022-08-08 15:44:07 +01:00
Jake Barnby 7b9fb32fae Update role references 2022-08-03 21:52:34 +12:00
Damodar Lohani 70a7446ad4 fix group 2022-07-22 06:42:49 +00:00
Damodar Lohani b168dde502 implementing new Utopia hooks 2022-07-22 06:00:42 +00:00
fogelito 45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
fogelito f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
fogelito ae4cb685c0 expire 2022-07-05 21:55:20 +03:00
fogelito 903ca342cb Model changes 2022-07-04 13:11:38 +03:00
fogelito 8628105eef Model changes 2022-07-04 12:55:11 +03:00
Torsten Dittmann 5a2d6c0b3e feat: 0.15.x response filters 2022-06-28 11:15:27 +02:00
Torsten Dittmann bbdf70ee90 feat: use new $createdAt and $updatedAt attributes 2022-06-15 14:46:52 +02:00
Torsten Dittmann 94b2db96c2 chore: run formatter 2022-06-03 11:12:19 +02:00
Torsten Dittmann 153ac5c60d Merge branch '0.15.x' of https://github.com/appwrite/appwrite into 0.15.x 2022-06-02 11:53:41 +02:00
shimon 2d7bc4fb16 small fix 2022-06-01 14:31:03 +03:00
shimon e782e4744f small fix 2022-06-01 13:09:53 +03:00
shimon 1a28c3a909 api keys, validation and test 2022-06-01 09:38:11 +03:00
shimon d39e6a842c Merge branch 'master' of github.com:appwrite/appwrite into feat-expire-key
 Conflicts:
	app/controllers/general.php
2022-06-01 09:34:34 +03:00
shimon 8013276515 api keys, validation and test 2022-06-01 09:26:55 +03:00
Steven Nguyen f645c2ce53 Update service checks to ignore server app users 2022-05-31 20:42:41 -07:00
Torsten Dittmann 540738101f fix: error type 2022-06-01 00:09:23 +02:00
shimon 8bca5cd13e api keys 2022-05-31 18:41:12 +03:00
Everly Precia Suresh f039fb36fc format newly added changes 2022-05-31 11:35:59 +00:00
Everly Precia Suresh 746dc72439 fix merge conflicts 2022-05-31 11:32:46 +00:00
Everly Precia Suresh 6bd7342d0e improve naming 2022-05-27 10:36:06 +00:00
Everly Precia Suresh f9cfb5478e refactor general.php 2022-05-26 14:46:08 +00:00
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Matej Bačo d8db5e5839 Ignore localhost as main domain 2022-05-18 08:31:54 +00:00
Matej Bačo 9bf7d9bda4 Added backwards compatibility (response&request) 2022-05-17 07:56:28 +00:00
Torsten Dittmann e69a22042c
Merge pull request #3113 from appwrite/feat-new-event-model
feat: new event model
2022-05-12 19:53:51 +02:00
Torsten Dittmann 32b55a901a
Merge pull request #2981 from appwrite/feat-https-redirect-exception
Feat: HTTPs Redirection Exception
2022-05-12 19:04:59 +02:00
Torsten Dittmann b82010c167
Merge pull request #3124 from appwrite/fix-wildcard-hostname-new
Feat: Wildcard hostname
2022-05-12 18:35:42 +02:00
Torsten Dittmann 086a242904 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-12 16:01:01 +02:00
Matej Bačo 3efb904151 Prevent unnecessary SSL jobs 2022-05-12 10:56:25 +00:00
Torsten Dittmann 784844b03e Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-11 19:04:31 +02:00
Matej Bačo 8bb3418f7c Merge remote-tracking branch 'origin/0.14.x' into feat-certificate-refactor 2022-05-11 14:12:38 +00:00
Matej Bačo 17b2ab86d8 Merge remote-tracking branch 'origin/0.14.x' into fix-wildcard-hostname-new 2022-05-03 07:59:11 +00:00