Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,947 Commits 1,269 Branches 495 Tags
f52bfacf0ed41e1e84ed2f4643050b490ca424d7
Commit Graph

349 Commits

Author SHA1 Message Date
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
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
Christy Jacob 5b7b39a300 Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
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 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 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
Christy Jacob 979768fc9f Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-14 14:42:14 +05:30
Christy Jacob 70d2ebf55b feat: tests 2022-08-14 14:25:59 +05:30
Christy Jacob a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
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
shimon b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
shimon d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
shimon 2d7a2bb57f leftovers 2022-08-08 18:23:45 +03:00
shimon 62ef532801 leftovers 2022-08-08 17:32:54 +03:00
Bradley Schofield 43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01: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
Fawzi E. Abdulfattah 3f09575740 get the invitee info from the db 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-07-25 06:09:35 +02:00
Fawzi E. Abdulfattah 9f45bce55f Fixing #3583 - create team membership to return added person name and email 
Signed-off-by: Fawzi E. Abdulfattah <iifawzie@gmail.com>
 2022-07-23 01:51:58 +02:00
Torsten Dittmann e83cf382fd fix: all sdks and specs 2022-06-28 13:21:28 +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 511898afc9 Merge branch '0.15.x' of https://github.com/appwrite/appwrite into origin/feat-internal-id 2022-06-20 15:34:27 +02:00
Torsten Dittmann bbdf70ee90 feat: use new $createdAt and $updatedAt attributes 2022-06-15 14:46:52 +02:00
fogelito 0d1b1ddef6 Adding Account + teams + users Internal Ids to colleactions 2022-06-14 20:15:22 +03:00
Matej Bačo 0aaa5779ab Linter fixes 2022-06-14 11:08:54 +00:00
Matej Bačo 0d94e4c9ce Merge branch 'master' into feat-password-hash-algos 2022-06-10 08:03:09 +00: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
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
Everly Precia Suresh c61dd1e261 remove unecessary semi colons 2022-05-31 14:24:01 +00:00
Everly Precia Suresh 60a73c74a5 fix multi-line params in controllers 2022-05-23 16:42:27 +00:00
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Torsten Dittmann bb0db796f7 feat: account update status 2022-05-16 11:58:17 +02: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 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 9455a7c573 Merge pull request #3144 from appwrite/feat-array-limits 
Feat: Array API limits
 2022-05-12 19:03:29 +02:00
Torsten Dittmann bf0506ecc7 feat: add user memberships endpoint 2022-05-12 15:20:06 +02:00
Torsten Dittmann 57246b14d7 fix: add missing teams update audit 2022-05-09 14:57:42 +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 4c642b99c5 Merge remote-tracking branch 'origin/0.14.x' into feat-sessions-subquery 2022-05-08 18:50:41 +00: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 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
Matej Bačo cc1ddc87d9 Fix tema user creation 2022-05-06 11:03:41 +00:00