Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
Matej Bačo
906f86fbb8
Merge branch 'cloud-1.4.x' into feat-git-integration
2023-08-06 09:31:32 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
27e212553d
Separate OAuth2 info from Sessions into Identities
...
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
Matej Bačo
8bc933ab91
Fix template issues
2023-08-04 10:56:46 +02:00
Matej Bačo
ac2ca267d7
Address more PR reviews
2023-07-31 08:47:47 +02:00
Steven Nguyen
5c3f96289d
Prevent Response from modifying the passed in doc
2023-07-19 22:21:21 -07:00
Khushboo Verma
6604a33e46
Add createRepositoryDetection endpoint
2023-06-14 00:34:22 +05:30
Matej Bačo
f53d75205b
Implement branches endpoint, rename some attributes, update response models
2023-05-26 00:29:08 +02:00
Matej Bačo
6e515e3cc4
Copy Khushboo's integration from feat-peach-q1-kh
2023-05-22 12:58:13 +02:00
Damodar Lohani
7419867078
new locale codes endpoint
2023-04-17 02:10:17 +00:00
Damodar Lohani
d394715b56
Merge remote-tracking branch 'origin/master' into feat-custom-smtp
2023-04-13 01:35:56 +00:00
Jake Barnby
7fe14ca10b
Merge remote-tracking branch 'origin/master' into sync-master
...
# 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
# app/console
# app/controllers/api/storage.php
# composer.lock
2023-04-12 00:50:31 +12:00
Damodar Lohani
b1778ff599
rename
2023-04-10 01:03:48 +00:00
Torsten Dittmann
3860602697
feat: console service
2023-03-31 17:14:59 +02:00
fogelito
00c1418246
Update response Model.php
2023-03-16 13:48:27 +02:00
fogelito
f255484fd4
Model relationship
2023-03-14 10:24:53 +02:00
Damodar Lohani
ae549a1e9a
tests and fixes
2023-03-14 07:21:56 +00:00
Damodar Lohani
c649ba897f
update response model
2023-03-13 09:33:11 +00:00
fogelito
ca3efdf562
create relation
2023-03-12 16:04:18 +02:00
Matej Baco
4b0d6d9826
Bug fixes after proxy QA
2023-03-10 12:20:24 +00:00
Damodar Lohani
1d3e0c19f8
error fixes
2023-03-10 11:04:11 +00:00
Damodar Lohani
83891f96eb
response models
2023-03-10 06:27:30 +00:00
Matej Bačo
59f5978fa3
Implement rules
2023-03-08 19:30:01 +01:00
Matej Bačo
11580a8a69
Update router for V3
2023-02-14 14:58:13 +01:00
Matej Bačo
e4d784c871
Add new V3 parameters
2023-02-14 11:01:38 +00:00
Damodar Lohani
f41e3b1e8f
Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync
2023-01-12 07:25:23 +00:00
Jake Barnby
2ee9f2607f
Remove redundant code
2022-12-21 19:15:42 +13:00
Jake Barnby
4de3289ebb
Remove redundant function
2022-12-07 19:29:24 +13:00
Christy Jacob
080abbbb79
Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console
2022-11-17 20:26:10 +05:30
Jake Barnby
e632731c4e
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
2022-10-27 12:24:57 +13:00
Torsten Dittmann
461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
...
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Jake Barnby
ce76fb58b1
Update request/response extensions for framework changes
2022-10-20 12:12:09 +13:00
Eldad Fux
65e004f145
Fixed health API and add new test endpoints
2022-10-17 14:43:57 +03:00
Jake Barnby
bf194c30e9
Review updates
2022-10-11 13:38:06 +13:00
Jake Barnby
e9f75d32a1
Merge remote-tracking branch 'origin/master' into feat-graphql-support
...
# Conflicts:
# Dockerfile
# app/config/errors.php
# app/config/roles.php
# 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
# app/controllers/api/graphql.php
# app/controllers/shared/api.php
# app/init.php
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Migration/Migration.php
2022-09-20 15:43:09 +12:00
Matej Baco
8513bb2dbe
Merge branch 'feat-list-endpoints-queries' into feat-variables-api
2022-08-25 11:14:42 +02:00
Jake Barnby
625608804e
Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
...
# 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
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# app/workers/builds.php
# src/Appwrite/Stats/Usage.php
# src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Bradley Schofield
0d81918685
Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api
2022-08-19 11:25:39 +01:00
Matej Bačo
61ab41bf86
Implement status of oauth providers, and refactor response models
2022-08-19 09:21:51 +00:00
Jake Barnby
7019be987c
Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
...
# 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
# app/controllers/api/account.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/workers/deletes.php
# composer.lock
# docker-compose.yml
# phpunit.xml
# src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
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
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
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
shimon
ab27e0a74d
some fixes
2022-08-14 18:01:34 +03:00
shimon
02f57cd69d
Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-file-cache-cleanup
...
Conflicts:
composer.lock
2022-08-13 18:45:29 +03:00
