1
0
Fork 0
mirror of synced 2024-08-04 13:01:45 +12:00
Commit graph

2865 commits

Author SHA1 Message Date
Torsten Dittmann
94b2db96c2 chore: run formatter 2022-06-03 11:12:19 +02:00
Torsten Dittmann
153ac5c60d Merge branch '0.15.x' of https://github.com/appwrite/appwrite into 0.15.x 2022-06-02 11:53:41 +02:00
Torsten Dittmann
3d297e825f
Merge pull request #3296 from stnguyen90/fix-2955-add-team-member-toast
Update success, loading, and error message for add team member
2022-06-01 16:24:45 +02:00
Torsten Dittmann
f1322175da
Merge pull request #3270 from stnguyen90/feat-3269-skip-service-check-for-server
Update service checks to ignore server app users
2022-06-01 16:23:27 +02:00
Shimon Newman
2bad41082b
Update projects.php 2022-06-01 17:23:05 +03:00
Shimon Newman
ad986fe852
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-06-01 17:14:26 +03:00
Shimon Newman
363c073839
Update app/controllers/api/projects.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-06-01 16:39:00 +03:00
shimon
cd5e6f2542 small fix 2022-06-01 15:36:04 +03:00
shimon
2d7bc4fb16 small fix 2022-06-01 14:31:03 +03:00
shimon
0c435b9c3b Merge remote-tracking branch 'origin/feat-expire-key' into feat-expire-key
# Conflicts:
#	app/controllers/api/projects.php
2022-06-01 13:11:24 +03:00
shimon
e782e4744f small fix 2022-06-01 13:09:53 +03:00
Shimon Newman
c31055f144
Update app/controllers/api/projects.php
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-06-01 12:55:35 +03:00
shimon
1a28c3a909 api keys, validation and test 2022-06-01 09:38:11 +03:00
shimon
d39e6a842c Merge branch 'master' of github.com:appwrite/appwrite into feat-expire-key
 Conflicts:
	app/controllers/general.php
2022-06-01 09:34:34 +03:00
shimon
8013276515 api keys, validation and test 2022-06-01 09:26:55 +03:00
Steven
4a87e73a45 Update success, loading, and error message for add team member
Remove text indicating invitations since no emails are sent when adding
a user via the Admin console.
2022-05-31 22:00:37 -07:00
Steven
ec1c4fd5c3 Bypass SMTP host check for admins adding team members
Since no email is sent when adding team members for admins, there shouldn't
be any need to check the SMTP host.
2022-05-31 20:50:19 -07:00
Steven Nguyen
f645c2ce53 Update service checks to ignore server app users 2022-05-31 20:42:41 -07:00
Torsten Dittmann
540738101f fix: error type 2022-06-01 00:09:23 +02:00
shimon
8bca5cd13e api keys 2022-05-31 18:41:12 +03:00
Everly Precia Suresh
c61dd1e261 remove unecessary semi colons 2022-05-31 14:24:01 +00:00
Everly Precia Suresh
95615416a6 formate function.php 2022-05-31 13:50:27 +00:00
Everly Precia Suresh
61c8cf5ccd Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter 2022-05-31 13:48:05 +00:00
Torsten Dittmann
fd58c57163
Merge pull request #3280 from appwrite/refactor-accounts
Refactor `account.php`
2022-05-31 15:47:39 +02:00
Everly Precia Suresh
1be5593d9d Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter 2022-05-31 13:40:43 +00:00
Torsten Dittmann
957ba08817
Merge pull request #3282 from appwrite/refactor-database
refactor `database.php`
2022-05-31 15:33:14 +02:00
Everly Precia Suresh
f1938f5151
update refactor
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-05-31 18:04:20 +05:30
Everly Precia Suresh
94e225411f update refacror 2022-05-31 12:33:13 +00:00
Everly Precia Suresh
318df0d3f3 Merge branch 'master' of https://github.com/appwrite/appwrite into introduce-formatter-and-linter 2022-05-31 11:55:30 +00:00
Torsten Dittmann
63092dd1fa
Merge pull request #3214 from appwrite/refactor-functions
Refactor `functions.php`
2022-05-31 13:51:54 +02:00
Everly Precia Suresh
f039fb36fc format newly added changes 2022-05-31 11:35:59 +00:00
Everly Precia Suresh
746dc72439 fix merge conflicts 2022-05-31 11:32:46 +00:00
Torsten Dittmann
60ffee2c5e
Merge pull request #3287 from appwrite/refactor-general
Refactor `general.php`
2022-05-31 13:15:56 +02:00
Everly Precia Suresh
e80ab77cab update refactor with changes 2022-05-31 11:11:55 +00:00
Everly Precia Suresh
f8fc5ca16c
remove ?
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-05-31 16:33:16 +05:30
Everly Precia Suresh
13f26a20d6 add string|array type to 2022-05-31 10:51:47 +00:00
Torsten Dittmann
103709eb8f
Merge pull request #3286 from appwrite/refactor-mock
Refactor `mock.php`
2022-05-31 12:29:06 +02:00
Torsten Dittmann
26b975597b
Merge pull request #3288 from appwrite/refactor-home
Refactor `home.php`
2022-05-31 11:21:27 +02:00
Torsten Dittmann
ce84dd1377
Merge pull request #3290 from appwrite/refactor-api
Refactor `api.php`
2022-05-31 11:04:39 +02:00
Torsten Dittmann
0fdd785ba9
Merge branch 'master' into refactor-functions 2022-05-31 10:54:03 +02:00
Torsten Dittmann
40724a5863
Merge pull request #3289 from appwrite/refactor-console
Refactor `console.php`
2022-05-31 10:53:17 +02:00
Torsten Dittmann
648644848a
Merge branch 'master' into refactor-mock 2022-05-31 10:37:55 +02:00
Torsten Dittmann
ff3292041f
Merge branch 'master' into refactor-database 2022-05-31 10:33:46 +02:00
Torsten Dittmann
61cf313d67
Merge branch 'master' into refactor-general 2022-05-31 10:33:12 +02:00
Torsten Dittmann
5bcaa5540f
Merge branch 'master' into refactor-home 2022-05-31 10:32:45 +02:00
Torsten Dittmann
016b5f540b
Merge branch 'master' into refactor-console 2022-05-31 09:49:51 +02:00
Torsten Dittmann
32928641a6
Merge branch 'master' into refactor-api 2022-05-31 09:45:59 +02:00
Torsten Dittmann
ca94367df6
Merge branch 'master' into refactor-web 2022-05-31 09:44:05 +02:00
Everly Precia Suresh
1fd7359fbb fix linter issues in app directory 2022-05-30 17:41:25 +00:00
Everly Precia Suresh
6bd7342d0e improve naming 2022-05-27 10:36:06 +00:00
Everly Precia Suresh
e6941e76a1 change param type from bool to string 2022-05-27 10:01:00 +00:00
Everly Precia Suresh
f9cfb5478e refactor general.php 2022-05-26 14:46:08 +00:00
Everly Precia Suresh
3c6bbb532f refactor mock.php 2022-05-26 14:02:31 +00:00
Everly Precia Suresh
05c9c47ff9 refactor home.php 2022-05-26 13:37:37 +00:00
Everly Precia Suresh
820589f5a2 refactor console.php 2022-05-26 13:23:49 +00:00
Everly Precia Suresh
d1e829f49a change type to array 2022-05-26 12:41:19 +00:00
Everly Precia Suresh
e845b2f3a6 refactor-api 2022-05-26 11:51:08 +00:00
Everly Precia Suresh
7f0ecf59d0 refactor web.php 2022-05-26 11:31:47 +00:00
Everly Precia Suresh
a2d243664b remove cname tests 2022-05-26 11:21:04 +00:00
Everly Precia Suresh
6ceef6a573 update refactor 2022-05-25 16:53:10 +00:00
Everly Precia Suresh
425d81256b rename audit to EventAudit 2022-05-25 13:49:32 +00:00
Everly Precia Suresh
8f624e115b refactor users.php 2022-05-25 13:36:25 +00:00
Everly Precia Suresh
fc6c546c88 refactor database 2022-05-25 12:10:10 +00:00
Everly Precia Suresh
eb6b8d408a update refactor 2022-05-24 15:04:28 +00:00
Everly Precia Suresh
07bf57b161 update refactor 2022-05-24 14:57:12 +00:00
Everly Precia Suresh
e2bd17d253 update refactor 2022-05-24 14:28:27 +00:00
Everly Precia Suresh
35e762453b pull latest 2022-05-24 14:04:55 +00:00
Everly Precia Suresh
107513c4c8 refactor func 2022-05-24 13:56:57 +00:00
Everly Precia Suresh
60a73c74a5 fix multi-line params in controllers 2022-05-23 16:42:27 +00:00
Everly Precia Suresh
7316e1c1ae fix multi-line params in account.php 2022-05-23 16:34:03 +00:00
Everly Precia Suresh
19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Everly Precia Suresh
722822dc31 refactor account.php 2022-05-18 16:14:21 +00:00
Torsten Dittmann
e63834b722
Merge pull request #3237 from appwrite/fix-main-domain
Fix: Main Domain
2022-05-18 15:25:52 +02:00
Matej Bačo
d8db5e5839 Ignore localhost as main domain 2022-05-18 08:31:54 +00:00
Christy Jacob
5463e62a6e feat: remove redundant order attributes validation 2022-05-18 04:36:24 +04:00
Matej Bačo
9bf7d9bda4 Added backwards compatibility (response&request) 2022-05-17 07:56:28 +00:00
Torsten Dittmann
ec1bfa0209 Merge branch 'feat-account-update-status' of https://github.com/appwrite/appwrite into feat-account-update-status 2022-05-16 12:34:20 +02:00
Torsten Dittmann
0aa8aad2a9 fix: remove wrongly placed remove 2022-05-16 12:34:14 +02:00
Torsten Dittmann
b1727b6d1c
Merge branch '0.14.x' into feat-account-update-status 2022-05-16 12:26:33 +02:00
Torsten Dittmann
bb0db796f7 feat: account update status 2022-05-16 11:58:17 +02:00
Torsten Dittmann
4621a150e4 fix: oauth2 verification 2022-05-16 11:34:00 +02:00
Everly Precia Suresh
eeb7ba120f add param types for vars and file 2022-05-14 10:11:38 +00:00
Everly Precia Suresh
6d3e4b3757 fix tests 2022-05-13 15:12:21 +00:00
Everly Precia Suresh
1b9e5bc086 fix tests 2022-05-13 15:05:10 +00:00
Everly Precia Suresh
1f139d9337 fix tests 2022-05-13 12:27:12 +00:00
Everly Precia Suresh
3e41a3a5f9 refactor functions.php 2022-05-13 12:05:42 +00:00
Torsten Dittmann
6d6361b672 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model-ui 2022-05-13 11:51:19 +02:00
Torsten Dittmann
49b6457384
Merge pull request #3213 from appwrite/feat-upgrade-hostname-validator
Feat: Upgrade hostname validator
2022-05-13 10:58:02 +02:00
Torsten Dittmann
5a9a967f35 fix: delete all sessions event 2022-05-12 21:31:15 +02:00
Matej Bačo
550b6475ef Upgrade hostname validator 2022-05-12 18:53:54 +00:00
Torsten Dittmann
158ecce959 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x 2022-05-12 20:41:04 +02:00
Torsten Dittmann
119506429f
Merge pull request #2947 from appwrite/feat-use-build-timeout
feat: use build timeout when building runtime
2022-05-12 20:23:11 +02:00
Torsten Dittmann
8fcc37e287
Merge pull request #3211 from appwrite/feat-api-user-memberships
feat(api): user memberships
2022-05-12 20:14:19 +02:00
Torsten Dittmann
6c9e17ec74 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-use-build-timeout 2022-05-12 19:57:20 +02:00
Torsten Dittmann
e69a22042c
Merge pull request #3113 from appwrite/feat-new-event-model
feat: new event model
2022-05-12 19:53:51 +02:00
Torsten Dittmann
4508158fe5 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-use-build-timeout 2022-05-12 19:18:31 +02:00
Torsten Dittmann
32b55a901a
Merge pull request #2981 from appwrite/feat-https-redirect-exception
Feat: HTTPs Redirection Exception
2022-05-12 19:04:59 +02:00
Torsten Dittmann
dfcae6eb4c
Merge pull request #3047 from appwrite/fix-bucket-size-update
Fix: Bucket Size Update
2022-05-12 19:04:21 +02:00
Torsten Dittmann
9455a7c573
Merge pull request #3144 from appwrite/feat-array-limits
Feat: Array API limits
2022-05-12 19:03:29 +02:00
Torsten Dittmann
b82010c167
Merge pull request #3124 from appwrite/fix-wildcard-hostname-new
Feat: Wildcard hostname
2022-05-12 18:35:42 +02:00
Torsten Dittmann
76689b4b30
Merge pull request #3187 from appwrite/fix-check-oauth-email-verification
Fix check oauth email verification
2022-05-12 18:26:00 +02:00
Torsten Dittmann
47ef1c9038 whitespace fixes 2022-05-12 18:25:36 +02:00
Torsten Dittmann
54530b9c0d fix: remove unused phpdocs 2022-05-12 16:26:12 +02:00
Torsten Dittmann
086a242904 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-12 16:01:01 +02:00
Torsten Dittmann
bf0506ecc7 feat: add user memberships endpoint 2022-05-12 15:20:06 +02:00
Matej Bačo
3efb904151 Prevent unnecessary SSL jobs 2022-05-12 10:56:25 +00:00
Torsten Dittmann
784844b03e Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-11 19:04:31 +02:00
Matej Bačo
8bb3418f7c Merge remote-tracking branch 'origin/0.14.x' into feat-certificate-refactor 2022-05-11 14:12:38 +00:00
Torsten Dittmann
0525d2cc7b fix: remove eventData 2022-05-10 15:52:55 +02:00
Torsten Dittmann
8012de5c4d fix: rename webhook event header to plural 2022-05-10 14:13:53 +02:00
Torsten Dittmann
0bd62bf4f8 fix: payload duplicates 2022-05-10 14:08:40 +02:00
Matej Bačo
30dfba6238 Bug fix 2022-05-10 10:30:44 +00:00
Matej Bačo
cd236bd3ff Merge remote-tracking branch 'origin/0.14.x' into fix-bucket-size-update 2022-05-10 10:28:32 +00:00
Matej Bačo
d3560ea91b PR review changes 2022-05-10 10:28:16 +00:00
Torsten Dittmann
57246b14d7 fix: add missing teams update audit 2022-05-09 14:57:42 +02:00
Torsten Dittmann
fdb64de616 docs: add comments to events passing 2022-05-09 14:36:29 +02:00
Torsten Dittmann
fdd16e44c6 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-09 09:12:06 +02:00
Matej Bačo
f28597bc17 Fix wording 2022-05-09 06:43:37 +00:00
Matej Bačo
ea4c1b9f9f Merge branch '0.14.x' into feat-sessions-subquery 2022-05-08 19:36:59 +00:00
Torsten Dittmann
c2d11aab7e fix: magic url email verification 2022-05-08 21:35:28 +02:00
Matej Bačo
4c642b99c5 Merge remote-tracking branch 'origin/0.14.x' into feat-sessions-subquery 2022-05-08 18:50:41 +00:00
Torsten Dittmann
2a2af79723
Merge pull request #2732 from appwrite/fix-unindexed-sort-attributes
Use validator on order attributes
2022-05-08 20:43:59 +02:00
Torsten Dittmann
3692ff0bf6
Merge branch '0.14.x' into feat-use-build-timeout 2022-05-08 20:42:36 +02:00
Torsten Dittmann
2396b2f1e6 Merge branch 'feat-new-event-model' of https://github.com/appwrite/appwrite into feat-new-event-model-ui 2022-05-08 17:51:55 +02:00
Torsten Dittmann
18379c25b8 fix: merge issues 2022-05-08 17:49:17 +02:00
Torsten Dittmann
33414b58b1 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-08 17:25:01 +02:00
Torsten Dittmann
3990ef7fa2 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x 2022-05-08 17:15:25 +02:00
Torsten Dittmann
773e6d0415 style: fix some styles 2022-05-08 17:10:56 +02:00
Torsten Dittmann
40fbc7aa60
Merge pull request #3156 from appwrite/feat-user-tokens-subquery
Feat: User tokens subcollection
2022-05-08 17:09:49 +02:00
Torsten Dittmann
9c88906c7e
Merge pull request #3184 from appwrite/fix-team-user
Fix: Team User Creation
2022-05-08 16:47:01 +02:00
Torsten Dittmann
f5844df97b
Merge branch 'master' into feat-user-tokens-subquery 2022-05-08 16:39:24 +02:00
Torsten Dittmann
df1f8735a9
Merge pull request #3158 from appwrite/feat-user-memberships-subquery
Feat: User membership subquery
2022-05-08 16:35:33 +02:00
Torsten Dittmann
2cc2a40377 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-08 15:11:14 +02:00
Christy Jacob
726b71ae3b feat: create new account if email not verified 2022-05-07 19:43:55 +04:00
Eldad A. Fux
157db4c522
Merge pull request #3171 from appwrite/refactor-teams
Refactor `teams.php`
2022-05-07 06:38:09 +03:00
Eldad A. Fux
80c9e87a3a
Merge pull request #3175 from appwrite/refactor-code
Refactor `storage.php`
2022-05-07 06:36:53 +03:00
Everly Precia Suresh
f3608dd4fe refactor projects.php 2022-05-06 16:51:02 +00:00
Everly Precia Suresh
a2091a2572 retrigger build 2022-05-06 15:12:11 +00:00
Everly Precia Suresh
8c4b035dd7 update storage.php with optional parameters 2022-05-06 13:33:44 +00:00
Matej Bačo
cc1ddc87d9 Fix tema user creation 2022-05-06 11:03:41 +00:00
Torsten Dittmann
809767401e sync ui 2022-05-06 10:49:37 +02:00
Everly Precia Suresh
ceea134579 fix file param 2022-05-04 13:00:12 +00:00
Everly Precia Suresh
5b72d9d48d change file type 2022-05-04 12:49:35 +00:00
Everly Precia Suresh
4e8d9a1da7 refactor storage.php 2022-05-04 12:23:34 +00:00
Torsten Dittmann
af9150def9 feat: dedicated webhook page 2022-05-04 13:29:50 +02:00
Everly Precia Suresh
65a246bd21 add type for locale 2022-05-04 09:51:48 +00:00
Jake Barnby
cdefbef05c
Remove redundant flags 2022-05-04 18:48:04 +12:00
Everly Precia Suresh
20b4119ee9 add primitive types to params 2022-05-03 13:21:25 +00:00
Eldad A. Fux
c7a9fd4cb7
Merge pull request #3168 from appwrite/refactor-code
Refactor `health.php`
2022-05-03 15:34:12 +03:00
Everly Precia Suresh
76cd825112 refactor teams.php 2022-05-03 11:57:26 +00:00