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
18,621 Commits 1,269 Branches 495 Tags
refactor-move-cli-scripts
Commit Graph

528 Commits

Author SHA1 Message Date
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
Jake Barnby b09aaabd14 Fix teams exception 2022-08-17 00:14:22 +12: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
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 66f518b531 Fix team membership delete 2022-08-15 18:04:00 +12:00
Eldad Fux 98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
Jake Barnby 613a0f8006 ID and test fixes 2022-08-15 02:22:38 +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
Jake Barnby b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Christy Jacob 979768fc9f Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-14 14:42:14 +05:30
Christy Jacob 70d2ebf55b feat: tests 2022-08-14 14:25:59 +05:30
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 fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12: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
Jake Barnby 68cc919aaa Test fixes 2022-08-14 02:10:28 +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
Jake Barnby 09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Bradley Schofield 7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01: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
Jake Barnby 1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
shimon b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
shimon d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Jake Barnby 216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Jake Barnby fb0168ea50 Fix erroneous whitespace 2022-08-09 14:48:39 +12:00
shimon 2d7a2bb57f leftovers 2022-08-08 18:23:45 +03:00
shimon 62ef532801 leftovers 2022-08-08 17:32:54 +03:00
Bradley Schofield 43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
Jake Barnby e8af744c97 More write ref updates 2022-08-05 18:00:56 +12:00
Jake Barnby bed6eb70af Replace write refs 2022-08-05 17:23:32 +12:00
Jake Barnby ce38e74ba2 Update remaining services to new permissions 2022-08-02 21:21:53 +12:00
Bradley Schofield 3c808ca895 Fix problem with Exception class 2022-07-26 15:56:59 +01:00
Bradley Schofield 96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
Matej Bačo dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
Fawzi E. Abdulfattah 3f09575740 get the invitee info from the db 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-07-25 06:09:35 +02:00
Fawzi E. Abdulfattah 9f45bce55f Fixing #3583 - create team membership to return added person name and email 
Signed-off-by: Fawzi E. Abdulfattah <iifawzie@gmail.com>
 2022-07-23 01:51:58 +02:00
fogelito 0816dd15f9 remove comments 2022-07-14 16:12:44 +03: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 29436c1e5f Datetime change for joined and invited 2022-07-07 10:44:28 +03:00
fogelito ae4cb685c0 expire 2022-07-05 21:55:20 +03:00
fogelito acba505144 addCookie timestamp 2022-07-05 21:24:10 +03:00