Commit graph

133 commits

Author SHA1 Message Date
snipe 4e35f389df 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-08-29 20:07:03 +01:00
snipe 37d04b7176 Some CSS tweaks for select2
Signed-off-by: snipe <[email protected]>
2024-08-29 17:52:01 +01:00
snipe 821dd158d1 Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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/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 <[email protected]>
2024-08-22 12:53:16 +01:00
snipe 6c9a402685 Updated prod assets
Signed-off-by: snipe <[email protected]>
2024-08-22 11:20:52 +01:00
snipe 94300d81d6 Updated dev assets
Signed-off-by: snipe <[email protected]>
2024-08-22 11:19:32 +01:00
snipe d3a555ce91 Updated assets
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <[email protected]>
2024-08-20 11:49:39 +01:00
snipe b4b6f7a35f Added css-consumable to overrides for table headers
Signed-off-by: snipe <[email protected]>
2024-08-19 11:58:21 +01:00
snipe c1caf6088e Prod assets
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <[email protected]>
2024-08-16 13:12:13 +01:00
snipe 67655ad84b Dev assets
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <[email protected]>
2024-08-16 13:11:33 +01:00
snipe 47f1b3b14e Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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-08-13 16:48:06 +01:00
snipe 4f0f0af83b Make the border radius match the rest of the site
Signed-off-by: snipe <[email protected]>
2024-08-13 16:46:26 +01:00
snipe 198afee946 Fixed select2 “x” color on mult-select and border color
Signed-off-by: snipe <[email protected]>
2024-08-13 16:42:23 +01:00
snipe 198b76ebc2 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-08-13 15:47:00 +01:00
snipe 389a06aac5 Hide UI elements from print view on assets
Signed-off-by: snipe <[email protected]>
2024-08-13 15:40:51 +01:00
snipe 277a0fd16a Make selected tab bold
Signed-off-by: snipe <[email protected]>
2024-08-13 14:19:41 +01:00
snipe 24560b9362 Updated prod assets
Signed-off-by: snipe <[email protected]>
2024-08-10 18:24:49 +01:00
snipe 2f299dbb20 Upgrade fontawesome, generate dev assets
Signed-off-by: snipe <[email protected]>
2024-08-10 15:51:24 +01:00
snipe 23c1d664fe Prod assets
Signed-off-by: snipe <[email protected]>
2024-06-24 22:07:01 +01:00
snipe 221c4eeb0c Dev assets
Signed-off-by: snipe <[email protected]>
2024-06-24 21:59:27 +01:00
snipe 6c6a3649ea Production assets
Signed-off-by: snipe <[email protected]>
2024-06-18 09:33:07 +01:00
snipe e28619f769 Bumped papaparse library
Signed-off-by: snipe <[email protected]>
2024-06-18 09:30:24 +01:00
snipe 569f05a99e Built prod assets
Signed-off-by: snipe <[email protected]>
2024-06-17 10:45:04 +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 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 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