Marcus Moore
|
f0a11be0b8
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# composer.lock
|
2024-06-18 15:10:46 -07:00 |
|
snipe
|
04560b4475
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-18 10:13:57 +01:00 |
|
|
snipe
|
0b30ad0da2
|
Removed test file - #14890
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 10:12:57 +01:00 |
|
|
snipe
|
6c6a3649ea
|
Production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 09:33:07 +01:00 |
|
|
snipe
|
e28619f769
|
Bumped papaparse library
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 09:30:24 +01:00 |
|
|
Marcus Moore
|
d9164281ab
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# resources/views/livewire/oauth-clients.blade.php
|
2024-06-17 12:57:04 -07:00 |
|
|
snipe
|
569f05a99e
|
Built prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 10:45:04 +01:00 |
|
|
Marcus Moore
|
1736bf5510
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# app/Livewire/LoginForm.php
# package.json
# resources/views/livewire/login-form.blade.php
|
2024-05-30 16:56:50 -07:00 |
|
|
snipe
|
0981cfa902
|
Built assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-30 20:22:50 +01:00 |
|
|
Marcus Moore
|
7d1acd3d79
|
Update Livewire via composer
|
2024-05-29 12:04:06 -07:00 |
|
|
snipe
|
8ee5e7cd0a
|
#14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 13:10:46 +01:00 |
|
Brady Wetherington
|
f633dbba64
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-20 12:55:29 +01:00 |
|
|
snipe
|
8d67e02d63
|
Added security.txt file
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 09:56:11 +01:00 |
|
|
snipe
|
8e35a56386
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 20:01:04 +01:00 |
|
|
snipe
|
69122034e7
|
Fixed icon table headers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 17:55:33 +01:00 |
|
|
snipe
|
49dc9767b6
|
Added debugging :(
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 15:54:43 +01:00 |
|
|
snipe
|
2b4a536f85
|
Added CSS for users, locations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 12:06:54 +01:00 |
|
|
Brady Wetherington
|
5b02a43957
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-06 18:44:03 +01:00 |
|
|
snipe
|
0892c34125
|
[Snyk] Upgrade tableexport.jquery.plugin from 1.28.0 to 1.30.0 #14656
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-06 12:45:33 +01:00 |
|
|
snipe
|
4d093160fc
|
Upgrade @fortawesome/fontawesome-free from 6.5.1 to 6.5.2 #14647
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-06 12:21:34 +01:00 |
|
|
snipe
|
4b6d236eb7
|
Added class for sidebar menu badges
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 15:44:06 +01:00 |
|
|
Brady Wetherington
|
3f5c5cbe82
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-04-24 16:24:43 +01:00 |
|
|
snipe
|
c8c81a360c
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-23 10:26:43 +01:00 |
|
|
snipe
|
e330e80c46
|
Reeduced z-index of bs table override
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-19 16:06:43 +01:00 |
|
|
snipe
|
c0dcae16f7
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 18:57:06 +01:00 |
|
|
snipe
|
774d0aa90c
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-04 15:05:35 +01:00 |
|
|
snipe
|
df95447ea4
|
New dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-03 13:08:08 +01:00 |
|
|
Brady Wetherington
|
65e21faa3e
|
Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
|
2024-04-02 20:34:04 +01:00 |
|
|
snipe
|
74d8431d01
|
Downgrade alpine to 3.13.5
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-28 12:58:43 +00:00 |
|
|
snipe
|
60c678680a
|
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.6
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-27 16:12:57 +00:00 |
|
|
snipe
|
9c1b1bc2b5
|
Removed fre-order columns - it’s not currently used
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 10:15:46 +00:00 |
|
|
snipe
|
566ba4783e
|
Fixed #14483 - adds deeplinking to search/sort/pagination
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 09:50:01 +00:00 |
|
|
snipe
|
faf48b1684
|
[Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 10:37:53 +00:00 |
|
|
snipe
|
4cd4a936d8
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-14 15:43:47 +00:00 |
|
|
snipe
|
02862d80eb
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-06 20:04:31 +00:00 |
|
|
Brady Wetherington
|
8f2843bfcf
|
Merge branch 'develop' into snipeit_v7_laravel10
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
|
2024-02-21 20:22:28 +00:00 |
|
|
snipe
|
81b9753b79
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/dist/all-defer.js
# public/mix-manifest.json
|
2024-02-15 09:58:09 +00:00 |
|
|
snipe
|
bf3794822c
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-15 09:47:45 +00:00 |
|
|
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 |
|