1
0
Fork 0
mirror of synced 2024-07-26 16:55:55 +12:00
Commit graph

128 commits

Author SHA1 Message Date
Matej Bačo 7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
fogelito a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Jake Barnby 8cfd194cc0
Fix user tests 2024-01-22 23:29:41 +13:00
Matej Bačo 311e9a75dd Allow empty values in PATH user service 2024-01-20 09:43:31 +00:00
loks0n bc1858c516 chore: do not auto create accounts in users endpoints 2024-01-17 11:03:04 +00:00
loks0n 6bf82c3dc5 test: fix user token test 2024-01-15 11:30:54 +00:00
Jake Barnby 5044c0cafa
Fix users tests 2024-01-09 16:43:39 +13:00
loks0n 5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
loks0n 8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +00:00
prateek banga ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
shimon c9a4eb0a49 tests fix 2023-11-26 22:57:57 +02:00
prateek banga 88f228c106 review changes 2023-11-21 15:11:09 +05:30
prateek banga 7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
loks0n df0271c56a chore: rename to 'custom' sessions 2023-11-02 13:22:10 +00:00
loks0n c39426745c test: fix create custom session params 2023-11-02 13:15:29 +00:00
prateek banga f5aa226b57 fix test 2023-10-26 00:02:22 +05:30
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
loks0n a67ca55af5 fix: use queueForEvents in users 2023-10-23 11:32:09 +01:00
loks0n 07286e5864 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-13 11:05:22 +01:00
loks0n 8ab429b92f feat: replace session confirmation endpoints 2023-10-12 14:38:32 +01:00
loks0n 8379551510 test: fix warning 2023-10-11 16:59:44 +01:00
loks0n 0332d35d9e test: e2e universal token 2023-10-11 14:21:20 +01:00
Prateek Banga bb52647366 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-10 19:06:39 +05:30
Jake Barnby aa1cf053f7
Add test ensuring no 500 on bad serach 2023-09-28 18:58:29 +13:00
prateek banga 1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +05:30
prateek banga c59887e8fb fixes issue in sub queries 2023-08-25 15:55:04 +05:30
prateek banga a95c29d546 lint fix 2023-08-24 01:55:08 +05:30
prateek banga ec54000263 adds test for target controllers 2023-08-24 01:54:25 +05:30
prateek banga ac33d7828f Revert "Pint linter ran"
This reverts commit bf5f0a8419.
2023-08-24 01:53:52 +05:30
wess bf5f0a8419 Pint linter ran 2023-08-23 13:12:43 -04:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Steven Nguyen d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Steven Nguyen 8400394857
Add an endpoint to update user labels 2023-06-09 10:18:51 -07:00
Steven Nguyen 85a40bf82d
Add a new labels attribute to the Users collection
This labels attribute can be used apply labels to users. These labels
can eventually be used:

* with permissions to grant access
* to filter users in the Users collection
2023-06-05 14:12:28 -07:00
Jake Barnby 47586fedb5
Remove invalid test 2023-03-24 23:09:49 +13:00
Jake Barnby 702000ac2f
Remove redundant test 2023-03-24 22:28:39 +13:00
Damodar Lohani 6b6f9edbd6
Merge branch '1.3.x' into feat-13x-master-sync 2023-02-21 07:38:46 +05:45
Damodar Lohani 5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
shimon 0f5b6665fa addressing comments 2023-02-05 23:06:32 +02:00
shimon 5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
fogelito c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
Damodar Lohani fe472e5b36 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history 2023-01-16 05:04:13 +00:00
shimon a0554ca91e usage test 2023-01-15 12:25:03 +02:00
shimon 9a2f734d3a compose.lock 2023-01-12 18:06:20 +02:00
Matej Bačo ccc9432219 Merge branch 'master' into fix-1.2.x-conflicts 2022-12-27 08:29:10 +01:00
shimon 44af531881 tests adjustments 2022-12-26 11:11:13 +02:00
Jake Barnby e86994b597
Add retries for flaky tests 2022-12-22 16:12:45 +13:00
Damodar Lohani 7a9b9f2710 remove test 2022-12-18 08:53:01 +00:00