Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add licences of vendor icon libraries #167

Merged
merged 20 commits into from
Dec 4, 2023
Merged

feat: Add licences of vendor icon libraries #167

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4245adc
Fix: Update locales and add floating options for images
fsbraun Nov 7, 2023
e66e618
Merge branch 'master' of github.com:fsbraun/djangocms-frontend
fsbraun Nov 7, 2023
cbaccdd
Merge branch 'master' of github.com:fsbraun/djangocms-frontend
fsbraun Nov 28, 2023
66e053e
fix: icons not showing in ckeditor
fsbraun Nov 28, 2023
fec0ece
Merge branch 'django-cms:master' into master
fsbraun Nov 28, 2023
49e4acc
Merge branch 'django-cms:master' into master
fsbraun Nov 28, 2023
a9ead97
Add image drag and drop
fsbraun Nov 28, 2023
9ac7126
Merge branch 'master' of github.com:fsbraun/djangocms-frontend
fsbraun Nov 28, 2023
f5f27b6
Update docs
fsbraun Nov 28, 2023
6d5fac4
Add tests
fsbraun Nov 28, 2023
18d60ab
Fix tests for v4
fsbraun Nov 28, 2023
44d5035
Bump version
fsbraun Nov 28, 2023
210cccd
Update changelog
fsbraun Nov 28, 2023
510494e
Merge branch 'django-cms:master' into master
fsbraun Nov 28, 2023
68e9776
Add icon vendor licences, remove icomoon and happy icons due to uncle…
fsbraun Dec 4, 2023
ac9b2d9
Add elegant icons upstream url
fsbraun Dec 4, 2023
71dc48a
Removed zondicons due to unclear licence, added all upstream links an…
fsbraun Dec 4, 2023
c73572f
Fix typo
fsbraun Dec 4, 2023
a8a20ab
Remove zondicons from config
fsbraun Dec 4, 2023
e01d9a3
Correct open iconic licence
fsbraun Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,17 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


This software package contains fonts under the following licenses which
may be used optionally in an installation of the software:

* ElegantIcons (MIT Licence https://www.elegantthemes.com/blog/resources/elegant-icon-font)
* feather-icons (MIT Licence https://github.com/feathericons/feather/blob/main/LICENSE)
* Fomantic UI icons (MIT Licence https://github.com/fomantic/Fomantic-UI/blob/develop/LICENSE.md)
fsbraun marked this conversation as resolved.
Show resolved Hide resolved
* Foundation icons (MIT Licence https://github.com/thecreation/standard-icons/blob/master/modules/foundation-icons/LICENSE)
* Open Iconic (MIT Licence https://github.com/iconic/open-iconic/blob/master/ICON-LICENSE)
* Tabler Icons (MIT Licence https://github.com/tabler/tabler-icons/blob/master/LICENSE)
* Weather Icons (SIL Open Font Licence https://openfontlicense.org)
fsbraun marked this conversation as resolved.
Show resolved Hide resolved
* ZondIcons (MIT Licence https://github.com/dukestreetstudio/zondicons/blob/master/LICENSE)

2 changes: 0 additions & 2 deletions djangocms_frontend/contrib/icon/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
"foundation-icons",
"elegant-icons",
"feather-icons",
"happy-icons",
"icomoon",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm hearing rumours that there is still something trying to load these.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any indications? They're still in the docs though...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I picked up this issue: django-cms/django-cms-quickstart#58 and traced the error back to this PR. Downgrading to 1.2.0 seems to resolve the bug. I have not gone deep into this yet, but I can still grep for files with the same name as those icon libraries: /djangocms_frontend/contrib/icon/static/djangocms_frontend/icon/vendor/assets/icons-libraries/icomoon.json (not sure if that's relevant at the moment).

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be related to my findings in #166 (comment) from about a month ago, id est that some files still reference the old icon sets.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stefan6419846 It is! Thank you! The css files reference the removed fonts which breaks whitenoise. I have removed the css files a month ago. This needs to go through the release process now!

The json files are staying, so that people fine with the iconset's license can use them more easily.

"open-iconic",
"tabler-icons",
"zondicons",
Expand Down
3,269 changes: 0 additions & 3,269 deletions ...contrib/icon/static/djangocms_frontend/icon/vendor/assets/fonts/happy-icons.svg
View file
Open in desktop

This file was deleted.

Binary file removed ...frontend/contrib/icon/static/djangocms_frontend/icon/vendor/assets/fonts/happy-icons.woff
View file
Open in desktop
Binary file not shown.
Binary file removed ...rontend/contrib/icon/static/djangocms_frontend/icon/vendor/assets/fonts/happy-icons.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed ...ocms_frontend/contrib/icon/static/djangocms_frontend/icon/vendor/assets/fonts/icomoon.eot
View file
Open in desktop
Binary file not shown.
501 changes: 0 additions & 501 deletions ...end/contrib/icon/static/djangocms_frontend/icon/vendor/assets/fonts/icomoon.svg
View file
Open in desktop

This file was deleted.

Binary file removed ...ocms_frontend/contrib/icon/static/djangocms_frontend/icon/vendor/assets/fonts/icomoon.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed ...cms_frontend/contrib/icon/static/djangocms_frontend/icon/vendor/assets/fonts/icomoon.woff
View file
Open in desktop
Binary file not shown.