DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
13674 commits 96 branches 267 tags 295 MiB
Commit graph

219 commits

Author SHA1 Message Date
snipe 8ee5e7cd0a #14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5 
Signed-off-by: snipe <[email protected]>
 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 69122034e7 Fixed icon table headers 
Signed-off-by: snipe <[email protected]>
 2024-05-07 17:55:33 +01:00
snipe 49dc9767b6 Added debugging :( 
Signed-off-by: snipe <[email protected]>
 2024-05-07 15:54:43 +01:00
snipe 2b4a536f85 Added CSS for users, locations 
Signed-off-by: snipe <[email protected]>
 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 4d093160fc Upgrade @fortawesome/fontawesome-free from 6.5.1 to 6.5.2 #14647 
Signed-off-by: snipe <[email protected]>
 2024-05-06 12:21:34 +01:00
snipe 4b6d236eb7 Added class for sidebar menu badges 
Signed-off-by: snipe <[email protected]>
 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 e330e80c46 Reeduced z-index of bs table override 
Signed-off-by: snipe <[email protected]>
 2024-04-19 16:06:43 +01:00
snipe 774d0aa90c Updated dev assets 
Signed-off-by: snipe <[email protected]>
 2024-04-04 15:05:35 +01:00
snipe df95447ea4 New dev assets 
Signed-off-by: snipe <[email protected]>
 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 faf48b1684 [Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455 
Signed-off-by: snipe <[email protected]>
 2024-03-20 10:37:53 +00:00
snipe 4cd4a936d8 Updated dev assets 
Signed-off-by: snipe <[email protected]>
 2024-03-14 15:43:47 +00:00
snipe 02862d80eb Updated dev assets 
Signed-off-by: snipe <[email protected]>
 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 0042359e5f Prod assets 
Signed-off-by: snipe <[email protected]>
 2024-02-05 17:23:30 +00:00
snipe cf2e2bfbc1 Updated prod assets 
Signed-off-by: snipe <[email protected]>
 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 <[email protected]>
 2024-01-05 15:16:14 +00:00
snipe f5960388f1 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
 2024-01-05 14:56:34 +00:00
snipe c8816354ae Updated assets for master 
Signed-off-by: snipe <[email protected]>
 2024-01-03 23:28:54 +00:00
snipe bbdc8383e1 Updated assets 
Signed-off-by: snipe <[email protected]>
 2024-01-03 23:17:44 +00:00
snipe ec3c4674de Updated prod assets 
Signed-off-by: snipe <[email protected]>
 2023-12-15 13:58:45 +00:00
snipe f8a56f6dc2 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
 2023-12-12 00:58:20 +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 <[email protected]>

# 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 <[email protected]>
 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 cfe6b07b3a Updated prod assets 
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
 2023-09-28 15:12:44 +01:00
snipe d7790cd16b Updated assets 
Signed-off-by: snipe <[email protected]>
 2023-09-18 22:24:15 +01:00
snipe 2a638e66f0 Added column re-ordering 
Signed-off-by: snipe <[email protected]>
 2023-09-15 21:53:34 +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 <[email protected]>

# 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 <[email protected]>
 2023-08-30 15:43:06 +01:00
snipe c18349d75f Updated webpack 
Signed-off-by: snipe <[email protected]>
 2023-08-08 22:07:49 +01:00
snipe 7debf126d6 Dev assets 
Signed-off-by: snipe <[email protected]>
 2023-07-10 20:03:12 +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 <[email protected]>

# 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 <[email protected]>
 2023-06-08 08:48:18 +01:00
snipe c05a4452bc Merge + update assets 
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
 2023-05-24 16:13:33 -07:00
snipe a3a64be19b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
 2023-05-24 16:02:28 -07:00
snipe f69caf77e5 Updated dev assets 
Signed-off-by: snipe <[email protected]>
 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