lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
11884 commits 1 branch 0 tags 220 MiB
Commit graph

1048 commits

Author SHA1 Message Date
Marcus Moore
3580bdae86
Use object accessor instead of array accessor 2023-02-01 11:44:35 -08:00
snipe
f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
Godfrey M
fc044528b8 validation is working, success message appears, database is not updating 2023-01-30 16:10:02 -08:00
Marcus Moore
39289dd18e
Use user provided alert email for checkout acceptances 2023-01-26 13:18:18 -08:00
akemidx
df31a76906 fixed apostraphe 2023-01-26 15:02:39 -05:00
Brady Wetherington
cfe9c687f9 Mark a bunch of SCIM config as nullable 2023-01-25 15:54:57 -08:00
Brady Wetherington
91cf683f3d Re-do the entire SCIM config so it no longer inherits 2023-01-25 15:53:46 -08:00
akemidx
53d8008a5f Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag 2023-01-25 17:14:29 -05:00
akemidx
b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
snipe
4c3354b778
Merge branch 'develop' into vip_tag 2023-01-24 20:29:43 -08:00
snipe
9c79fc19cb Tightened up and removed some validation that wasn’t needed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:37:15 -08:00
snipe
fd2a057d38 Make audit dates fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 17:36:58 -08:00
snipe
3c4f254583 Enforce Y-m-d as date format for date fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 13:38:53 -08:00
akemidx
596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
cram42
c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
snipe
febfcd4803 Updated model with new field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:56:19 -08:00
snipe
48c85966d7 Added gravatar and avatar as fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:07:17 -08:00
snipe
dceb77d4d4 Refactored numRemaining, removed unnecessary numCheckout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:40:20 -08:00
Marcus Moore
181f96ad33
Allow users to set a blank asset name during checkout 2023-01-19 12:35:44 -08:00
snipe
48b8cfcef9 Added byod to model, removed duplicate validation rule 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:04:36 -08:00
snipe
f08babfa8a Just moved some stuff around - no actual meaningful code changes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-17 17:22:03 -08:00
snipe
459c95064e Fixed default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 17:54:04 -08:00
snipe
0b0fdd8aa5 Small formatting fixes, fixed typo in comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:32:18 -08:00
snipe
b66cd313b9 Refactored itemCount() to use existing blah_count fields if they exist 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:16:25 -08:00
snipe
bef4224e14 Added notes to itemCount() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 13:50:24 -08:00
snipe
249b188654 Refactor category API and transformer for query optimization 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 13:30:01 -08:00
Brady Wetherington
2d0ac5b48b The cache system in getSettings() cached values "forever." That's bad. 2023-01-09 16:16:09 -08:00
Brady Wetherington
c4f900e9af Change license_seat changing method to properly 'true up' license seats 2023-01-04 13:02:53 -08:00
snipe
d187174f00
Merge pull request #12090 from Godmartinz/deparmtnet_name_validator 
Added: validation for department names at Company locations
 2022-12-22 11:29:12 -08:00
akemidx
94afe2bc6a edits & typo fixes 2022-12-19 14:48:43 -05:00
akemidx
133d6ffa50 Commenting on a scope in Models/Company.php 2022-12-15 15:18:24 -05:00
snipe
418ddcfac3
Merge pull request #9876 from Toreg87/fixes/locations-deletable 
Fixed #9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
 2022-12-14 17:46:53 -08:00
akemidx
f3e57d7dc0 fixing PR 2022-12-13 16:00:59 -05:00
akemi
07ae91b00f Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned. 2022-12-12 15:47:53 -05:00
Ivan Nieto Vivanco
c082d8b90e Return empty string if no MAIL_REPLYTO_ADDR var set 2022-11-23 18:22:31 -06:00
snipe
774962c122 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-17 21:14:35 +00:00
snipe
24841a75d4 Move common things into the model level validation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-17 19:41:10 +00:00
Cram42
17e81af4cd Add more Avery label sheets 2022-11-12 20:29:50 +08:00
Cram42
ffce6ec327 Need uppercase 2022-11-12 20:29:34 +08:00
Cram42
f849fcca89 Change the way fields are passed 2022-11-10 18:54:02 +08:00
Godfrey M
92ae271292 adds validation for department names at Company locations 2022-11-09 13:11:33 -08:00
snipe
7c37c70164 Added new field to allowed_fields so that the API can change them if needed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:22 +00:00
snipe
6d5ace0458
Merge pull request #12049 from uberbrady/improve_scim_externalid_support 
Fixed writes to the `externalId` from SCIM
 2022-11-02 15:43:55 -07:00
Cram42
53513d93fa Rework TZe labels for Asset Tag support 2022-11-02 22:38:00 +08:00
Cram42
fb467d9078 Include Asset for advanced users 2022-11-02 17:20:01 +08:00
Cram42
4fee5ece43 Support Avery L7163 2022-11-02 16:08:10 +08:00
Cram42
4bb40adfce Add Asset Tag as separate supported feature 2022-11-02 16:07:50 +08:00
Cram42
a60ee7736b Add P-touch TZe 12mm Tape Example 2022-11-02 12:22:55 +08:00
snipe
eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
Cram42
d0eb3cfc9b Merge branch 'feature-label2' into develop 2022-11-02 10:09:46 +08:00