Skip to content

Commit 12ae408

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
# Conflicts: # app/Http/Controllers/Auth/ResetPasswordController.php # resources/views/auth/passwords/reset.blade.php
2 parents 33cf489 + a62e841 commit 12ae408

File tree

1,735 files changed

+72708
-193942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,735 files changed

+72708
-193942
lines changed

‎.all-contributorsrc‎

Lines changed: 211 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,6 +1651,186 @@
16511651
"code"
16521652
]
16531653
},
1654+
{
1655+
"login": "jwhulette",
1656+
"name": "Wes Hulette",
1657+
"avatar_url": "https://avatars1.githubusercontent.com/u/4930051?v=4",
1658+
"profile": "http://macfoo.wordpress.com/",
1659+
"contributions": [
1660+
"code"
1661+
]
1662+
},
1663+
{
1664+
"login": "patrict",
1665+
"name": "patrict",
1666+
"avatar_url": "https://avatars0.githubusercontent.com/u/8134591?v=4",
1667+
"profile": "https://github.com/patrict",
1668+
"contributions": [
1669+
"code"
1670+
]
1671+
},
1672+
{
1673+
"login": "VELIKII-DIVAN",
1674+
"name": "Dmitriy Minaev",
1675+
"avatar_url": "https://avatars3.githubusercontent.com/u/2611616?v=4",
1676+
"profile": "https://github.com/VELIKII-DIVAN",
1677+
"contributions": [
1678+
"code"
1679+
]
1680+
},
1681+
{
1682+
"login": "liquidhorse",
1683+
"name": "liquidhorse",
1684+
"avatar_url": "https://avatars0.githubusercontent.com/u/5132245?v=4",
1685+
"profile": "https://github.com/liquidhorse",
1686+
"contributions": [
1687+
"code"
1688+
]
1689+
},
1690+
{
1691+
"login": "Seldaek",
1692+
"name": "Jordi Boggiano",
1693+
"avatar_url": "https://avatars1.githubusercontent.com/u/183678?v=4",
1694+
"profile": "https://seld.be/",
1695+
"contributions": [
1696+
"code"
1697+
]
1698+
},
1699+
{
1700+
"login": "inietov",
1701+
"name": "Ivan Nieto",
1702+
"avatar_url": "https://avatars0.githubusercontent.com/u/653557?v=4",
1703+
"profile": "https://github.com/inietov",
1704+
"contributions": [
1705+
"code"
1706+
]
1707+
},
1708+
{
1709+
"login": "benrubson",
1710+
"name": "Ben RUBSON",
1711+
"avatar_url": "https://avatars2.githubusercontent.com/u/6764151?v=4",
1712+
"profile": "https://github.com/benrubson",
1713+
"contributions": [
1714+
"code"
1715+
]
1716+
},
1717+
{
1718+
"login": "NMathar",
1719+
"name": "NMathar",
1720+
"avatar_url": "https://avatars2.githubusercontent.com/u/8554558?v=4",
1721+
"profile": "https://github.com/NMathar",
1722+
"contributions": [
1723+
"code"
1724+
]
1725+
},
1726+
{
1727+
"login": "smb",
1728+
"name": "Steffen",
1729+
"avatar_url": "https://avatars1.githubusercontent.com/u/139566?v=4",
1730+
"profile": "https://github.com/smb",
1731+
"contributions": [
1732+
"code"
1733+
]
1734+
},
1735+
{
1736+
"login": "Sxderp",
1737+
"name": "Sxderp",
1738+
"avatar_url": "https://avatars0.githubusercontent.com/u/6609453?v=4",
1739+
"profile": "https://github.com/Sxderp",
1740+
"contributions": [
1741+
"code"
1742+
]
1743+
},
1744+
{
1745+
"login": "fanta8897",
1746+
"name": "fanta8897",
1747+
"avatar_url": "https://avatars1.githubusercontent.com/u/4807843?v=4",
1748+
"profile": "https://github.com/fanta8897",
1749+
"contributions": [
1750+
"code"
1751+
]
1752+
},
1753+
{
1754+
"login": "andreybolonin",
1755+
"name": "Andrey Bolonin",
1756+
"avatar_url": "https://avatars2.githubusercontent.com/u/2576509?v=4",
1757+
"profile": "https://andreybolonin.com/phpconsulting/",
1758+
"contributions": [
1759+
"code"
1760+
]
1761+
},
1762+
{
1763+
"login": "shinayoshi",
1764+
"name": "shinayoshi",
1765+
"avatar_url": "https://avatars3.githubusercontent.com/u/2173307?v=4",
1766+
"profile": "http://www.shinayoshi.net/",
1767+
"contributions": [
1768+
"code"
1769+
]
1770+
},
1771+
{
1772+
"login": "reuser",
1773+
"name": "Hubert",
1774+
"avatar_url": "https://avatars3.githubusercontent.com/u/2130159?v=4",
1775+
"profile": "https://github.com/reuser",
1776+
"contributions": [
1777+
"code"
1778+
]
1779+
},
1780+
{
1781+
"login": "KeenRivals",
1782+
"name": "KeenRivals",
1783+
"avatar_url": "https://avatars0.githubusercontent.com/u/6865789?v=4",
1784+
"profile": "https://brashear.me",
1785+
"contributions": [
1786+
"code"
1787+
]
1788+
},
1789+
{
1790+
"login": "omyno",
1791+
"name": "omyno",
1792+
"avatar_url": "https://avatars3.githubusercontent.com/u/2902513?v=4",
1793+
"profile": "https://github.com/omyno",
1794+
"contributions": [
1795+
"code"
1796+
]
1797+
},
1798+
{
1799+
"login": "jackka",
1800+
"name": "Evgeny",
1801+
"avatar_url": "https://avatars1.githubusercontent.com/u/6271335?v=4",
1802+
"profile": "https://github.com/jackka",
1803+
"contributions": [
1804+
"code"
1805+
]
1806+
},
1807+
{
1808+
"login": "colin-campbell",
1809+
"name": "Colin Campbell",
1810+
"avatar_url": "https://avatars2.githubusercontent.com/u/1169963?v=4",
1811+
"profile": "https://digitalist.se",
1812+
"contributions": [
1813+
"code"
1814+
]
1815+
},
1816+
{
1817+
"login": "lubo",
1818+
"name": "Ľubomír Kučera",
1819+
"avatar_url": "https://avatars3.githubusercontent.com/u/2872098?v=4",
1820+
"profile": "https://github.com/lubo",
1821+
"contributions": [
1822+
"code"
1823+
]
1824+
},
1825+
{
1826+
"login": "Mezzle",
1827+
"name": "Martin Meredith",
1828+
"avatar_url": "https://avatars3.githubusercontent.com/u/570639?v=4",
1829+
"profile": "https://www.sourceguru.net",
1830+
"contributions": [
1831+
"code"
1832+
]
1833+
},
16541834
{
16551835
"login": "timothyfarmer",
16561836
"name": "Tim Farmer",
@@ -1724,10 +1904,37 @@
17241904
]
17251905
},
17261906
{
1727-
"login": "alek13",
1728-
"name": "Alexander Chibrikin",
1729-
"avatar_url": "https://avatars2.githubusercontent.com/u/1972329?v=4",
1730-
"profile": "http://phpprofi.ru/",
1907+
"login": "johnson-yi",
1908+
"name": "johnson-yi",
1909+
"avatar_url": "https://avatars1.githubusercontent.com/u/63399474?v=4",
1910+
"profile": "https://github.com/johnson-yi",
1911+
"contributions": [
1912+
"code"
1913+
]
1914+
},
1915+
{
1916+
"login": "sanjay900",
1917+
"name": "Sanjay Govind",
1918+
"avatar_url": "https://avatars1.githubusercontent.com/u/1862720?v=4",
1919+
"profile": "https://tangentmc.net",
1920+
"contributions": [
1921+
"code"
1922+
]
1923+
},
1924+
{
1925+
"login": "PeterUpfold",
1926+
"name": "Peter Upfold",
1927+
"avatar_url": "https://avatars0.githubusercontent.com/u/1255375?v=4",
1928+
"profile": "https://peter.upfold.org.uk/",
1929+
"contributions": [
1930+
"code"
1931+
]
1932+
},
1933+
{
1934+
"login": "jbiel",
1935+
"name": "Jared Biel",
1936+
"avatar_url": "https://avatars2.githubusercontent.com/u/961717?v=4",
1937+
"profile": "https://github.com/jbiel",
17311938
"contributions": [
17321939
"code"
17331940
]

‎.dockerignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
.git
2+
.github
3+
.gitattributes
4+
.gitignore
25
.dockerignore
36
app/storage/logs/*
47
app/storage/views/*
58
vendor/*
9+
storage/framework/cache/*
10+
node_modules
11+
.vagrant
12+
.idea
13+

‎.env.example‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ APP_TIMEZONE='UTC'
99
APP_LOCALE=en
1010
MAX_RESULTS=500
1111

12+
# --------------------------------------------
13+
# REQUIRED: UPLOADED FILE STORAGE SETTINGS
14+
# --------------------------------------------
15+
PRIVATE_FILESYSTEM_DISK=local
16+
PUBLIC_FILESYSTEM_DISK=local_public
17+
1218
# --------------------------------------------
1319
# REQUIRED: DATABASE SETTINGS
1420
# --------------------------------------------
@@ -95,12 +101,24 @@ MEMCACHED_HOST=null
95101
MEMCACHED_PORT=null
96102

97103
# --------------------------------------------
98-
# OPTIONAL: AWS S3 SETTINGS
104+
# OPTIONAL: PUBLIC S3 Settings
105+
# --------------------------------------------
106+
PUBLIC_AWS_SECRET_ACCESS_KEY=null
107+
PUBLIC_AWS_ACCESS_KEY_ID=null
108+
PUBLIC_AWS_DEFAULT_REGION=null
109+
PUBLIC_AWS_BUCKET=null
110+
PUBLIC_AWS_URL=null
111+
PUBLIC_AWS_BUCKET_ROOT=null
112+
113+
# --------------------------------------------
114+
# OPTIONAL: PRIVATE S3 Settings
99115
# --------------------------------------------
100-
AWS_SECRET=null
101-
AWS_KEY=null
102-
AWS_REGION=null
103-
AWS_BUCKET=null
116+
PRIVATE_AWS_ACCESS_KEY_ID=null
117+
PRIVATE_AWS_SECRET_ACCESS_KEY=null
118+
PRIVATE_AWS_DEFAULT_REGION=null
119+
PRIVATE_AWS_BUCKET=null
120+
PRIVATE_AWS_URL=null
121+
PRIVATE_AWS_BUCKET_ROOT=null
104122

105123
# --------------------------------------------
106124
# OPTIONAL: LOGIN THROTTLING
@@ -114,7 +132,6 @@ LOGIN_LOCKOUT_DURATION=60
114132
APP_LOG=single
115133
APP_LOG_MAX_FILES=10
116134
APP_LOCKED=false
117-
FILESYSTEM_DISK=local
118135
APP_CIPHER=AES-256-CBC
119136
GOOGLE_MAPS_API=
120137
BACKUP_ENV=true

‎.env.testing‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ IMAGE_LIB=gd
4040
# --------------------------------------------
4141
# OPTIONAL: AWS S3 SETTINGS
4242
# --------------------------------------------
43-
AWS_SECRET=null
44-
AWS_KEY=null
45-
AWS_REGION=null
43+
AWS_SECRET_ACCESS_KEY=null
44+
AWS_ACCESS_KEY_ID=null
45+
AWS_DEFAULT_REGION=null
4646
AWS_BUCKET=null
47+
AWS_BUCKET_ROOT=null
48+
AWS_URL=null
4749

4850

4951
# --------------------------------------------

‎.env.testing-ci‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# REQUIRED: BASIC APP SETTINGS
33
# --------------------------------------------
44
APP_ENV=testing-ci
5-
APP_DEBUG=true
5+
APP_DEBUG=false
66
APP_KEY=ChangeMe
77
APP_URL=http://localhost:8000
88
APP_TIMEZONE='US/Pacific'
@@ -40,10 +40,12 @@ IMAGE_LIB=gd
4040
# --------------------------------------------
4141
# OPTIONAL: AWS S3 SETTINGS
4242
# --------------------------------------------
43-
AWS_SECRET=null
44-
AWS_KEY=null
45-
AWS_REGION=null
43+
AWS_SECRET_ACCESS_KEY=null
44+
AWS_ACCESS_KEY_ID=null
45+
AWS_DEFAULT_REGION=null
4646
AWS_BUCKET=null
47+
AWS_BUCKET_ROOT=null
48+
AWS_URL=null
4749

4850

4951
# --------------------------------------------

‎.gitattributes‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
* text=auto
1+
* text=auto
2+
public/js/** binary
3+
public/css/** binary

‎.github/autolabeler.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*"]
2+
backend: ["/app", "*.php"]
3+
legal: ["LICENSE*", "NOTICES*"]
4+
config: .github

‎.github/config.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
2+
3+
# Comment to be posted to on first time issues
4+
newIssueWelcomeComment: |
5+
👋 Thanks for opening your first issue here! If you're reporting a 🐞 bug, please make sure you include steps to reproduce it. We get a lot of issues on this repo, so please be patient and we will get back to you as soon as we can.
6+
7+
# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
8+
9+
# Comment to be posted to on PRs from first time contributors in your repository
10+
newPRWelcomeComment: |
11+
💖 Thanks for this pull request! 💖
12+
13+
We use [semantic commit messages](https://snipe-it.readme.io/docs/contributing-overview#section-pull-request-guidelines) to streamline the release process and easily generate changelogs between versions. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix if it doesn't have one already.
14+
15+
Examples of commit messages with semantic prefixes:
16+
17+
- `Fixed #<issue number>: don't overwrite prevent_default if default wasn't prevented`
18+
- `Added #<issue number>: add checkout functionality to assets`
19+
- `Improved Asset Checkout: use new notification method for checkout`
20+
21+
Things that will help get your PR across the finish line:
22+
23+
- Document any user-facing changes you've made.
24+
- Include tests when adding/changing behavior.
25+
- Include screenshots and animated GIFs whenever possible.
26+
27+
We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can.
28+
29+
# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
30+
31+
# Comment to be posted to on pull requests merged by a first time user
32+
firstPRMergeComment: >
33+
Congrats on merging your first pull request! 🎉🎉🎉

‎.github/weekly-digest.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Configuration for weekly-digest - https://github.com/apps/weekly-digest
2+
publishDay: sun
3+
canPublishIssues: true
4+
canPublishPullRequests: true
5+
canPublishContributors: true
6+
canPublishStargazers: true
7+
canPublishCommits: true

0 commit comments

Comments
 (0)