Godfrey M
|
48821f8391
|
updates transformer, api controller
|
2024-07-16 12:58:23 -07:00 |
|
Godfrey M
|
aaa2858337
|
battling with handling depreciation percentage and amount
|
2024-07-16 12:25:19 -07:00 |
|
spencerrlongg
|
8650923b01
|
new branch cuz test merge
|
2024-07-08 12:55:59 -05:00 |
|
snipe
|
34bde52f74
|
Fixed typos
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 03:21:34 +01:00 |
|
snipe
|
6761ff44cc
|
Removed parens
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 00:22:46 +01:00 |
|
snipe
|
ae9085b11f
|
Modernize use statements, switch to auth()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:49:22 +01:00 |
|
snipe
|
e34f3c7c2c
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 14:32:41 +01:00 |
|
snipe
|
2b2853a183
|
Added acceptance model
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 14:29:58 +01:00 |
|
Konstantin Köhring
|
6c55e2bd9d
|
Add a Brother compatible 62mm wide label.
Tested with QL-600. Set print mode to landscape.
|
2024-06-28 09:49:53 +02:00 |
|
Konstantin Köhring
|
2fd357c346
|
Add rotation attribute to Label class to allow rotation of the generated label PDF.
This is necessary when printing labels with width = label width.
|
2024-06-28 09:49:53 +02:00 |
|
snipe
|
52c4885335
|
Added method for checking if the user can edit their own profile
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 14:02:17 +01:00 |
|
snipe
|
c6a0212384
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-06-22 17:33:12 +01:00 |
|
snipe
|
3531256c3f
|
Fixed deprecations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-21 21:06:43 +01:00 |
|
snipe
|
c8835bf5db
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 13:40:37 +01:00 |
|
snipe
|
bd1f43f9ee
|
Added lastname.firstname as email format
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 13:36:48 +01:00 |
|
snipe
|
61ced0b221
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 11:41:11 +01:00 |
|
snipe
|
ae7675fee0
|
Added audit date validation back in
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:37:15 +01:00 |
|
snipe
|
66ed26fbf9
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 11:13:47 +01:00 |
|
snipe
|
7099358985
|
Added accessor/mutator
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:11:50 +01:00 |
|
snipe
|
9a706b3e3e
|
Removed datetime validation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:05:31 +01:00 |
|
snipe
|
cb6ea2c6fb
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-18 09:59:43 +01:00 |
|
snipe
|
2f59bb74cd
|
Prefaced fields with “users” for clarity
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 09:52:41 +01:00 |
|
snipe
|
d87da78eb5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# 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/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-06-17 11:18:33 +01:00 |
|
snipe
|
cacb5d62dc
|
Merge pull request #14800 from snipe/fixes/importer_tweaks
Importer tweaks
|
2024-06-12 12:51:11 +01:00 |
|
snipe
|
7e3d66ec53
|
Merge branch 'develop' into fixes/companyable_trait_on_users
|
2024-06-12 11:27:26 +01:00 |
|
snipe
|
1cdec61be6
|
Use more modern mutator/accessory syntax
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:56:54 +01:00 |
|
snipe
|
9d9ad86dd5
|
Added mutators and accessors for dates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
b2a86e312b
|
Added last_checkout and last_checkin as fillable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
6229d0c616
|
Merge pull request #14758 from U-H-T/features/add_logo_support_for_Brother_TZe24
add logo support for Brother TZe24mm labels
|
2024-06-03 17:02:18 +01:00 |
|
snipe
|
b156264684
|
Tidied up scoping to be better for testing
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 23:10:53 +01:00 |
|
snipe
|
06e9625c64
|
Use hasUser() to avoid table collisions and infinite loop
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 06:58:07 +01:00 |
|
snipe
|
5800e8d8e9
|
Added companyable trait
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 06:57:34 +01:00 |
|
snipe
|
623aa58163
|
Removed unused statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 06:57:25 +01:00 |
|
snipe
|
92ba889cae
|
Updated/removed facades
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:53:51 +01:00 |
|
snipe
|
fb233c0aa4
|
Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:38:15 +01:00 |
|
snipe
|
8ac3937bf4
|
Commented model loading on asset model
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 18:03:19 +01:00 |
|
snipe
|
92eb6eb1b6
|
Add unique constraint to name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 15:09:31 +01:00 |
|
U-H-T
|
2777ac96cc
|
add logo support for Brother TZe24mm labels
|
2024-05-23 11:10:23 +02:00 |
|
Brady Wetherington
|
f633dbba64
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-20 12:55:29 +01:00 |
|
snipe
|
88d131666c
|
Sets purchase date as date (versus datetime) in labels
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 18:40:49 +01:00 |
|
snipe
|
eb0fd2f519
|
Removed stricter validation :(
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 16:29:11 +01:00 |
|
snipe
|
81efaa7481
|
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form
|
2024-05-16 16:13:21 +01:00 |
|
snipe
|
45eda0f611
|
Removed debug lines
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 15:09:27 +01:00 |
|
snipe
|
de088d452f
|
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance
Adds a note text area to asset acceptances/declines
|
2024-05-16 15:06:05 +01:00 |
|
snipe
|
71b5bf2eef
|
Added visual on the hardware view screen
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:48 +01:00 |
|
snipe
|
bdbfb0f2a1
|
Added accessor and mutator for next_audit_date
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:47 +01:00 |
|
snipe
|
d2e7e11dca
|
Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-13 12:48:28 +01:00 |
|
snipe
|
f769e8247f
|
Added ManagedUsers method, additional checks in isDeletable()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 12:07:15 +01:00 |
|
Brady Wetherington
|
5b02a43957
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-06 18:44:03 +01:00 |
|
snipe
|
dab5874fd7
|
Merge pull request #14391 from snipe/features/add_Brother_188mm_tape_label
Added Brother 18mm label type
|
2024-05-02 13:14:04 +01:00 |
|