 wess
|
9a88909e24
|
resolve conflicts from master
|
2022-11-16 11:30:43 -05:00 |
|
|
wess
|
9ee4792bd1
|
Fixes up conflicts
|
2022-11-15 10:04:52 -05:00 |
|
 Torsten Dittmann
|
9f384e016f
|
Merge branch '1.1.x' of https://github.com/appwrite/appwrite into feat-console-rewrite
|
2022-11-09 15:47:23 +01:00 |
|
|
Torsten Dittmann
|
a2570f5568
|
chore: update composer
|
2022-11-09 15:34:26 +01:00 |
|
|
wess
|
69c37a72be
|
Comment out HTTPTest cause torsten told me to
Updates some tests with sleep to ensure workers have created things, like attributes
Updated init.php to use new mongo driver/mongo adapter setup
|
2022-11-04 10:23:08 -04:00 |
|
|
wess
|
5763a3901a
|
Getting mongo working
|
2022-11-02 14:39:36 -04:00 |
|
 Christy Jacob
|
b2d884e329
|
Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x
|
2022-11-01 22:21:19 +05:30 |
|
 fogelito
|
1e92bda18b
|
composer changes
|
2022-10-31 16:50:54 +02:00 |
|
|
fogelito
|
eaf59693b7
|
composer.json
|
2022-10-31 15:26:40 +02:00 |
|
|
Torsten Dittmann
|
0049a76565
|
feat: submodule
|
2022-10-31 09:53:36 +01:00 |
|
|
Torsten Dittmann
|
d387f198db
|
Merge branch 'master' of https://github.com/appwrite/appwrite into rebase-1.1.x
|
2022-10-31 09:45:51 +01:00 |
|
|
fogelito
|
08e44f0656
|
some changes
|
2022-10-26 22:14:39 +03:00 |
|
|
wess
|
e0a1cdb886
|
Adds mongo adapter and client (specifically) where required
Updates tests to do in_array with map isntead of index specifics
Updates Dockerfile for update instead of install because _composer_
|
2022-10-26 11:27:23 -04:00 |
|
|
wess
|
5f5c9d7a27
|
fixe for composer
|
2022-10-19 10:53:46 -04:00 |
|
|
wess
|
26ac039ae3
|
Testing mongo/db
|
2022-10-19 09:09:02 -04:00 |
|
 Damodar Lohani
|
f27ccf4212
|
upgrade database version
|
2022-10-14 11:40:59 +00:00 |
|
|
Torsten Dittmann
|
788abad42e
|
chore: upgrade utopia-php/framework
|
2022-10-14 12:44:52 +02:00 |
|
|
wess
|
e68fabc135
|
Merging from master
|
2022-10-07 10:54:24 -04:00 |
|
 Jake Barnby
|
5c6caf5603
|
Update to messaging lib to tagged release
(cherry picked from commit 580eafffd2a90fb9dccc4554ac9ce388864f1e8d)
# Conflicts:
# composer.lock
|
2022-10-03 13:29:24 +13:00 |
|
|
Jake Barnby
|
2bb8854f61
|
WIP integrate messaging library
(cherry picked from commit 9a25f77e3e7e76f6c93cc3ce1985f43426a0debf)
# Conflicts:
# app/workers/messaging.php
# src/Appwrite/SMS/Adapter/Mock.php
# tests/e2e/Services/Account/AccountCustomClientTest.php
|
2022-10-03 13:28:30 +13:00 |
|
|
Jake Barnby
|
7c3732e277
|
Update SDK generator version
|
2022-09-22 21:23:51 +12:00 |
|
|
Christy Jacob
|
a0910a7f58
|
chore: update sdk generator
|
2022-09-22 08:39:20 +05:30 |
|
|
wess
|
2a022a34a5
|
that
|
2022-09-15 13:21:24 -04:00 |
|
|
wess
|
a86dff030c
|
Merge remote-tracking branch 'origin/master' into feat-experiment-mongo
|
2022-09-15 13:21:15 -04:00 |
|
|
Christy Jacob
|
0b767c15a6
|
feat: update examples
|
2022-09-14 14:41:08 +05:30 |
|
|
Christy Jacob
|
2634c5ae19
|
feat: update specs and platforms
|
2022-09-06 21:21:07 +04:00 |
|
|
Jake Barnby
|
95c5d7eb39
|
Update db + abuse + audit
|
2022-09-06 21:11:31 +12:00 |
|
|
Jake Barnby
|
02f54eca65
|
Fix tests
|
2022-09-06 13:02:32 +12:00 |
|
|
Jake Barnby
|
27af4e3b7c
|
Merge remote-tracking branch 'origin/0.16.x' into fix-write-permission-not-allowed
# Conflicts:
# composer.lock
|
2022-09-06 12:28:57 +12:00 |
|
|
Christy Jacob
|
cc124bf211
|
feat: update for 1.0.0-RC1
|
2022-09-05 20:11:55 +04:00 |
|
|
Jake Barnby
|
a861b174a2
|
Add allowed permissions tests
|
2022-09-05 14:16:40 +12:00 |
|
|
Christy Jacob
|
06603e53ca
|
feat: udpate sdk version
|
2022-09-04 21:43:15 +04:00 |
|
|
Christy Jacob
|
73bae25a3f
|
update sdk versions
|
2022-09-01 11:16:17 +00:00 |
|
|
Damodar Lohani
|
0129209eb0
|
storage version update
|
2022-08-31 09:37:58 +00:00 |
|
|
Damodar Lohani
|
63f95c0a5c
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-additional-compression-support
|
2022-08-31 02:55:26 +00:00 |
|
|
Damodar Lohani
|
5fa7d34757
|
zstd compression support on endpoints
|
2022-08-30 13:46:55 +00:00 |
|
|
Christy Jacob
|
25d9c8e501
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-improve-keys
|
2022-08-27 20:03:15 +00:00 |
|
|
Jake Barnby
|
cab456aaff
|
Update database, audit, abuse
|
2022-08-27 22:09:49 +12:00 |
|
|
Jake Barnby
|
e989735e89
|
Remove permissions processor
|
2022-08-23 13:42:25 +12:00 |
|
|
Christy Jacob
|
2a750eaa73
|
Merge branch 'refactor-permissions-inc-console-fix' of https://github.com/appwrite/appwrite into feat-improve-keys
|
2022-08-19 09:32:22 +00:00 |
|
|
Christy Jacob
|
278afd77c0
|
Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-improve-keys
|
2022-08-19 09:20:08 +00:00 |
|
|
Jake Barnby
|
cb6fc7f618
|
Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
# .gitignore
# app/config/collections.php
# app/controllers/api/account.php
# app/controllers/api/databases.php
# app/controllers/api/storage.php
# app/controllers/api/users.php
# composer.lock
# tests/e2e/Services/Account/AccountCustomClientTest.php
|
2022-08-19 16:49:34 +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 |
|
|
fogelito
|
093a8be8a3
|
composer updates
|
2022-08-17 18:20:26 +03:00 |
|
|
fogelito
|
ae5163c813
|
tags changes
|
2022-08-17 17:38:40 +03:00 |
|
 shimon
|
a4c0d89d55
|
sync with 0.16
|
2022-08-17 11:19:31 +03:00 |
|
|
Christy Jacob
|
d2305a7900
|
feat: update abuse library
|
2022-08-16 20:45:55 +00:00 |
|
|
fogelito
|
78b0b24c25
|
composer changes for audit abuse
|
2022-08-16 10:45:16 +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 |
|
|
Damodar Lohani
|
94d9bb8a18
|
Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-functions-console-logs
|
2022-08-16 04:42:03 +00:00 |
|