Commit graph

102 commits

Author SHA1 Message Date
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
2024-04-02 20:34:04 +01: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 f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +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 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
Brady Wetherington f5ff9b2208 Merge branch 'develop' into snipeit_v7 - 2023-06-12 2023-06-12 16:56:23 +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
snipe b1fda46e11 Production assets
Signed-off-by: snipe <[email protected]>
2023-05-10 11:25:28 -07:00
snipe 1f5e4309fa Updated webpack, new asset files
Signed-off-by: snipe <[email protected]>
2023-05-10 11:20:06 -07:00
snipe 5950ec27ab 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/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 <[email protected]>
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
snipe 9a73f5eca3 Updated production assets
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2023-04-17 20:14:50 -07:00
snipe c683233aa3 Updated production assets
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2023-04-03 23:53:57 -07:00
snipe 3bd87a2785 Removed iCheck
Signed-off-by: snipe <[email protected]>
2023-04-03 22:52:54 -07:00
snipe 3473e24de5 Updated assets
Signed-off-by: snipe <[email protected]>
2023-04-03 22:36:23 -07:00
snipe 2c47b63e91 Small tweaks to overrides
Signed-off-by: snipe <[email protected]>
2023-04-03 19:37:07 -07:00
snipe c05ee5db0e Built assets
Signed-off-by: snipe <[email protected]>
2023-04-03 17:08:54 -07:00
snipe 4035cd118e Handle the column selector in bs table styling
Signed-off-by: snipe <[email protected]>
2023-04-03 14:35:47 -07:00
snipe e066f033c8 First attempt at moving us away from iCheck
Signed-off-by: snipe <[email protected]>
2023-04-03 10:54:01 -07:00
snipe dbe0a3352b Updated prod 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-02-28 20:34:20 -08:00
snipe f9b5a67dc2 Compiled dev assets
Signed-off-by: snipe <[email protected]>
2023-02-28 20:32:08 -08:00
snipe 05a3f20d51 Updated production assets
Signed-off-by: snipe <[email protected]>
2023-01-19 15:55:59 -08:00
snipe 0080ac92e7 Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-01-19 15:52:06 -08:00
snipe 91d0c383df Production assets
Signed-off-by: snipe <[email protected]>
2023-01-05 18:47:55 -08:00
snipe e05764ac34 Truncate URL with ellipsis if too long
Signed-off-by: snipe <[email protected]>
2023-01-05 18:42:26 -08:00
snipe c8baf4c6ad Updated prod assets
Signed-off-by: snipe <[email protected]>
2022-10-12 16:25:43 -07:00
snipe ecc6bd8a24 Updated dev assets
Signed-off-by: snipe <[email protected]>
2022-10-12 16:24:31 -07:00
snipe da40c0ad48 Dev assets
Signed-off-by: snipe <[email protected]>
2022-10-04 18:09:18 -07:00
snipe 1377725a97 Dev assets
Signed-off-by: snipe <[email protected]>
2022-09-27 14:53:47 -07:00
snipe 0924d2144b 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
2022-09-15 21:47:14 -07:00
snipe ca70988879 Larger checkbox in lists
Signed-off-by: snipe <[email protected]>
2022-09-15 21:42:16 -07:00
snipe a8a00f0a79 Updated prod JS assets
Signed-off-by: snipe <[email protected]>
2022-09-12 11:08:29 -07:00
snipe ab60fa08df Updated dev assets
Signed-off-by: snipe <[email protected]>
2022-08-24 16:38:11 -07:00