Godfrey M
2c1f368828
adds validation for all purchase costs variables
2022-05-10 16:26:06 -07:00
Godfrey M
33b1ab3658
prevents values for assets being negative through validation
2022-05-10 16:19:06 -07:00
snipe
72fe0d22ea
Merge pull request #11040 from snipe/uberbrady-patch-2
...
Remove extraneous `{` in migration
2022-05-09 11:59:23 -07:00
Brady Wetherington
5357b1fa10
Remove extraneous { in migration
...
It looks like we inadvertently got an extra `{` in here - I noticed it because my IDE threw a big red dot on this migration. We must've accidentally put that in when we were adding the 'id' column.
2022-05-09 11:56:05 -07:00
snipe
dfd4d54433
Fixed route name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 15:46:25 -07:00
snipe
e353780b1b
Merge pull request #11027 from snipe/features/add_bulk_edit_to_other_asset_views
...
Fixed #11026 - add bulk edit to other asset views
2022-05-06 14:21:10 -07:00
snipe
220f94faee
Check that the session key exists
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:10:47 -07:00
snipe
d5edb0908b
Added translation string to the correct file this time
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:07:05 -07:00
snipe
2982d78899
Added translation for no assets selected
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:42:02 -07:00
snipe
22ec3c1398
Use error style instead of warn/info when nothing was selected
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:52 -07:00
snipe
caf17d4f25
Fixed wrong variable name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:32 -07:00
snipe
e1b24bb763
Added a comment
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:30:21 -07:00
snipe
304cd75af5
Fixed extra divs
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:20:44 -07:00
snipe
59a0f4722b
Use partial for asset bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:20:35 -07:00
snipe
418a797e7e
Use partial for asset bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:20:29 -07:00
snipe
adc017db23
Added checkbox to audit listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:16:13 -07:00
snipe
0c20543c49
Remove conflicting toolbar call in model listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:15:58 -07:00
snipe
fe98e505fe
Use the new partial for bulk asset edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:15:31 -07:00
snipe
78a9c16761
Minor formatting improvements
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:15:10 -07:00
snipe
c4bf0045c8
Fixed stray < tag
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:55 -07:00
snipe
c64f34ebcc
Check the "do not change” radio button by default
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:31 -07:00
snipe
76213ec3d9
Create a session on bulk actions, store it for redirect, then delete it
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:08 -07:00
snipe
243739e9c3
Added missing gate for bulk checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:13:36 -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
snipe
a43b54cc8d
Bumped hash for clarity
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 02:13:56 -07:00
snipe
caef98d36d
Patched #11025 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 02:06:12 -07:00
snipe
784bf4d784
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .github/ISSUE_TEMPLATE/feature_request.yml
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ReportsController.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/users/print.blade.php
# webpack.mix.js
2022-05-06 01:52:43 -07:00
snipe
6304709c77
Merge pull request #11023 from snipe/fixes/10890_use_translation_strings_in_assigned_printout
...
Fixed #10890 - Use translation strings in assigned printout instead of hardcoded English
2022-05-06 01:33:46 -07:00
snipe
39ee825ba2
Fixed html lang specification
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 01:32:20 -07:00
snipe
c0e9393092
Fixed #10890 - use translation strings in user asset printout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 01:30:58 -07:00
snipe
1ac626a43a
Merge pull request #11022 from snipe/fixes/specify_full_url_in_favicons
...
Use full app_url in favicon paths
2022-05-06 00:22:14 -07:00
snipe
3a415b2fce
Use full app_url in favicon paths
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 00:19:32 -07:00
snipe
b20921cb62
Removed duplicate session regenerate
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 21:35:05 -07:00
snipe
2e03270fca
Updated feature request YAML
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 19:06:25 -07:00
snipe
5370c2ca42
Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all
...
[Fix] changes the query for the accept signature on print blade
2022-05-05 13:32:37 -07:00
snipe
0939591efb
Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop
...
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop
2022-05-05 13:28:00 -07:00
snipe
a859eac4a0
Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null
...
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null
2022-05-05 13:27:45 -07:00
snipe
35d81be8d1
Merge pull request #11018 from snipe/update_bootstrap_table_to_latest
...
Update BS tables and table export to latest
2022-05-05 13:23:55 -07:00
snipe
a5760cfe7b
Update BS tables and table export to latest
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 12:22:20 -07:00
snipe
cab29745e7
More small tweaks to feature request template
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 11:17:31 -07:00
snipe
41fa42f7d8
FR updates
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 11:14:55 -07:00
snipe
eb49c33e1b
Reverting feature request YAML
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 11:10:11 -07:00
snipe
31f2b73e5a
Bumped version to GM
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 10:55:29 -07:00
snipe
953b3a8d6e
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8
...
Merge master into develop for RC 6.0.0-8
2022-05-05 10:53:17 -07:00
snipe
c01f0880ef
Changed language string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 10:52:57 -07:00
snipe
c838354b74
Merge pull request #11016 from benwa/patch-1
...
Update feature_request.yml
2022-05-05 10:19:37 -07:00
Bennett Blodinger
46c4d1a3d6
Update feature_request.yml
...
Correcting the label/description fields
2022-05-05 09:49:41 -05:00
snipe
57ed3afcc4
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-04 16:50:50 -07:00
snipe
5c78a15835
Removed dupe lines from merge conflict
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-03 12:56:29 -07:00
snipe
011ab604f2
Merge pull request #11001 from inietov/fixes/download_all_triggers_getDisplayNameAttribute_on_null_develop
...
Fixes Activity Report Download all action fails creating the CSV report for develop.
2022-05-03 20:52:47 +01:00
