Marcus Moore
|
bfebcdc7ed
|
Improve variable name
|
2024-08-05 15:22:35 -07:00 |
|
Marcus Moore
|
480e4f3a69
|
Improve readability
|
2024-08-05 15:16:40 -07:00 |
|
Marcus Moore
|
78a0417ee9
|
Add another user into the mix
|
2024-08-05 15:11:18 -07:00 |
|
snipe
|
b83d148b37
|
Merge pull request #15217 from TelecomsSansFrontieres/feature_extend-search-by-tag
Feature: Extend search capabilities to other assets attributes
|
2024-08-05 15:38:51 +01:00 |
|
Florent Bervas
|
ad794248fe
|
add a warning message if asset tag not found
|
2024-08-05 13:54:33 +00:00 |
|
Florent Bervas
|
b804791ff6
|
feature: extend search capabilities to other assets attributes
|
2024-08-05 12:26:29 +00:00 |
|
snipe
|
c45bf870b7
|
Merge pull request #15211 from snipe/feaures/15205_copy_asset_tag
Fixed #15205 - adds copy to asset tag
|
2024-08-02 20:59:53 +01:00 |
|
snipe
|
a0bd8b6049
|
Fixed #15205 - adds copy to asset tag
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-02 20:56:31 +01:00 |
|
Godfrey M
|
ae4f278df1
|
edited terenaries on notifs
|
2024-08-01 11:13:20 -07:00 |
|
snipe
|
28abb8d8cc
|
Hotfix for 405 update asset
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-01 12:30:35 +01:00 |
|
snipe
|
24d948a3f6
|
Merge pull request #15204 from snipe/fixes/405_on_api_asset_update
Fixed (temp) put route
|
2024-08-01 12:28:23 +01:00 |
|
snipe
|
c1c9c3554e
|
Fixed (temp) put route
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-01 12:27:02 +01:00 |
|
snipe
|
fcea564afa
|
Fixed button label
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-31 21:44:27 +01:00 |
|
snipe
|
f44abd0b28
|
Fixed button label
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-31 21:43:09 +01:00 |
|
Godfrey M
|
854903805b
|
one more spot
|
2024-07-31 12:16:41 -07:00 |
|
Godfrey M
|
868f117b67
|
Merge branch 'status_labels_check_emails' of github.com:Godmartinz/snipe-it into status_labels_check_emails
|
2024-07-31 12:03:56 -07:00 |
|
Godfrey M
|
b6cac4baae
|
corrects ? usage
|
2024-07-31 12:03:36 -07:00 |
|
snipe
|
4fcb3df1d9
|
Merge pull request #15199 from Godmartinz/fix-signature-pad
adds closing brackets to signature pad
|
2024-07-31 19:23:33 +01:00 |
|
Godfrey M
|
b60e22bcb4
|
adds closing brackets to signature pad
|
2024-07-31 11:10:33 -07:00 |
|
spencerrlongg
|
61312c2eec
|
oops, mysql
|
2024-07-31 12:07:50 -05:00 |
|
spencerrlongg
|
b0063b1d4a
|
test written
|
2024-07-31 11:57:35 -05:00 |
|
akemidx
|
fffcbdc44d
|
Merge remote-tracking branch 'upstream/develop' into upstream/dev
|
2024-07-31 07:14:06 -04:00 |
|
akemidx
|
8d1fa362f7
|
restoring code
|
2024-07-31 07:13:42 -04:00 |
|
snipe
|
31a2765b30
|
Merge pull request #15145 from Godmartinz/purge-storage
Added user storage files to purge command
|
2024-07-31 10:16:08 +01:00 |
|
snipe
|
e79a5b7efe
|
Merge pull request #15193 from Godmartinz/admin-settings
Fixed admin boxes alignment
|
2024-07-31 08:54:44 +01:00 |
|
snipe
|
ca531e85f3
|
Merge pull request #15194 from spencerrlongg/bug/sc-26247
Fixed A Translation Issue With Auth
|
2024-07-31 08:54:09 +01:00 |
|
spencerrlongg
|
0941c0944a
|
ok, found issue, but need to test some things now...
|
2024-07-30 22:55:15 -05:00 |
|
spencerrlongg
|
9b80843c77
|
tests a little broken, added some nullchecks
|
2024-07-30 21:44:22 -05:00 |
|
spencerrlongg
|
8684a3efc3
|
delete note, add trait to other request
|
2024-07-30 21:22:46 -05:00 |
|
akemidx
|
fccfce2ae8
|
first thought
|
2024-07-30 19:27:37 -04:00 |
|
Godfrey M
|
935d2ce29a
|
fixes admin box alignment
|
2024-07-30 15:05:09 -07:00 |
|
spencerrlongg
|
437ddc01b4
|
removed extraneous $request->validate() arguments
|
2024-07-30 16:26:24 -05:00 |
|
Godfrey Martinez
|
f19e58b352
|
Merge pull request #21 from Godmartinz/status_labels_check_emails_checkout
adds Status labels to check in and out emails
|
2024-07-30 09:41:05 -07:00 |
|
Godfrey M
|
eb6f330e67
|
adds status to check in and out
|
2024-07-30 09:38:39 -07:00 |
|
Godfrey M
|
f19899543d
|
changed error to info
|
2024-07-30 09:18:17 -07:00 |
|
snipe
|
3a2611f8e1
|
Merge pull request #14565 from spencerrlongg/bug/sc-23936
Checks that custom fields exist before saving
|
2024-07-30 11:36:55 +01:00 |
|
Godfrey M
|
53ad312700
|
added missing closing bracket
|
2024-07-29 15:17:32 -07:00 |
|
Godfrey M
|
89d375daad
|
add indents
|
2024-07-29 15:15:41 -07:00 |
|
Godfrey M
|
d46f9776fe
|
remove text
|
2024-07-29 15:14:58 -07:00 |
|
Godfrey M
|
f9a47c8a9f
|
adds a try catch
|
2024-07-29 15:12:48 -07:00 |
|
Godfrey M
|
e395ee1878
|
adds a try catch
|
2024-07-29 15:12:32 -07:00 |
|
snipe
|
4971c54b05
|
Fixed seeder
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-29 20:17:25 +01:00 |
|
snipe
|
4c5b82ae37
|
Merge pull request #15188 from Godmartinz/1d_barcode_select_bug
Fixed 1d barcode targeting.
|
2024-07-29 20:00:21 +01:00 |
|
Spencer Long
|
fd7082c30f
|
Merge branch 'develop' into bug/sc-23936
|
2024-07-29 14:00:00 -05:00 |
|
snipe
|
8d0b72293f
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2024-07-29 18:51:19 +01:00 |
|
snipe
|
f3d98f90c0
|
Add @arne-kroeger as a contributor
|
2024-07-29 18:51:12 +01:00 |
|
snipe
|
4eccb5ffc6
|
Merge pull request #15185 from arne-kroeger/feat/accesspories-checkout-to-location-or-asset
Added #14979: add checkout to location and assets functionality to accessories
|
2024-07-29 18:50:48 +01:00 |
|
Godfrey M
|
86049624c7
|
retargeted new label engine to correct 1d column
|
2024-07-29 10:42:26 -07:00 |
|
snipe
|
3972782033
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-07-29 18:27:56 +01:00 |
|
snipe
|
33b86057d1
|
Version bump
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-29 18:27:01 +01:00 |
|