1
0
Fork 0
mirror of synced 2024-09-09 22:27:06 +12:00
Commit graph

13420 commits

Author SHA1 Message Date
Christy Jacob
8e99c44c59 Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 20:39:20 +05:30
Eldad A. Fux
32be6d6816
Merge pull request #4282 from appwrite/doc-unique-id
Update Unique ID references in docs from magic string to ID.unique()
2022-11-02 15:39:46 +02:00
Christy Jacob
360a51ec20 Merge branch '1.1.x' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 10:16:27 +05:30
Christy Jacob
e9239717d7 Merge branch 'master' of github.com:appwrite/appwrite into sync-1.2.x 2022-11-02 10:16:16 +05:30
Christy Jacob
be642762b3
Merge pull request #4611 from appwrite/fix-missing-deployment-attributes
Fix get deployment
2022-11-02 08:05:10 +05:30
Christy Jacob
c074731615
Merge pull request #4590 from rskbansal/master
fixed grammatical and spelling errors
2022-11-02 07:38:45 +05:30
Jake Barnby
0827d59f21
Merge remote-tracking branch 'origin/1.1.x' into fix-missing-deployment-attributes
# Conflicts:
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-02 13:33:10 +13:00
Christy Jacob
f95145b796
Merge pull request #4620 from appwrite/sync-1.1.x
Sync 1.1.x
2022-11-02 02:14:32 +05:30
Vincent (Wen Yu) Ge
a8a23fb8eb Merge branch 'master' into doc-unique-id 2022-11-01 17:53:48 +00:00
Christy Jacob
bf34af86ac Merge branch '1.0.x' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:24:53 +05:30
Christy Jacob
b2d884e329 Merge branch 'master' of github.com:appwrite/appwrite into 1.1.x 2022-11-01 22:21:19 +05:30
Christy Jacob
5ea19cd539
Merge pull request #3848 from appwrite/refactor-remove-beta
Remove beta tag from Android, Kotlin, Apple and Swift
2022-11-01 12:35:56 +05:30
Christy Jacob
622c852367
Merge pull request #4584 from appwrite/test-mysql-adapter
Test mysql adapter
2022-11-01 02:11:54 +05:30
Christy Jacob
256046cba7
Merge pull request #4614 from appwrite/update-db-library
feat: update database library
2022-10-31 23:41:15 +05:30
Christy Jacob
629c1b1686 Merge branch 'test-mysql-adapter' of github.com:appwrite/appwrite into update-db-library 2022-10-31 23:38:58 +05:30
Christy Jacob
a450089fe7
Update composer.json 2022-10-31 20:51:32 +05:30
fogelito
bf119867e8 change name back to original 'name' 2048 2022-10-31 17:17:37 +02:00
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
ae288ffc9b
Merge pull request #4613 from appwrite/rebase-1.1.x
rebase: 1.1.x
2022-10-31 13:59:12 +01:00
Christy Jacob
aff7c59097 feat: update database library 2022-10-31 12:02:51 +00:00
Torsten Dittmann
983f885b3f fix: builds worker buildTime 2022-10-31 12:47:41 +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
Jake Barnby
dad4e3a2f4
Update changelog 2022-10-31 18:19:55 +13:00
Jake Barnby
2bfbf4acaf
Add check to tests 2022-10-31 18:17:13 +13:00
Jake Barnby
049e3a2646
Add missing status, buildStdout, buildStderr to getDeployment 2022-10-31 18:11:55 +13:00
Eldad A. Fux
1b0abf4643
Merge pull request #3836 from appwrite/gewenyu99-patch-1
Update Chinese README-CN.md
2022-10-30 10:09:39 +02:00
Eldad A. Fux
68d31d4ac7
Merge pull request #4555 from appwrite/feat-4535-remove-pdo-rethrow
Remove PDO rethrow
2022-10-29 17:15:19 +03:00
Vincent (Wen Yu) Ge
afa508cbed undo changes in swagger files 2022-10-28 20:45:13 +00:00
Rhythm Bansal
572e5d5f93
Update hi.json 2022-10-27 14:49:58 +05:30
Rhythm Bansal
569c5644fa
Update hi.json 2022-10-27 14:43:59 +05:30
Rhythm Bansal
b5a61d949b
fixed grammatical and spelling errors 2022-10-27 14:42:08 +05:30
fogelito
a5e67db604 fulltext 2022-10-26 23:12:46 +03:00
fogelito
013f4d55c2 docker-compose.yml 2022-10-26 23:07:04 +03:00
fogelito
8e8801b11c adapter change 2022-10-26 23:05:25 +03:00
fogelito
08e44f0656 some changes 2022-10-26 22:14:39 +03:00
Torsten Dittmann
eb31bfb78e
Merge pull request #4418 from appwrite/feat-deployment-buildtime
Add build time to deployments
2022-10-26 18:42:53 +02:00
Torsten Dittmann
32f2333ab6 test: mysql adapter 2022-10-26 16:38:40 +02:00
Christy Jacob
73bce1d7d0
Merge pull request #4309 from appwrite/fix-update-docker-compose
fix: docker compose syntax
2022-10-26 09:48:06 +05:30
Steven Nguyen
719aa67afa
Remove PDO rethrow
The PDOException was rethrown in general.php so that it could be caught
in the catch block of http.php. However, [a change in
utopia-php/framework](9d37326851)
caused the exception to be masked as an Exception rather than the
underlying PDOException. As such, the `$th instanceof PDOException` in
http.php is always false and `$db = null` is never executed. Since these
snippets of code aren't doing anything or adding value, they should be
removed.

In addition, the `$db = null` may have been added to ensure the
connection was added back to the pool and/or reset if needed, but it
seems like that's not a problem anymore.
2022-10-25 10:05:52 -07:00
Eldad A. Fux
4942ba9951
Merge pull request #4569 from appwrite/fix-spec-tests
Fix spec tests
2022-10-25 10:41:18 +03:00
Jake Barnby
1f49985d26
Remove var dumps 2022-10-25 19:38:31 +13:00
Jake Barnby
e2a63c10a1
Fix spec tests 2022-10-25 12:37:19 +13:00
Torsten Dittmann
461c12c7fe
Merge pull request #3701 from appwrite/feat-oauth-improvements
Feat: OAuth improvements
2022-10-24 17:57:40 +02:00
Eldad A. Fux
04066af992
Merge pull request #4277 from appwrite/feat-phone-examples
Add meaningful phone number to generated examples.
2022-10-22 12:42:31 +03:00
Vincent (Wen Yu) Ge
9a1f54baf1
Merge branch 'master' into doc-unique-id 2022-10-21 17:43:52 -04:00
Eldad A. Fux
61d6b435b3
Merge pull request #4530 from appwrite/feat-bump-api-specs
Update API specs
2022-10-19 09:28:13 +03:00
Bradley Schofield
60e924b62b Run Linter 2022-10-19 02:50:48 +01:00
Bradley Schofield
fe4028f588 Add tests and add buildTime to worker 2022-10-19 02:43:40 +01:00
Steven Nguyen
080116cff8 Update API specs 2022-10-18 21:05:54 +00:00