Commit graph

203 commits

Author SHA1 Message Date
snipe d44202e55b 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-04-03 13:09:48 +01:00
snipe df95447ea4 New dev assets
Signed-off-by: snipe <[email protected]>
2024-04-03 13:08:08 +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 7070bad53b 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-03-18 12:32:22 +00:00
snipe 4cd4a936d8 Updated dev assets
Signed-off-by: snipe <[email protected]>
2024-03-14 15:43:47 +00:00
snipe bd566324ed Updated assets
Signed-off-by: snipe <[email protected]>
2024-03-06 20:20:23 +00:00
snipe 939e4cba3e Updated prod assets
Signed-off-by: snipe <[email protected]>
2024-03-06 20:05:16 +00:00
snipe 02862d80eb Updated dev assets
Signed-off-by: snipe <[email protected]>
2024-03-06 20:04:31 +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
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
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
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
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
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
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
snipe 42f0975414 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2023-04-25 22:12:56 -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 46cce0115e Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2023-04-16 05:43:42 -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