snipe
|
a111482217
|
Use number_format on badges
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 14:59:06 -07:00 |
|
|
snipe
|
a758e825ed
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 13:45:33 -07:00 |
|
|
snipe
|
af66f83a3d
|
Check for blank (not null) values i asset transformer date
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 13:42:30 -07:00 |
|
|
snipe
|
b3605fa141
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-15 11:39:16 -07:00 |
|
|
snipe
|
6f713985fb
|
Merge pull request #11324 from snipe/features/add_badges_to_companies
Features/add badges to companies
|
2022-06-15 11:38:32 -07:00 |
|
|
snipe
|
677e5a8cf1
|
Added tab badges to company detail view
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 11:37:44 -07:00 |
|
|
snipe
|
872600a7a7
|
Link company on license page
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 11:37:26 -07:00 |
|
|
snipe
|
61c601dbdf
|
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-06-15 02:09:32 -07:00 |
|
|
snipe
|
74bc06cc49
|
Removed debugging code
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 02:07:58 -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
|
a011b07d99
|
Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables
Added fullscreen option to tables
|
2022-06-14 17:52:50 -07:00 |
|
|
snipe
|
b392ed269b
|
Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header
Tweaked CSS for smaller padlock
|
2022-06-14 17:52:41 -07:00 |
|
|
snipe
|
6059e9e119
|
Added fullscreen option to tables
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 17:49:00 -07:00 |
|
|
snipe
|
e6d792bdf7
|
Tweaked CSS for smaller padlock
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 17:43:12 -07:00 |
|
|
snipe
|
f16a4b6aef
|
Removed footer from show category
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 17:16:14 -07:00 |
|
|
snipe
|
d74b4f55fb
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-14 17:15:39 -07:00 |
|
|
snipe
|
693043e645
|
Merge pull request #11313 from snipe/fixes/nicer_suppliers_mfgs_ui
Nicer suppliers and manufacturers UI
|
2022-06-14 17:14:53 -07:00 |
|
|
snipe
|
e935a34946
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-14 16:25:50 -07:00 |
|
|
snipe
|
4052e360c1
|
Merge pull request #11314 from snipe/fixes/deja_vu_font_pdf
Fixed #11175 - Use the Deja Vu font in PDFs to be able to support Cyrillic, etc
|
2022-06-14 16:25:33 -07:00 |
|
|
snipe
|
cc6a2f2d49
|
Use the Deja Vu font to be able to support cyrllic, etc
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 16:23:30 -07:00 |
|
|
snipe
|
07bc2fd742
|
Added maintenance scope for ordering by supplier
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 16:11:43 -07:00 |
|
|
snipe
|
a57a6486e7
|
Only add http:// if the url variable isn’t blank
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 16:11:13 -07:00 |
|
|
snipe
|
a33276cb3d
|
Additional filters on maintenances UI
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 16:10:48 -07:00 |
|
|
snipe
|
bfec0059c5
|
Improved manufacturers UI
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 16:10:36 -07:00 |
|
|
snipe
|
aea9dd1de5
|
Improved suplpiers UI
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 16:06:56 -07:00 |
|
|
snipe
|
954b54f914
|
Removed duplicated $allowed_columns
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 15:06:04 -07:00 |
|
|
snipe
|
56a15731ef
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-14 12:56:16 -07:00 |
|
|
snipe
|
766e59acde
|
Merge pull request #11310 from snipe/fixes/statuslabels_bulk_edit
Fixes #11308 - bulk edit on statuslabels detail page
|
2022-06-14 12:55:56 -07:00 |
|
|
snipe
|
f1a63f25e7
|
Partialize and add data atributes to statuslabel bulk
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 12:50:26 -07:00 |
|
|
snipe
|
88dfdb7538
|
Fixed bug in uncheck
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 12:50:10 -07:00 |
|
|
snipe
|
9072f7c6c9
|
Added click-to-select to tables
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-14 12:49:50 -07:00 |
|
|
snipe
|
bff34063cd
|
Merge pull request #11309 from uberbrady/ldap_troubleshooter_improvements
Fixed SC-19104 - fixes to ldap:troubleshoot artisan command
|
2022-06-14 12:24:24 -07:00 |
|
Brady Wetherington
|
1e685ca835
|
Fixed SC-19104 - fixes to ldap:troubleshoot artisan command
|
2022-06-14 12:18:42 -07:00 |
|
|
snipe
|
b55630aafa
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-14 11:45:27 -07:00 |
|
|
snipe
|
c3b644797e
|
Merge pull request #11169 from inietov/fixes/user_update_from_import_location_in_assets
Fixes Asset location doesn't change when assigned user's location change via importer
|
2022-06-14 11:44:26 -07:00 |
|
|
snipe
|
1806dacb9d
|
Bumped hash on master to 6.0.4
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-06-13 23:59:43 -07:00 |
|
|
snipe
|
abb7f23ca5
|
Bumped version to 6.0.4
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 23:58:53 -07:00 |
|
|
snipe
|
b448c89655
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-06-13 23:52:48 -07:00 |
|
|
snipe
|
8857391da7
|
Merge pull request #11305 from inietov/fixes/trying_to_access_array_offset_on_value_of_type_null
Fixed #11304 Trying to access array offset on value of type null at .../Transformers/AssetsTransformer.php
|
2022-06-13 23:51:51 -07:00 |
|
Ivan Nieto Vivanco
|
50c008ead5
|
Adds check in condition that format custom dates
|
2022-06-14 01:37:15 -05:00 |
|
|
snipe
|
3e8837dd6e
|
Bumped dev branch to 6.0.3
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 22:13:18 -07:00 |
|
|
snipe
|
ea1ff1e8bb
|
Bumped version to 6.0.3
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 22:12:40 -07:00 |
|
|
snipe
|
a7b155108d
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-13 22:07:13 -07:00 |
|
|
snipe
|
44c0c1bf0e
|
Merge pull request #11301 from snipe/features/models_view_in_categories
Added models view (and bulk edit) in category detail view
|
2022-06-13 21:45:43 -07:00 |
|
|
snipe
|
7cd35a80b6
|
Updated assets for production
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:52:47 -07:00 |
|
|
snipe
|
e8973f08b5
|
Added a back button
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:47:35 -07:00 |
|
|
snipe
|
dd9c9520fb
|
Correctly filter by category_id
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:42:21 -07:00 |
|
|
snipe
|
aec033d8d2
|
Use better phrasing for tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:33:37 -07:00 |
|
|
snipe
|
5496b62b33
|
Split categories into two tabs if the type = asset
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:30:50 -07:00 |
|
|
snipe
|
e393e2eb4b
|
Fixed issue in BS tables where uncheck-all then checking a few would not uncheck properly
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:30:35 -07:00 |
|