mirror of
https://github.com/flarum/core.git
synced 2025-08-15 12:54:47 +02:00
Compare commits
201 Commits
dw/less-fo
...
1236-user-
Author | SHA1 | Date | |
---|---|---|---|
|
4eaf9ae23f | ||
|
4d80700e97 | ||
|
8ad95a4dfb | ||
|
03faaaedef | ||
|
5c3a0e3e6e | ||
|
588f7498e1 | ||
|
8d1240559b | ||
|
7ad8eb7544 | ||
|
ebd2c69c8d | ||
|
637ae1624c | ||
|
0c9bcba3a6 | ||
|
5b3acfc0d9 | ||
|
7adfb5bd7e | ||
|
6b916065e9 | ||
|
f99f48b155 | ||
|
d2c345c834 | ||
|
966a093911 | ||
|
0560238945 | ||
|
63801484fa | ||
|
f8d92edc9a | ||
|
e1dbfa7d68 | ||
|
ef7623e4ff | ||
|
d7fd076220 | ||
|
30a2421749 | ||
|
1bf6e79b32 | ||
|
8aaa39bd4e | ||
|
b1e11830d1 | ||
|
3375f283eb | ||
|
df4c193ab7 | ||
|
5a8326f442 | ||
|
d8dd870efe | ||
|
60572b93fb | ||
|
810bfdc28f | ||
|
9c4a24b258 | ||
|
18462c079f | ||
|
10d6e653cb | ||
|
4e1f753f59 | ||
|
3c2dd23765 | ||
|
aebc23cba2 | ||
|
f6d03771cb | ||
|
54be9573ac | ||
|
bf46ea3840 | ||
|
bab49650e6 | ||
|
a789c6b4e9 | ||
|
3b3459ad3d | ||
|
223f4d93d4 | ||
|
5d1fe9b815 | ||
|
521834f5da | ||
|
622e2a6644 | ||
|
c5e38a5b1f | ||
|
9d2595d531 | ||
|
3526083320 | ||
|
82562294b7 | ||
|
51ae92f841 | ||
|
6448babaa5 | ||
|
f7feea496d | ||
|
75e624d7ca | ||
|
5a01b63c99 | ||
|
cae4a6eb45 | ||
|
36d6d79011 | ||
|
22c599b283 | ||
|
456f5095da | ||
|
0b3ce2e7d0 | ||
|
607eeb530d | ||
|
5f4efe3c66 | ||
|
fac61b5bce | ||
|
ea64de5952 | ||
|
ff6c407e53 | ||
|
c4ba13f608 | ||
|
cef46ec357 | ||
|
5788c7373e | ||
|
8fdd8a1089 | ||
|
dc31a0a076 | ||
|
29eb233dd1 | ||
|
f6e48fa054 | ||
|
1b5e8f221a | ||
|
f903487ef3 | ||
|
1da4b72eac | ||
|
55bdad55fc | ||
|
b603c7b336 | ||
|
a530c52fb4 | ||
|
f7dc716042 | ||
|
a72f87d7ee | ||
|
5dbe97630c | ||
|
23709a77a2 | ||
|
29a2c247a1 | ||
|
a7f97c14ec | ||
|
8fcd62955b | ||
|
618e91805f | ||
|
431ab9f3e8 | ||
|
4f06133d75 | ||
|
bf79f2474c | ||
|
1b74e43cb9 | ||
|
3643e2010b | ||
|
58299edc20 | ||
|
18774e0b10 | ||
|
86d890d043 | ||
|
ab0ba707e7 | ||
|
04b2cf4462 | ||
|
28e3ec4014 | ||
|
a6decb2350 | ||
|
1e55361539 | ||
|
e80f5429d0 | ||
|
108a23c1eb | ||
|
1dd329982a | ||
|
e0c2ef5e64 | ||
|
d654517c91 | ||
|
0232d949e9 | ||
|
6363753d0f | ||
|
0918b04fe2 | ||
|
929d7b87c1 | ||
|
544f687cf4 | ||
|
a7ed625d16 | ||
|
a67eca0c9e | ||
|
855dd2445a | ||
|
1a3d955b4f | ||
|
8db91e3395 | ||
|
d725012a84 | ||
|
5a03cd865a | ||
|
0a32a96207 | ||
|
1587d48e59 | ||
|
b750554011 | ||
|
db7e28d316 | ||
|
14e89546ca | ||
|
92642519d4 | ||
|
f779f4d092 | ||
|
7b73036441 | ||
|
8b628be507 | ||
|
51f4bcdcb0 | ||
|
47a528305b | ||
|
6121229c6f | ||
|
df7f1291a7 | ||
|
52e73b2481 | ||
|
d08f851c0b | ||
|
22b32bd601 | ||
|
6797770c75 | ||
|
4cab48c0fd | ||
|
f7222d7e20 | ||
|
53c728b184 | ||
|
1d525d0a78 | ||
|
301e571772 | ||
|
e7c12ce928 | ||
|
5d5ebc088e | ||
|
6e62240153 | ||
|
17d1942c5c | ||
|
e786e297ef | ||
|
2829618814 | ||
|
5875b31fd5 | ||
|
ae59bf549f | ||
|
d45bf04341 | ||
|
7f9588af62 | ||
|
17dfb58590 | ||
|
c5e3e26d07 | ||
|
5d768db6d2 | ||
|
6e089c12d4 | ||
|
5ddb843eb2 | ||
|
bbeacc0299 | ||
|
82480457ce | ||
|
685459c0bc | ||
|
347edcf2cd | ||
|
731a038f29 | ||
|
af5113eb7b | ||
|
ddfb2c1ec1 | ||
|
6cf3c1088d | ||
|
2f174edfd0 | ||
|
2c231aa475 | ||
|
1e5c7e54ee | ||
|
408043a203 | ||
|
9b449386d6 | ||
|
f1d9753aee | ||
|
54f733ca80 | ||
|
a737b98e7f | ||
|
80546b9ed7 | ||
|
9758dfac47 | ||
|
970c0f5604 | ||
|
42a7f2f586 | ||
|
3611fa1bb9 | ||
|
c881f9f633 | ||
|
0a22a66189 | ||
|
64b53fb0ac | ||
|
627724839d | ||
|
fa3915fa53 | ||
|
1948b7e6f4 | ||
|
4465e7648b | ||
|
aef56c055a | ||
|
dd3a4173a1 | ||
|
7c204c82ab | ||
|
12fff33763 | ||
|
603367a41a | ||
|
6bdebfbf3c | ||
|
58ab6052ad | ||
|
3737ce8146 | ||
|
ca5404db76 | ||
|
d6fc3a91a6 | ||
|
31134ca16d | ||
|
6cfc9182f4 | ||
|
caa63107ad | ||
|
0acab8f1c7 | ||
|
c19b2e99bd | ||
|
e7a5e1e5e2 | ||
|
209c4c6143 |
BIN
.deploy.enc
BIN
.deploy.enc
Binary file not shown.
3
.github/FUNDING.yml
vendored
Normal file
3
.github/FUNDING.yml
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
github: flarum
|
||||||
|
open_collective: flarum
|
||||||
|
tidelift: packagist/flarum/core
|
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -16,7 +16,7 @@ IMPORTANT: We applaud pull requests, they excite us every single time. As we hav
|
|||||||
**Confirmed**
|
**Confirmed**
|
||||||
|
|
||||||
- [ ] Frontend changes: tested on a local Flarum installation.
|
- [ ] Frontend changes: tested on a local Flarum installation.
|
||||||
- [ ] Backend changes: tests are green (run `php vendor/bin/phpunit`).
|
- [ ] Backend changes: tests are green (run `composer test`).
|
||||||
|
|
||||||
**Required changes:**
|
**Required changes:**
|
||||||
|
|
||||||
|
26
.github/stale.yml
vendored
Normal file
26
.github/stale.yml
vendored
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
daysUntilStale: 90
|
||||||
|
daysUntilClose: 30
|
||||||
|
|
||||||
|
staleLabel: stale
|
||||||
|
|
||||||
|
exemptLabels:
|
||||||
|
- org/keep
|
||||||
|
- type/bug
|
||||||
|
- type/regression
|
||||||
|
- critical
|
||||||
|
- security
|
||||||
|
exemptAssignees: true
|
||||||
|
exemptMilestones: true
|
||||||
|
exemptProjects: true
|
||||||
|
|
||||||
|
markComment: >
|
||||||
|
This issue has been automatically marked as stale because it has not had
|
||||||
|
recent activity. It will be closed if no further activity occurs. We do this
|
||||||
|
to keep the amount of open issues to a manageable minimum.
|
||||||
|
|
||||||
|
In any case, thanks for taking an interest in this software and contributing
|
||||||
|
by opening the issue in the first place!
|
||||||
|
|
||||||
|
closeComment: >
|
||||||
|
We are closing this issue as it seems to have grown stale. If you still
|
||||||
|
encounter this problem with the latest version, feel free to re-open it.
|
16
.github/workflows/build.yml
vendored
Normal file
16
.github/workflows/build.yml
vendored
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
name: JavaScript
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@master
|
||||||
|
- uses: flarum/action-build@master
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
65
.github/workflows/test.yml
vendored
Normal file
65
.github/workflows/test.yml
vendored
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
name: Tests
|
||||||
|
|
||||||
|
on: [push, pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
php: [7.1, 7.2, 7.3]
|
||||||
|
service: ['mysql:5.7', mariadb]
|
||||||
|
prefix: ['', flarum_]
|
||||||
|
|
||||||
|
include:
|
||||||
|
- service: 'mysql:5.7'
|
||||||
|
db: MySQL
|
||||||
|
- service: mariadb
|
||||||
|
db: MariaDB
|
||||||
|
- prefix: flarum_
|
||||||
|
prefixStr: (prefix)
|
||||||
|
|
||||||
|
exclude:
|
||||||
|
- php: 7.1
|
||||||
|
service: 'mysql:5.7'
|
||||||
|
prefix: flarum_
|
||||||
|
- php: 7.1
|
||||||
|
service: mariadb
|
||||||
|
prefix: flarum_
|
||||||
|
- php: 7.2
|
||||||
|
service: 'mysql:5.7'
|
||||||
|
prefix: flarum_
|
||||||
|
- php: 7.2
|
||||||
|
service: mariadb
|
||||||
|
prefix: flarum_
|
||||||
|
|
||||||
|
services:
|
||||||
|
mysql:
|
||||||
|
image: ${{ matrix.service }}
|
||||||
|
ports:
|
||||||
|
- 13306:3306
|
||||||
|
|
||||||
|
name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@master
|
||||||
|
|
||||||
|
- name: Select PHP version
|
||||||
|
run: sudo update-alternatives --set php $(which php${{ matrix.php }})
|
||||||
|
|
||||||
|
- name: Create MySQL Database
|
||||||
|
run: mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
|
||||||
|
|
||||||
|
- name: Install Composer dependencies
|
||||||
|
run: composer install
|
||||||
|
|
||||||
|
- name: Setup Composer tests
|
||||||
|
run: composer test:setup
|
||||||
|
env:
|
||||||
|
DB_PORT: 13306
|
||||||
|
DB_PASSWORD: root
|
||||||
|
DB_PREFIX: ${{ matrix.prefix }}
|
||||||
|
|
||||||
|
- name: Run Composer tests
|
||||||
|
run: composer test
|
67
.travis.yml
67
.travis.yml
@@ -1,67 +0,0 @@
|
|||||||
language: php
|
|
||||||
|
|
||||||
cache:
|
|
||||||
directories:
|
|
||||||
- $HOME/.composer/cache
|
|
||||||
- $HOME/.npm
|
|
||||||
|
|
||||||
install:
|
|
||||||
- composer install
|
|
||||||
- mysql -e 'CREATE DATABASE flarum_test;'
|
|
||||||
|
|
||||||
before_script:
|
|
||||||
- echo 'error_reporting = E_ALL' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
|
|
||||||
|
|
||||||
script:
|
|
||||||
- composer test:setup
|
|
||||||
- composer test
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
include:
|
|
||||||
- php: 7.1
|
|
||||||
env: DB=mysql
|
|
||||||
|
|
||||||
- php: 7.2
|
|
||||||
env: DB=mysql
|
|
||||||
|
|
||||||
- php: 7.3
|
|
||||||
env: DB=mysql
|
|
||||||
|
|
||||||
- php: 7.1
|
|
||||||
addons:
|
|
||||||
mariadb: '10.2'
|
|
||||||
env: DB=mariadb
|
|
||||||
|
|
||||||
- php: 7.2
|
|
||||||
addons:
|
|
||||||
mariadb: '10.2'
|
|
||||||
env: DB=mariadb
|
|
||||||
|
|
||||||
- php: 7.3
|
|
||||||
addons:
|
|
||||||
mariadb: '10.2'
|
|
||||||
env: DB=mariadb
|
|
||||||
|
|
||||||
- php: 7.2
|
|
||||||
env: DB=mysql PREFIX=forum_
|
|
||||||
|
|
||||||
- php: 7.4snapshot
|
|
||||||
env: DB=mysql
|
|
||||||
|
|
||||||
- php: 7.4snapshot
|
|
||||||
addons:
|
|
||||||
mariadb: '10.2'
|
|
||||||
env: DB=mariadb
|
|
||||||
|
|
||||||
- stage: build
|
|
||||||
language: generic
|
|
||||||
if: branch = master AND type = push
|
|
||||||
install: skip
|
|
||||||
script: bash .travis/build.sh
|
|
||||||
-k $encrypted_678139e2bc67_key
|
|
||||||
-i $encrypted_678139e2bc67_iv
|
|
||||||
after_success: skip
|
|
||||||
|
|
||||||
matrix:
|
|
||||||
allow_failures:
|
|
||||||
- php: 7.4snapshot
|
|
@@ -1,33 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
main() {
|
|
||||||
while getopts ":k:i:" opt; do
|
|
||||||
case $opt in
|
|
||||||
k) encrypted_key="$OPTARG"
|
|
||||||
;;
|
|
||||||
i) encrypted_iv="$OPTARG"
|
|
||||||
;;
|
|
||||||
\?) echo "Invalid option -$OPTARG" >&2
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
git checkout -f $TRAVIS_BRANCH
|
|
||||||
git config user.name "flarum-bot"
|
|
||||||
git config user.email "bot@flarum.org"
|
|
||||||
|
|
||||||
cd js
|
|
||||||
npm i -g npm@6.1.0
|
|
||||||
npm ci
|
|
||||||
npm run build
|
|
||||||
|
|
||||||
git add dist/* -f
|
|
||||||
git commit -m "Bundled output for commit $TRAVIS_COMMIT [skip ci]"
|
|
||||||
|
|
||||||
eval `ssh-agent -s`
|
|
||||||
openssl aes-256-cbc -K $encrypted_key -iv $encrypted_iv -in ../.deploy.enc -d | ssh-add -
|
|
||||||
|
|
||||||
git push git@github.com:$TRAVIS_REPO_SLUG.git $TRAVIS_BRANCH
|
|
||||||
}
|
|
||||||
|
|
||||||
main "$@"
|
|
59
CHANGELOG.md
59
CHANGELOG.md
@@ -1,5 +1,64 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.1.0-beta.11.1](https://github.com/flarum/core/compare/v0.1.0-beta.11...v0.1.0-beta.11.1)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Saving custom css in admin failed (#1946)
|
||||||
|
|
||||||
|
## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.10...v0.1.0-beta.11)
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Comments have an additional class `Post--by-actor` when posted by the user (#1927)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Improved support for URL identification during installation (#1861)
|
||||||
|
- KeyboardNavigatable now has a callback ability (#1922)
|
||||||
|
- Links are no longer opened with target `_blank` but in the same window (#859)
|
||||||
|
- Links now have `nofollow ugc` by default as their `rel` attribute (#859, #1884)
|
||||||
|
- Improved performance of the full text gambit when searching for users (#1877)
|
||||||
|
- The Queue implementation is now available under its Illuminate contract
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- No error handling was possible in the console/cli (#1789)
|
||||||
|
- Enable scrollbars in log in modals so it fits for GitHub (#1716)
|
||||||
|
- Reduce log in modal for SSO so it fits for Facebook (#1727)
|
||||||
|
- Deleting discussions permanently did not delete its posts (#1909)
|
||||||
|
- Fixed the queue:restart command (#1932)
|
||||||
|
- Deleted posts were visible to all visitors (#1827)
|
||||||
|
- Old avatars weren't being deleted when replaced (#1918)
|
||||||
|
- The search performance regression was reverted (#1764)
|
||||||
|
- No profile background could be set for remote images (#445)
|
||||||
|
- Back button sends to home even though it could actually go back (#1942)
|
||||||
|
- Debug button no longer visible (#1687)
|
||||||
|
- Modals on smaller screens use the whole width of the page
|
||||||
|
|
||||||
|
## [0.1.0-beta.10](https://github.com/flarum/core/compare/v0.1.0-beta.9...v0.1.0-beta.10)
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Initial queue support: Infrastructure for offloading long-running tasks (e.g. email sending) to background workers (#1773)
|
||||||
|
- Notifications can now be marked as read without visiting a discussion (#151)
|
||||||
|
- SEO: The discussion list now has a `rel="canonical"` meta tag, preventing duplicate content (#1134, #1814)
|
||||||
|
- The "Edit User" permission can now be edited in the UI (#1845)
|
||||||
|
- New status message and redirect after user deletion (#1750, #1777)
|
||||||
|
- Errors in Flarum's boot process are now presented with more detailed information (#1607)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Better, more detailed and extensible error handling (#1641, #1843)
|
||||||
|
- Error pages in debug mode now return the same HTTP status codes as in production (#1648)
|
||||||
|
- Tweak HTTP status codes for authentication / authorization errors (#1854)
|
||||||
|
- Already-used links from account activation emails now show a better error message (#1337)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Security vulnerabilities in dependencies
|
||||||
|
- Performance: High CPU usage when scrolling in a discussion (#1222)
|
||||||
|
- Special characters crashed the search (#1498)
|
||||||
|
- Missing declarations for language and text direction in HTML output (#1772)
|
||||||
|
- Private messages were counted in user post counts (#1695)
|
||||||
|
- Extensions could not change the forum's default page (#1819)
|
||||||
|
- API requests authenticated using access tokens needed to provide a CSRF token (#1828)
|
||||||
|
- Accessibility: Screenreaders did not read the "Back to discussion list" link (#1835)
|
||||||
|
|
||||||
## [0.1.0-beta.9](https://github.com/flarum/core/compare/v0.1.0-beta.8.2...v0.1.0-beta.9)
|
## [0.1.0-beta.9](https://github.com/flarum/core/compare/v0.1.0-beta.8.2...v0.1.0-beta.9)
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
3
LICENSE
3
LICENSE
@@ -1,6 +1,7 @@
|
|||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) Toby Zerner
|
Copyright (c) 2019-2020 Stichting Flarum (Flarum Foundation)
|
||||||
|
Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
@@ -27,7 +27,7 @@ Thank you for considering contributing to Flarum! Please read the **[Contributin
|
|||||||
|
|
||||||
## Security Vulnerabilities
|
## Security Vulnerabilities
|
||||||
|
|
||||||
If you discover a security vulnerability within Flarum, please send an e-mail to [security@flarum.org](mailto:security@flarum.org). All security vulnerabilities will be promptly addressed.
|
If you discover a security vulnerability within Flarum, please send an e-mail to [security@flarum.org](mailto:security@flarum.org). All security vulnerabilities will be promptly addressed. More details can be found in our [security policy](https://github.com/flarum/core/security/policy).
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
@@ -12,6 +12,10 @@
|
|||||||
{
|
{
|
||||||
"name": "Franz Liedke",
|
"name": "Franz Liedke",
|
||||||
"email": "franz@develophp.org"
|
"email": "franz@develophp.org"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Daniel Klabbers",
|
||||||
|
"email": "daniel@klabbers.email"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
@@ -36,11 +40,16 @@
|
|||||||
"illuminate/filesystem": "5.7.*",
|
"illuminate/filesystem": "5.7.*",
|
||||||
"illuminate/hashing": "5.7.*",
|
"illuminate/hashing": "5.7.*",
|
||||||
"illuminate/mail": "5.7.*",
|
"illuminate/mail": "5.7.*",
|
||||||
|
"illuminate/queue": "5.7.*",
|
||||||
"illuminate/session": "5.7.*",
|
"illuminate/session": "5.7.*",
|
||||||
"illuminate/support": "5.7.*",
|
"illuminate/support": "5.7.*",
|
||||||
"illuminate/validation": "5.7.*",
|
"illuminate/validation": "5.7.*",
|
||||||
"illuminate/view": "5.7.*",
|
"illuminate/view": "5.7.*",
|
||||||
"intervention/image": "^2.3.0",
|
"intervention/image": "^2.3.0",
|
||||||
|
"laminas/laminas-diactoros": "^1.8.4",
|
||||||
|
"laminas/laminas-httphandlerrunner": "^1.0",
|
||||||
|
"laminas/laminas-stratigility": "^3.0",
|
||||||
|
"laminas/laminas-zendframework-bridge": "^1.0",
|
||||||
"league/flysystem": "^1.0.11",
|
"league/flysystem": "^1.0.11",
|
||||||
"matthiasmullie/minify": "^1.3",
|
"matthiasmullie/minify": "^1.3",
|
||||||
"middlewares/base-path": "^1.1",
|
"middlewares/base-path": "^1.1",
|
||||||
@@ -55,12 +64,10 @@
|
|||||||
"s9e/text-formatter": "^1.2.0",
|
"s9e/text-formatter": "^1.2.0",
|
||||||
"symfony/config": "^3.3",
|
"symfony/config": "^3.3",
|
||||||
"symfony/console": "^4.2",
|
"symfony/console": "^4.2",
|
||||||
|
"symfony/event-dispatcher": "^4.3.2",
|
||||||
"symfony/translation": "^3.3",
|
"symfony/translation": "^3.3",
|
||||||
"symfony/yaml": "^3.3",
|
"symfony/yaml": "^3.3",
|
||||||
"tobscure/json-api": "^0.3.0",
|
"tobscure/json-api": "^0.3.0"
|
||||||
"zendframework/zend-diactoros": "^1.8.4",
|
|
||||||
"zendframework/zend-httphandlerrunner": "^1.0",
|
|
||||||
"zendframework/zend-stratigility": "^3.0"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"mockery/mockery": "^1.0",
|
"mockery/mockery": "^1.0",
|
||||||
|
20
js/dist/admin.js
vendored
20
js/dist/admin.js
vendored
File diff suppressed because one or more lines are too long
2
js/dist/admin.js.map
vendored
2
js/dist/admin.js.map
vendored
File diff suppressed because one or more lines are too long
22
js/dist/forum.js
vendored
22
js/dist/forum.js
vendored
File diff suppressed because one or more lines are too long
2
js/dist/forum.js.map
vendored
2
js/dist/forum.js.map
vendored
File diff suppressed because one or more lines are too long
981
js/package-lock.json
generated
981
js/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -9,13 +9,13 @@
|
|||||||
"flarum-webpack-config": "0.1.0-beta.10",
|
"flarum-webpack-config": "0.1.0-beta.10",
|
||||||
"jquery": "^3.4.1",
|
"jquery": "^3.4.1",
|
||||||
"jquery.hotkeys": "^0.1.0",
|
"jquery.hotkeys": "^0.1.0",
|
||||||
"lodash-es": "^4.17.11",
|
"lodash-es": "^4.17.14",
|
||||||
"m.attrs.bidi": "github:tobscure/m.attrs.bidi",
|
"m.attrs.bidi": "github:tobscure/m.attrs.bidi",
|
||||||
"mithril": "^0.2.8",
|
"mithril": "^0.2.8",
|
||||||
"moment": "^2.22.2",
|
"moment": "^2.22.2",
|
||||||
"punycode": "^2.1.1",
|
"punycode": "^2.1.1",
|
||||||
"spin.js": "^3.1.0",
|
"spin.js": "^3.1.0",
|
||||||
"webpack": "^4.26.0",
|
"webpack": "^4.41.2",
|
||||||
"webpack-cli": "^3.1.2",
|
"webpack-cli": "^3.1.2",
|
||||||
"webpack-merge": "^4.1.4"
|
"webpack-merge": "^4.1.4"
|
||||||
},
|
},
|
||||||
|
@@ -29,12 +29,13 @@ export default class MailPage extends Page {
|
|||||||
{}
|
{}
|
||||||
);
|
);
|
||||||
|
|
||||||
Object.keys(this.driverFields).flatMap(key => this.driverFields[key]).forEach(
|
for (const driver in this.driverFields) {
|
||||||
key => {
|
for (const field in this.driverFields[driver]) {
|
||||||
this.fields.push(key);
|
this.fields.push(field);
|
||||||
this.values[key] = m.prop(settings[key]);
|
this.values[field] = m.prop(settings[field]);
|
||||||
}
|
}
|
||||||
);
|
}
|
||||||
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
m.redraw();
|
m.redraw();
|
||||||
});
|
});
|
||||||
@@ -87,9 +88,9 @@ export default class MailPage extends Page {
|
|||||||
className: 'MailPage-MailSettings',
|
className: 'MailPage-MailSettings',
|
||||||
children: [
|
children: [
|
||||||
<div className="MailPage-MailSettings-input">
|
<div className="MailPage-MailSettings-input">
|
||||||
{this.driverFields[this.values.mail_driver()].flatMap(field => [
|
{Object.keys(this.driverFields[this.values.mail_driver()]).map(field => [
|
||||||
<label>{app.translator.trans(`core.admin.email.${field}_label`)}</label>,
|
<label>{app.translator.trans(`core.admin.email.${field}_label`)}</label>,
|
||||||
<input className="FormControl" value={this.values[field]() || ''} oninput={m.withAttr('value', this.values[field])} />
|
this.renderField(field),
|
||||||
])}
|
])}
|
||||||
</div>
|
</div>
|
||||||
]
|
]
|
||||||
@@ -108,6 +109,18 @@ export default class MailPage extends Page {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
renderField(name) {
|
||||||
|
const driver = this.values.mail_driver();
|
||||||
|
const field = this.driverFields[driver][name];
|
||||||
|
const prop = this.values[name];
|
||||||
|
|
||||||
|
if (typeof field === 'string') {
|
||||||
|
return <input className="FormControl" value={prop() || ''} oninput={m.withAttr('value', prop)}/>;
|
||||||
|
} else {
|
||||||
|
return <Select value={prop()} options={field} onchange={prop} />;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
changed() {
|
changed() {
|
||||||
return this.fields.some(key => this.values[key]() !== app.data.settings[key]);
|
return this.fields.some(key => this.values[key]() !== app.data.settings[key]);
|
||||||
}
|
}
|
||||||
|
@@ -228,6 +228,12 @@ export default class PermissionGrid extends Component {
|
|||||||
permission: 'discussion.deletePosts'
|
permission: 'discussion.deletePosts'
|
||||||
}, 60);
|
}, 60);
|
||||||
|
|
||||||
|
items.add('userEdit', {
|
||||||
|
icon: 'fas fa-user-cog',
|
||||||
|
label: app.translator.trans('core.admin.permissions.edit_users_label'),
|
||||||
|
permission: 'user.edit'
|
||||||
|
}, 60);
|
||||||
|
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
import ItemList from './utils/ItemList';
|
import ItemList from './utils/ItemList';
|
||||||
import Alert from './components/Alert';
|
import Alert from './components/Alert';
|
||||||
|
import Button from './components/Button';
|
||||||
import ModalManager from './components/ModalManager';
|
import ModalManager from './components/ModalManager';
|
||||||
import AlertManager from './components/AlertManager';
|
import AlertManager from './components/AlertManager';
|
||||||
|
import RequestErrorModal from './components/RequestErrorModal';
|
||||||
import Translator from './Translator';
|
import Translator from './Translator';
|
||||||
import Store from './Store';
|
import Store from './Store';
|
||||||
import Session from './Session';
|
import Session from './Session';
|
||||||
@@ -141,7 +143,7 @@ export default class Application {
|
|||||||
bootExtensions(extensions) {
|
bootExtensions(extensions) {
|
||||||
Object.keys(extensions).forEach(name => {
|
Object.keys(extensions).forEach(name => {
|
||||||
const extension = extensions[name];
|
const extension = extensions[name];
|
||||||
|
|
||||||
const extenders = flattenDeep(extension.extend);
|
const extenders = flattenDeep(extension.extend);
|
||||||
|
|
||||||
for (const extender of extenders) {
|
for (const extender of extenders) {
|
||||||
@@ -328,9 +330,14 @@ export default class Application {
|
|||||||
children = app.translator.trans('core.lib.error.generic_message');
|
children = app.translator.trans('core.lib.error.generic_message');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isDebug = app.forum.attribute('debug');
|
||||||
|
|
||||||
error.alert = new Alert({
|
error.alert = new Alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
children
|
children,
|
||||||
|
controls: isDebug && [
|
||||||
|
<Button className="Button Button--link" onclick={this.showDebug.bind(this, error)}>Debug</Button>
|
||||||
|
]
|
||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -345,6 +352,16 @@ export default class Application {
|
|||||||
return deferred.promise;
|
return deferred.promise;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {RequestError} error
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
showDebug(error) {
|
||||||
|
this.alerts.dismiss(this.requestError.alert);
|
||||||
|
|
||||||
|
this.modal.show(new RequestErrorModal({error}));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct a URL to the route with the given name.
|
* Construct a URL to the route with the given name.
|
||||||
*
|
*
|
||||||
|
@@ -190,7 +190,7 @@ export default class Model {
|
|||||||
* @public
|
* @public
|
||||||
*/
|
*/
|
||||||
delete(data, options = {}) {
|
delete(data, options = {}) {
|
||||||
if (!this.exists) return m.deferred.resolve().promise;
|
if (!this.exists) return m.deferred().resolve().promise;
|
||||||
|
|
||||||
return app.request(Object.assign({
|
return app.request(Object.assign({
|
||||||
method: 'DELETE',
|
method: 'DELETE',
|
||||||
|
@@ -37,6 +37,7 @@ import Placeholder from './components/Placeholder';
|
|||||||
import Separator from './components/Separator';
|
import Separator from './components/Separator';
|
||||||
import Dropdown from './components/Dropdown';
|
import Dropdown from './components/Dropdown';
|
||||||
import SplitDropdown from './components/SplitDropdown';
|
import SplitDropdown from './components/SplitDropdown';
|
||||||
|
import RequestErrorModal from './components/RequestErrorModal';
|
||||||
import FieldSet from './components/FieldSet';
|
import FieldSet from './components/FieldSet';
|
||||||
import Select from './components/Select';
|
import Select from './components/Select';
|
||||||
import Navigation from './components/Navigation';
|
import Navigation from './components/Navigation';
|
||||||
@@ -100,6 +101,7 @@ export default {
|
|||||||
'components/Separator': Separator,
|
'components/Separator': Separator,
|
||||||
'components/Dropdown': Dropdown,
|
'components/Dropdown': Dropdown,
|
||||||
'components/SplitDropdown': SplitDropdown,
|
'components/SplitDropdown': SplitDropdown,
|
||||||
|
'components/RequestErrorModal': RequestErrorModal,
|
||||||
'components/FieldSet': FieldSet,
|
'components/FieldSet': FieldSet,
|
||||||
'components/Select': Select,
|
'components/Select': Select,
|
||||||
'components/Navigation': Navigation,
|
'components/Navigation': Navigation,
|
||||||
|
@@ -29,6 +29,12 @@ export default class Button extends Component {
|
|||||||
attrs.className = attrs.className || '';
|
attrs.className = attrs.className || '';
|
||||||
attrs.type = attrs.type || 'button';
|
attrs.type = attrs.type || 'button';
|
||||||
|
|
||||||
|
// If a tooltip was provided for buttons without additional content, we also
|
||||||
|
// use this tooltip as text for screen readers
|
||||||
|
if (attrs.title && !this.props.children) {
|
||||||
|
attrs['aria-label'] = attrs.title;
|
||||||
|
}
|
||||||
|
|
||||||
// If nothing else is provided, we use the textual button content as tooltip
|
// If nothing else is provided, we use the textual button content as tooltip
|
||||||
if (!attrs.title && this.props.children) {
|
if (!attrs.title && this.props.children) {
|
||||||
attrs.title = extractText(this.props.children);
|
attrs.title = extractText(this.props.children);
|
||||||
|
30
js/src/common/components/RequestErrorModal.js
Normal file
30
js/src/common/components/RequestErrorModal.js
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
import Modal from './Modal';
|
||||||
|
|
||||||
|
export default class RequestErrorModal extends Modal {
|
||||||
|
className() {
|
||||||
|
return 'RequestErrorModal Modal--large';
|
||||||
|
}
|
||||||
|
|
||||||
|
title() {
|
||||||
|
return this.props.error.xhr
|
||||||
|
? this.props.error.xhr.status+' '+this.props.error.xhr.statusText
|
||||||
|
: '';
|
||||||
|
}
|
||||||
|
|
||||||
|
content() {
|
||||||
|
let responseText;
|
||||||
|
|
||||||
|
try {
|
||||||
|
responseText = JSON.stringify(JSON.parse(this.props.error.responseText), null, 2);
|
||||||
|
} catch (e) {
|
||||||
|
responseText = this.props.error.responseText;
|
||||||
|
}
|
||||||
|
|
||||||
|
return <div className="Modal-body">
|
||||||
|
<pre>
|
||||||
|
{this.props.error.options.method} {this.props.error.options.url}<br/><br/>
|
||||||
|
{responseText}
|
||||||
|
</pre>
|
||||||
|
</div>;
|
||||||
|
}
|
||||||
|
}
|
@@ -91,6 +91,7 @@ Object.assign(User.prototype, {
|
|||||||
user.freshness = new Date();
|
user.freshness = new Date();
|
||||||
m.redraw();
|
m.redraw();
|
||||||
};
|
};
|
||||||
|
image.crossOrigin = 'anonymous';
|
||||||
image.src = this.avatarUrl();
|
image.src = this.avatarUrl();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
const scroll = window.requestAnimationFrame ||
|
const later = window.requestAnimationFrame ||
|
||||||
window.webkitRequestAnimationFrame ||
|
window.webkitRequestAnimationFrame ||
|
||||||
window.mozRequestAnimationFrame ||
|
window.mozRequestAnimationFrame ||
|
||||||
window.msRequestAnimationFrame ||
|
window.msRequestAnimationFrame ||
|
||||||
@@ -17,7 +17,7 @@ export default class ScrollListener {
|
|||||||
*/
|
*/
|
||||||
constructor(callback) {
|
constructor(callback) {
|
||||||
this.callback = callback;
|
this.callback = callback;
|
||||||
this.lastTop = -1;
|
this.ticking = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -27,27 +27,27 @@ export default class ScrollListener {
|
|||||||
* @protected
|
* @protected
|
||||||
*/
|
*/
|
||||||
loop() {
|
loop() {
|
||||||
if (!this.active) return;
|
// THROTTLE: If the callback is still running (or hasn't yet run), we ignore
|
||||||
|
// further scroll events.
|
||||||
|
if (this.ticking) return;
|
||||||
|
|
||||||
this.update();
|
// Schedule the callback to be executed soon (TM), and stop throttling once
|
||||||
|
// the callback is done.
|
||||||
|
later(() => {
|
||||||
|
this.update();
|
||||||
|
this.ticking = false;
|
||||||
|
});
|
||||||
|
|
||||||
scroll(this.loop.bind(this));
|
this.ticking = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the scroll position has changed; if it has, run the handler.
|
* Run the callback, whether there was a scroll event or not.
|
||||||
*
|
*
|
||||||
* @param {Boolean} [force=false] Whether or not to force the handler to be
|
|
||||||
* run, even if the scroll position hasn't changed.
|
|
||||||
* @public
|
* @public
|
||||||
*/
|
*/
|
||||||
update(force) {
|
update() {
|
||||||
const top = window.pageYOffset;
|
this.callback(window.pageYOffset);
|
||||||
|
|
||||||
if (this.lastTop !== top || force) {
|
|
||||||
this.callback(top);
|
|
||||||
this.lastTop = top;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -57,8 +57,10 @@ export default class ScrollListener {
|
|||||||
*/
|
*/
|
||||||
start() {
|
start() {
|
||||||
if (!this.active) {
|
if (!this.active) {
|
||||||
this.active = true;
|
window.addEventListener(
|
||||||
this.loop();
|
'scroll',
|
||||||
|
this.active = this.loop.bind(this)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,6 +70,8 @@ export default class ScrollListener {
|
|||||||
* @public
|
* @public
|
||||||
*/
|
*/
|
||||||
stop() {
|
stop() {
|
||||||
this.active = false;
|
window.removeEventListener('scroll', this.active);
|
||||||
|
|
||||||
|
this.active = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -16,6 +16,10 @@ export function truncate(string, length, start = 0) {
|
|||||||
* Create a slug out of the given string. Non-alphanumeric characters are
|
* Create a slug out of the given string. Non-alphanumeric characters are
|
||||||
* converted to hyphens.
|
* converted to hyphens.
|
||||||
*
|
*
|
||||||
|
* NOTE: This method does not use the comparably sophisticated transliteration
|
||||||
|
* mechanism that is employed in the backend. Therefore, it should only be used
|
||||||
|
* to *suggest* slugs that can be overridden by the user.
|
||||||
|
*
|
||||||
* @param {String} string
|
* @param {String} string
|
||||||
* @return {String}
|
* @return {String}
|
||||||
*/
|
*/
|
||||||
|
@@ -13,7 +13,7 @@ export default class LogInButton extends Button {
|
|||||||
props.className = (props.className || '') + ' LogInButton';
|
props.className = (props.className || '') + ' LogInButton';
|
||||||
|
|
||||||
props.onclick = function() {
|
props.onclick = function() {
|
||||||
const width = 600;
|
const width = 580;
|
||||||
const height = 400;
|
const height = 400;
|
||||||
const $window = $(window);
|
const $window = $(window);
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ export default class LogInButton extends Button {
|
|||||||
`height=${height},` +
|
`height=${height},` +
|
||||||
`top=${$window.height() / 2 - height / 2},` +
|
`top=${$window.height() / 2 - height / 2},` +
|
||||||
`left=${$window.width() / 2 - width / 2},` +
|
`left=${$window.width() / 2 - width / 2},` +
|
||||||
'status=no,scrollbars=no,resizable=no');
|
'status=no,scrollbars=yes,resizable=no');
|
||||||
};
|
};
|
||||||
|
|
||||||
super.initProps(props);
|
super.initProps(props);
|
||||||
|
@@ -2,6 +2,7 @@ import Component from '../../common/Component';
|
|||||||
import avatar from '../../common/helpers/avatar';
|
import avatar from '../../common/helpers/avatar';
|
||||||
import icon from '../../common/helpers/icon';
|
import icon from '../../common/helpers/icon';
|
||||||
import humanTime from '../../common/helpers/humanTime';
|
import humanTime from '../../common/helpers/humanTime';
|
||||||
|
import Button from '../../common/components/Button';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The `Notification` component abstract displays a single notification.
|
* The `Notification` component abstract displays a single notification.
|
||||||
@@ -26,6 +27,17 @@ export default class Notification extends Component {
|
|||||||
|
|
||||||
if (!isInitialized) $(element).click(this.markAsRead.bind(this));
|
if (!isInitialized) $(element).click(this.markAsRead.bind(this));
|
||||||
}}>
|
}}>
|
||||||
|
{!notification.isRead() && Button.component({
|
||||||
|
className: 'Notification-action Button Button--icon Button--link',
|
||||||
|
icon: 'fas fa-check',
|
||||||
|
title: app.translator.trans('core.forum.notifications.mark_as_read_tooltip'),
|
||||||
|
onclick: e => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
|
||||||
|
this.markAsRead();
|
||||||
|
}
|
||||||
|
})}
|
||||||
{avatar(notification.fromUser())}
|
{avatar(notification.fromUser())}
|
||||||
{icon(this.icon(), {className: 'Notification-icon'})}
|
{icon(this.icon(), {className: 'Notification-icon'})}
|
||||||
<span className="Notification-content">{this.content()}</span>
|
<span className="Notification-content">{this.content()}</span>
|
||||||
|
@@ -39,7 +39,7 @@ export default class Post extends Component {
|
|||||||
view() {
|
view() {
|
||||||
const attrs = this.attrs();
|
const attrs = this.attrs();
|
||||||
|
|
||||||
attrs.className = 'Post ' + (this.loading ? 'Post--loading ' : '') + (attrs.className || '');
|
attrs.className = this.classes(attrs.className).join(' ');
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<article {...attrs}>
|
<article {...attrs}>
|
||||||
@@ -98,6 +98,26 @@ export default class Post extends Component {
|
|||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the post's classes.
|
||||||
|
*
|
||||||
|
* @param string classes
|
||||||
|
* @returns {string[]}
|
||||||
|
*/
|
||||||
|
classes(existing) {
|
||||||
|
let classes = (existing || '').split(' ').concat(['Post']);
|
||||||
|
|
||||||
|
if (this.loading) {
|
||||||
|
classes.push('Post--loading');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.props.post.user() === app.session.user) {
|
||||||
|
classes.push('Post--by-actor');
|
||||||
|
}
|
||||||
|
|
||||||
|
return classes;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Build an item list for the post's actions.
|
* Build an item list for the post's actions.
|
||||||
*
|
*
|
||||||
|
@@ -2,7 +2,6 @@ import Component from '../../common/Component';
|
|||||||
import ScrollListener from '../../common/utils/ScrollListener';
|
import ScrollListener from '../../common/utils/ScrollListener';
|
||||||
import PostLoading from './LoadingPost';
|
import PostLoading from './LoadingPost';
|
||||||
import anchorScroll from '../../common/utils/anchorScroll';
|
import anchorScroll from '../../common/utils/anchorScroll';
|
||||||
import mixin from '../../common/utils/mixin';
|
|
||||||
import evented from '../../common/utils/evented';
|
import evented from '../../common/utils/evented';
|
||||||
import ReplyPlaceholder from './ReplyPlaceholder';
|
import ReplyPlaceholder from './ReplyPlaceholder';
|
||||||
import Button from '../../common/components/Button';
|
import Button from '../../common/components/Button';
|
||||||
@@ -586,7 +585,7 @@ class PostStream extends Component {
|
|||||||
*/
|
*/
|
||||||
unpause() {
|
unpause() {
|
||||||
this.paused = false;
|
this.paused = false;
|
||||||
this.scrollListener.update(true);
|
this.scrollListener.update();
|
||||||
this.trigger('unpaused');
|
this.trigger('unpaused');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,7 +2,6 @@ import Component from '../../common/Component';
|
|||||||
import icon from '../../common/helpers/icon';
|
import icon from '../../common/helpers/icon';
|
||||||
import ScrollListener from '../../common/utils/ScrollListener';
|
import ScrollListener from '../../common/utils/ScrollListener';
|
||||||
import SubtreeRetainer from '../../common/utils/SubtreeRetainer';
|
import SubtreeRetainer from '../../common/utils/SubtreeRetainer';
|
||||||
import computed from '../../common/utils/computed';
|
|
||||||
import formatNumber from '../../common/utils/formatNumber';
|
import formatNumber from '../../common/utils/formatNumber';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -365,7 +364,7 @@ export default class PostStreamScrubber extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onresize() {
|
onresize() {
|
||||||
this.scrollListener.update(true);
|
this.scrollListener.update();
|
||||||
|
|
||||||
// Adjust the height of the scrollbar so that it fills the height of
|
// Adjust the height of the scrollbar so that it fills the height of
|
||||||
// the sidebar and doesn't overlap the footer.
|
// the sidebar and doesn't overlap the footer.
|
||||||
|
@@ -102,7 +102,7 @@ export default class ReplyComposer extends ComposerBody {
|
|||||||
app.alerts.show(
|
app.alerts.show(
|
||||||
alert = new Alert({
|
alert = new Alert({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
message: app.translator.trans('core.forum.composer_reply.posted_message'),
|
children: app.translator.trans('core.forum.composer_reply.posted_message'),
|
||||||
controls: [viewButton]
|
controls: [viewButton]
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
@@ -122,6 +122,8 @@ export default class TextEditor extends Component {
|
|||||||
setSelectionRange(start, end) {
|
setSelectionRange(start, end) {
|
||||||
const $textarea = this.$('textarea');
|
const $textarea = this.$('textarea');
|
||||||
|
|
||||||
|
if (!$textarea.length) return;
|
||||||
|
|
||||||
$textarea[0].setSelectionRange(start, end);
|
$textarea[0].setSelectionRange(start, end);
|
||||||
$textarea.focus();
|
$textarea.focus();
|
||||||
}
|
}
|
||||||
@@ -134,6 +136,8 @@ export default class TextEditor extends Component {
|
|||||||
getSelectionRange() {
|
getSelectionRange() {
|
||||||
const $textarea = this.$('textarea');
|
const $textarea = this.$('textarea');
|
||||||
|
|
||||||
|
if (!$textarea.length) return [0, 0];
|
||||||
|
|
||||||
return [$textarea[0].selectionStart, $textarea[0].selectionEnd];
|
return [$textarea[0].selectionStart, $textarea[0].selectionEnd];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -88,8 +88,13 @@ export default class UserPage extends Page {
|
|||||||
loadUser(username) {
|
loadUser(username) {
|
||||||
const lowercaseUsername = username.toLowerCase();
|
const lowercaseUsername = username.toLowerCase();
|
||||||
|
|
||||||
|
// Load the preloaded user object, if any, into the global app store
|
||||||
|
// We don't use the output of the method because it returns raw JSON
|
||||||
|
// instead of the parsed models
|
||||||
|
app.preloadedApiDocument();
|
||||||
|
|
||||||
app.store.all('users').some(user => {
|
app.store.all('users').some(user => {
|
||||||
if (user.username().toLowerCase() === lowercaseUsername && user.joinTime()) {
|
if ((user.username().toLowerCase() === lowercaseUsername || user.id() === username) && user.joinTime()) {
|
||||||
this.show(user);
|
this.show(user);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@@ -7,10 +7,24 @@
|
|||||||
*/
|
*/
|
||||||
export default class KeyboardNavigatable {
|
export default class KeyboardNavigatable {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
/**
|
||||||
|
* Callback to be executed for a specified input.
|
||||||
|
*
|
||||||
|
* @callback KeyboardNavigatable~keyCallback
|
||||||
|
* @param {KeyboardEvent} event
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
this.callbacks = {};
|
this.callbacks = {};
|
||||||
|
|
||||||
// By default, always handle keyboard navigation.
|
/**
|
||||||
this.whenCallback = () => true;
|
* Callback that determines whether keyboard input should be handled.
|
||||||
|
* By default, always handle keyboard navigation.
|
||||||
|
*
|
||||||
|
* @callback whenCallback
|
||||||
|
* @param {KeyboardEvent} event
|
||||||
|
* @returns {boolean}
|
||||||
|
*/
|
||||||
|
this.whenCallback = event => true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -19,7 +33,7 @@ export default class KeyboardNavigatable {
|
|||||||
* This will be triggered by the Up key.
|
* This will be triggered by the Up key.
|
||||||
*
|
*
|
||||||
* @public
|
* @public
|
||||||
* @param {Function} callback
|
* @param {KeyboardNavigatable~keyCallback} callback
|
||||||
* @return {KeyboardNavigatable}
|
* @return {KeyboardNavigatable}
|
||||||
*/
|
*/
|
||||||
onUp(callback) {
|
onUp(callback) {
|
||||||
@@ -37,7 +51,7 @@ export default class KeyboardNavigatable {
|
|||||||
* This will be triggered by the Down key.
|
* This will be triggered by the Down key.
|
||||||
*
|
*
|
||||||
* @public
|
* @public
|
||||||
* @param {Function} callback
|
* @param {KeyboardNavigatable~keyCallback} callback
|
||||||
* @return {KeyboardNavigatable}
|
* @return {KeyboardNavigatable}
|
||||||
*/
|
*/
|
||||||
onDown(callback) {
|
onDown(callback) {
|
||||||
@@ -55,7 +69,7 @@ export default class KeyboardNavigatable {
|
|||||||
* This will be triggered by the Return and Tab keys..
|
* This will be triggered by the Return and Tab keys..
|
||||||
*
|
*
|
||||||
* @public
|
* @public
|
||||||
* @param {Function} callback
|
* @param {KeyboardNavigatable~keyCallback} callback
|
||||||
* @return {KeyboardNavigatable}
|
* @return {KeyboardNavigatable}
|
||||||
*/
|
*/
|
||||||
onSelect(callback) {
|
onSelect(callback) {
|
||||||
@@ -73,7 +87,7 @@ export default class KeyboardNavigatable {
|
|||||||
* This will be triggered by the Escape key.
|
* This will be triggered by the Escape key.
|
||||||
*
|
*
|
||||||
* @public
|
* @public
|
||||||
* @param {Function} callback
|
* @param {KeyboardNavigatable~keyCallback} callback
|
||||||
* @return {KeyboardNavigatable}
|
* @return {KeyboardNavigatable}
|
||||||
*/
|
*/
|
||||||
onCancel(callback) {
|
onCancel(callback) {
|
||||||
@@ -81,7 +95,7 @@ export default class KeyboardNavigatable {
|
|||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
callback(e);
|
callback(e);
|
||||||
}
|
};
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -92,7 +106,7 @@ export default class KeyboardNavigatable {
|
|||||||
* This will be triggered by the Backspace key.
|
* This will be triggered by the Backspace key.
|
||||||
*
|
*
|
||||||
* @public
|
* @public
|
||||||
* @param {Function} callback
|
* @param {KeyboardNavigatable~keyCallback} callback
|
||||||
* @return {KeyboardNavigatable}
|
* @return {KeyboardNavigatable}
|
||||||
*/
|
*/
|
||||||
onRemove(callback) {
|
onRemove(callback) {
|
||||||
@@ -110,7 +124,7 @@ export default class KeyboardNavigatable {
|
|||||||
* Provide a callback that determines whether keyboard input should be handled.
|
* Provide a callback that determines whether keyboard input should be handled.
|
||||||
*
|
*
|
||||||
* @public
|
* @public
|
||||||
* @param {Function} callback
|
* @param {KeyboardNavigatable~whenCallback} callback
|
||||||
* @return {KeyboardNavigatable}
|
* @return {KeyboardNavigatable}
|
||||||
*/
|
*/
|
||||||
when(callback) {
|
when(callback) {
|
||||||
@@ -138,7 +152,7 @@ export default class KeyboardNavigatable {
|
|||||||
*/
|
*/
|
||||||
navigate(event) {
|
navigate(event) {
|
||||||
// This callback determines whether keyboard should be handled or ignored.
|
// This callback determines whether keyboard should be handled or ignored.
|
||||||
if (!this.whenCallback()) return;
|
if (!this.whenCallback(event)) return;
|
||||||
|
|
||||||
const keyCallback = this.callbacks[event.which];
|
const keyCallback = this.callbacks[event.which];
|
||||||
if (keyCallback) {
|
if (keyCallback) {
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import Alert from '../../common/components/Alert';
|
||||||
import Button from '../../common/components/Button';
|
import Button from '../../common/components/Button';
|
||||||
import Separator from '../../common/components/Separator';
|
import Separator from '../../common/components/Separator';
|
||||||
import EditUserModal from '../components/EditUserModal';
|
import EditUserModal from '../components/EditUserModal';
|
||||||
@@ -61,7 +62,7 @@ export default {
|
|||||||
items.add('edit', Button.component({
|
items.add('edit', Button.component({
|
||||||
icon: 'fas fa-pencil-alt',
|
icon: 'fas fa-pencil-alt',
|
||||||
children: app.translator.trans('core.forum.user_controls.edit_button'),
|
children: app.translator.trans('core.forum.user_controls.edit_button'),
|
||||||
onclick: this.editAction.bind(user)
|
onclick: this.editAction.bind(this, user)
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,7 +85,7 @@ export default {
|
|||||||
items.add('delete', Button.component({
|
items.add('delete', Button.component({
|
||||||
icon: 'fas fa-times',
|
icon: 'fas fa-times',
|
||||||
children: app.translator.trans('core.forum.user_controls.delete_button'),
|
children: app.translator.trans('core.forum.user_controls.delete_button'),
|
||||||
onclick: this.deleteAction.bind(user)
|
onclick: this.deleteAction.bind(this, user)
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,23 +94,51 @@ export default {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete the user.
|
* Delete the user.
|
||||||
|
*
|
||||||
|
* @param {User} user
|
||||||
*/
|
*/
|
||||||
deleteAction() {
|
deleteAction(user) {
|
||||||
if (confirm(app.translator.trans('core.forum.user_controls.delete_confirmation'))) {
|
if (!confirm(app.translator.trans('core.forum.user_controls.delete_confirmation'))) {
|
||||||
this.delete().then(() => {
|
return;
|
||||||
if (app.current instanceof UserPage && app.current.user === this) {
|
|
||||||
app.history.back();
|
|
||||||
} else {
|
|
||||||
window.location.reload();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
user.delete().then(() => {
|
||||||
|
this.showDeletionAlert(user, 'success');
|
||||||
|
if (app.current instanceof UserPage && app.current.user === user) {
|
||||||
|
app.history.back();
|
||||||
|
} else {
|
||||||
|
window.location.reload();
|
||||||
|
}
|
||||||
|
}).catch(() => this.showDeletionAlert(user, 'error'));
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show deletion alert of user.
|
||||||
|
*
|
||||||
|
* @param {User} user
|
||||||
|
* @param {string} type
|
||||||
|
*/
|
||||||
|
showDeletionAlert(user, type) {
|
||||||
|
const { username, email } = user.data.attributes;
|
||||||
|
const message = {
|
||||||
|
success: 'core.forum.user_controls.delete_success_message',
|
||||||
|
error: 'core.forum.user_controls.delete_error_message',
|
||||||
|
}[type];
|
||||||
|
|
||||||
|
app.alerts.show(new Alert({
|
||||||
|
type,
|
||||||
|
children: app.translator.trans(
|
||||||
|
message, { username, email }
|
||||||
|
)
|
||||||
|
}));
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Edit the user.
|
* Edit the user.
|
||||||
|
*
|
||||||
|
* @param {User} user
|
||||||
*/
|
*/
|
||||||
editAction() {
|
editAction(user) {
|
||||||
app.modal.show(new EditUserModal({user: this}));
|
app.modal.show(new EditUserModal({ user }));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@@ -156,6 +156,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.Modal {
|
.Modal {
|
||||||
|
max-width: 100%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
-webkit-transform: none !important;
|
-webkit-transform: none !important;
|
||||||
transform: none !important;
|
transform: none !important;
|
||||||
|
@@ -87,6 +87,10 @@
|
|||||||
&:hover {
|
&:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background: @control-bg;
|
background: @control-bg;
|
||||||
|
|
||||||
|
.Notification-action {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.Avatar {
|
.Avatar {
|
||||||
.Avatar--size(24px);
|
.Avatar--size(24px);
|
||||||
@@ -98,6 +102,27 @@
|
|||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.Notification-action {
|
||||||
|
float: right;
|
||||||
|
display: none;
|
||||||
|
margin-top: -7px;
|
||||||
|
margin-right: -10px;
|
||||||
|
line-height: inherit;
|
||||||
|
padding: 5px 0;
|
||||||
|
|
||||||
|
& when (@config-colored-header = true) {
|
||||||
|
.Button--color(@control-color, @control-bg);
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: @link-color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon {
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.Notification-icon {
|
.Notification-icon {
|
||||||
float: left;
|
float: left;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,15 +3,13 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Util\Str;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
use Illuminate\Database\Schema\Builder;
|
use Illuminate\Database\Schema\Builder;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'up' => function (Builder $schema) {
|
'up' => function (Builder $schema) {
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Builder;
|
use Illuminate\Database\Schema\Builder;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Builder;
|
use Illuminate\Database\Schema\Builder;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Query\Expression;
|
use Illuminate\Database\Query\Expression;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Builder;
|
use Illuminate\Database\Schema\Builder;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Builder;
|
use Illuminate\Database\Schema\Builder;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Query\Expression;
|
use Illuminate\Database\Query\Expression;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Builder;
|
use Illuminate\Database\Schema\Builder;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Group\Group;
|
use Flarum\Group\Group;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Group\Group;
|
use Flarum\Group\Group;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
/*
|
/*
|
||||||
* This file is part of Flarum.
|
* This file is part of Flarum.
|
||||||
*
|
*
|
||||||
* (c) Toby Zerner <toby.zerner@gmail.com>
|
* For detailed copyright and license information, please view the
|
||||||
*
|
* LICENSE file that was distributed with this source code.
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Flarum\Database\Migration;
|
use Flarum\Database\Migration;
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user