Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-18 14:38:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
12067 commits 1250 branches 495 tags 497 MiB
Commit graph

316 commits

Author SHA1 Message Date
Damodar Lohani
d4f02402bd Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 10:38:16 +00:00
shimon
e94c7eba83 more audit labels on users new routes 2022-08-17 13:01:16 +03: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
88f6a67802 sync with 0.16 2022-08-17 10:36:38 +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
Matej Bačo
7a1dfbfb8d Fix passwordUpdate time for non-pass users 2022-08-16 15:56:54 +00:00
Matej Bačo
2814a6f680 Linter fix 2022-08-16 13:03:38 +00:00
Matej Bačo
3088535806 Added phone number to UsersAPI createUser + tests 2022-08-16 13:02:28 +00:00
shimon
de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
shimon
beaad6c49d fill gaps from merge 2022-08-16 13:19:38 +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
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
shimon
9770f10a8c fill gaps from merge 2022-08-15 20:33:44 +03:00
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
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 A. Fux
340cfb0104
Update app/controllers/api/users.php 2022-08-14 20:01:32 +03:00
Eldad Fux
7d83f9d644 Removed import path 2022-08-14 19:29:07 +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 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
shimon
630954c94e some fixes 2022-08-13 17:55:27 +03:00
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
Damodar Lohani
02074a93ef remove unused import 2022-08-13 04:55:42 +00:00
Bradley Schofield
83c1129ed5 Add TODO Warning 2022-08-12 17:01:25 +01:00
Bradley Schofield
930120fc4d
Update app/controllers/api/users.php 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-08-12 16:55:58 +01:00
Bradley Schofield
7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon
b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
Damodar Lohani
e666ae2b2e fix users usage endpoint 2022-08-11 02:11:31 +00:00
Damodar Lohani
5647f957a7 users metrics via route labels 2022-08-11 01:43:02 +00:00
Damodar Lohani
16fe9e241a Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-10 01:49:27 +00:00
shimon
d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Damodar Lohani
bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
shimon
62ef532801 leftovers 2022-08-08 17:32:54 +03:00
Matej Bačo
15b5df10a4 Fix search attribute regarding phone number 2022-07-28 09:36:08 +00:00
Bradley Schofield
3c808ca895 Fix problem with Exception class 2022-07-26 15:56:59 +01:00
Bradley Schofield
96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
Matej Bačo
dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
Torsten Dittmann
e83cf382fd fix: all sdks and specs 2022-06-28 13:21:28 +02:00
Matej Bačo
5a10a9494f
Update SCrypt tests 2022-06-24 14:30:39 +02:00
Matej Bačo
d9a88515bc Merge remote-tracking branch 'origin/0.15.x' into feat-password-hash-algos 2022-06-21 14:03:19 +00:00
Torsten Dittmann
48177e8d03 docs: update new phone docs 2022-06-20 16:47:49 +02:00
Matej Baco
62ec121a5e Improved docs 2022-06-17 11:25:28 +02:00
Matej Bačo
0aaee54a63 Fix snake_case 2022-06-16 09:21:35 +00:00
Torsten Dittmann
1eb91bc91e feat: add ui for phone authentication 2022-06-14 17:41:58 +02:00