prateek banga
92e587769a
resolve merge conflicts
2023-08-16 15:16:45 +05:30
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Matej Bačo
75e66e675b
Move oauth secret to identity
2023-08-10 01:02:13 +02:00
Bradley Schofield
d001f14249
Add Service Account Role Assignment
2023-08-09 23:46:23 +01:00
Khushboo Verma
ced6eed6fa
Add urls in deployment details
2023-08-09 23:05:23 +05:30
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-09 18:08:40 +01:00
Steven Nguyen
c7c546bfe7
Add a secrets attribute to the identities collection
...
These secrets can be used to store data from the provider that may or
may not be sensitive.
For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.
This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 09:01:51 -07:00
Bradley Schofield
1135060681
Start work on identities implementation
2023-08-09 16:18:17 +01:00
Steven Nguyen
14b84ed9e6
Add a secrets attribute to the identities collection
...
These secrets can be used to store data from the provider that may or
may not be sensitive.
For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.
This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 08:15:44 -07:00
Khushboo Verma
e267349a88
Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration
2023-08-09 16:33:49 +05:30
Khushboo Verma
056b7120a6
Add additional information to deployments
2023-08-09 16:24:46 +05:30
Matej Bačo
a60b54f434
Use identities table
2023-08-09 11:52:34 +02:00
Bradley Schofield
47ebf77ff0
Continue work on OAuth Firebase last stage
2023-08-08 20:28:38 +01:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-08 08:34:01 -07:00
Bradley Schofield
f0477a7f2b
Move collections and update redirect sig
2023-08-08 14:36:44 +01:00
Bradley Schofield
f4cbcb1383
Re-Add collections
2023-08-08 13:45:33 +01:00
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
Bradley Schofield
91c82f0d7d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations
2023-08-07 16:09:28 +01:00
prateek banga
9057a50a10
rename provider param in config
2023-08-07 15:54:00 +05:30
Matej Bačo
345df3f2ca
More QA fixes
2023-08-06 12:30:38 +02:00
Matej Bačo
e60456cfda
QA after merge with 1.4
2023-08-06 10:51:53 +02:00
Matej Bačo
906f86fbb8
Merge branch 'cloud-1.4.x' into feat-git-integration
2023-08-06 09:31:32 +02:00
Matej Bačo
8a9f3f1b54
Update build to use 1 logs attribute
2023-08-05 16:50:28 +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
cb7abdb906
Remove identity status
...
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-04 15:07:36 -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
Bradley Schofield
8f5d79e668
Move to new branch
2023-08-04 17:21:41 +01:00
Steven Nguyen
b8e22151f6
Remove identity status
...
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-02 15:37:22 -07:00
Steven Nguyen
a235024268
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-02 15:36:06 -07:00
prateek banga
2d33681a0b
add collections to config file
2023-08-02 20:28:30 +05:30
Matej Bačo
c7605b85e0
Remove vcs prefix
2023-07-30 21:10:25 +02:00
Matej Bačo
c3cef56e39
Bug fixing after QA
2023-07-30 15:12:55 +02:00
Matej Bačo
280b2fc994
Rename repositories and installation IDs
2023-07-30 11:51:13 +02:00
Matej Bačo
a718f09f74
Update execution model, add detection to repository
2023-07-30 09:17:23 +02:00
Matej Bačo
2e177873c0
Update execution response model
2023-07-29 18:20:20 +02:00
Matej Bačo
22f638e6aa
rename vcsRepos to vcsRepositories
2023-07-29 18:04:43 +02:00
Matej Bačo
37c0cc122a
More PR review changes
2023-07-28 10:27:16 +02:00
Matej Bačo
ce98b04348
Address PR reviews
2023-07-28 09:56:07 +02:00
Matej Bačo
7e386b885c
Upgrade console, reword commands into 1 param
2023-07-21 13:52:14 +02:00
Steven Nguyen
2befa60350
Track a user's last activity
...
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.
To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
2023-07-19 22:22:58 -07:00
Torsten Dittmann
500cfdb4c9
fix: remove hotp support for now
2023-07-19 14:40:59 +02:00
Damodar Lohani
8dc5c2cb4c
Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp
2023-07-19 07:24:58 +00: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
shimon
d282dbf787
usage collections fix
2023-07-12 16:02:42 +03:00
Damodar Lohani
57bdf56c3d
fix schedules collections
2023-07-11 02:12:28 +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
8258d70b78
Update user's search attribute using database filter
...
Using a database filter is the cleanest approach because it ensures
the logic is applied whenever the user is updated regardless of
whichever endpoint was used.
2023-07-05 12:17:47 -07:00
Matej Bačo
f4da8079e2
Improve VCS indexes
2023-07-01 08:46:21 +02:00
Matej Bačo
c6e491f2ed
Support for external contributors
2023-06-28 10:48:10 +02:00
Torsten Dittmann
1f46d03e8c
feat: initial mfa implementation
2023-06-22 15:35:49 +02:00
Matej Bačo
cc06a4bdaa
log streaming, locking GH comments, execution headers, locale header, redeploy logic
2023-06-22 12:59:41 +02:00
Matej Bačo
a174562c4e
vcs.createRepository()
2023-06-18 13:38:37 +02:00
Matej Bačo
5237e24739
VCS integration edge cases fix
2023-06-17 12:07:30 +02:00
Damodar Lohani
7eaa5f1e35
fix errors
2023-06-15 01:23:46 +00:00
Jake Barnby
10f06226d3
Make error optional
2023-06-15 13:05:37 +12:00
Jake Barnby
1604b339dd
Merge remote-tracking branch 'origin/1.4.x' into add-error-attribute
...
# Conflicts:
# CHANGES.md
# app/workers/databases.php
# composer.json
# composer.lock
2023-06-15 12:26:29 +12:00
Damodar Lohani
c25e014be1
refactor collections config
2023-06-15 00:20:18 +00:00
Matej Bačo
5e221e285f
Update naming convention, add new VCS endpoints, support silent mode and rootDirectory
2023-06-07 17:50:32 +02: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
shimon
a6768bdc32
saving file output to cache instead of decoding data to json
2023-05-31 14:41:56 +03:00
Matej Bačo
f53d75205b
Implement branches endpoint, rename some attributes, update response models
2023-05-26 00:29:08 +02:00
Khushboo Verma
df17c8a3dc
Add production branch as param in updateFunction
2023-05-23 16:04:38 +05:30
Matej Bačo
18105d4999
Remove repository owner
2023-05-22 15:02:55 +02:00
Matej Bačo
612af6edf0
Update dependencies, fix bugs
2023-05-22 13:29:35 +02:00
Matej Bačo
6e515e3cc4
Copy Khushboo's integration from feat-peach-q1-kh
2023-05-22 12:58:13 +02:00
Bishwajeet Parhi
40f70faa89
Feat: Add enable param in Database and Collection
2023-05-18 18:55:22 +05:30
Matej Bačo
998c2749cb
Merge branch 'feat-db-pools-master' into feat-executor-v3
2023-05-11 21:59:49 +02:00
shimon
1e29ec8d59
added bucketInternalId to file
2023-05-08 10:32:29 +03:00
Damodar Lohani
d394715b56
Merge remote-tracking branch 'origin/master' into feat-custom-smtp
2023-04-13 01:35:56 +00:00
Matej Bačo
5389afc80e
Add build & install commands
2023-03-28 15:21:42 +02:00
Jake Barnby
0797df8414
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2
...
# 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
2023-03-25 15:32:55 +13:00
Christy Jacob
5f10ff4d3b
Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools-sync
2023-03-24 06:35:30 +00:00
Matej Bačo
e8b11b2d14
Fix scheduler
2023-03-19 10:43:57 +01:00
fogelito
00c1418246
Update response Model.php
2023-03-16 13:48:27 +02:00
Matej Bačo
75f935601e
Add function entrypoint
2023-03-16 11:07:15 +01:00
Matej Bačo
a4b31f6472
Fix after merge
2023-03-15 09:20:25 +01:00
Matej Bačo
d10c7c7775
Merge branch 'feat-db-pools-master' into feat-executor-v3-sync
2023-03-15 08:59:42 +01:00
fogelito
31fad24603
collections.php
2023-03-14 15:20:56 +02:00
Matej Bačo
c01fcb130c
Merge branch 'feat-db-pools-master' into feat-db-pools-sync
2023-03-14 12:58:54 +01:00
Matej Baco
e7351f4eec
Add logs to rules
2023-03-13 13:35:34 +00:00
fogelito
9c4b269669
update collections.php with options
2023-03-13 12:59:01 +02:00
Matej Bačo
1f409b4e40
Shared variables
2023-03-11 17:06:02 +01:00
Matej Baco
2d25514dd8
Improve 409 rule error; update console
2023-03-10 13:36:31 +00:00
Matej Baco
4b0d6d9826
Bug fixes after proxy QA
2023-03-10 12:20:24 +00:00
Damodar Lohani
f1adf61337
project attribute update for templates
2023-03-09 13:43:59 +00:00
Damodar Lohani
dbcc70607a
smtp attribute for project
2023-03-09 01:58:59 +00:00
Matej Bačo
83370c21f7
Improve error logs
2023-03-08 20:50:51 +01:00
Matej Bačo
59f5978fa3
Implement rules
2023-03-08 19:30:01 +01:00
Torsten Dittmann
496da61cd9
feat: team preferences
2023-03-06 19:54:02 +05:30
Matej Bačo
69aa59a1d6
Add more log details to execution
2023-02-27 11:24:21 +01:00
Matej Bačo
d7c5d8bb46
Remove response body & headers
2023-02-27 11:20:37 +01:00
Matej Bačo
464f88634c
Add function logging toggle
2023-02-24 10:24:20 +01:00
Matej Bačo
068acef0f6
Add unique url generator
2023-02-22 16:07:34 +01:00
Damodar Lohani
6b6f9edbd6
Merge branch '1.3.x' into feat-13x-master-sync
2023-02-21 07:38:46 +05:45
Matej Bačo
20bc1ab00e
Merge remote-tracking branch 'origin/feat-db-pools' into feat-executor-v3
2023-02-14 11:16:28 +00:00
Matej Bačo
e4d784c871
Add new V3 parameters
2023-02-14 11:01:38 +00:00
shimon
5850a454e0
addressing comments
2023-02-05 22:07:46 +02:00
Matej Bačo
75c7d94633
Implement Open Runtimes v3 support
2023-02-02 19:21:00 +00:00
shimon
a30dfd284c
addressing comments
2023-02-02 18:36:32 +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
0ac5e293b6
add internalId to collections
2022-12-25 14:13:52 +02:00
shimon
586c7fac7c
add internalId to collections
2022-12-25 14:07:54 +02:00
shimon
f3dcd6a79f
add internalId to collections
2022-12-25 13:06:25 +02:00
shimon
b89e04f561
add internalId to collections
2022-12-22 19:18:54 +02:00
shimon
5e394fed5d
refactor usage worker
2022-12-21 21:03:09 +02:00
shimon
c6b3fb39b1
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats
...
Conflicts:
app/console
app/workers/builds.php
docker-compose.yml
src/Appwrite/Usage/Stats.php
2022-12-21 09:58:22 +02:00
Christy Jacob
ff9bccf1ff
Revert "Feat: Build output size"
2022-12-20 18:26:56 +05:30
Matej Bačo
8f363eae7a
Fix bugs
2022-12-18 08:35:16 +01:00
Matej Bačo
ab68bb4ea1
Merge branch 'feat-db-pools' into feat-build-size
2022-12-18 08:21:41 +01:00
Matej Bačo
c5da386d67
PR review changes
2022-12-18 08:20:50 +01:00
Damodar Lohani
0eae73e7b8
fix: password comparison
2022-12-18 06:27:41 +00:00
Christy Jacob
90e93f3255
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools
2022-12-16 15:42:40 +00:00
Damodar Lohani
8e7b89ec03
feat: check password history
2022-12-16 10:22:39 +00:00
fogelito
f96128e14f
Changing Id
2022-12-14 17:42:25 +02:00
shimon
961c408885
metric negative / positive values in worker
2022-12-14 09:34:04 +02:00
shimon
06aee565a8
addressing comments
2022-12-13 13:46:53 +02:00
shimon
141d55bd36
build+functions worker
2022-12-13 09:35:05 +02:00
Matej Bačo
fe27670e1f
New attribute + migration
2022-12-12 13:39:43 +01:00
shimon
0348472345
usage cleanup
2022-12-11 19:15:38 +02:00
Matej Bačo
4dfaa5e69a
Fix mimetype size
2022-12-05 14:54:13 +00:00
Eldad Fux
db345fae41
WIP
2022-11-24 09:53:52 +02:00
Christy Jacob
080abbbb79
Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console
2022-11-17 20:26:10 +05:30
Bradley Schofield
3c71164741
Merge branch '1.1.x' into feat-implement-session-length-api
2022-11-14 15:30:38 +00:00
Bradley Schofield
43d4d6fec3
Address Eldad's Comments
2022-11-14 09:57:37 +00:00
shimon
745ae7a4c8
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-scheduler
2022-11-10 20:07:32 +02:00
shimon
aef565c8ff
addressing comments
2022-11-10 18:40:12 +02:00
Christy Jacob
1d4afd2f6c
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-mysql-test
2022-11-07 16:45:28 +05:30
shimon
ef7b53fbc7
queue
2022-11-06 23:41:33 +02:00
shimon
ed505fba7c
queue
2022-11-06 15:10:26 +02:00
Bradley Schofield
4dfafd1169
Merge branch 'master' into feat-implement-session-length-api
2022-11-04 16:11:38 +00:00
Bradley Schofield
e1f9a8e0ce
Clean up a couple things and fix tests
2022-11-04 14:48:29 +00:00
Eldad Fux
1ff53bc82a
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-fixes-for-pools
2022-11-04 07:26:35 +02:00
shimon
bc631d926e
ticker
2022-11-04 07:12:08 +02:00
Everly Precia Suresh
e869debc76
resolve merge conflicts
2022-11-03 15:20:20 +00:00
Bradley Schofield
4b8287c097
Remove 'expire' from sessions
2022-11-03 15:03:39 +00:00
Christy Jacob
b2d884e329
Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x
2022-11-01 22:21:19 +05:30
Bradley Schofield
cddacfbb78
Handle Eldad's Comments
2022-11-01 14:43:18 +00:00
Christy Jacob
4331e1ef03
feat: update PR
2022-11-01 04:55:13 +00:00
Christy Jacob
a6499e34a3
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-mysql-test
2022-11-01 04:52:07 +00:00
fogelito
bf119867e8
change name back to original 'name' 2048
2022-10-31 17:17:37 +02:00
Bradley Schofield
d34359fd49
Implement Variable Session Duration
2022-10-31 14:54:15 +00:00
Eldad Fux
8e492a9797
Tests
2022-10-28 17:45:16 +03:00
fogelito
a5e67db604
fulltext
2022-10-26 23:12:46 +03:00
fogelito
08e44f0656
some changes
2022-10-26 22:14:39 +03:00
Everly Precia Suresh
943a334277
review comments
2022-10-26 17:01:16 +00:00
Everly Precia Suresh
3c8b74628d
revert unnecessary commit
2022-10-25 19:42:19 +00:00
Everly Precia Suresh
17251b1973
initial implementation
2022-10-25 17:37:07 +00:00
Christy Jacob
2d6a00e56f
Merge branch 'feat-mysql-test' of github.com:appwrite/appwrite into feat-db-pools
2022-10-25 19:26:23 +05:30
Christy Jacob
ca602199da
feat: update mysql changes
2022-10-25 13:42:30 +00:00
fogelito
1b776f7fdc
some changes
2022-10-20 23:59:00 +03:00
Christy Jacob
6bfb76b620
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools
2022-10-18 07:57:34 +00:00
Eldad Fux
7484656be3
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools-eldad
2022-10-15 22:08:16 +03:00
Christy Jacob
1a9c4e3756
fix: mysql indexes issue
2022-10-06 18:41:15 +05:30
Christy Jacob
12b1ecfcf9
feat: mysql support
2022-10-04 17:04:42 +05:30
Matej Bačo
a883d3728f
Allow teamId queries on listProjects
2022-10-03 07:16:49 +00:00
Torsten Dittmann
fbbb150e86
Revert "Merge pull request #4041 from appwrite/revert-3789-feat-app-region"
...
This reverts commit 2117fa53f0
, reversing
changes made to c634d12ef4
.
2022-09-30 14:22:11 +02:00
Torsten Dittmann
e0b9f57d85
Revert "Feat app region"
2022-09-30 12:32:58 +02:00
Christy Jacob
3b802e9ba6
Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools
2022-09-27 20:59:50 +05:30
Damodar Lohani
e80e65946b
Merge branch 'master' of https://github.com/appwrite/appwrite into feat-app-region
2022-09-19 12:01:56 +00:00
Matej Bačo
20bbbfc493
Merge remote-tracking branch 'origin/0.16.x' into fix-function-scheduling
2022-09-13 20:14:42 +00:00
Matej Bačo
640b5abe1e
PR review changes
2022-09-13 20:13:48 +00:00
Christy Jacob
efbe21d433
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into matej-qa-3
2022-09-13 18:21:44 +00:00
Matej Bačo
a315f43039
Fix functon scheduling loop logic, and double-loop prevention
2022-09-11 12:20:26 +00:00
Christy Jacob
cb50220b60
feat: rename time attribute to duration
2022-09-09 16:02:04 +04:00
Matej Bačo
b41aaefc7e
Implement 'enabled' attribute for functions
2022-09-09 08:49:18 +00:00
Damodar Lohani
3beacf0263
add region to usage documents
2022-09-09 06:13:12 +00:00
Damodar Lohani
fafef03512
region attribute on project
2022-09-08 04:53:46 +00:00
Christy Jacob
e5a9195e66
Merge pull request #3736 from appwrite/refactor-cache-date
...
Refactor cache date
2022-08-31 19:00:36 +02:00
Matej Bačo
a85a471d3b
Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2
2022-08-31 13:33:18 +00:00
Damodar Lohani
8fe365d66e
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support
2022-08-31 13:21:45 +00:00
shimon
f7da33a873
Merge branch '0.16.x' of github.com:appwrite/appwrite into refactor-cache-date
2022-08-31 16:09:42 +03:00
Matej Bačo
dccb9b7291
Merge remote-tracking branch 'origin/0.16.x' into fix-ui-with-queries-v2
2022-08-31 12:38:40 +00:00
Matej Bačo
d5997d92c3
Updated all UI components for new queries V2. introduced queries to listProjects
2022-08-31 12:30:16 +00:00
shimon
bc786cdb86
Merge branch '0.16.x' of github.com:appwrite/appwrite into refactor-cache-date
2022-08-31 10:42:55 +03:00
Matej Bačo
0897cd0fe4
Merge branch '0.16.x' into feat-variables-api
2022-08-31 09:37:47 +02:00
Damodar Lohani
63f95c0a5c
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support
2022-08-31 02:55:26 +00:00
Christy Jacob
fe8295c2ec
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys
2022-08-30 17:35:46 +00:00
Damodar Lohani
5666002ff2
compression attribute on bucket collection
2022-08-30 12:52:53 +00:00
shimon
69066cfc5e
timestamp -> datetime on file cache
2022-08-30 15:44:37 +03:00
Matej Bačo
6df1d35712
PR review changes
2022-08-30 07:30:23 +00:00
Matej Bačo
dca0b211f6
Implement queries into list variables
2022-08-26 13:38:39 +00:00
Matej Baco
8513bb2dbe
Merge branch 'feat-list-endpoints-queries' into feat-variables-api
2022-08-25 11:14:42 +02:00
Matej Bačo
b1dfd94d49
Add indexes for internal queries
2022-08-24 18:41:26 +00:00
Matej Bačo
cb6a186c5d
PR review changes
2022-08-24 15:07:18 +00:00
Steven
fe0b778fac
Add indexes to users collection
2022-08-19 21:10:15 +00: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
Christy Jacob
dbd7afeda0
feat: update default values
2022-08-19 09:58:11 +00:00
Christy Jacob
74a5bd2556
feat: update default values
2022-08-19 09:54:26 +00:00
Christy Jacob
e104f553cb
feat: use datetime filters for acessedAt
2022-08-19 09:41:22 +00:00
Christy Jacob
f09cce93ee
feat: use datetime filters for acessedAt
2022-08-19 09:37:35 +00:00
Christy Jacob
2a750eaa73
Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys
2022-08-19 09:32:22 +00:00
Christy Jacob
278afd77c0
Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys
2022-08-19 09:20:08 +00:00
Jake Barnby
cb6fc7f618
Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
...
# Conflicts:
# .gitignore
# app/config/collections.php
# app/controllers/api/account.php
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# app/controllers/api/users.php
# composer.lock
# tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12: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
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
Eldad A. Fux
69a4f51d58
Merge pull request #3656 from appwrite/feat-functions-console-logs
...
Functions Console Logs Capture
2022-08-16 23:23:53 +03:00
fogelito
f1d186d6ae
filters for collections
2022-08-15 18:03:03 +03:00
shimon
df0bdeb8a3
some fixes
2022-08-15 16:55:11 +03:00