From 185f7f9c677d13aa327757f2f094327b616ecca8 Mon Sep 17 00:00:00 2001 From: Luiz Marin <67489841+luizcmarin@users.noreply.github.com> Date: Fri, 3 May 2024 08:14:23 -0300 Subject: [PATCH 1/3] Update file --- CHANGELOG.md | 6 ++---- LICENSE.md | 6 +++--- README.md | 16 +++++++--------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2758f8ae7..562c113b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ -Yii Active Record Change Log -======================== +# Yii Active Record Change Log -3.0.0 under development ------------------------ +## 3.0.0 under development - Enh #40: Added public method `yii\data\ActiveDataProvider::prepareQuery()` for debug facilitation (GHopperMSK) - Enh #34: Adjustments to new DI and events replacements (fabriziocaldarelli) diff --git a/LICENSE.md b/LICENSE.md index 6a920d605..c48bcea79 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -5,13 +5,13 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -* Redistributions of source code must retain the above copyright + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of Yii Software nor the names of its + * Neither the name of Yii Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. diff --git a/README.md b/README.md index faec76866..0018213b1 100644 --- a/README.md +++ b/README.md @@ -148,11 +148,16 @@ final class Register - [Internals](docs/internals.md) -## Support - If you need help or have a question, the [Yii Forum](https://forum.yiiframework.com/c/yii-3-0/63) is a good place for that. You may also check out other [Yii Community Resources](https://www.yiiframework.com/community). +## License + +The Yii ActiveRecord Library is free software. It is released under the terms of the BSD License. +Please see [`LICENSE`](./LICENSE.md) for more information. + +Maintained by [Yii Software](https://www.yiiframework.com/). + ## Support the project [![Open Collective](https://img.shields.io/badge/Open%20Collective-sponsor-7eadf1?logo=open%20collective&logoColor=7eadf1&labelColor=555555)](https://opencollective.com/yiisoft) @@ -164,10 +169,3 @@ You may also check out other [Yii Community Resources](https://www.yiiframework. [![Telegram](https://img.shields.io/badge/telegram-join-1DA1F2?style=flat&logo=telegram)](https://t.me/yii3en) [![Facebook](https://img.shields.io/badge/facebook-join-1DA1F2?style=flat&logo=facebook&logoColor=ffffff)](https://www.facebook.com/groups/yiitalk) [![Slack](https://img.shields.io/badge/slack-join-1DA1F2?style=flat&logo=slack)](https://yiiframework.com/go/slack) - -## License - -The Yii ActiveRecord Library is free software. It is released under the terms of the BSD License. -Please see [`LICENSE`](./LICENSE.md) for more information. - -Maintained by [Yii Software](https://www.yiiframework.com/). From 87a97edb6d98fdfbae6ee7ed2fc66fa319c3cfaf Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Fri, 3 May 2024 15:09:29 +0300 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 562c113b0..7bd3c8c78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Yii Active Record Change Log -## 3.0.0 under development +## 1.0.0 under development - Enh #40: Added public method `yii\data\ActiveDataProvider::prepareQuery()` for debug facilitation (GHopperMSK) - Enh #34: Adjustments to new DI and events replacements (fabriziocaldarelli) From ec93ba2ed3486d47dd752b30213eadcbfcbb77b0 Mon Sep 17 00:00:00 2001 From: Sergei Predvoditelev Date: Fri, 3 May 2024 15:09:35 +0300 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0018213b1..4b3a8ba69 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ You may also check out other [Yii Community Resources](https://www.yiiframework. ## License -The Yii ActiveRecord Library is free software. It is released under the terms of the BSD License. +The Yii Active Record Library is free software. It is released under the terms of the BSD License. Please see [`LICENSE`](./LICENSE.md) for more information. Maintained by [Yii Software](https://www.yiiframework.com/).