Marcus Moore
74a891afbb
WIP: Render select box for field options in label engine
2023-09-27 15:58:01 -07:00
snipe
7bcb28d8fd
Commented out sortable columns
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-26 15:24:20 +01:00
spencerrlongg
7dab59c98d
fix for no eol, fix for optional in view
2023-09-20 14:17:30 -05:00
snipe
2a638e66f0
Added column re-ordering
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-15 21:53:34 +01:00
snipe
3ba8b60f54
Fixed regression that disabled sticky headers
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-15 20:28:28 +01:00
spencerrlongg
70a251de55
fix up gui edit
2023-09-13 13:51:14 -05:00
Grant Le Roux
b1464e028c
Merge branch 'develop' into develop
2023-07-31 07:57:29 +08: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
14c61e4c17
Added phone, fax to departments, locations, companies
...
Signed-off-by: snipe <snipe@snipe.net>
2023-07-10 19:44:21 +01: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
6dd7181d09
fixed audit log image not appearing
2023-06-12 12:10:19 -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
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
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
277618bf16
Added maxlenth to form fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-05-08 14:13:24 -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
7711938f4b
fixes dark yellow
2023-05-01 16:27:21 -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
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
snipe
e25dc42121
Switch to externalLinkFormatter
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-26 18:42:34 -07:00
snipe
e853f8b7fd
Removed SR text for exporting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-26 18:23:21 -07:00
snipe
deff312381
Remove auto-link from from manufacturer warranty
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-26 18:16:23 -07:00
snipe
b5b335a2ca
Use the asset tag instead of asset name if no name is given
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-26 14:41:19 -07:00
snipe
d3bdaf7cd3
Fixed destination name
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 12:59:46 -07:00
snipe
92f516484e
Small tooltip improvements for undeployable items
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 12:54:06 -07:00
snipe
59f4fe67d6
Removed duplicate tooltip
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 11:28:35 -07:00
snipe
7aab4290c7
Updated tooltips with data-tooltip=true from old method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 02:44:50 -07:00
snipe
220e20d208
Changed tooltip invocation
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-18 01:02:36 -07:00
snipe
bc7c0aa80d
Fixed clone tooltip
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-16 15:23:00 -07:00
snipe
589f7fa183
Larger qty box
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-15 21:03:09 -07:00
snipe
9ff62c966e
Check for $item (matters mostly in custom report blade)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-15 21:03:00 -07:00
Godfrey M
ab67d903b5
adds multi select to custom report for companies
2023-04-13 12:02:11 -07:00
snipe
b6d3f2827b
Switched to standardized require check
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-13 11:05:52 -07:00
snipe
65bb0486d4
Changed blade to use standard required check
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-13 11:04:29 -07:00
snipe
74babfa081
Added maxlength="10"
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-12 08:26:36 -07:00
snipe
19d5d34ffb
Echo out the array values in withInput()
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-07 10:16:35 -07:00
Jens Maes
c42078ea4a
Update bpay.blade.php
...
Removed FARTS from the file. This was shown in production on the master branch.
2023-04-07 10:15:34 +02:00
snipe
74b471bbad
Check for more specifics in env vars
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-06 16:24:46 -07:00
snipe
6ff3745adf
Added BM JS
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-06 16:19:33 -07:00
snipe
bd4757ad7a
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css
...
Move from iCheck to pure CSS for radio and checkboxes
2023-04-06 14:58:33 -07:00
snipe
161999fbca
Fixed #12772 - use the APP_URL config more consistently
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-05 16:05:40 -07:00
snipe
0e68b8e9f2
Small fixes for profile edits
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 23:06:09 -07:00
snipe
9a3e727390
Updated other form fields to use new label class, fixed HTML for accessibility
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:38:56 -07:00
snipe
aca64dc088
Updated check groups for permissions to skip iCheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:38:24 -07:00
snipe
1af7cdb715
Wrapped the image delete into the existing image upload partial
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:35:55 -07:00
snipe
58b3369234
Requestable partial - removing icheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:38:12 -07:00
snipe
60d60be0ac
Small style specification for notes partial field
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:37:16 -07:00
snipe
986c73982e
Check if status is set
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-30 14:50:56 -07:00
snipe
1fc0a0f94d
Quick fix for bulk restore menu
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-30 14:44:38 -07:00
slong753
d5d50264c3
fix permissions stuff + optional parameter
2023-03-29 19:53:04 -05:00
slong753
162b70d5a9
wireframed, needs a view and should work
2023-03-29 17:34:36 -05:00
snipe
658252125e
Added new partial for the form inline “demo mode”
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:57:27 -07:00
snipe
e39a75f2cc
Fixed min width on select2 bulk menus
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-18 00:14:57 -07:00
snipe
07fbbf5f7f
Added merge to user menu
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-16 18:18:54 -07:00
snipe
379c5f6790
Reworked the layout for logo upoloads
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 18:54:09 -08:00
snipe
e60fa15414
Nicer layout, but it kinda dosn’t work :(
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 17:02:52 -08:00
snipe
1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable
2023-02-28 18:05:09 -08:00
snipe
af9f9d2523
Convert string to date object for formatting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-28 15:48:45 -08:00
akemidx
25f3e4d41a
Adding ability to see boolean values when using normal export
2023-02-28 16:01:23 -05:00
snipe
3e111fca6e
Cleanup some small UI bugaboos (padding, etc)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 17:13:40 -08:00
akemidx
7dd789d5c0
translate no assets at checkout
2023-02-15 19:22:13 -05:00
akemidx
b96f2f738d
fixed weird phrasing in asset checkout screen
2023-02-15 16:47:48 -05:00
Brady Wetherington
02ca5248b1
Don't append username to the user's name if it's already there
2023-01-31 17:44:09 -08:00
cram42
c2c009a018
Merge branch 'develop' into develop
2023-01-24 09:53:42 +08:00
snipe
8040d08e8c
Removed formatter from EOL date
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:54:37 -08:00
snipe
abad579306
Added eol date picker
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:45:33 -08:00
snipe
93ad0d02b9
Use fieldname for aria labels too
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:20:02 -08:00
snipe
3674f46ce0
Added arial labels
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 16:42:44 -08:00
snipe
a57315aed5
Added username to display in asset listings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 12:58:58 -08:00
Brady Wetherington
75a757d6f5
There was a bug with select-all where some bits didn't quite work
2022-12-20 14:57:58 -08:00
snipe
27898e660c
Inherit the background color, since the field isn’t actually technically readonly
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-22 08:54:48 -08:00
Aaron
7c854c0a5c
Fix restore icon in table view
...
Signed-off-by: Aaron <admin@datahoarder.dev>
2022-11-19 10:45:10 +01:00
Cram42
60ef5686ab
Add "Pop Out" button for preview
2022-11-12 19:02:38 +08:00
Cram42
30a7a31724
Move label preview to alpine component
2022-11-11 14:23:02 +08:00
Cram42
67d021e457
Add alpinejs to deferred scripts
2022-11-11 11:25:41 +08:00
Cram42
7108156072
Fix button disabling
2022-11-10 19:24:02 +08:00
Cram42
a4b93d4bbd
Create Field Definitions helper control
2022-11-10 19:20:18 +08:00
snipe
2106b64da6
Fixed some layout issues
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:06:49 -07:00
Cram42
cde2ba7720
Fix: Oops
2022-11-02 09:51:02 +08:00
Cram42
6b2fe582ca
Merge branch 'feature-label2' into develop
2022-11-01 20:12:28 +08:00
Cram42
6de48b4dc8
Implement settings for labels
2022-11-01 20:00:53 +08:00
snipe
b503b672ba
Merge pull request #11951 from Godmartinz/AccessKey_shortcuts
...
adds shortcuts for listing, creating, and saving
2022-10-25 15:53:57 -07:00
snipe
515b14a001
Updated JS to better handle input IDs
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-20 19:21:09 -07:00
snipe
4eed2baa31
Added default tab to locations
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-20 19:06:58 -07:00
Godfrey M
4fa01350c3
adds shortcuts for listing, creating, and saving
2022-10-11 12:00:15 -07:00
snipe
3605aa8f5a
Added clear button to generic datepicker and made it wider
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:59:06 -07:00
snipe
9d93c72534
Use BS datepicker’s built in clear button
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-26 14:34:35 -07:00
Ivan Nieto Vivanco
23cf556a8b
Adds cursor:pointer to indicate a clickable link
2022-09-20 22:24:52 -05:00
Ivan Nieto Vivanco
f75917d34d
Add a link used to clear the purchase date input
2022-09-20 17:53:55 -05:00
snipe
a5fd9ebbb1
Added style to readonly datetime picker field
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-24 17:10:15 -07:00
Ivan Nieto Vivanco
581cae94ab
Add readonly property to datepickers
2022-08-24 18:21:54 -05:00
snipe
7b3be076b4
Make location field the same width
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:38:34 -07:00
snipe
afab167e8c
Fixed restore button in listings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-02 13:08:46 -07:00
Mike Roquemore
123963c14c
Modify genericActionsFormatter restore link to be a button instead since it's in a form.
...
Changed user restore route to POST
2022-07-02 14:34:22 -05:00
snipe
95d4f7c62e
Added models router to BS tables
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 15:56:18 -07:00
snipe
6b8abb1511
Fixed missing archived tooltip
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:32:39 -07:00
snipe
e2b1494511
Reordered and added xlsx to export list
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 11:18:59 -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
88dfdb7538
Fixed bug in uncheck
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 12:50:10 -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
snipe
5a86004081
Created new models bulk edit partial
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 20:29:08 -07:00
snipe
20a0c4e3b5
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields
...
Fixes #8143 Date localization not working on custom fields
2022-06-13 19:47:20 -07:00
snipe
93e4d23143
Changed font-awesome leading class
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 18:36:13 -07:00
Ivan Nieto Vivanco
740f27198f
Evaluate if a custom field is a Date to present it with the correct format
2022-06-07 18:00:46 -05:00
snipe
f7449921e9
Merge pull request #11253 from snipe/features/nicer_locations_ui
...
Nicer locations UI
2022-06-06 10:23:04 -07:00
snipe
01348187c8
Fixed #11224 - only show menu options if the user is allowed
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 22:41:53 -07:00
snipe
89f45d3d05
Removed extra console logs and unused variable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:16:29 -07:00
snipe
880828379e
Update bulki partials with new values
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:02:51 -07:00
snipe
9b54077409
Additional tweaks to BS tables partial
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:02:19 -07:00
snipe
9f478b51e2
Additional JS tweaking
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 20:13:51 -07:00
snipe
7c77e03c5a
Initial rework of locations display
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 18:08:15 -07:00
Godfrey M
83d0743ab8
saves bootstrap pdf tables in landscape
2022-05-12 09:18:44 -07:00
snipe
cf0548bd1f
Create a new partial for asset bulk actions
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:11:52 -07:00
Brady Wetherington
5a776af091
This disables the display of HTML content during exports, without enabling XSS attacks
2022-04-07 16:27:06 +01:00
snipe
8ccf148799
Fixed #10881 - bad merge with bootstrap-tables changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 22:57:00 +01:00
snipe
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:28:43 +01:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
snipe
42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving
...
Fixes Customfields with boolean format not saving [ch-9973]
2022-03-19 22:10:54 +00:00
Ivan Nieto Vivanco
6ed9ed0e79
Add field type boolean to custom fields list all
2022-03-16 17:21:05 -06:00
Godfrey M
b2e78e3382
formats most of the pdf blade
2022-03-16 15:53:32 -07:00
Godfrey M
5fcc3c39f3
routes eula agreements for download correctly to the asset history
2022-03-16 11:56:56 -07:00
snipe
9db8bd782d
Merging master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:02:07 +00:00
Godfrey M
6386fa1c5e
clean up
2022-03-16 09:54:10 -07:00
Godfrey M
b2f7262cd2
adds table structure for asset history
2022-03-14 19:38:36 -07:00
Brady Wetherington
6f3e9033c2
One attempt to fix the 'datatable double-request' problem.
2022-03-07 12:52:57 -08:00
snipe
1400c610a1
Use correct button translation
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 04:22:44 -08:00
snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
2022-01-12 20:51:33 -08:00
Wächtler, Yannick
f906dbd81e
Added missed translation strings, fixed the column width for the date selector (too small in certain languages)
2022-01-10 09:21:23 +01:00
Wächtler, Yannick
b77e7f88d4
fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix
2022-01-09 17:35:28 +01:00
Wächtler, Yannick
c3ab4c7512
Fixed the tables not displaying the correct language
2022-01-06 14:29:10 +01:00
Nuraeil
271c364ef8
Merge pull request #9 from snipe/develop
...
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
2022-01-04 10:48:51 +01:00
snipe
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:36:08 -08:00
snipe
4ca2252e3b
Switches GET to POST for request assset
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:32:29 -08:00
Wächtler, Yannick
2901525194
Merge branch 'snipe-develop' into added-localized-strings
2021-12-17 00:22:08 +01:00
snipe
c3d55ee27e
Merge master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
2021-12-16 14:26:24 -08:00
Wächtler, Yannick
484b996879
fixed merge conflicts
2021-12-14 19:48:59 +01:00
snipe
6d84482104
Merge pull request #10388 from snipe/features/switch_to_dusk
...
WIP - Fixing unit tests, switching to dusk
2021-12-06 14:19:36 -08:00
Andrew Roth
d1d3b84f77
Fixed #10365 : Snipe-IT has a wrong total purchase cost when reaches million. Fixed to remove multiple commas in +1M per item.
2021-12-06 13:06:23 -05:00
snipe
d08c1787a1
First steps at getting dusk working
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:09:29 -08:00
Klaus J. Mueller
a85fa14f9c
fix #10344 and #9135
2021-11-22 17:58:26 +01:00
Matthew Nickson
9381ba2404
Merge branch 'develop' into sum_cost_by_quantity
2021-11-21 18:59:34 +00:00
Wächtler, Yannick
04fec144a0
Added localization strings for partials, added file structure
2021-11-19 12:12:11 +01:00
Matthew Nickson
90ca66834b
Fixed sumFormatterQuantity if using 1.234,56 fomat
...
Previously sumFormatterQuantity used the parseFloat to convert the
string purchase_cost to a floating point number. parseFloat does not
return the correct value when using the comma format. To fix this
sumFormatterQuantity now used the cleanFloat function to convert
purchase_cost to a float.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2021-10-30 22:48:45 +01:00
snipe
798f6d65de
Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self
...
Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view
2021-10-28 17:53:24 -07:00
snipe
aa8f1378c9
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
2021-10-20 17:26:41 -07:00