 snipe
|
7ec60bc6f2
|
Same as #18808 but renamed assetstatus to status
|
2026-04-02 11:26:23 +01:00 |
|
|
snipe
|
7c95f03166
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/_all-skins.css
# public/css/dist/skins/_all-skins.min.css
# 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/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2025-07-28 17:41:13 +01:00 |
|
|
Brady Wetherington
|
7167b17d25
|
Rebased and brought up to current from the original
|
2025-07-28 09:57:20 -06:00 |
|
|
snipe
|
2187adf59a
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
|
2025-04-19 15:34:58 +01:00 |
|
|
snipe
|
6e5eb55b45
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-04-19 14:28:01 +01:00 |
|
|
snipe
|
451646fe4f
|
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-04-15 19:42:26 +01:00 |
|
|
snipe
|
083cf78305
|
Added footer style for nicer number cell padding
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-12 21:17:41 +00:00 |
|
|
snipe
|
0e2251c810
|
Scope selectlist by company
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 14:59:05 +00:00 |
|
|
snipe
|
d87a6868cc
|
Updated less and papaparse
Signed-off-by: snipe <snipe@snipe.net>
|
2025-02-23 12:50:09 +00:00 |
|
|
snipe
|
7f5ea30904
|
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-17 17:09:00 +00:00 |
|
|
snipe
|
0bb2e98af3
|
Built assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-14 12:33:59 +00:00 |
|
|
snipe
|
9564f7fdb8
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-06 12:46:17 +00:00 |
|
|
Brady Wetherington
|
582b462326
|
Removed inadvertently added files.
|
2024-12-16 16:55:54 +00:00 |
|
|
snipe
|
183a4d49d8
|
Refactor of #15235 - added accessory checkout to locations, assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-16 16:34:49 +00:00 |
|
|
snipe
|
8ee549efbf
|
Bumped font-awesome to 6.7.0
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-16 15:51:23 +00:00 |
|
|
snipe
|
ad2b85393b
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2024-11-21 19:23:10 +00:00 |
|
|
snipe
|
85c1b0ec57
|
[Snyk] Upgrade jquery-ui from 1.14.0 to 1.14.1 #15868
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-21 19:22:08 +00:00 |
|
|
snipe
|
9e3997e0a1
|
Generated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-29 11:25:47 +01:00 |
|
|
snipe
|
1b041af862
|
Merge remote-tracking branch 'origin/master' into 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-09-29 11:25:01 +01:00 |
|
|
snipe
|
e5b9d9a28b
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2024-08-29 15:04:32 +01:00 |
|
|
snipe
|
de0565f5b3
|
Updated jquery UI
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 11:24:06 +01:00 |
|
|
snipe
|
821dd158d1
|
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/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2024-08-22 15:50:20 +01:00 |
|
|
snipe
|
744f43676d
|
Fixed checkbox layout on modal from #15296
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 12:53:16 +01:00 |
|
|
snipe
|
3283704fe8
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 12:25:08 +01:00 |
|
|
snipe
|
4356cb7b9b
|
Added confetti option
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 11:32:42 +01:00 |
|
|
snipe
|
24560b9362
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 18:24:49 +01:00 |
|
|
snipe
|
0cba5ba67e
|
Upgrade jquery-validation from 1.20.1 to 1.21.0
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 16:06:14 +01:00 |
|
|
snipe
|
2f299dbb20
|
Upgrade fontawesome, generate dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 15:51:24 +01:00 |
|
|
snipe
|
e1eb963962
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 19:11:51 +01:00 |
|
|
snipe
|
2e2f59b290
|
Updated production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 15:29:36 +01:00 |
|
|
snipe
|
e502968707
|
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-01 10:00:28 +01:00 |
|
|
snipe
|
23c1d664fe
|
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 22:07:01 +01:00 |
|
|
snipe
|
221c4eeb0c
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 21:59:27 +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 |
|
|
snipe
|
569f05a99e
|
Built prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 10:45:04 +01:00 |
|
|
snipe
|
0981cfa902
|
Built assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-30 20:22:50 +01: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
|
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
|
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 |
|
|
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
|
c8816354ae
|
Updated assets for master
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-03 23:28:54 +00:00 |
|