CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-05 20:53:27 +13:00
Code Issues Projects Releases Wiki Activity
12257 commits 246 branches 446 tags 327 MiB
Commit graph

544 commits

Author SHA1 Message Date
Jake Barnby
e7298b13b0 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/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 18:26:30 +12:00
Damodar Lohani
6af467398b update usage labels 2022-08-21 02:04:52 +00:00
Jake Barnby
e4392bdbfb Merge fixes 
(cherry picked from commit 24875e352d)
 2022-08-19 17:12:20 +12:00
Jake Barnby
5f990ecb6d Fix imports 2022-08-19 16:28:40 +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
Damodar Lohani
db9faebcc9
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-18 16:04:19 +05:45
Damodar Lohani
4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +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
cc887beae9 sync with 0.16 2022-08-17 10:32:42 +03:00
shimon
2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
 2022-08-17 10:05:37 +03:00
Damodar Lohani
3bc0aa8dca fix merge issues 2022-08-17 02:35:55 +00: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
shimon
7ad7d1807e fill gaps from merge 2022-08-16 17:56:05 +03:00
shimon
5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03:00
Matej Bačo
1e96f8c3d9 Revert changes regarding AccountAPI createAccount 2022-08-16 12:05:46 +00:00
shimon
de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
shimon
923a741c5a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
 2022-08-16 12:47:51 +03:00
shimon
8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03: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
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
Damodar Lohani
34fd6763e1
Update app/controllers/api/account.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-16 11:14:55 +05:45
shimon
f091774afd fill gaps from merge 2022-08-15 20:04:23 +03:00
shimon
590c1467bc Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
 2022-08-15 18:19:59 +03:00
Eldad A. Fux
72e524963c
Update app/controllers/api/account.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-08-15 11:30:58 +03:00
Christy Jacob
7723c633a0 feat: fix tests 2022-08-15 13:24:54 +05:30
Christy Jacob
509f9083c9 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-15 12:43:24 +05:30
Eldad Fux
95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
Eldad Fux
bd77354926 Fixed test 2022-08-14 20:22:01 +03:00
Eldad Fux
22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03: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
Eldad Fux
2ed9199bf1 Added the ability to create a user with a phone number 2022-08-14 18:10:12 +03:00
Eldad Fux
b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
Eldad Fux
25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions 
Simplify Exception Creation
 2022-08-14 15:27:52 +03:00
Damodar Lohani
5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00:00
Christy Jacob
bb4693ddfc feat: update email session endpoint 2022-08-14 15:41:21 +05:30
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Christy Jacob
5296e61d35 feat: address issues on accounts controller 2022-08-13 20:45:19 +05:30
shimon
630954c94e some fixes 2022-08-13 17:55:27 +03:00
Christy Jacob
8b23dcd69e fix: update constructor, remove account entity, add missing ID error 2022-08-13 20:14:04 +05:30
shimon
51e3fc8cab some fixes 2022-08-13 12:59:34 +03:00
shimon
48b2fb0b36 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 2022-08-13 10:34:25 +03:00
shimon
cc9dad6bb8 Tidy up 2022-08-13 10:34:03 +03:00
Eldad Fux
3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Damodar Lohani
be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00:00
Bradley Schofield
d86e4ac0b6 Run Linter 2022-08-12 15:15:58 +01:00
Bradley Schofield
d9104ceced Update capitalisation on some names 2022-08-12 15:15:36 +01:00
Bradley Schofield
7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon
1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
shimon
90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00