Skip to content

Commit

Permalink
Update for Flarum 1.0
Browse files Browse the repository at this point in the history
Update emoji dependency and move license file
  • Loading branch information
clarkwinkelmann committed Jul 28, 2021
1 parent cb18008 commit 2df3bba
Show file tree
Hide file tree
Showing 7 changed files with 944 additions and 744 deletions.
1 change: 0 additions & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
MIT License

Copyright (c) 2019-2021 Clark Winkelmann
Emoji list Copyright (c) 2018 David Sevilla Martín

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "flarum-extension",
"license": "MIT",
"require": {
"flarum/core": "^0.1.0-beta.16",
"flarum/core": "^1.0",
"ext-json": "*"
},
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion js/dist/forum.js.map

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
"name": "@clarkwinkelmann/status",
"private": true,
"dependencies": {
"flarum": "^0.1.0-beta.16",
"flarum-webpack-config": "^0.1.0-beta.10",
"simple-emoji-map": "^0.3.0",
"webpack": "^4.26.0",
"webpack-cli": "^3.0.7"
"flarum-webpack-config": "^1.0",
"simple-emoji-map": "^0.4",
"webpack": "^4.0",
"webpack-cli": "^3.0"
},
"scripts": {
"dev": "webpack --mode development --watch",
Expand Down
1,651 changes: 916 additions & 735 deletions js/yarn.lock

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions resources/emojis/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2020 David Sevilla Martín

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion resources/emojis/all.json

Large diffs are not rendered by default.

0 comments on commit 2df3bba

Please sign in to comment.