Skip to content

Commit db2baae

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]> # Conflicts: # public/css/dist/all.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json
2 parents d146426 + bf0edcb commit db2baae

18 files changed

+603
-209
lines changed

‎.all-contributorsrc‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,6 +3018,87 @@
30183018
"contributions": [
30193019
"code"
30203020
]
3021+
},
3022+
{
3023+
"login": "koiakoia",
3024+
"name": "koiakoia",
3025+
"avatar_url": "https://avatars.githubusercontent.com/u/60405354?v=4",
3026+
"profile": "https://github.com/koiakoia",
3027+
"contributions": [
3028+
"code"
3029+
]
3030+
},
3031+
{
3032+
"login": "mustafa-online",
3033+
"name": "Mustafa Online",
3034+
"avatar_url": "https://avatars.githubusercontent.com/u/5323832?v=4",
3035+
"profile": "https://github.com/mustafa-online",
3036+
"contributions": [
3037+
"code"
3038+
]
3039+
},
3040+
{
3041+
"login": "franceslui",
3042+
"name": "franceslui",
3043+
"avatar_url": "https://avatars.githubusercontent.com/u/104601439?v=4",
3044+
"profile": "https://github.com/franceslui",
3045+
"contributions": [
3046+
"code"
3047+
]
3048+
},
3049+
{
3050+
"login": "Q4kK",
3051+
"name": "Q4kK",
3052+
"avatar_url": "https://avatars.githubusercontent.com/u/125313163?v=4",
3053+
"profile": "https://github.com/Q4kK",
3054+
"contributions": [
3055+
"code"
3056+
]
3057+
},
3058+
{
3059+
"login": "squintfox",
3060+
"name": "squintfox",
3061+
"avatar_url": "https://avatars.githubusercontent.com/u/55590532?v=4",
3062+
"profile": "https://github.com/squintfox",
3063+
"contributions": [
3064+
"code"
3065+
]
3066+
},
3067+
{
3068+
"login": "jeffclay",
3069+
"name": "Jeff Clay",
3070+
"avatar_url": "https://avatars.githubusercontent.com/u/1380084?v=4",
3071+
"profile": "https://github.com/jeffclay",
3072+
"contributions": [
3073+
"code"
3074+
]
3075+
},
3076+
{
3077+
"login": "PP-JN-RL",
3078+
"name": "Phil J R",
3079+
"avatar_url": "https://avatars.githubusercontent.com/u/52716446?v=4",
3080+
"profile": "https://github.com/PP-JN-RL",
3081+
"contributions": [
3082+
"code"
3083+
]
3084+
},
3085+
{
3086+
"login": "chandanchowdhury",
3087+
"name": "i_virus",
3088+
"avatar_url": "https://avatars.githubusercontent.com/u/1496725?v=4",
3089+
"profile": "https://www.corelight.com/",
3090+
"contributions": [
3091+
"code"
3092+
]
3093+
},
3094+
{
3095+
"login": "gitgrimbo",
3096+
"name": "Paul Grime",
3097+
"avatar_url": "https://avatars.githubusercontent.com/u/1020541?v=4",
3098+
"profile": "https://github.com/gitgrimbo",
3099+
"contributions": [
3100+
"code"
3101+
]
30213102
}
30223103
]
30233104
}

‎CONTRIBUTORS.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,17 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
432432
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bilias"><img src="https://avatars.githubusercontent.com/u/47315739?v=4?s=110" width="110px;" alt="bilias"/><br /><sub><b>bilias</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=bilias" title="Code">💻</a></td>
433433
<td align="center" valign="top" width="14.28%"><a href="https://github.com/coach1988"><img src="https://avatars.githubusercontent.com/u/2565989?v=4?s=110" width="110px;" alt="coach1988"/><br /><sub><b>coach1988</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=coach1988" title="Code">💻</a></td>
434434
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mauro-miatello"><img src="https://avatars.githubusercontent.com/u/11910225?v=4?s=110" width="110px;" alt="MrM"/><br /><sub><b>MrM</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mauro-miatello" title="Code">💻</a></td>
435+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/koiakoia"><img src="https://avatars.githubusercontent.com/u/60405354?v=4?s=110" width="110px;" alt="koiakoia"/><br /><sub><b>koiakoia</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=koiakoia" title="Code">💻</a></td>
436+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mustafa-online"><img src="https://avatars.githubusercontent.com/u/5323832?v=4?s=110" width="110px;" alt="Mustafa Online"/><br /><sub><b>Mustafa Online</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=mustafa-online" title="Code">💻</a></td>
437+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/franceslui"><img src="https://avatars.githubusercontent.com/u/104601439?v=4?s=110" width="110px;" alt="franceslui"/><br /><sub><b>franceslui</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=franceslui" title="Code">💻</a></td>
438+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Q4kK"><img src="https://avatars.githubusercontent.com/u/125313163?v=4?s=110" width="110px;" alt="Q4kK"/><br /><sub><b>Q4kK</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=Q4kK" title="Code">💻</a></td>
439+
</tr>
440+
<tr>
441+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/squintfox"><img src="https://avatars.githubusercontent.com/u/55590532?v=4?s=110" width="110px;" alt="squintfox"/><br /><sub><b>squintfox</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=squintfox" title="Code">💻</a></td>
442+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jeffclay"><img src="https://avatars.githubusercontent.com/u/1380084?v=4?s=110" width="110px;" alt="Jeff Clay"/><br /><sub><b>Jeff Clay</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=jeffclay" title="Code">💻</a></td>
443+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/PP-JN-RL"><img src="https://avatars.githubusercontent.com/u/52716446?v=4?s=110" width="110px;" alt="Phil J R"/><br /><sub><b>Phil J R</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=PP-JN-RL" title="Code">💻</a></td>
444+
<td align="center" valign="top" width="14.28%"><a href="https://www.corelight.com/"><img src="https://avatars.githubusercontent.com/u/1496725?v=4?s=110" width="110px;" alt="i_virus"/><br /><sub><b>i_virus</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=chandanchowdhury" title="Code">💻</a></td>
445+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/gitgrimbo"><img src="https://avatars.githubusercontent.com/u/1020541?v=4?s=110" width="110px;" alt="Paul Grime"/><br /><sub><b>Paul Grime</b></sub></a><br /><a href="https://github.com/snipe/snipe-it/commits?author=gitgrimbo" title="Code">💻</a></td>
435446
</tr>
436447
</tbody>
437448
</table>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ It is built on [Laravel 8](http://laravel.com).
1212
Snipe-IT is actively developed and we [release quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
1313

1414
> [!TIP]
15-
> __This is web-based software__. This means there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
15+
> __This is web-based software__. This means there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, any flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
1616
1717
-----
1818

‎composer.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)