snipe
|
24a3e0ee83
|
Added LOGIN_AUTOCOMPLETE as env var
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-15 01:56:01 +01:00 |
|
snipe
|
d3fbbec92c
|
Merge pull request #13455 from snipe/fixes/confusion_around_localization_date
Fixed #13382 - confusion around localization date
|
2023-08-14 22:50:30 +01:00 |
|
snipe
|
9820ab34d7
|
Use today’s date for date format selectlist
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-14 22:44:29 +01:00 |
|
Godfrey M
|
c3356ab765
|
fixed translation choice and color choice
|
2023-08-14 12:20:46 -07:00 |
|
Godfrey M
|
6b94ef6adc
|
fixes the statuslabeltypeforatter instead of the model
|
2023-08-14 12:13:01 -07:00 |
|
snipe
|
58286c9cab
|
Fixed case in BS table formatter for boolean
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-14 13:01:32 +01:00 |
|
Robert-Azelis
|
da701677c7
|
Update edit.blade.php
|
2023-08-13 17:24:17 +02:00 |
|
snipe
|
a6a742d8d8
|
Merge pull request #13407 from marcusmoore/feature/sc-23465
Added messaging to category edit page to improve clarity around when users will be emailed
|
2023-08-09 10:36:19 +01:00 |
|
snipe
|
6a3a38b6f6
|
Call tooltip again on custom fields jquery
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 18:53:57 +01:00 |
|
snipe
|
40aca9709a
|
Added container to the tooltip invocation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 18:52:26 +01:00 |
|
snipe
|
bd4061e023
|
Change text on dropdown
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 08:18:56 +01:00 |
|
snipe
|
5bda73f151
|
Ugh - messing with the blade layout
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-08 08:18:40 +01:00 |
|
Marcus Moore
|
d019e62d39
|
Remove lazy from eula field to avoid race condition
|
2023-08-02 18:22:40 -07:00 |
|
Ivan Nieto Vivanco
|
9ca163e8cf
|
Stop asset acceptances from shown to user if full company support is enabled and companies not match
|
2023-08-02 19:22:35 -06:00 |
|
Marcus Moore
|
b70a5280f9
|
Remove unneed jquery
|
2023-08-02 18:04:21 -07:00 |
|
Marcus Moore
|
cbe5a9bc8a
|
Persist eula text even when field is disabled
|
2023-08-02 18:03:09 -07:00 |
|
Marcus Moore
|
2e7aa01abe
|
Pass checkin_email value to backend even when unchecked
|
2023-08-02 17:45:39 -07:00 |
|
Marcus Moore
|
896f038054
|
Set send email back to original value when eulas cleared
|
2023-08-02 17:03:56 -07:00 |
|
Marcus Moore
|
48979ce177
|
Disable send email when it should not be modified
|
2023-08-02 16:52:56 -07:00 |
|
Marcus Moore
|
e12935f7fa
|
Disable eula textarea when using global eula
|
2023-08-02 16:18:57 -07:00 |
|
Marcus Moore
|
6400034435
|
Improve variable name
|
2023-08-02 16:06:59 -07:00 |
|
Marcus Moore
|
105c94aea9
|
Implement toggling message when email will be sent
|
2023-08-02 11:36:20 -07:00 |
|
Marcus Moore
|
6349d52803
|
WIP: migrate to livewire
|
2023-08-01 17:29:23 -07:00 |
|
Marcus Moore
|
65de9c5e07
|
Extract translation strings
|
2023-08-01 15:21:49 -07:00 |
|
Marcus Moore
|
ebfc395e78
|
Improve messaging
|
2023-08-01 14:39:30 -07:00 |
|
Marcus Moore
|
5c8c2ca027
|
Improve variable names
|
2023-08-01 14:26:21 -07:00 |
|
snipe
|
2e1c3fb51b
|
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields
Fixed #11794 Admins Cannot View Encrypted Field
|
2023-07-31 13:08:28 +01:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
Godfrey M
|
9c6e8d57aa
|
removes typos
|
2023-07-25 11:44:16 -07:00 |
|
Godfrey M
|
11e3487263
|
custom field set order starts at 1 now
|
2023-07-25 11:41:08 -07:00 |
|
snipe
|
a01cb26aac
|
Merge pull request #12940 from akemidx/delete_asset_from_view_page
Delete button on asset view page
|
2023-07-25 12:11:35 +01:00 |
|
akemidx
|
e289e95721
|
no ? needed
|
2023-07-24 17:22:10 -04:00 |
|
akemidx
|
b082d27c42
|
removing :item
|
2023-07-24 17:12:12 -04:00 |
|
snipe
|
1a771e6ab9
|
Check that the model is valid before trying to chain the relationship
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-21 14:46:58 +01:00 |
|
snipe
|
7f761000b4
|
Use slightly less terrifying and more accurate language
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-21 14:46:39 +01:00 |
|
Ivan Nieto Vivanco
|
ecf522243b
|
Add the new rule to proper views and also in the Asset Transformer
|
2023-07-19 19:52:03 -06:00 |
|
snipe
|
33fd904c18
|
Merge pull request #13330 from akemidx/merge_users_typo
merge users page typo fix
|
2023-07-19 10:26:57 +01:00 |
|
akemidx
|
064e696521
|
merge users page typo fix
|
2023-07-18 15:33:33 -04:00 |
|
Marcus Moore
|
2eaab6d9fb
|
Change message to a callout
|
2023-07-17 12:23:31 -07:00 |
|
snipe
|
c21a7db3c1
|
Moved warranty into manufactuer’s section
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-15 10:45:36 +01:00 |
|
snipe
|
3078cab7ee
|
Added ability to show/hide custom fields in list views by default
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-14 09:09:43 +01:00 |
|
snipe
|
4027acee46
|
Merge pull request #13184 from akemidx/department_in_side_bar
User department now visible in side pane of asset view page
|
2023-07-13 21:01:48 +01:00 |
|
snipe
|
5aa99a15d8
|
Merge pull request #13288 from snipe/fixes/line_based_markdown
Added Inline markdown method
|
2023-07-13 13:16:50 +01:00 |
|
snipe
|
5d1f294f0e
|
Added parseEscapedMarkedownInline to accessories API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-13 12:03:01 +01:00 |
|
akemidx
|
1163af3c10
|
change to make sure department actually exists
|
2023-07-12 15:57:44 -04:00 |
|
snipe
|
c1c2c38995
|
Fixed #13256 - Added option to switch to localStorage instead of cookies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-12 20:06:17 +01:00 |
|
snipe
|
44231fa52c
|
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin
Fixed #13167 Default location not being set/updated upon check-in
|
2023-07-12 19:14:53 +01:00 |
|
snipe
|
44b8558e38
|
Merge pull request #13233 from Godmartinz/barcode_adjusts_if_qr_code_
fixed margin if qr_code present
|
2023-07-12 17:11:58 +01:00 |
|
snipe
|
a569a99e61
|
Used inline markdown in views
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-12 16:57:04 +01:00 |
|
Marcus Moore
|
3df175fb3e
|
Improve variable name
|
2023-07-11 16:36:38 -07:00 |
|
Marcus Moore
|
44d8b2fd5e
|
Handle default eula checkbox
|
2023-07-11 16:36:03 -07:00 |
|
Ivan Nieto Vivanco
|
e0df8cc4aa
|
Add admin role to show encrypted customfield values
|
2023-07-11 17:21:32 -06:00 |
|
Marcus Moore
|
af681d8190
|
Display message and update checkbox depending on EULA status
|
2023-07-11 16:12:43 -07:00 |
|
snipe
|
b5695c9ab7
|
Test parsedown in notes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-11 12:20:47 +01:00 |
|
snipe
|
ba37a9db8c
|
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations
Added phone, fax to departments, locations, companies
|
2023-07-11 11:15:13 +01:00 |
|
Ivan Nieto Vivanco
|
ec8cb1b09e
|
Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash
|
2023-07-10 16:34:00 -06:00 |
|
snipe
|
14c61e4c17
|
Added phone, fax to departments, locations, companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-10 19:44:21 +01:00 |
|
Marcus Moore
|
ef160b0e15
|
Add span tag so label is displayed properly
|
2023-07-06 10:49:57 -07:00 |
|
Ivan Nieto Vivanco
|
f4ca29b4a8
|
Only show radio inputs for location in checkin view
|
2023-07-06 11:36:55 -06:00 |
|
Ivan Nieto Vivanco
|
743e852998
|
Add radio buttons to alter asset checkin location behavior
|
2023-07-06 10:38:48 -06:00 |
|
Godfrey M
|
d44e667697
|
fixed margin if qr_code present
|
2023-06-29 13:37:38 -07:00 |
|
snipe
|
bbbeaaee2b
|
Merge pull request #13232 from Godmartinz/labels_overlapping_issue
fixed barcode and info from overlapping
|
2023-06-29 21:23:31 +01:00 |
|
Godfrey M
|
df90e924b4
|
prevent labels from overlapping
|
2023-06-29 13:18:17 -07:00 |
|
akemidx
|
d0212d4bda
|
formatting fix
|
2023-06-29 15:39:19 -04:00 |
|
slong753
|
8cee3a8218
|
ok, @marcusmoore was right all along
i just didn't get it
|
2023-06-29 14:06:52 -05:00 |
|
Godfrey M
|
f83effbb85
|
removed unnecessary css rule
|
2023-06-29 11:25:40 -07:00 |
|
Godfrey M
|
d4cddebba5
|
fixes custom fields labels being unreadable
|
2023-06-29 11:21:21 -07:00 |
|
slong753
|
826ea0ded8
|
move colon to blade based on a comment
|
2023-06-29 10:40:04 -05:00 |
|
snipe
|
a3096e1b47
|
Merge pull request #13219 from inietov/features/cancel_request_asset
Cancel requested assets without checkin/out [ch-17606]
|
2023-06-29 16:18:13 +01:00 |
|
akemidx
|
af03b9f140
|
user department clarification & translation for that phrase. will be used in a later PR
|
2023-06-28 17:45:13 -04:00 |
|
slong753
|
8923206ac8
|
translation string
|
2023-06-28 13:08:34 -05:00 |
|
slong753
|
3b8ab2d682
|
clean formatting a little
|
2023-06-28 13:00:59 -05:00 |
|
slong753
|
2d27941105
|
added to textarea too
|
2023-06-28 12:59:54 -05:00 |
|
slong753
|
50a518e5f3
|
disable input when field is unique
|
2023-06-28 12:57:23 -05:00 |
|
Ivan Nieto Vivanco
|
e2c2736a9c
|
Delete (gulp) Form for bulk edit since is not used in this view
|
2023-06-28 11:23:37 -06:00 |
|
Ivan Nieto Vivanco
|
85e717bc4e
|
Fix cancel button style and translate title
|
2023-06-28 10:38:44 -06:00 |
|
snipe
|
161f4c8d83
|
Merge pull request #13045 from akemidx/feature/sc-23261
Checkin/out info on side bar
|
2023-06-28 16:41:21 +01:00 |
|
slong753
|
8b8e7cb5ee
|
couple translation strings
|
2023-06-28 10:17:28 -05:00 |
|
Ivan Nieto Vivanco
|
1c29bd37a6
|
Added feature to cancel requests from the Requested Assets view
|
2023-06-27 18:11:10 -06:00 |
|
Ivan Nieto Vivanco
|
b647a8fcd2
|
Change the inline form HTML label to the Form:: facade
|
2023-06-27 17:02:25 -06:00 |
|
Ivan Nieto Vivanco
|
62347a56ba
|
Add button with cancel action in requested assets view
|
2023-06-27 16:41:30 -06:00 |
|
Marcus Moore
|
b0177d513a
|
Fix translation
|
2023-06-27 12:37:19 -07:00 |
|
slong753
|
e8988bf51e
|
add list
|
2023-06-26 20:22:27 -05:00 |
|
slong753
|
2736161909
|
oops, fixed translation
|
2023-06-26 16:37:06 -05:00 |
|
slong753
|
8cbff0179c
|
translation strings
|
2023-06-26 16:35:53 -05:00 |
|
slong753
|
691faf6340
|
ok, this kind of works - pr needs some clean up
|
2023-06-26 14:56:07 -05:00 |
|
Spencer Long
|
f646623a5e
|
Merge branch 'develop' into bulk_edit_custom_fields
|
2023-06-22 18:00:31 -05:00 |
|
snipe
|
4029efebfd
|
Merge pull request #13159 from Godmartinz/audit_image_bug
fixed audit log image not appearing
|
2023-06-22 21:11:39 +01:00 |
|
akemidx
|
4b8a08edc1
|
typo
|
2023-06-20 19:32:16 -04:00 |
|
akemidx
|
1a407dc05b
|
user department now in side view of asset view page
|
2023-06-20 19:17:14 -04:00 |
|
snipe
|
7a425f8a49
|
Merge pull request #13093 from NojoudAlshehri/features/added_asset_tag_colum_in_requestable_assets
feature: Added asset_tag column in requestable assets page
|
2023-06-15 19:37:18 +01:00 |
|
snipe
|
21a27f43a9
|
Merge pull request #13158 from Godmartinz/asset_maint_warranty_bug
Added warranty confirmation to asset maintenance table
|
2023-06-15 19:34:16 +01:00 |
|
snipe
|
004992086e
|
Merge pull request #13098 from ak-piracha/feature/snipe-13049-status-label-chart-color
Fixed #13098: Status Label Chart Color, resets to default when editing a Status Label
|
2023-06-15 16:55:32 +01:00 |
|
snipe
|
157a4341ea
|
Merge pull request #13041 from snipe/features/refactor_importer_for_localization
Refactor importer for localization
|
2023-06-13 18:12:07 +01:00 |
|
snipe
|
0bb8cc63c5
|
Updated translation strings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-13 17:12:01 +01:00 |
|
Godfrey M
|
fc86530c94
|
uses the trueFalseFormatter now
|
2023-06-13 09:10:42 -07:00 |
|
Godfrey M
|
6dd7181d09
|
fixed audit log image not appearing
|
2023-06-12 12:10:19 -07:00 |
|
Godfrey M
|
69325beddb
|
adds warranty confirmation to asset maintenance table
|
2023-06-12 11:03:32 -07:00 |
|
NojoudAlshehri
|
d06bdc2db4
|
Fix of typo in an HTML tag
|
2023-06-07 13:46:17 +07:00 |
|
snipe
|
7ae260b489
|
More license translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-01 19:51:06 +01:00 |
|
ak-piracha
|
daf6bcb6d5
|
follow best practices when working with blade and javascript
|
2023-06-01 11:07:21 +09:30 |
|
snipe
|
13e8f91a59
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-29 18:18:46 -04:00 |
|
ak-piracha
|
825a9a384d
|
Fixed
|
2023-05-29 14:07:53 +09:30 |
|
NojoudAlshehri
|
980cb53efa
|
Added asset_tag column in requestable assets page
|
2023-05-27 07:05:59 +07:00 |
|
snipe
|
44cbb0c2e9
|
Merge branch 'develop' into asset_info_overflow
|
2023-05-24 16:11:34 -07:00 |
|
snipe
|
064dbdd3d4
|
Fixed missing brace from conflict
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-24 16:02:23 -07:00 |
|
snipe
|
9086cb5310
|
Merge branch 'develop' into fix_unclickable_nav_bar_and_notifcation_block
|
2023-05-24 15:56:01 -07:00 |
|
snipe
|
47fa490e8a
|
More translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 19:28:23 -07:00 |
|
snipe
|
80e8022c76
|
Merge pull request #13044 from Godmartinz/bug/sc-23260_multi_select_example_text
Bug/sc 23260 multi select example text
|
2023-05-23 14:45:55 -07:00 |
|
snipe
|
35794c8ba2
|
More translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-23 12:57:48 -07:00 |
|
Godfrey M
|
68a43cb590
|
fixes mobile nav bar and notification position
|
2023-05-23 12:43:32 -07:00 |
|
Ivan Nieto Vivanco
|
6df9a33eab
|
Add a condition to check if images should be shown in notification
|
2023-05-22 16:24:16 -06:00 |
|
snipe
|
511d83cc47
|
Added/fixed a few more translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:52:42 -07:00 |
|
snipe
|
0ea29a0224
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:21:36 -07:00 |
|
snipe
|
b7149d8339
|
Added translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-20 14:20:38 -07:00 |
|
Godfrey M
|
608d07d03c
|
adds overflow-wrap to asset info table
|
2023-05-17 13:08:53 -07:00 |
|
Godfrey M
|
addd806653
|
testing overflow solutions
|
2023-05-17 10:47:50 -07:00 |
|
Godfrey M
|
fe60309dfd
|
adds padding to multi select2 inputs
|
2023-05-17 10:19:25 -07:00 |
|
akemidx
|
deca80ba71
|
checkin/out info on side bar
|
2023-05-17 13:17:48 -04:00 |
|
Godfrey M
|
448472b6d3
|
testing input paddings
|
2023-05-17 09:45:45 -07:00 |
|
snipe
|
7012018e22
|
Removed todo
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 22:30:17 -07:00 |
|
snipe
|
3cbb4620c3
|
Merge pull request #13008 from Godmartinz/importer_happy_changes
Added standardized colors to the importer
|
2023-05-16 17:26:32 -07:00 |
|
snipe
|
f1575d2020
|
Merge pull request #13024 from Godmartinz/adds_localization_to_checkout_notif
adds translation to checkout notification
|
2023-05-16 17:25:50 -07:00 |
|
snipe
|
b9b9eb86d9
|
Merge pull request #13036 from snipe/features/multiselect_locations_custom_report
Added multi-select option for location, more to custom report
|
2023-05-16 16:29:13 -07:00 |
|
snipe
|
fe92667812
|
Use actions text in backups table
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 16:02:48 -07:00 |
|
snipe
|
02cacf76c6
|
Additional multi-select options for custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-16 13:58:21 -07:00 |
|
Godfrey M
|
46d6783fc5
|
adds translation to checkout notification
|
2023-05-15 09:01:30 -07:00 |
|
akemidx
|
ba4fc146e2
|
Merge branch 'delete_asset_from_view_page' of https://github.com/akemidx/snipe-it into delete_asset_from_view_page
|
2023-05-10 19:30:11 -04:00 |
|
akemidx
|
1916594d27
|
fixing translation
|
2023-05-10 19:16:11 -04:00 |
|
Godfrey M
|
763176c86b
|
standardizes the importer colors no matter the theme
|
2023-05-10 14:52:08 -07:00 |
|
snipe
|
0f3b77ee2d
|
Added multi-select option to custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 14:45:31 -07:00 |
|
snipe
|
a49257ad4b
|
Wrong eval
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 13:16:59 -07:00 |
|
snipe
|
c6eef86661
|
Fixed multiselect for companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 13:15:22 -07:00 |
|
snipe
|
23e3d18931
|
Used brackets for multiselect company
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 12:35:30 -07:00 |
|
snipe
|
9f39d71f16
|
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report
Added Multiselect of companies for custom reports
|
2023-05-10 11:36:21 -07:00 |
|
snipe
|
b8a59cc2d8
|
Merge branch 'master' into develop
|
2023-05-10 09:32:26 -07:00 |
|
snipe
|
7c77f4a697
|
Extra debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 09:10:53 -07:00 |
|
akemidx
|
537aa04c9a
|
Merge branch 'develop' into delete_asset_from_view_page
|
2023-05-10 09:30:54 -04:00 |
|
snipe
|
27e0484072
|
I lied. Missed one
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 03:12:22 -07:00 |
|
snipe
|
ec76de607b
|
Final google login tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 03:08:29 -07:00 |
|
snipe
|
14da8934c5
|
Few more login page tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:53:11 -07:00 |
|
snipe
|
ed370a0104
|
Added translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:47:28 -07:00 |
|
snipe
|
b99640ecb2
|
Added ends_with validation message
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:40:55 -07:00 |
|
snipe
|
f3c977aa9d
|
Nicer button
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:37:01 -07:00 |
|
snipe
|
788c03ef57
|
Hide client secret if app is locked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:22:49 -07:00 |
|
snipe
|
3c00f68bda
|
Added translation string for google auth failure
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:18:50 -07:00 |
|
snipe
|
1ef4ea6381
|
Very ugly login shim just to test functionality
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:14:31 -07:00 |
|
snipe
|
37bc47290c
|
Disabled fields in demo mode
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:12:55 -07:00 |
|
snipe
|
4da40792ea
|
Use google logo
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:08:28 -07:00 |
|
snipe
|
f57e39191d
|
Added google settings blade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:55:16 -07:00 |
|
snipe
|
6ab214d3a6
|
Added google option to settings index
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:55:04 -07:00 |
|
snipe
|
bc9b47c46d
|
Removed env dependency, switched to DB
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:27:47 -07:00 |
|
snipe
|
c52b48c383
|
Google oauth login
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:14:28 -07:00 |
|
snipe
|
11cd875c6d
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 22:42:45 -07:00 |
|
snipe
|
0680405f4d
|
Tightened up some layout issues, checkbox issues in LDAP settings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 22:34:46 -07:00 |
|
snipe
|
cbe70c9cc1
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 20:14:44 -07:00 |
|
snipe
|
6a7bab453f
|
Made spacing more compact
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 20:14:00 -07:00 |
|
snipe
|
7412bc32e2
|
Merge pull request #12991 from snipe/fixes/accessories_view
Fixed width of columns in details
|
2023-05-09 20:11:36 -07:00 |
|
snipe
|
ec4697fd3e
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 19:45:10 -07:00 |
|
snipe
|
999dc3c358
|
Added icon field back into assets page
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 19:43:37 -07:00 |
|
snipe
|
a10652797f
|
Fixed width of columns in details
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 19:42:32 -07:00 |
|
snipe
|
a43dea3c04
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 16:29:53 -07:00 |
|
snipe
|
2d5da67b1e
|
Merge pull request #12982 from akemidx/feature/sc-23214
Buttons on the Accessory View Page
|
2023-05-09 14:26:28 -07:00 |
|
slong753
|
1d2596fc54
|
wip
|
2023-05-09 14:58:59 -05:00 |
|
snipe
|
7dd41aa574
|
Removed whitespace
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 15:49:12 -07:00 |
|
snipe
|
c4d40cdbd4
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-08 15:11:25 -07:00 |
|
snipe
|
277618bf16
|
Added maxlenth to form fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 14:13:24 -07:00 |
|
snipe
|
6cb6beb6c7
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-08 13:21:43 -07:00 |
|
snipe
|
d70e14de61
|
Merge pull request #12972 from marcusmoore/bug/sc-23177
Fixes user name missing in accessory acceptance notifications
|
2023-05-08 13:04:37 -07:00 |
|
snipe
|
a73205f228
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-08 11:24:03 -07:00 |
|
snipe
|
223ff5e97e
|
Fixed misplaced div when saml is disabled
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 11:20:26 -07:00 |
|
snipe
|
3d345d15ac
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-04 11:01:15 -07:00 |
|
snipe
|
60515f1262
|
Show signature column regardless of “require sig” state
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-04 10:56:35 -07:00 |
|
Marcus Moore
|
9efe13bb5e
|
Capitalize "declined" in acceptance in notification
|
2023-05-03 17:03:22 -07:00 |
|
snipe
|
5950ec27ab
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# 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 |
|
akemidx
|
526c089424
|
Buttons on the accessory view page
|
2023-05-03 16:40:06 -04:00 |
|
akemidx
|
67105528d1
|
Buttons on the accessory view page
|
2023-05-03 16:31:56 -04:00 |
|
akemidx
|
12f0c42545
|
buttons added
|
2023-05-03 16:31:56 -04:00 |
|
slong753
|
815c77f943
|
wip
|
2023-05-03 14:49:31 -05:00 |
|
snipe
|
fe710efb40
|
Merge pull request #12874 from Godmartinz/feature/sc-23130
Adds a checkout range for custom asset reports
|
2023-05-03 11:43:44 -07:00 |
|
snipe
|
b716f9f55e
|
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
Added ability to auto-add fields to new fieldsets
|
2023-05-03 11:04:33 -07:00 |
|
snipe
|
4a643c1252
|
Merge pull request #12880 from Godmartinz/asset_total_cost
Added component costs to asset view
|
2023-05-03 10:49:03 -07:00 |
|
snipe
|
466c2fd47c
|
Merge pull request #12966 from Godmartinz/bug/sc-23161
fixed color differences in dark themes
|
2023-05-03 10:38:54 -07:00 |
|
Godfrey M
|
87d1a82e35
|
moar changes to red
|
2023-05-02 15:15:02 -07:00 |
|
Godfrey M
|
1d494252ef
|
corrections for dark red
|
2023-05-02 14:05:29 -07:00 |
|
Godfrey M
|
786e8deb91
|
removed dead space
|
2023-05-02 13:54:14 -07:00 |
|
Godfrey M
|
0a3cb5286d
|
fixes dark red
|
2023-05-02 12:37:05 -07:00 |
|
Godfrey M
|
f91e76e0f2
|
fixes dark blue and btn-warning bg
|
2023-05-02 12:33:40 -07:00 |
|
Godfrey M
|
af2f288286
|
fixes dark orange theme
|
2023-05-02 12:17:22 -07:00 |
|
Godfrey M
|
5de30db0a9
|
fixes dark green theme
|
2023-05-02 12:10:55 -07:00 |
|
Godfrey M
|
47370da924
|
adds fixes to dark black theme
|
2023-05-02 11:08:37 -07:00 |
|
Godfrey M
|
7711938f4b
|
fixes dark yellow
|
2023-05-01 16:27:21 -07:00 |
|
akemidx
|
ad7a1d6c3b
|
edits from Github comments
|
2023-05-01 15:50:48 -04:00 |
|
snipe
|
609b1646e9
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-30 18:40:52 -07:00 |
|
snipe
|
031c9c1204
|
Added nobr tag to prevent external link icon and link from breaking
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:40:40 -07:00 |
|
snipe
|
77b51136cf
|
Merge remote-tracking branch 'origin/develop'
|
2023-04-30 18:38:19 -07:00 |
|
snipe
|
0222a922a1
|
Added tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:20:23 -07:00 |
|
snipe
|
8ad600085a
|
Moved external link icon into link
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-30 18:17:56 -07:00 |
|
akemidx
|
cd389368f7
|
adding in script
|
2023-04-27 19:00:17 -04:00 |
|
akemidx
|
d3675831bb
|
snippet rewrite
|
2023-04-27 18:58:59 -04:00 |
|