snipe
|
1c3306046c
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2024-02-08 23:14:54 +00:00 |
|
|
snipe
|
f4fc845375
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-08 23:06:47 +00:00 |
|
|
snipe
|
0042359e5f
|
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-05 17:23:30 +00:00 |
|
|
snipe
|
cf2e2bfbc1
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-05 17:23:21 +00:00 |
|
|
snipe
|
688017bd8a
|
Upgrade bootstrap-table from 1.22.1 to 1.22.2
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-05 16:59:01 +00:00 |
|
Brady Wetherington
|
f734e196e5
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-01-08 18:57:55 +00:00 |
|
|
snipe
|
012fe57ca1
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-05 15:16:14 +00:00 |
|
|
snipe
|
f5960388f1
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-01-05 15:05:22 +00:00 |
|
|
snipe
|
7c5d29ccd9
|
Move Google Login prompt higher, made it bigger
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-05 14:56:34 +00:00 |
|
|
snipe
|
c8816354ae
|
Updated assets for master
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-03 23:28:54 +00:00 |
|
|
snipe
|
bbdc8383e1
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-03 23:17:44 +00:00 |
|
|
snipe
|
ec3c4674de
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-15 13:58:45 +00:00 |
|
|
snipe
|
f8a56f6dc2
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2023-12-12 04:33:04 +00:00 |
|
|
snipe
|
41f1c5c1e3
|
Smaller icon size for activity reports, other action icons
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-12 00:58:20 +00:00 |
|
|
snipe
|
09ec8d1d5c
|
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/mix-manifest.json
|
2023-12-04 15:42:58 +00:00 |
|
|
snipe
|
1455331a90
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-30 18:25:38 +00:00 |
|
|
Brady Wetherington
|
6210716199
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-11-27 13:04:39 +00:00 |
|
|
snipe
|
84d26fe7fa
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# package-lock.json
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/js/dist/all-defer.js
# public/mix-manifest.json
|
2023-11-23 16:53:13 +00:00 |
|
|
snipe
|
88cc234cbd
|
Higher contrast for green dark skin
Applies #13915 to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-23 15:28:43 +00:00 |
|
|
Brady Wetherington
|
db400dffb5
|
Merge branch 'develop' into snipeit_v7_laravel10
Rebuild assets and re-install from npm
|
2023-10-16 20:13:59 +01:00 |
|
|
snipe
|
d9a1dab827
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2023-10-06 20:17:59 +01:00 |
|
|
snipe
|
5277f7cc5c
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-06 20:14:44 +01:00 |
|
|
Brady Wetherington
|
7a5714cc85
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-10-03 20:37:17 +01:00 |
|
|
snipe
|
3de656f5c6
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-09-28 19:20:27 +01:00 |
|
|
snipe
|
0bf423cda9
|
Set modal focus to modal-name field
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 19:16:40 +01:00 |
|
|
snipe
|
cfe6b07b3a
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-09-28 15:15:50 +01:00 |
|
|
snipe
|
1acb14a39f
|
Moved dragtable css
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 15:12:44 +01:00 |
|
|
snipe
|
bb7a41628a
|
Fixed #13662 - added clipboard.js
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-28 15:06:55 +01:00 |
|
|
snipe
|
d7790cd16b
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-18 22:24:15 +01:00 |
|
|
snipe
|
2a638e66f0
|
Added column re-ordering
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-15 21:53:34 +01:00 |
|
|
snipe
|
8bdecb1da9
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-09-15 20:32:05 +01:00 |
|
|
snipe
|
3ba8b60f54
|
Fixed regression that disabled sticky headers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-15 20:28:28 +01:00 |
|
|
Brady Wetherington
|
3500217f94
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-08-31 13:07:06 +01:00 |
|
|
snipe
|
305804f260
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# package-lock.json
# public/css/dist/all.css
# public/js/dist/all-defer.js
# public/mix-manifest.json
|
2023-08-30 15:50:09 +01:00 |
|
|
snipe
|
5cf8c36698
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-30 15:43:06 +01:00 |
|
|
snipe
|
1bcc74f156
|
Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.4.2 #13527
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-30 15:41:11 +01:00 |
|
|
Brady Wetherington
|
8b52bad16f
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-08-15 21:25:16 +01:00 |
|
|
snipe
|
28b1461cb4
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/mix-manifest.json
|
2023-08-15 18:21:51 +01:00 |
|
|
snipe
|
e41368daac
|
Merge pull request #12050 from cram42/develop
New Label Engine
|
2023-08-15 17:58:57 +01:00 |
|
|
snipe
|
7df3be3a54
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-08-09 10:54:49 +01:00 |
|
|
snipe
|
c18349d75f
|
Updated webpack
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 22:07:49 +01:00 |
|
|
Brady Wetherington
|
4654f7aa37
|
Porting Snipe-IT v7 to Laravel v10
|
2023-07-31 14:07:12 +01:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
|
Brady Wetherington
|
605d267fe8
|
Merge branch 'develop' into snipeit_v7
|
2023-07-19 11:47:51 +01:00 |
|
|
snipe
|
3a6d8ef684
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-07-12 19:22:34 +01:00 |
|
|
snipe
|
7debf126d6
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 20:03:12 +01:00 |
|
|
Brady Wetherington
|
8f2a17585e
|
Merge branch 'develop' into snipeit_v7
Had to do a lot of conflict work here, so this could get ugly :(
|
2023-07-10 16:53:35 +01:00 |
|
|
snipe
|
1b71ab6d86
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 20:41:16 +01:00 |
|
|
snipe
|
faf2a235fb
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-29 20:31:13 +01:00 |
|
|
Brady Wetherington
|
f5ff9b2208
|
Merge branch 'develop' into snipeit_v7 - 2023-06-12
|
2023-06-12 16:56:23 +01:00 |
|
|
snipe
|
924d0b25e8
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/dist/all.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-06-08 08:53:22 +01:00 |
|
|
snipe
|
14727700ab
|
Updated libraries and dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-08 08:48:18 +01:00 |
|
|
snipe
|
03233465c7
|
Updated webpack, added new dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-08 08:10:12 +01:00 |
|
|
snipe
|
c05a4452bc
|
Merge + update assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2023-05-29 18:20:12 -04:00 |
|
|
snipe
|
60d2046b6d
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-24 16:13:33 -07:00 |
|
|
snipe
|
a3a64be19b
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2023-05-24 16:06:26 -07:00 |
|
|
snipe
|
d7f4fa146b
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-24 16:02:28 -07:00 |
|
|
snipe
|
cc07921608
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-24 15:59:52 -07:00 |
|
|
snipe
|
f69caf77e5
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 14:57:57 -07:00 |
|
|
Brady Wetherington
|
09fdc946a0
|
Merge branch 'develop' into snipeit_v7
Had to do some asset rebuilds, and a composer update
|
2023-05-17 17:37:10 -07:00 |
|
|
snipe
|
dbae01f545
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/mix-manifest.json
|
2023-05-16 17:41:39 -07:00 |
|
|
snipe
|
c4876865cf
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 17:36:58 -07:00 |
|
|
snipe
|
b1fda46e11
|
Production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 11:25:28 -07:00 |
|
|
snipe
|
1f5e4309fa
|
Updated webpack, new asset files
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 11:20:06 -07:00 |
|
|
snipe
|
5950ec27ab
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2023-05-03 13:49:36 -07:00 |
|
|
snipe
|
577fff7d65
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 10:45:36 -07:00 |
|
|
Brady Wetherington
|
a938009074
|
Rebuilt assets with new Node and node_modules and package.json
|
2023-05-01 18:06:51 -07:00 |
|
|
Brady Wetherington
|
381890b578
|
Merge branch 'develop' into laravel_v9
|
2023-04-27 13:56:04 -07:00 |
|
|
snipe
|
42f0975414
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-04-25 22:19:27 -07:00 |
|
|
snipe
|
470a36a7c9
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 22:12:56 -07:00 |
|
|
Brady Wetherington
|
71fa6d765f
|
Update to Latest Livewire files
|
2023-04-18 11:05:35 -07:00 |
|
|
snipe
|
9a73f5eca3
|
Updated production assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2023-04-17 20:27:49 -07:00 |
|
|
snipe
|
9698c3b07b
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 20:14:50 -07:00 |
|
|
snipe
|
2b10357c4e
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 19:06:27 -07:00 |
|
|
snipe
|
46cce0115e
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2023-04-16 05:46:26 -07:00 |
|
|
snipe
|
21f5d39fa1
|
Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 05:43:42 -07:00 |
|
|
snipe
|
86b04c7294
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 20:50:36 -07:00 |
|
|
snipe
|
20ab412e1e
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-15 20:45:35 -07:00 |
|
|
snipe
|
c683233aa3
|
Updated production assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-04-06 15:00:38 -07:00 |
|
|
snipe
|
6164e8b3fa
|
Changed colors for disabled, removed dupe checkmark
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 23:53:57 -07:00 |
|
|
snipe
|
3bd87a2785
|
Removed iCheck
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 22:52:54 -07:00 |
|
|
snipe
|
3473e24de5
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 22:36:23 -07:00 |
|
|
snipe
|
2c47b63e91
|
Small tweaks to overrides
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 19:37:07 -07:00 |
|
|
snipe
|
c05ee5db0e
|
Built assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 17:08:54 -07:00 |
|
|
snipe
|
4035cd118e
|
Handle the column selector in bs table styling
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 14:35:47 -07:00 |
|
|
snipe
|
e066f033c8
|
First attempt at moving us away from iCheck
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 10:54:01 -07:00 |
|
|
snipe
|
b91e914a61
|
Merge remote-tracking branch 'origin/develop'
|
2023-03-23 10:55:58 -07:00 |
|
|
snipe
|
e8e1ada776
|
Merge pull request #12669 from akemidx/feature/sc-20178
#20178: Added Dell and Lenovo to warranty link function
|
2023-03-22 00:54:40 -07:00 |
|
|
snipe
|
58ea1592bb
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/livewire/slack-settings-form.blade.php
|
2023-03-22 00:26:15 -07:00 |
|
akemidx
|
0909d94c8f
|
actually added the icons haha
|
2023-03-15 15:07:07 -04:00 |
|
|
snipe
|
ac0b22d696
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-08 00:33:04 -08:00 |
|
|
snipe
|
5defd5ec0a
|
Merge develop into master
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 19:59:17 -08:00 |
|
|
snipe
|
383b5b43bb
|
Added a few more jquery options for prevoew flexibility
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 18:54:38 -08:00 |
|
|
snipe
|
c7fb542dc3
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-03-06 17:13:29 -08:00 |
|
|
snipe
|
eec5163e7f
|
Updated vue assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:04 -08:00 |
|
|
snipe
|
823203641d
|
Updated assets with new font awesome
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-28 23:18:58 -08:00 |
|
|
snipe
|
1911480d3a
|
Updated font-awesome to ^6.3.0
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-28 23:15:50 -08:00 |
|
|
snipe
|
b29276579f
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-28 20:34:31 -08:00 |
|
|
snipe
|
dbe0a3352b
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2023-02-28 20:34:20 -08:00 |
|
|
snipe
|
f9b5a67dc2
|
Compiled dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-28 20:32:08 -08:00 |
|