DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
15186 commits 95 branches 267 tags 294 MiB
Commit graph

679 commits

Author SHA1 Message Date
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
snipe 6fbd20a11b Merge remote-tracking branch 'origin/develop' 2023-01-31 19:50:18 -08:00
Ivan Nieto Vivanco a7a578bf51 Added head only logo to be used as default in apple-touch-icon 2023-01-31 00:13:44 -06:00
snipe e7917d1f93 Rebuild prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 19:16:03 -08:00
snipe 6b729502c6 Rebuilt dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 19:13:40 -08:00
cram42 c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
snipe 05a3f20d51 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-19 15:55:59 -08:00
snipe 0080ac92e7 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-19 15:52:06 -08:00
snipe 91d0c383df Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:47:55 -08:00
snipe e05764ac34 Truncate URL with ellipsis if too long 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:42:26 -08:00
snipe b89979fbec 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
 2022-12-14 17:06:26 -08:00
snipe 8043b86786 Upgraded font awesome to 6.2.1 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-14 16:41:56 -08:00
Godfrey M d0d0058e79 removed unwanted changes 2022-12-06 11:19:28 -08:00
Godfrey M bbd04f8876 adds the rest of the fields for Remote 2022-12-06 11:13:24 -08:00
snipe 97731cd7c8 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-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
 2022-12-05 16:34:34 -08:00
Godfrey M 371a5bf4d6 changes the icon color with themes 2022-11-30 10:37:47 -08:00
Cram42 67d021e457 Add alpinejs to deferred scripts 2022-11-11 11:25:41 +08:00
Cram42 48fb4f2439 Add labels route for testing layouts 2022-11-02 17:23:52 +08:00
snipe c8baf4c6ad Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:25:43 -07:00
snipe ecc6bd8a24 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:24:31 -07:00
snipe da40c0ad48 Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 18:09:18 -07:00
snipe 1377725a97 Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:53:47 -07:00
snipe 58ccfe9226 Updated prod assets 
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-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
 2022-09-27 14:51:19 -07:00
snipe 05ac9f4a68 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:47:54 -07:00
snipe 0889cd61cf Updated skins 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:47:09 -07:00
snipe de399a9f8f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2022-09-27 14:46:30 -07:00
snipe 942eaac2ee Upgraded fontawesome 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:25:44 -07:00
snipe 0924d2144b 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
 2022-09-15 21:47:14 -07:00
snipe ca70988879 Larger checkbox in lists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 21:42:16 -07:00
snipe 421c9baecc # Conflicts: 
Signed-off-by: snipe <snipe@snipe.net>
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2022-09-15 20:11:07 -07:00
snipe 07e0fec1de Downgraded BS Tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 20:05:29 -07:00
snipe 4ac3650d64 Merge remote-tracking branch 'origin/develop' 2022-09-14 18:21:40 -07:00
snipe 9b5790b7e6
Merge pull request #11072 from snipe/fixes/support_apache_24 
YOLO
 2022-09-12 14:26:43 -07:00
snipe a8a00f0a79 Updated prod JS assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-12 11:08:29 -07:00
snipe 448aefac28 Updated compiled assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-12 10:54:54 -07:00
snipe ab60fa08df Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 16:38:11 -07:00
snipe 8b03abde8d Production assets for dark skin fix 
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-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
 2022-07-22 15:39:46 -07:00
snipe c5530104ff Fixed #11549 - dark skin dropdowbn menu fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-22 15:36:51 -07:00
snipe 0d656e3963 Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 17:29:37 -07:00
snipe 50ce471dc6 Production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2022-07-18 17:29:29 -07:00
snipe a92bb80055 Upgraded jquery-UI 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 17:27:54 -07:00
snipe 6f1f6c75e6 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
 2022-07-15 17:11:55 -07:00
snipe 58499c2322 Fixed #11508 - font size in alert menu 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 17:09:17 -07:00
snipe 30c03435e4 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
 2022-07-07 16:01:17 -07:00
snipe d458973649 Removed unneeded JS 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:58:37 -07:00
snipe 9c86b4bf88 Fixes padlock icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:57:33 -07:00
snipe 3a6c6d8466 Prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:40:39 -07:00
snipe b98af0f50f Upgrade font-awesome to v6 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:22:08 -07:00
snipe 18c37c97b8 Dark skin prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:14:12 -07:00
snipe 3a8786fdb7 Updated assets for prod 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:27:31 -07:00
snipe f4c346a57c Small fixes to default blue skin 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:11:42 -07:00
snipe 4b9ec9218d Upgraded/updates assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 15:54:58 -07:00
snipe a758e825ed Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 13:45:33 -07:00
snipe 5fe1078013 Squashed commit of the following: 
commit a011b07d99
Merge: b392ed269 6059e9e11
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:50 2022 -0700

    Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables

    Added fullscreen option to tables

commit b392ed269b
Merge: 693043e64 e6d792bdf
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:41 2022 -0700

    Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header

    Tweaked CSS for smaller padlock

commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:49:00 2022 -0700

    Added fullscreen option to tables

    Signed-off-by: snipe <snipe@snipe.net>

commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:43:12 2022 -0700

    Tweaked CSS for smaller padlock

    Signed-off-by: snipe <snipe@snipe.net>

Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:54:18 -07:00
snipe 7cd35a80b6 Updated assets for production 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:52:47 -07:00
snipe eaecf8137a Updated assets for develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:52:27 -07:00
snipe 61a6c83418 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-black.min.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-blue.min.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-green.min.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-orange.min.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-purple.min.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-red.min.css
#	public/css/dist/skins/skin-yellow.css
#	public/css/dist/skins/skin-yellow.min.css
#	public/mix-manifest.json
 2022-05-18 17:21:32 -07:00
snipe 319eae7810 Recompiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 16:21:04 -07:00
snipe 937472feb0 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
 2022-05-18 13:37:31 -07:00
snipe f14a4d3bc7 Recompiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 13:35:38 -07:00
snipe 4b21d9e7f4 Rebuild production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 11:13:18 -07:00
snipe 3bf2328db2 Regenerated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 11:11:34 -07:00
snipe bf028adcc3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:33:50 -07:00
snipe be5be7a8b9 Bumped packages 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:30:57 -07:00
snipe 3dc4f56fb4 Update constraints to allow up to 8.2 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 17:23:41 -07:00