CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-02 10:16:27 +13:00
Code Issues Projects Releases Wiki Activity
12116 commits 243 branches 442 tags 324 MiB
Commit graph

360 commits

Author SHA1 Message Date
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
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
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
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
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00: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
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
fogelito
0816dd15f9 remove comments 2022-07-14 16:12:44 +03:00
fogelito
45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
fogelito
f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
fogelito
29436c1e5f Datetime change for joined and invited 2022-07-07 10:44:28 +03:00
fogelito
ae4cb685c0 expire 2022-07-05 21:55:20 +03:00
fogelito
acba505144 addCookie timestamp 2022-07-05 21:24:10 +03:00
fogelito
8628105eef Model changes 2022-07-04 12:55:11 +03: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