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
Matej Bačo
32cc186ea6
Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal
2024-01-22 08:17:52 +00:00
loks0n
3112a82dce
test: fix authTest
2024-01-17 12:18:35 +00:00
loks0n
bc1858c516
chore: do not auto create accounts in users endpoints
2024-01-17 11:03:04 +00:00
Matej Bačo
98d84a6887
Fix unit tests
2024-01-15 14:53:37 +00:00
Jake Barnby
7795301772
Fix unit tests
2024-01-09 15:21:43 +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
Matej Bačo
554e9f93b6
Implement max password length
2024-01-02 10:59:35 +00:00
prateek banga
fd4a81c4fc
made review changes
2023-10-25 23:03:23 +05:30
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
loks0n
1343d4851a
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-23 09:10:57 +01:00
prateek banga
161bbfb822
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 14:55:17 +05:30
shimon
0e2cf14e12
minor fix
2023-10-16 18:17:13 +03:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
shimon
002fc19d60
tests fix
2023-10-10 21:02:24 +03:00
loks0n
bd83c16ae7
test: null token type case
2023-10-10 10:02:32 +01:00
Prateek Banga
d5cc214546
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x
2023-10-06 03:44:36 +05:30
shimon
6d60b0bd8c
sync with 1.4
2023-10-03 11:40:34 +03:00
shimon
c4bd6e008e
Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.env
app/cli.php
app/config/collections.php
app/console
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
app/init.php
app/worker.php
app/workers/audits.php
app/workers/builds.php
app/workers/certificates.php
app/workers/databases.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
bin/worker-usage
composer.json
composer.lock
docker-compose.yml
src/Appwrite/Event/Delete.php
src/Appwrite/Event/Mail.php
src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Prateek Banga
350549db7d
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-14 02:17:34 +05:30
Prateek Banga
851afae29a
change test provider to authProviders
2023-09-13 00:50:16 +05:30
Binyamin Yawitz
b37c2658ec
Adding the functions.* test for the base event
2023-09-11 23:56:30 -04:00
Binyamin Yawitz
5cb03da001
Extracting function event validator to its own class.
2023-09-11 23:24:11 -04:00
Steven Nguyen
65e2e79457
Fix create execution request filter from previous SDK version
...
When an older SDK executes a function without passing any data, the
data param is unset/null so we need to make sure to handle that case.
2023-09-04 16:10:49 -07:00
Jake Barnby
6f775a2411
Review updates
2023-08-22 19:14:23 -04:00
Jake Barnby
02f8e7796d
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
2023-08-22 17:20:50 -04:00
Jake Barnby
9476c064c6
Fix test
2023-08-22 17:17:42 -04:00
Jake Barnby
360935fd28
Apply suggestions from code review
2023-08-22 14:13:37 -04:00
Jake Barnby
c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
...
# Conflicts:
# app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby
e7d5d25263
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4.x-response-filters
...
# Conflicts:
# app/controllers/api/proxy.php
2023-08-22 13:37:03 -04:00
Steven Nguyen
a012a42008
Create 1.4 request filters
2023-08-21 11:52:03 -07:00
Steven Nguyen
0a0a5e9f04
Create 1.4 response filter
2023-08-21 11:48:48 -07:00
shimon
e86286e7e3
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
...
Conflicts:
composer.lock
2023-08-20 18:07:57 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
Matej Bačo
efe3793679
PR review changes, fix node test
2023-08-19 20:26:47 +02:00
Khushboo Verma
00f6785818
Addressed PR comments
2023-08-18 12:25:44 +05:30
Matej Bačo
b9d790224f
Fix missing model
2023-08-09 13:29:56 +02:00
Christy Jacob
82a206d808
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-08-08 16:48:59 +00: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
Christy Jacob
e493551f8a
Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data
2023-07-20 01:44:25 +04:00
Christy Jacob
cd57da8ead
fix: update tests
2023-07-20 01:42:42 +04:00
Eldad A. Fux
6bf6bc7dc3
Merge pull request #5743 from appwrite/feature-restrict-project-id-chars
...
Restrict characters for project ID
2023-07-18 18:06:01 +03:00
Torsten Dittmann
74308b445e
Merge pull request #5587 from appwrite/feat-user-labels
...
Add a new labels attribute to the Users collection
2023-07-18 14:59:18 +02:00
Christy Jacob
e0aa3db21e
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-07-11 19:36:37 +00:00
Damodar Lohani
f59d3563f4
Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync
2023-07-10 03:06:48 +00:00
Steven Nguyen
33f5cbeca6
Restrict characters for project ID
...
Only allow lowercase alphanumeric chars and hyphens
because the project ID is used as part of url
schemes to redirect users back to mobile apps
and certain characters are not allowed.
2023-06-23 16:22:42 -07:00
Christy Jacob
1980b8c677
Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into refactor-collections-config-db-pools
2023-06-15 14:30:27 +00:00
Christy Jacob
6853a44f03
feat: update tests
2023-06-15 11:06:04 +00:00
