snipe
|
cfaa6679af
|
Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history
Fixed #10026: Checkout date not saved in asset history
|
2021-09-07 17:37:30 -07:00 |
|
|
snipe
|
387018c44e
|
Updated depreciation report blade to use server-side API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:05:31 -07:00 |
|
Ivan Nieto Vivanco
|
e621eaf456
|
Change date showed in the activity report view, the condition is now on action_date
|
2021-09-01 13:58:17 -05:00 |
|
|
snipe
|
d5a7955e1d
|
Fixed #10024 - use string for dashboard in side nav instead of hard coded
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-31 22:25:00 -07:00 |
|
|
snipe
|
7e2def7896
|
Merge pull request #9880 from inietov/bug/fd18463/cannot_edit_departments
Fixes: Can't update departments if Full Company Support is activated
|
2021-08-30 19:40:59 -07:00 |
|
|
snipe
|
4abb9baa95
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-24 15:29:41 -07:00 |
|
|
Ivan Nieto Vivanco
|
830ba470dd
|
Change the used function to only affect single and double quotes
|
2021-08-23 22:10:59 -05:00 |
|
|
Ivan Nieto Vivanco
|
80fb24e861
|
Fix issue caused for single and double quotes when used as listbox's values
|
2021-08-23 22:00:01 -05:00 |
|
|
snipe
|
70f6753f50
|
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs
Add client side ldap certs
|
2021-08-23 16:30:46 -07:00 |
|
|
snipe
|
4ec4e0f44e
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-19 12:09:48 -07:00 |
|
Brady Wetherington
|
e28db2d221
|
Fix regression for NULL valued numbers in the summary calculation
|
2021-08-19 12:01:47 -07:00 |
|
|
snipe
|
24af2ab67a
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-18 14:31:53 -07:00 |
|
|
Brady Wetherington
|
4519f6e180
|
Fixed sum total calculation on Bootstrap Table pages
|
2021-08-18 14:13:31 -07:00 |
|
|
snipe
|
04fa5f2022
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-18 01:05:25 -07:00 |
|
|
snipe
|
923d2a79ae
|
Fixed weird layout on bulk audit [ch17146]
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 01:05:09 -07:00 |
|
|
snipe
|
f99602c039
|
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/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2021-08-18 00:47:33 -07:00 |
|
|
snipe
|
8a6c7269d3
|
Fixed border radius for bulk checkout field [ch16936]
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 00:44:55 -07:00 |
|
|
snipe
|
37f2c7beac
|
Nicer bulk asset select width
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 00:44:16 -07:00 |
|
|
snipe
|
b5bb74b8ca
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-17 22:01:23 -07:00 |
|
|
snipe
|
cce808c784
|
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
Duplicates d4e46ee41f but on v5
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-17 21:59:33 -07:00 |
|
|
Brady Wetherington
|
4d4badf830
|
Got the client-side LDAP setup working well enough for sync!
|
2021-08-17 14:43:36 -07:00 |
|
|
snipe
|
29c584289f
|
Merge remote-tracking branch 'origin/develop'
|
2021-08-14 14:09:31 -07:00 |
|
Godfrey M
|
01037cf9cb
|
initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]
|
2021-08-10 18:26:43 -07:00 |
|
|
Ivan Nieto Vivanco
|
1b8156ac7f
|
Add a hidden field to handle departments inside Full Company Support config
|
2021-07-29 13:28:57 -05:00 |
|
|
snipe
|
75d4a46fff
|
Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown
Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]
|
2021-07-24 01:05:26 -07:00 |
|
|
Ivan Nieto Vivanco
|
0f1c48cb6f
|
Add the field model_number to Accessory importer
|
2021-07-24 02:38:44 -05:00 |
|
|
snipe
|
33e92c975a
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# 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-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2021-07-15 13:29:00 -07:00 |
|
|
Godfrey M
|
44612e5eb7
|
Make non linked striped text the same for [ch16602]
|
2021-07-14 14:50:45 -07:00 |
|
|
snipe
|
4cfdaf89d8
|
Merge remote-tracking branch 'origin/develop'
|
2021-07-08 17:47:08 -07:00 |
|
|
Brady Wetherington
|
0ec2884c29
|
The custom settings section of SAML sometimes has bad linefeeds
|
2021-07-08 17:00:01 -07:00 |
|
|
snipe
|
f264cade7d
|
Merge remote-tracking branch 'origin/develop'
|
2021-07-08 16:05:32 -07:00 |
|
|
Ivan Nieto Vivanco
|
d2e94dfc1c
|
Added cookie option to assets Bootstrap Table to save the state of the table.
|
2021-07-08 14:05:40 -05:00 |
|
|
snipe
|
721b749ae1
|
Merge remote-tracking branch 'origin/develop'
|
2021-07-06 15:13:39 -07:00 |
|
|
snipe
|
2f10d946ec
|
Merge branch 'bug/ch16594/table-striping-on-dark-mode-skins-is-too' of https://github.com/Godmartinz/snipe-it into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# 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/mix-manifest.json
|
2021-07-06 15:08:20 -07:00 |
|
|
Ivan Nieto Vivanco
|
131a285e2f
|
Fixes Vue issue with the import process.
|
2021-07-06 15:59:45 -05:00 |
|
|
snipe
|
b46e2b5990
|
Merge remote-tracking branch 'origin/develop'
|
2021-06-30 01:03:05 -07:00 |
|
|
Godfrey M
|
aba912001d
|
Table striping on dark mode skins is too [ch16594]
|
2021-06-28 20:41:56 -07:00 |
|
|
Brady Wetherington
|
dce1dd41c8
|
Regenerate assets after repairing Vue integration
|
2021-06-28 16:38:05 -07:00 |
|
|
snipe
|
f504d7ef5f
|
Merge remote-tracking branch 'origin/develop'
|
2021-06-28 13:12:10 -07:00 |
|
|
snipe
|
30297e479e
|
Hide notes field by default
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-28 13:08:32 -07:00 |
|
|
snipe
|
a4fd0c9c6d
|
Fixed #9745 - added searchable, sortable notes field to status labels
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-28 11:52:57 -07:00 |
|
|
snipe
|
3ca3de9e4f
|
Merge remote-tracking branch 'origin/develop'
|
2021-06-23 20:05:38 -07:00 |
|
|
snipe
|
174d53aff9
|
Fixed #9729 - order number maxlength updated to 200
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-23 20:05:22 -07:00 |
|
|
snipe
|
b5a75206fe
|
Merge remote-tracking branch 'origin/develop'
|
2021-06-23 17:19:48 -07:00 |
|
|
snipe
|
3f39cff225
|
Merge pull request #9738 from Godmartinz/bug/ch16594/table-striping-on-dark-mode-skins-is-too
corrected a link color in the dark mode yellow skin
|
2021-06-23 16:39:02 -07:00 |
|
|
Godfrey M
|
a37edd5c5b
|
darkened back-sub-alt more
|
2021-06-23 16:34:41 -07:00 |
|
|
Godfrey M
|
f199098a59
|
undid the color change for links, darkened the back-sub-alt
|
2021-06-23 16:29:21 -07:00 |
|
|
snipe
|
7b51bf4f51
|
Merge remote-tracking branch 'origin/develop'
|
2021-06-23 14:41:27 -07:00 |
|
|
snipe
|
4db5a8f62b
|
Merge pull request #9695 from Joly0/master
Update print.blade.php
|
2021-06-23 14:33:25 -07:00 |
|
|
snipe
|
ac52ea3463
|
Porting PR #9720 to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-23 14:27:15 -07:00 |
|