Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,296 Commits 1,269 Branches 495 Tags
fix-query-syntax-errors
Commit Graph

1596 Commits

Author SHA1 Message Date
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
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 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
Christy Jacob 4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00: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
shimon 0dc485d8d7 some fixes 2022-08-15 12:05:41 +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
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 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03: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
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Steven 610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Christy Jacob c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
Christy Jacob 4521907b83 feat: refactor workers 2022-08-12 21:39:45 +05:30
Christy Jacob b4e944e9ba feat: run linter 2022-08-10 19:19:58 +05:30
Christy Jacob 741824ef87 feat: move server list to app resource 2022-08-10 19:15:04 +05:30
Bradley Schofield 6882ffaa00 Merge branch '0.16.x' into feat-variables-api 2022-08-09 13:37:24 +01:00
Bradley Schofield 603cb1db34 Update init.php 2022-08-09 13:32:33 +01: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
Damodar Lohani bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
Christy Jacob 8cae6bb627 feat: review comments 2022-08-09 11:26:53 +05:30
Christy Jacob 82e39ccf52 feat: review comments 2022-08-09 01:12:13 +05:30
Bradley Schofield 43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
Christy Jacob 561e7b43e1 feat: review comments 2022-08-03 00:26:45 +05:30
Torsten Dittmann a4588cc848 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:49:28 +02:00
Torsten Dittmann 7b95c46cf5 Merge branch 'master' of https://github.com/appwrite/appwrite into origin/datetime-api 2022-07-28 14:40:45 +02:00
Torsten Dittmann bd550f8a1e feat: ui for datetime attribute 2022-07-28 14:38:54 +02:00
Christy Jacob 9e183f8994 feat: review comments 2022-07-27 22:29:27 +05:30
Christy Jacob da16c0159b feat: rename environment variable 2022-07-27 09:17:00 +05:30
Torsten Dittmann 0bf39bd152 Merge pull request #3603 from appwrite/0.15.x 
master <- 0.15.x
 2022-07-26 11:22:23 +02:00
fogelito b58c04c28b Add attribute datetime 2022-07-25 11:53:41 +03:00
Jake Barnby fd79922284 Per project keys 2022-07-25 16:26:46 +12:00
shimon 64050337cf tidy up 2022-07-24 10:05:24 +03:00
Torsten Dittmann 80258efc7f feat: prepare 0.15.3 2022-07-22 17:53:50 +02:00
Bradley Schofield 40022decb4 Start working on simplifying exceptions 2022-07-22 15:38:06 +01:00
Matej Bačo 183a18f618 Implement functions CRUD operations 2022-07-20 07:18:49 +00:00
Christy Jacob 56856309c5 feat: update php docs 2022-07-18 17:02:12 +05:30
Jake Barnby 1dc557042f Fix lazy matching route replacement parameters 2022-07-18 14:52:41 +12:00
Jake Barnby 0b7b5496f3 Merge remote-tracking branch 'origin/master' into feat-graphql-support 
# Conflicts:
#	app/init.php
 2022-07-14 20:13:41 +12:00
Jake Barnby 221e7b59c4 Add abuse test 2022-07-14 20:11:39 +12:00
Christy Jacob 6662fa7b7b feat: merge and fix conflicts 2022-07-14 04:11:35 +04:00
Christy Jacob 662800cc67 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-07-14 03:42:26 +04:00
Jake Barnby 814298c549 Remove redundant injections 2022-07-14 01:38:16 +12:00
Jake Barnby a656699fa7 Code cleanup 2022-07-13 21:34:56 +12:00
Aditya Oberai f63c1c95fe Create Vonage phone auth adapter 2022-07-12 15:45:22 +00:00
Jake Barnby 10a5c24a63 Format and lint 2022-07-12 09:52:00 +12:00
Jake Barnby 7259f21cf1 Merge remote-tracking branch 'origin/master' into feat-graphql-support 
# Conflicts:
#	composer.lock
 2022-07-12 09:18:58 +12:00