1
0
Fork 0
mirror of synced 2024-07-04 06:00:53 +12:00
Commit graph

20050 commits

Author SHA1 Message Date
Jake Barnby f5aebe6673
Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log
Fix missing user activity logs
2024-02-12 23:04:20 +13:00
fogelito e5bada0493 typo 2024-02-12 12:03:31 +02:00
fogelito 2ef59134a0 Merge branch '1.5.x' of github.com:appwrite/appwrite into attributes-query-fix 2024-02-12 12:00:26 +02:00
fogelito adbe11fd50 fix Indexes 2024-02-12 11:55:45 +02:00
Jake Barnby dd7ac27f11
Merge pull request #7570 from appwrite/feat-support-label-queries
Feat support label queries
2024-02-12 22:46:38 +13:00
Jake Barnby e2f71cbf3a
Merge pull request #7557 from appwrite/create-array-index
Hardcode size and orders for Json Key Indexes
2024-02-12 22:27:15 +13:00
shimon 70effd1e99 Sync against main 2024-02-12 11:14:26 +02:00
shimon e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
Jake Barnby 862f20479d
Merge pull request #7568 from appwrite/chore-merge-main
Merge main
2024-02-12 22:08:13 +13:00
shimon 6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby b9b0df9492
Update sleep for flaky test 2024-02-12 18:54:36 +13:00
Jake Barnby ac8bddb10d
Update sleep for flaky test 2024-02-12 18:41:32 +13:00
Jake Barnby 8ed2b1f3a5
Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby 3ba6652be8
Only set schedule active is status is scheduled 2024-02-12 16:55:34 +13:00
Jake Barnby f237e863de
Throw on updating sent, processing, failed message 2024-02-12 16:55:00 +13:00
Jake Barnby dd8fd2e394
Allow querying on labels attribute 2024-02-12 16:10:28 +13:00
Jake Barnby 2059de5dea
Fix test 2024-02-12 15:40:11 +13:00
Jake Barnby bb264bef23
Increase sleep for flaky test 2024-02-12 15:17:50 +13:00
Jake Barnby 272b9fecd7
Update lock 2024-02-12 15:15:42 +13:00
Jake Barnby 560e458fa0
Merge pull request #7567 from appwrite/fix-spec-use-cloud-endpoint-by-default
PEA-334 - Fix spec use cloud endpoint by default
2024-02-12 15:12:44 +13:00
Jake Barnby 05884e154e
Update telesign credentials 2024-02-12 15:10:18 +13:00
Jake Barnby f2efe9ca72
Merge remote-tracking branch 'origin/1.5.x' into fix-template-enum-seperation
# Conflicts:
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-latest-console.json
2024-02-12 15:03:51 +13:00
Damodar Lohani 869d3c9809 fix url 2024-02-12 01:27:20 +00:00
Jake Barnby 809f5a019f
Merge remote-tracking branch 'origin/1.5.x' into chore-merge-main 2024-02-12 14:22:43 +13:00
Damodar Lohani 545a5ee126 set default endpoint and host name for specs. 2024-02-12 01:21:28 +00:00
Jake Barnby be761b31c1
Update image lib 2024-02-12 14:21:06 +13:00
Jake Barnby 18f7168160
Merge main 2024-02-12 14:18:19 +13:00
Eldad A. Fux eb75b527ad
Merge pull request #7560 from appwrite/update-x-example-format
Update place holders from [PARAM_NAME] to <PARAM_NAME>
2024-02-11 23:04:42 +01:00
Damodar Lohani d4ad369a7e
Merge pull request #7563 from appwrite/fix-user-deletion
PEA-233-prevent console user deletion before deleting their team
2024-02-11 16:04:59 +05:45
Damodar Lohani eb7e2fd23b fix injection 2024-02-11 09:46:39 +00:00
Damodar Lohani 36eabfa2dd fix check twice 2024-02-11 09:45:36 +00:00
Damodar Lohani 2634c928c7 fix format 2024-02-11 09:34:13 +00:00
Damodar Lohani e462d73f65 prevent user with active team, from deletion 2024-02-11 09:31:09 +00:00
Christy Jacob e2baefe8c6
Merge pull request #7500 from appwrite/fix-account-delete
PEA-233-prevent console user deletion before deleting their team
2024-02-11 14:52:24 +05:30
Damodar Lohani 4ffde8e827
fix indentation 2024-02-11 14:55:14 +05:45
Damodar Lohani 57a695367b
fix typo 2024-02-11 14:54:32 +05:45
Damodar Lohani 681688e252
fix rename 2024-02-11 14:52:54 +05:45
Damodar Lohani a8718bccb5
fix rename 2024-02-11 14:42:21 +05:45
Damodar Lohani eba03cb126
Update app/config/errors.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:32 +05:45
Damodar Lohani 622bdb7b2b
Update app/config/errors.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:25 +05:45
Damodar Lohani c8720805c7
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:19 +05:45
Christy Jacob fdb11af6bb
Merge pull request #7561 from appwrite/update-team-counts
Update team counts
2024-02-11 12:15:05 +05:30
shimon b09386727b Usage logs text update 2024-02-10 10:34:44 +02:00
Christy Jacob f3e8994bb8 fix: use atomic operations for updating team count 2024-02-09 23:21:17 +05:30
Christy Jacob fb68dcc89e fix: use atomic operations for updating team count 2024-02-09 23:20:37 +05:30
Christy Jacob 5abcb86fd7 fix: use atomic operations for updating team count 2024-02-09 23:18:18 +05:30
Christy Jacob ff93957922
Merge pull request #7503 from appwrite/usage-queue-poc
Usage queue poc
2024-02-09 20:12:40 +05:30
Torsten Dittmann 7f8449b54a chore: update console 2024-02-09 15:37:13 +01:00
shimon 179a045399 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.lock
2024-02-09 16:29:26 +02:00
Bradley Schofield 0f3a1c3762 Merge branch 'main' into 1.5.x-response-request-models 2024-02-09 12:36:02 +00:00