snipe
|
8794936e1a
|
Merge pull request #11067 from uberbrady/master
Fix cancel button in two-factor sign-in screen
|
2022-05-13 14:56:00 -07:00 |
|
Brady Wetherington
|
ec65f7c72a
|
Merge remote-tracking branch 'upstream/master'
|
2022-05-13 14:50:08 -07:00 |
|
Brady Wetherington
|
b6284e6651
|
Fix 'cancel' button in two-factor screen
|
2022-05-13 14:49:37 -07:00 |
|
snipe
|
5cc4f9bc2a
|
Merge pull request #11066 from uberbrady/fix_two_factor_v6
Switch the barcode backend to SVG, and fix the two-factor middleware
|
2022-05-13 14:38:15 -07:00 |
|
snipe
|
d8a4509b22
|
Fix logout on 2fa
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 14:36:20 -07:00 |
|
Brady Wetherington
|
0ddb0f2c81
|
Switch the barcode backend to SVG, and fix the two-factor middleware
|
2022-05-13 14:22:27 -07:00 |
|
snipe
|
ce5ae80755
|
Regenerated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:44:51 -07:00 |
|
snipe
|
c0868a68fb
|
Removed console.log cruft
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:44:38 -07:00 |
|
snipe
|
eccc5e7cf0
|
Make logout a post on 2FA cancel
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:35:13 -07:00 |
|
snipe
|
1424e168d6
|
Switch logout back to post
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:30:11 -07:00 |
|
snipe
|
bda5d13c2b
|
Fixed route name for appending models to kit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:26:01 -07:00 |
|
snipe
|
7c82f5670b
|
One more 2FA login change
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 12:48:55 -07:00 |
|
snipe
|
32bbe7c715
|
Fixed 2FA middleware
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 12:45:54 -07:00 |
|
snipe
|
293e3e02e4
|
Updated cookie name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 12:07:00 -07:00 |
|
snipe
|
13d81f0a0c
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 11:55:19 -07:00 |
|
snipe
|
64dc6fbd9c
|
Switched branch to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 11:52:27 -07:00 |
|
snipe
|
e55aac7fea
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 11:51:41 -07:00 |
|
snipe
|
b36bfad0ca
|
Set maxlength on password confirmation form element
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:27:47 -07:00 |
|
snipe
|
6b27c0311d
|
Updated help text on groups for more info on deselecting
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:23:12 -07:00 |
|
snipe
|
93454decec
|
Fixed broken quotes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:14:53 -07:00 |
|
snipe
|
47fb323d90
|
Adding feature request file back
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:03:48 -07:00 |
|
snipe
|
e4bd5be4fe
|
Try deleting the issue template file because wtf?
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:03:27 -07:00 |
|
snipe
|
cf4b418b22
|
Merge pull request #11063 from snipe/fixes/set_maxlength_for_user_fields
Sets maxlength of user fields to 191
|
2022-05-13 04:56:09 -07:00 |
|
snipe
|
deb2d958d8
|
Sets maxlength of user fields to 191
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 04:54:12 -07:00 |
|
snipe
|
c3e8c35063
|
Replaced feature request
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-12 22:15:02 -07:00 |
|
snipe
|
aa04a9b2e2
|
Clear feature template to see if it fixes docker issue
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-12 22:14:49 -07:00 |
|
snipe
|
0cb6a9ce69
|
Bumped tableexport plugin
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-12 22:14:09 -07:00 |
|
snipe
|
ef1eb15a91
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/permissions.php
|
2022-05-12 09:31:42 -07:00 |
|
snipe
|
714f6d80f2
|
Merge pull request #11059 from Godmartinz/feature/sc-19017/change-bootstrap-tables-export-to-be-landscape
Bootstrap tables export as landscape
|
2022-05-12 09:28:47 -07:00 |
|
Godfrey M
|
54f5e268a0
|
removed change from tableExport.js
|
2022-05-12 09:20:19 -07:00 |
|
Godfrey M
|
83d0743ab8
|
saves bootstrap pdf tables in landscape
|
2022-05-12 09:18:44 -07:00 |
|
snipe
|
722e88a472
|
Merge pull request #11058 from snipe/fixes/kit_permissions
Fixed kit checkout permissions if admin is not superadmin
|
2022-05-11 20:11:13 -07:00 |
|
snipe
|
91cc08d3fb
|
Merge pull request #11050 from uberbrady/fix_encrypted_textareas
Make sure to decrypt Textareas as well as input type=text
|
2022-05-11 19:03:02 -07:00 |
|
snipe
|
c52faaf23d
|
Added checkout to permissions check
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-11 19:02:23 -07:00 |
|
snipe
|
c0ef27fc9e
|
Removed kit checkout permission - it’s just confusing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-11 19:02:11 -07:00 |
|
snipe
|
5a5bb79188
|
Merge pull request #11055 from uberbrady/update_livewire_assets
Update Livewire assets, and make Composer auto-update Livewire assets
|
2022-05-11 14:02:04 -07:00 |
|
Brady Wetherington
|
35450aebdd
|
Update Livewire assets, and make Composer auto-update Livewire assets as needed
|
2022-05-11 14:00:10 -07:00 |
|
Brady Wetherington
|
e3696ff84c
|
Make sure to decrypt Textareas as well as input type=text
|
2022-05-10 18:39:03 -07:00 |
|
snipe
|
446e44deb6
|
Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative
Fixed validation for purchase cost allowed to be negative
|
2022-05-10 17:36:01 -07:00 |
|
snipe
|
816437b4d8
|
Updated hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 17:28:11 -07:00 |
|
snipe
|
5dfdf73e01
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 17:28:06 -07:00 |
|
snipe
|
780222d372
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
|
2022-05-10 17:26:26 -07:00 |
|
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
|
f4650c65db
|
Clearer phrasing for log
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 13:00:48 -07:00 |
|
snipe
|
d3830a44d8
|
Added more verbose messaging
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:40:50 -07:00 |
|
snipe
|
5869b6ed0c
|
And still more debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:38:46 -07:00 |
|
snipe
|
4fccf4ddc4
|
Few more log lines
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:27:42 -07:00 |
|
snipe
|
646166b2b6
|
Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:16:07 -07:00 |
|
snipe
|
f4e737eaf3
|
More SAML debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:14:22 -07:00 |
|