snipe
c1babdc9b0
Merge remote-tracking branch 'origin/develop'
2021-05-12 16:51:57 -07:00
snipe
1a95337db1
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-05-12 16:51:39 -07:00
Ivan Nieto Vivanco
6ed5dff1a5
Fix the target path to copy the demo logos in the database\seeds\SettingsSeeder.php. Also added the code that copies the demo logos to app\Console\Commands\ResetDemoSettings.php ( #9571 )
2021-05-12 16:41:49 -07:00
snipe
3f559c4a50
Add @tbrconnect as a contributor
2021-05-12 13:38:56 -07:00
tbrconnect
a29ef73346
Feature #3088 Print labels from asset detail page ( #9559 )
...
This PR adds a "Generate Label" button to the detail asset page as
described in #3088 .
Fixes #3088
Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>
2021-05-12 13:38:26 -07:00
snipe
015ca1fcdc
Merge remote-tracking branch 'origin/develop'
2021-05-07 18:13:22 -07:00
snipe
ded61614d1
Attempt to fix transient LDAP bug
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 18:13:04 -07:00
Brady Wetherington
62199f6255
Manually re-add support for Label Logos in Labels ( #9552 )
2021-05-07 17:01:32 -07:00
snipe
75b89b5a97
Merge remote-tracking branch 'origin/develop'
2021-05-07 16:42:41 -07:00
snipe
a704614397
Bumped max for country on model
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 16:42:26 -07:00
snipe
2dcb50d28e
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-05-07 16:36:12 -07:00
snipe
9aac3ae628
Fixed HTML causing two backup headers to appear
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 16:36:07 -07:00
Tom Misilo
397e2df3ea
Upgrade the Alpine docker img to v3.13 for PHP 7.4 ( #9550 )
...
v3.13 of the alpine image has php7.4 instead of php7.3
2021-05-07 13:50:36 -07:00
Tom Misilo
4e408cbc42
Fix CSP Always being Enabled unless in debug mode. ( #9543 )
2021-05-05 10:51:47 -07:00
snipe
570a31a1c4
Merge remote-tracking branch 'origin/develop'
2021-05-05 10:29:10 -07:00
snipe
ece627b3a3
Small fixes for location printing when relationships are missing/invalid, per #9521
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 10:23:46 -07:00
snipe
d8d3fa2293
Only show department if it’s valid
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 10:13:19 -07:00
snipe
ab694347b0
Added favicon to demo dir
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 01:18:49 -07:00
snipe
aa98e4ea7a
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2021-05-05 00:04:17 -07:00
snipe
6935d94184
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 00:03:33 -07:00
snipe
d9d5b4d730
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
2021-05-05 00:01:09 -07:00
Ivan Nieto Vivanco
36a43642d8
Changed the orderBy clause inside the custom reports function that forms the CSV to be 'id' so making it a unique value and don't causes repeated items. [ch14587] ( #9535 )
2021-05-04 23:50:02 -07:00
snipe
ed98683496
Add @mikecmpbll as a contributor
2021-05-04 22:40:04 -07:00
snipe
c2dc7ac182
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-05-04 22:39:24 -07:00
Dampfklon
37f7768e7a
Fix Dockerfile.alpine build error and snipeit runtime permission error ( #9520 )
2021-05-04 22:29:24 -07:00
snipe
c1a8b609ea
Add @markbrule as a contributor
2021-05-04 22:27:35 -07:00
markbrule
6c1553167d
issue #9422 - pivot ID was being used as a user_id ( #9512 )
2021-05-04 22:27:01 -07:00
snipe
c572c98361
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-05-04 22:21:35 -07:00
snipe
6c0af3c6e1
Add @JohnnyPicnic as a contributor
2021-05-04 22:21:18 -07:00
snipe
715b1a0fb2
Fixed #9157 Update .env to API_TOKEN_EXPIRATION_YEARS=15 (reapplies #9524 )
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-04 22:20:54 -07:00
Tom Misilo
a6bbe1fec3
Delete file from assets folder, not just the ref. ( #9525 )
2021-05-04 22:18:22 -07:00
snipe
67ac3631df
Production assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-04 22:05:26 -07:00
snipe
5760b76c4e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/mix-manifest.json
2021-05-04 22:03:56 -07:00
snipe
57b9b571dc
Fixed #9531 - highlight search box when filled, add clear button ( #9534 )
2021-05-04 22:00:34 -07:00
snipe
62f091e769
Merge remote-tracking branch 'origin/develop'
2021-04-30 15:38:02 -07:00
snipe
cee5eea121
Use 24-hour date format for audit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 15:37:39 -07:00
snipe
c6726015f7
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-30 14:52:08 -07:00
snipe
961268172b
Merge remote-tracking branch 'origin/develop'
2021-04-26 18:12:10 -07:00
snipe
b01baec7a8
Updated languages
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 18:11:48 -07:00
snipe
a1bc984d17
Generate production assets, bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:34:02 -07:00
snipe
31944cd4d4
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:28:38 -07:00
snipe
d5894a4d64
Generated dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:27:28 -07:00
snipe
32f043c5df
Set the body skin style if one was overridden by the user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:25:39 -07:00
snipe
23376c317e
Use correct URL for css for subdirs
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:22:02 -07:00
snipe
b3b02933a5
Removed duplicate code
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:21:48 -07:00
snipe
882732b2de
WTF kind of gendered language was this mess?
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:18:17 -07:00
snipe
b8c3564434
Removed min from personal CSS
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 14:05:18 -07:00
snipe
138ddfec1c
Merge remote-tracking branch 'origin/develop'
2021-04-23 14:27:12 -07:00
snipe
315bcb6b38
Added use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-23 14:26:57 -07:00
snipe
8016807268
Add @Nevets82 as a contributor
2021-04-23 12:09:34 -07:00
