Jeremy Price
e1c7cc38f1
buildx action docs say we don't need the checkout action, let's test that
2025-05-08 10:50:24 +02:00
Jeremy Price
85a5b9a872
replace repo because we fixed other formatting error, i think
2025-05-08 10:04:36 +02:00
Jeremy Price
2ebe2080c8
fix source image names
2025-05-07 17:50:33 +02:00
Jeremy Price
747f780604
try master
2025-05-07 17:10:57 +02:00
Jeremy Price
afeefbee38
try it w/o a version?
2025-05-07 17:06:02 +02:00
Jeremy Price
4fef2b5926
fix docker-manifest-action version because it's wrong in their f-ing readme
2025-05-07 17:00:04 +02:00
Jeremy Price
c79fd12842
actually set branch name
2025-05-07 16:46:23 +02:00
Jeremy Price
5a875afe12
removing wonky outputs and trying different tag format... seems wheird?
2025-05-07 16:19:52 +02:00
Jeremy Price
4134bd5fc6
fix indentation
2025-05-07 16:12:30 +02:00
Jeremy Price
1188d2fcba
lets try to combine arches with a manifest, first the simple way
2025-05-07 16:10:57 +02:00
Jeremy Price
8e7b2a0678
swap around docker builds to see if we can coolate tags & architectures
2025-05-06 17:00:05 +02:00
snipe
f013a4c5ea
Merge pull request #16871 from grokability/one-more-docker-fix
...
One more docker repo name fix
2025-05-06 15:16:48 +01:00
Jeremy Price
194a22452e
stop building intel image in arm server
2025-05-06 16:10:44 +02:00
Jeremy Price
930a6a2ac8
One more docker repo name fix
...
i feel like i'm taking crazy pills
also right-naming the arm builds again
2025-05-06 16:06:13 +02:00
snipe
444dea8b42
Merge pull request #16868 from grokability/fix-dockerhub-references
...
OMG fix 2 more (only 1 active) dockerhub repo references
2025-05-06 10:15:28 +01:00
Jeremy Price
6cc3f69c2a
OMG fix 2 more (only 1 active) dockerhub repo references
2025-05-06 07:54:20 +02:00
snipe
36f3834ca5
Merge pull request #16865 from ntaylor-86/fixes/alerts-enabled-new-install
...
Fixed #16815 : Avoids potential error when settings table is empty
2025-05-06 00:59:52 +01:00
Nathan Taylor
d4b73b4fb9
Avoids potential error when alerts table is empty
...
Updates the Kernel to use the null-safe operator
when accessing the alerts_enabled setting. This prevents
a potential error if the settings object is null.
2025-05-06 09:47:33 +10:00
snipe
b37f488117
Merge pull request #16864 from marcusmoore/update-contributors
...
Added missing contributors
2025-05-05 22:18:11 +01:00
snipe
ee0a9e834a
Fixed BulkDeleteAssetsTest test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-05 22:12:08 +01:00
snipe
c776e0e7e9
Merge pull request #16851 from grokability/fix-dockerhub-repo
...
Fix dockerhub repo we're pushing to, and arm build names
2025-05-05 22:03:58 +01:00
Jeremy Price
54d3193b6f
run arm builds on arm
2025-05-05 22:55:38 +02:00
Marcus Moore
326657c709
contributors:generate
2025-05-05 13:30:49 -07:00
Marcus Moore
c72e86ea2e
Update casing for contributor
2025-05-05 13:29:05 -07:00
Marcus Moore
34b1ca29d3
Remove duplicate contributor (QveenSi)
2025-05-05 13:28:25 -07:00
Marcus Moore
1dc876a436
docs: add @austinsasko as a contributor
2025-05-05 13:19:37 -07:00
Marcus Moore
b28bc2c500
docs: add @drexljo as a contributor
2025-05-05 13:18:53 -07:00
Marcus Moore
c38d98b00a
docs: add @jfwiebe as a contributor
2025-05-05 13:18:29 -07:00
Marcus Moore
7b83df088b
docs: add @JemCdo as a contributor
2025-05-05 13:18:29 -07:00
Marcus Moore
c8b1240665
docs: add @jjasghar as a contributor
2025-05-05 13:18:28 -07:00
Marcus Moore
8a9d6bbdca
docs: add @pottom as a contributor
2025-05-05 13:18:27 -07:00
Marcus Moore
6859b36e7c
docs: add @dasjoe as a contributor
2025-05-05 13:18:26 -07:00
Marcus Moore
f0073c1528
docs: add @gl-pup as a contributor
2025-05-05 13:18:26 -07:00
Marcus Moore
f6b7e621b7
docs: add @gastamper as a contributor
2025-05-05 13:18:25 -07:00
Marcus Moore
108a0179ca
docs: add @LeafedFox as a contributor
2025-05-05 13:18:24 -07:00
Marcus Moore
2baf65aa62
docs: add @m4us1ne as a contributor
2025-05-05 13:18:24 -07:00
Marcus Moore
74c4e9665e
docs: add @lopezio as a contributor
2025-05-05 13:18:23 -07:00
Marcus Moore
ae9c22f327
docs: add @loganswartz as a contributor
2025-05-05 13:18:22 -07:00
Marcus Moore
37bca6febd
docs: add @sniff122 as a contributor
2025-05-05 13:18:22 -07:00
Marcus Moore
30196793bd
docs: add @KorvinSzanto as a contributor
2025-05-05 13:18:21 -07:00
Marcus Moore
3060282ffb
docs: add @juhotaipale as a contributor
2025-05-05 13:18:20 -07:00
Marcus Moore
d63bba8db7
docs: add @juanfont as a contributor
2025-05-05 13:18:20 -07:00
Marcus Moore
2c12ee01a0
docs: add @CalvinSchwartz as a contributor
2025-05-05 13:18:19 -07:00
Marcus Moore
aa76424a74
docs: add @byronwolfman as a contributor
2025-05-05 13:18:18 -07:00
Marcus Moore
9188d6229e
docs: add @benperiton as a contributor
2025-05-05 13:18:18 -07:00
Marcus Moore
5555f32ffe
docs: add @arukompas as a contributor
2025-05-05 13:18:17 -07:00
Marcus Moore
59062980ff
docs: add @hex128 as a contributor
2025-05-05 13:18:16 -07:00
Marcus Moore
f4aac5f0b7
docs: add @disc as a contributor
2025-05-05 13:18:16 -07:00
Marcus Moore
5c167aa2a9
docs: add @AlexanderWPapyrus as a contributor
2025-05-05 13:18:15 -07:00
Marcus Moore
8e1eed498e
docs: add @MelonSmasher as a contributor
2025-05-05 13:18:14 -07:00
Marcus Moore
e449f39ea6
docs: add @fabiang as a contributor
2025-05-05 13:16:43 -07:00
Marcus Moore
97171e0e1c
docs: add @Jarli01 as a contributor
2025-05-05 13:16:42 -07:00
Marcus Moore
5935ca4664
docs: add @dkmansion as a contributor
2025-05-05 13:16:42 -07:00
Marcus Moore
21c88cd311
docs: add @splashx as a contributor
2025-05-05 13:16:41 -07:00
Marcus Moore
5c786d8b70
docs: add @corydlamb as a contributor
2025-05-05 13:09:28 -07:00
Marcus Moore
d718d210ed
docs: add @bricelabelle as a contributor
2025-05-05 13:09:27 -07:00
Marcus Moore
f50c5d22b8
docs: add @bmkalle as a contributor
2025-05-05 13:09:27 -07:00
Marcus Moore
c36f9a432e
docs: add @terwey as a contributor
2025-05-05 13:09:26 -07:00
Marcus Moore
65b6b02b1d
docs: add @xWyatt as a contributor
2025-05-05 12:54:08 -07:00
Marcus Moore
9c65d7c057
docs: add @Wouter0100 as a contributor
2025-05-05 12:54:08 -07:00
Marcus Moore
eab07834cf
docs: add @valentyntu as a contributor
2025-05-05 12:54:07 -07:00
Marcus Moore
eb38f33baf
docs: add @viclou as a contributor
2025-05-05 12:54:06 -07:00
Marcus Moore
462f9f2f39
docs: add @yannikp as a contributor
2025-05-05 12:54:05 -07:00
Marcus Moore
1021ccb230
docs: add @timwsuqld as a contributor
2025-05-05 12:54:05 -07:00
Marcus Moore
84e9a3a7d6
docs: add @p3nj as a contributor
2025-05-05 12:54:04 -07:00
Marcus Moore
c0060b3625
docs: add @sreyemnayr as a contributor
2025-05-05 12:54:03 -07:00
Marcus Moore
197aa12c61
docs: add @octobunny as a contributor
2025-05-05 12:54:02 -07:00
Marcus Moore
dfb2959751
docs: add @nixn as a contributor
2025-05-05 12:54:01 -07:00
Marcus Moore
95fb4f0e45
docs: add @rcmcdonald91 as a contributor
2025-05-05 12:54:00 -07:00
Marcus Moore
b2c729b7b8
docs: add @owalerys as a contributor
2025-05-05 12:53:59 -07:00
Marcus Moore
fe9b224a44
docs: add @nunomaduro as a contributor
2025-05-05 12:53:59 -07:00
Marcus Moore
fc4e8c68f2
docs: add @Scorcher as a contributor
2025-05-05 12:53:58 -07:00
Marcus Moore
6fb1c03908
docs: add @nticaric as a contributor
2025-05-05 12:53:57 -07:00
Marcus Moore
96ccfdb8cc
docs: add @firefrei as a contributor
2025-05-05 12:53:57 -07:00
Marcus Moore
75fd07e057
docs: add @mzack5020 as a contributor
2025-05-05 12:53:56 -07:00
Marcus Moore
87fe69ecfb
docs: add @Mateus-Romera as a contributor
2025-05-05 12:53:55 -07:00
Marcus Moore
19b47030ca
docs: add @Nevets82 as a contributor
2025-05-05 12:53:54 -07:00
Marcus Moore
cf4e3fcc37
docs: add @snazy2000 as a contributor
2025-05-05 12:53:54 -07:00
Marcus Moore
bef4133f51
docs: add @smcpeck as a contributor
2025-05-05 12:53:53 -07:00
Marcus Moore
7ac24efced
docs: add @cendai-mis as a contributor
2025-05-05 12:53:52 -07:00
Marcus Moore
d8d4a7075e
docs: add @Shankschn as a contributor
2025-05-05 12:53:51 -07:00
Marcus Moore
dd4c9df6d1
docs: add @serkanerip as a contributor
2025-05-05 12:53:50 -07:00
Marcus Moore
da28c02b50
docs: add @SBrown2021 as a contributor
2025-05-05 12:53:50 -07:00
Marcus Moore
54858402e3
docs: add @McG800 as a contributor
2025-05-05 12:53:49 -07:00
Marcus Moore
b39d8cc0b9
docs: add @rosscdh as a contributor
2025-05-05 12:53:48 -07:00
Marcus Moore
4c7c33800a
docs: add @rickheil as a contributor
2025-05-05 12:53:47 -07:00
Marcus Moore
d2c604a7ce
docs: add @Nothing4You as a contributor
2025-05-05 12:53:47 -07:00
Marcus Moore
91243fb6c0
docs: add @mbrrg as a contributor
2025-05-05 12:53:46 -07:00
Marcus Moore
940a85888a
docs: add @deloz as a contributor
2025-05-05 12:53:45 -07:00
Marcus Moore
280c12e22b
docs: add @Galaxy102 as a contributor
2025-05-05 12:53:44 -07:00
Marcus Moore
39e644d048
docs: add @manu-crealytics as a contributor
2025-05-05 12:53:44 -07:00
Marcus Moore
9acb3e5935
docs: add @marcquark as a contributor
2025-05-05 12:53:43 -07:00
Marcus Moore
8ac5b5df61
docs: add @brandon-bailey as a contributor
2025-05-05 12:53:42 -07:00
Marcus Moore
434932599c
docs: add @thinkl33t as a contributor
2025-05-05 12:53:42 -07:00
Marcus Moore
81b8c445c6
docs: add @vicleos as a contributor
2025-05-05 12:53:41 -07:00
Marcus Moore
002bb72a8d
docs: add @herroworrd as a contributor
2025-05-05 12:53:40 -07:00
Marcus Moore
288770900e
docs: add @robintemme as a contributor
2025-05-05 12:53:39 -07:00
Marcus Moore
f6f6a23f8b
docs: add @wewhite as a contributor
2025-05-05 12:53:39 -07:00
Marcus Moore
522fa7be44
docs: add @Serdnad as a contributor
2025-05-05 12:53:38 -07:00
Marcus Moore
272d9e0552
docs: add @mink-adao-duy as a contributor
2025-05-05 12:53:37 -07:00
Marcus Moore
9060a3cc13
docs: add @ahpaleus as a contributor
2025-05-05 12:53:36 -07:00
Marcus Moore
b6a9c0e68b
docs: add @DanielRuf as a contributor
2025-05-05 12:53:36 -07:00
Marcus Moore
b43ae5be13
docs: add @dkaatz as a contributor
2025-05-05 12:53:35 -07:00
Marcus Moore
6384041107
docs: add @seanborg-codethink as a contributor
2025-05-05 12:53:34 -07:00
Marcus Moore
89703cd9df
docs: add @sorvani as a contributor
2025-05-05 12:53:33 -07:00
Marcus Moore
f6aa9f1318
docs: add @fe80 as a contributor
2025-05-05 12:53:33 -07:00
Marcus Moore
838e214b24
docs: add @phil-flip as a contributor
2025-05-05 12:53:32 -07:00
Marcus Moore
628c444cd4
docs: add @aranar-pro as a contributor
2025-05-05 12:53:31 -07:00
Marcus Moore
e8289b0f45
docs: add @JonathonReinhart as a contributor
2025-05-05 12:53:31 -07:00
Marcus Moore
86816f632f
docs: add @test1337ahp as a contributor
2025-05-05 12:53:30 -07:00
Marcus Moore
494710306b
docs: add @NebelKreis as a contributor
2025-05-05 12:53:29 -07:00
Marcus Moore
7a5fe4981f
docs: add @mnemonicly as a contributor
2025-05-05 12:53:29 -07:00
snipe
a67b320cae
Merge pull request #15907 from uberbrady/protect_assigned_to_assigned_type_rebased
...
Rebased version of #15629 - prevent setting assigned_to without setting assigned_type
2025-05-05 20:42:46 +01:00
snipe
9ef20997a5
Merge pull request #16861 from uberbrady/cherry_pick_avery_3490
...
adds support for Avery 3490 (Cherry-picked from 'master')
2025-05-05 15:01:00 +01:00
Calvin Schwartz
cfd10ae294
adds support for Avery 3490
2025-05-05 14:59:10 +01:00
snipe
9b85e9a071
Add @realchrisolin as a contributor
2025-05-05 14:44:04 +01:00
snipe
407962d998
Merge pull request #16790 from Godmartinz/empty_field_columns_labels
...
Adds Label fields offset as an option
2025-05-05 14:09:40 +01:00
snipe
1245289906
Add @chfsx as a contributor
2025-05-05 14:08:31 +01:00
snipe
76c19202ed
Merge pull request #16806 from chfsx/patch-1
...
[FIX] set upload-limit
2025-05-05 14:07:42 +01:00
snipe
ada8195e2e
Merge pull request #16860 from grokability/better_location_scope_check
...
Livewire component for smoother check for location companies
2025-05-05 14:04:23 +01:00
snipe
83d6e9ad8a
Removed log error
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-05 14:00:05 +01:00
snipe
4469db0bd3
Livewire component for smoother check for location companies
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-05 13:55:28 +01:00
snipe
5e2dba5483
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-05 11:15:46 +01:00
Fabian Schmid
9de97694c3
[FIX] set upload-limit
2025-05-05 08:35:45 +02:00
Jeremy Price
8349065b0a
stop buiulding intel on arm
2025-05-02 10:59:42 +02:00
Jeremy Price
bb82b2513e
Fix dockerhub repo we're pushing to, and arm build names
2025-05-02 10:58:25 +02:00
snipe
e781c170f3
Merge pull request #16841 from Godmartinz/dark_mode_black_input_group_add_on_color_fix
...
remove duplicate input-group color corrections from theme skins
2025-05-01 01:48:49 +01:00
Godfrey M
43dfbd3d21
remove duplicate input-group color correction from other themes
2025-04-30 16:21:15 -07:00
Godfrey M
073c9f5f7c
remove duplicate input-group color correction
2025-04-30 16:16:14 -07:00
snipe
f9d67dd431
Merge pull request #16840 from uberbrady/docker_backmerge
...
Copy changes from 'master' to develop for docker builds
2025-04-30 21:19:22 +01:00
Brady Wetherington
a2ea4c7fd0
Copy changes from 'master' to develop for docker builds
2025-04-30 21:12:10 +01:00
snipe
a0358e32d7
Removed escaping
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 16:46:06 +01:00
snipe
c2023c5c56
Ampersand showing in Custom fields [sc-29051]
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 16:25:44 +01:00
snipe
43c310c82d
Merge pull request #16531 from akemidx/bug/sc-28715
...
FIXED: Purchase Cost Column Always Shown
2025-04-30 15:54:31 +01:00
snipe
939a0c44dc
Merge pull request #16826 from Godmartinz/fix_multiple_inline_label_field_options
...
Reworked fix for for 24mm_D label indent errror
2025-04-30 15:47:57 +01:00
snipe
2b9cf1663b
Merge pull request #16837 from grokability/fmcs_scoping_improvements
...
Small improvements to scoped views
2025-04-30 15:33:53 +01:00
snipe
0a29e90701
Smal improvements to scoping displays
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 15:24:42 +01:00
snipe
d1be13e7d4
Added button text to translations
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 14:32:29 +01:00
snipe
049a777ca8
Added buttons to dashboard
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 14:32:20 +01:00
snipe
0dcaa83a3e
Nicer breadcrumb
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 14:22:13 +01:00
snipe
db706269e6
Fixed validation message
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 14:22:06 +01:00
snipe
4f72505dc3
Merge pull request #16836 from grokability/fixes/#16834_handle_bad_data_in_permissions
...
Fixed #16834 - better handle bad data in permissions
2025-04-30 13:56:59 +01:00
snipe
340f8b73a5
Updated comments
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 13:56:37 +01:00
snipe
6c6b37000a
Better handle permissions with bad data
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 13:43:05 +01:00
snipe
b5c79624c6
Display notes in group listing
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 11:14:42 +01:00
snipe
49d66dedf4
Nicer existing image display
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 10:19:12 +01:00
snipe
ebbcdbc864
Nicer breadcrumb
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 10:11:55 +01:00
snipe
a18691c09f
Set image path in singleton
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 10:11:48 +01:00
snipe
245b0b0f8f
Added image path
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-30 10:11:40 +01:00
snipe
1d3b0478f9
Merge pull request #16829 from marcusmoore/fixes/contributors-fix
...
Fixed updating CONTRIBUTORS.md via cli
2025-04-30 01:23:59 +01:00
Marcus Moore
a5d0307532
Wrap username in quotes
2025-04-29 16:20:00 -07:00
snipe
7daecdd53f
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 23:17:03 +01:00
snipe
667b4a49c3
Merge pull request #16828 from grokability/chore/sc-29037
...
Add audit button to BS table partial, redirect if asset won't validate
2025-04-29 23:07:45 +01:00
snipe
2518e60a5e
Corrected gates
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 22:59:05 +01:00
snipe
9ff8b62cee
Updated icon
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 22:58:58 +01:00
snipe
5086c80658
Invoke a validator, redirect to edit screen if invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 22:47:34 +01:00
snipe
cb852fc20f
Added audit gate to API
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 22:47:12 +01:00
snipe
fb3b34e0f6
Add audit button to BS table partial
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 22:47:02 +01:00
snipe
8d4fc07f63
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 20:37:47 +01:00
snipe
a0514ad8c1
Merge pull request #16799 from marcusmoore/bug/sc-28990
...
Handle category being null in CheckoutableListener
2025-04-29 20:37:11 +01:00
snipe
4e03e525a4
Merge pull request #16797 from Godmartinz/dark_mode_green_fix
...
Fixed Dark Mode color choices for fieldset links
2025-04-29 20:35:59 +01:00
snipe
0efdebcfd8
Merge pull request #16827 from grokability/fixed_custom_field_fieldset_display
...
Fixed fieldset display if custom fields are not available
2025-04-29 20:26:14 +01:00
snipe
c7835d2d1d
Fixed copypasta
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 20:08:34 +01:00
snipe
3e3bc0a347
Removed test tab
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 20:01:22 +01:00
snipe
184a22828f
Use input vs get
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 19:22:10 +01:00
snipe
f26e27d23e
Display in checkboxes not saving on custom [sc-29028]
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 19:21:50 +01:00
snipe
e717f1e780
Removed logging
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 19:21:18 +01:00
snipe
d1085a0f46
Move notes above custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 18:53:31 +01:00
Godfrey M
2e0913bb3b
remove unused method
2025-04-29 10:49:19 -07:00
Godfrey M
851ae46ea9
reworked fix for for 24mm_D label indent errior
2025-04-29 10:45:29 -07:00
snipe
89a52b7551
Fixed fieldset display if custom fields are not available
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 18:09:32 +01:00
snipe
15870d0e75
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 12:38:07 +01:00
snipe
eb2c536221
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 12:36:55 +01:00
snipe
bced7df539
Merge pull request #16822 from grokability/nicer_optional_disclosures
...
Nicer disclosure UI for optional data
2025-04-29 12:31:14 +01:00
snipe
fe672ed727
Nicer disclosure UI for optional data
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 12:10:09 +01:00
snipe
6e60594e66
Fixed escaped text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 10:25:20 +01:00
snipe
f357dd690b
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 10:21:24 +01:00
snipe
255e0c3bdc
Merge pull request #16602 from akemidx/bug/sc-25897-2
...
FIXED: Text Overflow on Settings Tiles
2025-04-29 10:20:45 +01:00
snipe
8984d60c39
Merge pull request #16798 from grokability/more-mint-support-and-newer-ubuntus
...
Support more Mint versions and verify newer Ubuntu versions in snipeit.sh
2025-04-29 10:19:28 +01:00
snipe
6dbfc8875b
Merge pull request #16817 from marcusmoore/fixes/restore-custom-field-values-on-asset-edit-v2
...
Maintain checkbox and radio custom field values on asset edit page
2025-04-29 10:17:10 +01:00
snipe
139f45872c
Merge pull request #16819 from marcusmoore/chore/migrate-radio-helpers
...
Replaced calls to Form::radio helper on user create and edit pages
2025-04-29 10:16:16 +01:00
snipe
eb223a4c09
Merge pull request #16821 from grokability/small_settings_ui_fixes
...
Use default BS tables “no results” view, small UI formatting improvements
2025-04-29 10:15:16 +01:00
snipe
c3531e9eba
Nicer formatting on smaller screens
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-29 10:11:00 +01:00
Marcus Moore
db3f8e5d68
Replace a Form::radio on user edit page
2025-04-28 15:08:05 -07:00
Marcus Moore
8ca11542f8
Replace a Form::radio on user edit page
2025-04-28 15:03:54 -07:00
Marcus Moore
36be23f7e4
Replace a Form::radio on user edit page
2025-04-28 14:57:03 -07:00
Marcus Moore
51f67082f4
Replace a Form::radio on user edit page
2025-04-28 14:23:39 -07:00
Marcus Moore
ea2f0cdd7b
Replace a Form::radio on user edit page
2025-04-28 14:18:01 -07:00
Marcus Moore
97d2e6f9d4
Replace a Form::radio on user edit page
2025-04-28 14:03:27 -07:00
Marcus Moore
28ea75512c
Replace from Form::radio on user edit page
2025-04-28 13:47:23 -07:00
snipe
9b6683ae16
Merge pull request #16818 from Godmartinz/fix_multiple_inline_label_field_options
...
Fixed label fields multiple option alignment bug
2025-04-28 21:37:19 +01:00
Godfrey M
149d276e06
fix field alignment issue
2025-04-28 13:26:49 -07:00
snipe
a519ebe19b
Default BS table no results
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-28 09:59:52 +01:00
snipe
66b537bc64
Fixed duplicate ID
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-28 09:59:28 +01:00
snipe
9722d29070
Use default BS tables “no results” view
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-28 09:59:17 +01:00
snipe
c748278637
Merge pull request #16810 from grokability/settings_improvements_branding
...
Use fieldsets for branding page
2025-04-26 17:53:11 +01:00
snipe
23c39520e5
Added empty alt tags to images since we don’t have additional info
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-26 17:42:49 +01:00
snipe
41f68d8a30
Use locked x-icon
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-26 17:33:18 +01:00
snipe
7320e823ad
Added alt text for sad panda
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-26 17:33:09 +01:00
snipe
1aeda546fd
Added urls for pa11y
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-26 17:33:00 +01:00
snipe
91fcff5faf
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-26 17:32:52 +01:00
snipe
d97e54f85e
Use fieldsets for branding page
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-26 17:32:41 +01:00
snipe
4b58af8850
Fixed message while processing audit on quickscan
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-24 14:25:42 +01:00
snipe
0822aa985d
Fixed #16802 - use asset endpoint for assets assigned to locations
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-24 14:05:44 +01:00
snipe
e5c6e294ec
Added #16239 - make city searchabke in users
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-24 12:16:41 +01:00
Marcus Moore
25fdde1807
Handle null category
2025-04-23 14:16:28 -07:00
snipe
fa45ca1453
Stupid fix for when people use id instead of an actual ID
...
@todo - use RMB for these
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 21:56:43 +01:00
Jeremy Price
67ec042ee3
Support more Mint versions and verify newer Ubuntu versions in snipeit.sh
...
In https://github.com/grokability/snipe-it/pull/16763 we added support
for Linux Mint 22.1, which is the newest stable version of Mint, but but
didn't get around to testing or adding support for less-recent versions.
With this PR, we're adding support for the following LinuxMint versions
* 22
* 21.3
* 21.2
* 21.1
* 21
We recommend using the newest version, but at least now you won't be
blocked so long as you're remotely up-to-date.
We're not going back any further because prior versions are based on
Ubuntu 20.04 (Focal), which is out of support as of April 2025, aka this
month.
Additionally, the most recent Ubuntu version specifically mentioned in
the script is 23.10. The script in its current version works all the way
up to the most recent version, so we're adding notation to that
effect.
Newly included Ubuntu versions are
25.04
24.10
24.04 (LTS)
2025-04-23 13:37:33 -07:00
snipe
8b6c88a7c6
Okay…
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 21:27:28 +01:00
snipe
9f8fddb4c5
Removed accidentally commited generated images
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 21:23:58 +01:00
snipe
8fcf7e3b9d
Merge pull request #16792 from grokability/add_pa11y
...
Added pa11y
2025-04-23 21:17:35 +01:00
snipe
d9326fc555
Removed sky-is-blue text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 21:13:40 +01:00
snipe
c1196599e1
Merge branch 'develop' into add_pa11y
2025-04-23 21:11:59 +01:00
Godfrey M
a26279e0b9
adds custom field link color correction to all dark modes
2025-04-23 12:38:58 -07:00
Marcus Moore
29433882ea
Restore custom field checkbox and radio button values when switching model
2025-04-23 12:38:09 -07:00
snipe
e3f511ec7c
Small accessibility improvements
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 15:53:41 +01:00
snipe
f0b18042f9
Added aria label to admin settings search
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 14:01:52 +01:00
snipe
75c9936dbb
Added alt text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 12:37:13 +01:00
snipe
ddd4065c81
Merge pull request #16793 from spencerrlongg/bug/sc-28972
...
Added Nullsafe Checks to Users
2025-04-23 12:01:25 +01:00
snipe
ad88a72d0a
Override legend style
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 06:31:25 +01:00
snipe
6a00620552
More urls
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 06:27:20 +01:00
snipe
a9db8d6898
Added more urls
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 06:20:23 +01:00
snipe
65cc1bbd7e
Ignore screenshots
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 05:53:11 +01:00
spencerrlongg
2935697209
added nullsafe checks to user
2025-04-22 23:39:24 -05:00
snipe
3ae2454228
This doesn’t work the way I thought
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 05:35:49 +01:00
snipe
11b48ee636
Removed dupes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 05:21:32 +01:00
snipe
2aa864afaa
Updated rules
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 05:16:22 +01:00
snipe
ec65e64a67
Updated ignore rules
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 05:06:34 +01:00
snipe
7e01d23aa2
Renamed file
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 04:50:14 +01:00
snipe
f05b2ad9be
First stabs at improvements
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 04:48:47 +01:00
snipe
eaaac76435
Added configs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 04:48:39 +01:00
snipe
41160c64a8
Merge pull request #16791 from grokability/location_company_scoping_improvements
...
Improved settings page for location-company scoping
2025-04-23 01:25:54 +01:00
snipe
0cfef59568
Updated string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 01:22:25 +01:00
snipe
d953d1a889
Use translation strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 01:21:54 +01:00
snipe
4aa06f6a75
Update dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-23 00:30:06 +01:00
snipe
07a9bded95
Added strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 23:50:28 +01:00
snipe
f686e86afb
Refactored setting page
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 23:50:21 +01:00
snipe
9f28dae01b
Invoke the artisan command
...
This *might* suck for people with a lot of assets, etc
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 23:50:11 +01:00
snipe
67ab584dc7
Updated text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 23:49:31 +01:00
Godfrey M
5da492cbf5
set max to 5
2025-04-22 12:07:02 -07:00
Godfrey M
d871c529d1
fix input max, and help block position
2025-04-22 11:59:19 -07:00
Godfrey M
7c2c5ea98d
adds Field offset option to labels
2025-04-22 10:50:20 -07:00
snipe
2e31a0530f
Merge pull request #16789 from grokability/fixes/#16475_delete_oauth_clients
...
Fixed #16475 - Allow deleting oauth client
2025-04-22 17:48:24 +01:00
snipe
5f66fb0bba
Allow deleting oauth user
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 17:42:07 +01:00
snipe
143e9cdd61
Merge pull request #16788 from grokability/better_handle_arrays_for_model_ids
...
Better handle model_id arrays passed to the API
2025-04-22 16:33:47 +01:00
snipe
aed32e6ada
Better handle arrays in API rerquests for model_id
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 16:23:34 +01:00
snipe
ed86c90b7e
Merge pull request #16787 from uberbrady/suppress_action_date_error_in_loggable
...
Fixed: [RB-19645] Suppress error message about 'action_date' not existing
2025-04-22 14:48:38 +01:00
snipe
7dc606fd3b
Merge pull request #16786 from grokability/populate_manufacturers
...
Added ability to seed common manufacturers
2025-04-22 14:35:20 +01:00
snipe
185fd559c9
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 14:34:03 +01:00
snipe
473c684fa5
Nicer translation
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 14:22:58 +01:00
Brady Wetherington
d3dbd82ce2
Check that array key exists before accessing it
2025-04-22 14:20:01 +01:00
snipe
e5dc13e48c
Added ability to seed manufacturers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 14:13:46 +01:00
snipe
2a2d118973
Updated readme with star count
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 12:38:05 +01:00
snipe
f2f17402c9
Merge pull request #16785 from grokability/feature/sc-28956
...
Added checkout date to license seats
2025-04-22 11:41:52 +01:00
snipe
39f764803d
Added checkout date to license seats
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-22 11:38:54 +01:00
snipe
55176816aa
Merge pull request #16784 from marcusmoore/fix-flaky-timestamp-tests
...
Fixed flaky test
2025-04-22 11:03:58 +01:00
Marcus Moore
1f7d4e0793
Fix flaky test
2025-04-21 15:14:53 -07:00
snipe
e17fae02ad
Merge pull request #16783 from uberbrady/upgrade_debugbar
...
Upgrade Debugbar to make deprecation warnings easier to find
2025-04-21 21:44:28 +01:00
Brady Wetherington
3c1099a6a9
Upgrade Debugbar to make deprecation warnings easier to find
2025-04-21 21:00:02 +01:00
snipe
b1761ec246
Merge pull request #16781 from uberbrady/make_min_qty_not_required
...
min_amt wasn't correctly being set to required or not
2025-04-21 18:44:20 +01:00
Brady Wetherington
03f0f13727
min_amt wasn't correctly being set to required or not
2025-04-21 18:32:53 +01:00
snipe
12648912aa
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 16:45:10 +01:00
snipe
4c898a8741
Fixed filename
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 16:44:47 +01:00
snipe
6bef8620e4
Merge pull request #16780 from grokability/feature/sc-23604
...
Fixed #9249 - added file uploads to locations
2025-04-21 14:49:02 +01:00
snipe
beb5560dce
Added files tab
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 14:43:04 +01:00
snipe
2ebe1ebc69
Load location route files
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 14:42:58 +01:00
snipe
00092a079f
Added uploads method
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 14:42:10 +01:00
snipe
9d313eb2d9
Added locations dir
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 14:42:02 +01:00
snipe
e8404c8720
Moved location routes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 14:41:52 +01:00
snipe
e71e25955a
Check for array
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 12:20:03 +01:00
snipe
fa9ac3c449
Return value as int
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 11:53:26 +01:00
snipe
70854b2c42
Small fix or groups API
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 11:49:49 +01:00
snipe
e2a1be9762
Int values for group permissions on API
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-21 10:49:28 +01:00
snipe
f2c2fefd99
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 15:28:48 +01:00
snipe
b5a960e933
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 15:27:41 +01:00
snipe
66b2cc2e28
Set empty array if permissions are null
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 15:17:55 +01:00
snipe
47246a3fdf
Merge pull request #15420 from grokability/return_boolean_in_api
...
Possible fix for #15315 - decode as permissions as boolean
2025-04-19 15:01:36 +01:00
snipe
4d01b2bb4f
Removed invalid json_decode() flag
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 14:57:43 +01:00
snipe
876715b3c5
Merge pull request #16435 from marcusmoore/fixes/prevent-deleting-accessories-with-checkouts
...
Disallow deleting accessories that have active checkouts
2025-04-19 14:38:14 +01:00
snipe
93d74587e1
Merge pull request #16538 from marcusmoore/bug/sc-28305
...
Return null from accessory transformer for missing assignment
2025-04-19 14:37:45 +01:00
snipe
5bae74bc1b
Merge pull request #16688 from 36864/patch-1
...
Fixes #14734 : Only show signatures for the printed user
2025-04-19 14:36:26 +01:00
snipe
0259c91a06
Added @mrdahbi as a contributor
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 14:34:15 +01:00
snipe
04ccfc3002
Fixed: escape '/' in preg_quote of asset tag prefix (Applied #16542 to develop)
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 14:32:21 +01:00
snipe
495b7db72b
Merge branch 'chore/sc-28495' into develop
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 14:29:30 +01:00
snipe
6e5eb55b45
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 14:28:01 +01:00
snipe
9ad99c1d81
Merge pull request #16494 from marcusmoore/bug/sc-28675
...
Avoid logging consumable checkins and purge action log of bad entries
2025-04-19 14:24:52 +01:00
snipe
622626bb27
Merge pull request #16521 from grokability/add-disable-saml-command
...
Add console command to disable SAML logins
2025-04-19 14:23:49 +01:00
snipe
f66575393a
Merge pull request #16766 from CloCkWeRX/fix-placeholder-translations
...
Fixed: Admin > General Settings - Some placeholders not translatable
2025-04-18 16:40:53 +01:00
snipe
f67548cd70
Merge pull request #16738 from CloCkWeRX/patch-9
...
Fixed: Update SECURITY.md to indicate v8 is supported
2025-04-18 16:33:18 +01:00
snipe
cd63657a92
Merge pull request #16694 from r-xyz/api-files-notes
...
Fixed #16689 : re-add `note` field in API files listing for AssetModel
2025-04-18 14:06:30 +01:00
snipe
54f2b62294
Fixed consumable item_no import field
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-18 00:55:56 +01:00
snipe
1a1120220c
Merge pull request #16765 from grokability/#15035-add-company_name_to_slack
...
Fixed #15035 - adds company to slack message
2025-04-18 00:36:25 +01:00
Daniel O'Connor
82d93b6980
Point to existing translation
2025-04-17 23:32:11 +00:00
Daniel O'Connor
72b2b2d819
Refactor to translatable placeholder text
2025-04-17 23:30:08 +00:00
snipe
ad6352adc4
Fixed #15035 - adds company to slack message
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-18 00:28:37 +01:00
snipe
4170397094
Merge pull request #16731 from CloCkWeRX/patch-4
...
Fixed: Editing > Email input > Utilise HTML5 controls
2025-04-17 23:16:23 +01:00
snipe
1e15aca809
Merge pull request #16733 from CloCkWeRX/patch-6
...
Fixed: Suppliers > Edit > Mark URL inputs as HTML5 URL inputs
2025-04-17 23:15:53 +01:00
snipe
8234c3eb0f
Merge pull request #16734 from CloCkWeRX/patch-7
...
Fixed: Users > Edit > Mark website as a URL field
2025-04-17 23:14:59 +01:00
snipe
80eea7b064
Merge pull request #16757 from CloCkWeRX/fields
...
Fixed: Admin > Custom Fields > Ensure name field is marked required
2025-04-17 23:14:26 +01:00
snipe
779c28661e
Merge pull request #16753 from CloCkWeRX/admin-slack-hook
...
Fixed: Admin > Webhooks > Swap to url input
2025-04-17 23:13:58 +01:00
snipe
516f59f0fc
Added @BeatSpark as contributor
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 23:12:51 +01:00
snipe
bfb55da1a3
Repeat #16571 without conflicts, correctly targeted
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 23:10:20 +01:00
snipe
79e2e5c272
Merge pull request #16729 from CloCkWeRX/patch-2
...
Fixed #16727 : Bulk Audit > Mark Asset Tag input required
2025-04-17 23:06:26 +01:00
snipe
db1af98992
Merge pull request #16764 from grokability/fixed_flaky_user_create_tests
...
Fixed flaky user creation tests
2025-04-17 22:46:42 +01:00
snipe
c8ea3ba79a
Merge pull request #16763 from grokability/add-linux-mint
...
Fixed : #16715 - Added LinuxMint support to snipeit.sh
2025-04-17 22:40:33 +01:00
snipe
96d5e072fe
Fixed flaky tests on user creation
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 22:39:04 +01:00
snipe
d25ba74123
Merge pull request #16762 from grokability/fixes/#15702-min_amt_and_termination_date_on_license_import
...
Fixed #15702 - Added termination_date, reordered fields for clarity
2025-04-17 21:37:27 +01:00
snipe
f05dce8960
Added min_amt explicitly
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 21:31:20 +01:00
snipe
0758e73c5f
Added termination_date, reordered fields for clarity
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 21:29:27 +01:00
Jeremy Price
617ee026c0
Add LinuxMint support to snipeit.sh
...
Fixes: https://github.com/grokability/snipe-it/issues/16715
@synergy34 requested LinuxMint support in our installer script. Mint is
Ubuntu-based, so i figured this wouldn't be too big of an issue, and
indeed it wasn't.
It mostly involved just supporting the OS version strings, and removing
the ondrej ppa because 22.1 ships with php8.3 already.
We only support 22.1 for the moment, as that's the most recent version
and the only one I tested on.
If you're on 22/Wilma and want to try, change the 221 on line 579 to 22 and
give it a whirl... If 22/Wilma also has php8.3, then it will probably be
fine
2025-04-17 12:22:42 -07:00
Daniel O'Connor
0cec64c056
Update SECURITY.md to indicate v8 is support
...
Unsure if v7 still is
2025-04-17 16:02:31 +00:00
snipe
915c730dae
Fixed #16714 - moved custom validation out of array
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 16:42:25 +01:00
snipe
0451f1219a
Merge pull request #16732 from CloCkWeRX/patch-5
...
Fixed: Manufacturers > Edit > Mark URL inputs as HTML5 url inputs
2025-04-17 16:27:03 +01:00
Daniel O'Connor
5290a95b6b
Update resources/views/hardware/quickscan.blade.php
2025-04-18 00:53:37 +09:30
snipe
e407695ff9
Merge pull request #16741 from CloCkWeRX/patch-10
...
Fixed: Change Password > Mark password fields required for change password
2025-04-17 16:22:01 +01:00
snipe
c5b53b00c1
Merge pull request #16742 from CloCkWeRX/security-url
...
Fixed: Admin > Security - Mark url fields as URL type
2025-04-17 16:21:26 +01:00
snipe
d2ac9b9610
Added @CloCkWeRX as contributor
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 16:18:29 +01:00
snipe
537e695ae9
Merge pull request #16730 from CloCkWeRX/patch-3
...
Fixed: Depreciations > Create/Edit > Change controls to various number inputs
2025-04-17 16:15:24 +01:00
snipe
b4b158da9e
Merge pull request #16747 from CloCkWeRX/admin-oauth-required
...
Fixed: Admin > OAuth > Mark fields required
2025-04-17 16:09:42 +01:00
snipe
ad072c0546
Moved validation email_array
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 16:04:56 +01:00
snipe
713e1671d4
Merge pull request #16749 from CloCkWeRX/admin-ldap-change-password-url
...
Fixed: Admin > LDAP > Use HTML5 inputs
2025-04-17 15:58:45 +01:00
snipe
087f9756a2
Merge pull request #16744 from CloCkWeRX/api-token-required
...
Fixed: Manage API Keys > New name field not marked required
2025-04-17 15:58:07 +01:00
snipe
eb0408703e
Merge pull request #16725 from CloCkWeRX/patch-1
...
Fixed #16723 : Mark category name as required in modals
2025-04-17 15:47:07 +01:00
Daniel O'Connor
7e961b690a
Mark required
2025-04-17 11:05:03 +00:00
snipe
81f3730d84
Merge pull request #16754 from grokability/fixes/ambiguous_clause_for_company_id
...
Fixed ambiguous clause using company_id
2025-04-17 11:58:15 +01:00
snipe
141fad8393
Fixed ambiguous clause using company_id
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 11:56:39 +01:00
Daniel O'Connor
58ff63845e
Admin > Slack > Swap to url input
2025-04-17 10:47:37 +00:00
Daniel O'Connor
a8150b7864
Update resources/views/settings/ldap.blade.php
2025-04-17 19:57:52 +09:30
Daniel O'Connor
ce6724f788
Admin > LDAP > Swap to URL input
2025-04-17 10:25:23 +00:00
Daniel O'Connor
13faa8ab00
Admin > LDAP > Swap to URL input
2025-04-17 10:23:43 +00:00
Daniel O'Connor
89beb73836
Swap to URL input
2025-04-17 19:49:28 +09:30
Daniel O'Connor
8b7e36a697
Mark fields required
2025-04-17 10:17:32 +00:00
Daniel O'Connor
c0f3d89b0b
Fixed: Manage API Keys > New name field not marked required
2025-04-17 10:00:26 +00:00
Daniel O'Connor
ec62a59e57
Update resources/views/depreciations/edit.blade.php
2025-04-17 19:20:44 +09:30
Daniel O'Connor
f9269cfc63
Mark required
2025-04-17 19:19:19 +09:30
Daniel O'Connor
56bc06746c
Set max limit
2025-04-17 19:18:31 +09:30
Daniel O'Connor
497e94d8a0
Admin > Security - Mark url fields as URL type
2025-04-17 09:42:45 +00:00
Daniel O'Connor
aa77c8c528
Mark password fields required for change password
2025-04-17 09:40:27 +00:00
Daniel O'Connor
6cd2a5d1a5
Users > Edit > Mark website as a URL field
2025-04-17 09:35:35 +00:00
Daniel O'Connor
e4a3a1a35f
Suppliers > Edit > Mark URL inputs as HTML5 URL inputs
2025-04-17 09:34:45 +00:00
Daniel O'Connor
06f3cc1345
Manufacturers > Edit > Opt into HTML fields
2025-04-17 09:33:24 +00:00
Daniel O'Connor
3a6832ea58
Editing > Email input > Utilise HTML5 controls
...
Should be safe as this is validated by the UI as a singular email.
2025-04-17 09:32:02 +00:00
Daniel O'Connor
d2bb7fc926
Deprecations > Create/Edit > Mark number of months as a numeric control
2025-04-17 09:30:56 +00:00
Daniel O'Connor
4b93f329c2
Bulk Audit > Mark Asset Tag input required
...
Fix https://github.com/grokability/snipe-it/issues/16727
2025-04-17 09:29:43 +00:00
Daniel O'Connor
f03da92152
Mark category name as required in modals
...
Fix #16723
2025-04-17 09:27:04 +00:00
snipe
88acdbcc28
Move array return
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-17 01:00:09 +01:00
snipe
23623cca2c
Merge pull request #16719 from grokability/fixes_weird_layout_datepicker
...
Use x-icon blade component, nicer small-screen form size for datepicker on assets checkout
2025-04-16 21:13:21 +01:00
snipe
93e66aae54
Nicer form sizing on smaller screens
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 21:05:56 +01:00
snipe
02b831c174
Use x-icon blade component
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 21:05:43 +01:00
snipe
cd20486fe2
Merge pull request #16667 from Godmartinz/user-redirect-checkin-option
...
Adds option to redirect back to checkedInBy user for assets/licenses/accessories
2025-04-16 20:54:47 +01:00
snipe
1464f80425
Merge pull request #16717 from Godmartinz/fix_checkin_mail_test
...
Adds a check for category email alert boolean, bolster Check in Test
2025-04-16 18:10:29 +01:00
Godfrey M
8f673a7e3e
default checkin_email to true in category factory
2025-04-16 10:05:37 -07:00
Godfrey M
c44d037933
removed some words
2025-04-16 09:57:40 -07:00
Godfrey M
c8b5b3f176
adds a check for category checkin/out emails, also updates our test
2025-04-16 09:51:44 -07:00
snipe
ce94470a10
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 16:41:25 +01:00
snipe
e7592eeeb9
Use disable admin CC
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 16:41:14 +01:00
snipe
46253b421e
Added disableAdminCC to settings test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 16:41:04 +01:00
snipe
7d4e77a7c8
Updated string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 15:52:05 +01:00
snipe
9a4f21e0cb
Merge pull request #16716 from grokability/log_deprecations
...
Allow toggle for logging deprecation warnings
2025-04-16 14:28:07 +01:00
snipe
934aa3da7f
Allow toggle for logging deprecation warnings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 14:25:51 +01:00
snipe
e4244d60f1
Check for username
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 09:47:06 +01:00
snipe
0b6c6bf1df
Send email to CC addresses even if the target doesn’t have an email
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-16 09:18:50 +01:00
snipe
b35181c289
Removed deleted accessories (for now) from transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 21:15:43 +01:00
snipe
277564436b
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 20:45:13 +01:00
snipe
87a03ec1ed
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 20:41:43 +01:00
snipe
f8833241ef
Added @36864 as contributor
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 20:28:36 +01:00
snipe
7f62c5cbb6
Add @fvollmer as a contributor
2025-04-15 20:22:23 +01:00
snipe
93b4749993
Update @ntaylor-86 as a contributor
2025-04-15 20:20:36 +01:00
snipe
b2dac291da
Merge pull request #16712 from grokability/fixes/snipe-api-token
...
Removed deprecation resulting in `Creation of dynamic property` error
2025-04-15 20:16:56 +01:00
Jermops
bec83d4343
Merge pull request #16713 from grokability/fix-docker-arm-buildname
...
Fix name of ARM docker container workflow
2025-04-15 12:16:40 -07:00
snipe
4f3b3721c4
Remove comments
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 20:15:44 +01:00
Jeremy Price
e5cf296b79
Fix name of ARM docker container workflow
2025-04-15 12:15:44 -07:00
snipe
e1abdd1c7b
Removed deprecation resulting in Creation of dynamic property
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 20:11:26 +01:00
snipe
71d8f1eb89
Merge pull request #16701 from grokability/repo-move
...
Update references to the repo to reflect move to Grokability org
2025-04-15 19:54:08 +01:00
snipe
68c1568345
Merge pull request #16711 from snipe/publish_assets
...
Updated dev CSS/LESS/JS assets
2025-04-15 19:40:48 +01:00
snipe
b5be0844ec
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 19:39:58 +01:00
snipe
f76e80ba68
Merge pull request #16710 from snipe/localizations/2025-04-15
...
Updated localization strings
2025-04-15 19:32:12 +01:00
snipe
ffbab554be
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 19:30:19 +01:00
snipe
0be50e803e
Merge pull request #16709 from snipe/#16699-fix-email-locales-when-none-set-on-user
...
Fixed #16699 - Better handle user locales in mailables
2025-04-15 16:44:38 +01:00
snipe
7133a1b262
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 16:41:09 +01:00
snipe
5876418eed
Search on email partial
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 16:31:03 +01:00
snipe
950472b935
Fixed typos
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 16:30:54 +01:00
snipe
c0c5699e38
Added public property name
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 16:21:02 +01:00
snipe
49fee3a211
Removed manually setting locale on mailable
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 16:10:54 +01:00
snipe
a21ca92c90
Added boot method to set name property for mailable
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 16:08:21 +01:00
snipe
260174dfd9
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 15:46:12 +01:00
snipe
afc5e08716
Added email as searchable field in select list
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 15:45:25 +01:00
snipe
89616727a1
Remove english as default
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 15:45:11 +01:00
snipe
ba55dfb841
Fixed #16699 - added mutator for user locale
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 13:41:24 +01:00
snipe
65b956143c
Merge pull request #16700 from snipe/docker-arm-size-fix
...
[Docker] Don't cache composer deps, remove any .git repos that creep in
2025-04-14 22:15:10 +01:00
snipe
42e1987147
Merge pull request #16702 from snipe/separate-docker-architecture-builds
...
Separate docker builds into Intel/ARM builds
2025-04-14 22:14:48 +01:00
Jeremy Price
545e07455b
Separate docker builds into Intel/ARM builds
...
Now that we're moving to a paid org, we have native ARM github action
runners available, which means we can streamline our ARM-based docker
image builds by not having them run emulated.
I've switched our worker split from ubuntu/alpine to Intel/ARM... if we
hate this we can make it 4 separate workflows, but i don't see an issue
with this one.
2025-04-14 12:55:36 -07:00
Jeremy Price
b00594052c
[Docker] Don't cache composer deps, remove any .git repos that creep in
...
There is a failure mode in composer where if it has a connection trying to get
a dependency tarball from the github API, it will fall-back to
downloading the entire repo for the dependency and use that... and it
will cache it outside of vendor/, using a whopping 1.5G of space
that full 1.5G is _then_ copied into vendor/
```
98M league
100M tecnickcom
133M laravel
323M sebastian
681M aws
```
for a total of a 1.8G vendor/ directory
vs the trimmed-down version with a 552M vendor/ directory
```
53M league
30M tecnickcom
31M laravel
70M sebastian
241M aws
```
This is still a far cry from the proper 150M version when everything
works as it should, but it's still a vast improvement
```
3.2M league
14M laravel
30M tecnickcom
260K sebastian
52M aws
```
Ideally this never happens, but it'd be great tp avoid the bloat if/when
it does..
To wit: Our ARM/Ubuntu Docker images are currently bloated because of this
issue due builds happening on an emulated ARM environment, and the resultant
performance penalties causing composer issues
All that to say, this change sets OMPOSER_CACHE_DIR to /dev/null to
avoid the caching, and then removes vendor/*/*/.git to remove that
needless bloat if it occurs. It's a no-op in general practice.
2025-04-14 11:55:20 -07:00
snipe
1c387795fe
Merge pull request #16683 from marcusmoore/bug/sc-28755
...
Create default label when importing assets if none exists
2025-04-14 09:52:48 +01:00
snipe
102f26cac1
Merge pull request #16676 from marcusmoore/fixes/acceptance-logging
...
Store accepted_at and declined_at in action log when accepting/declining assets
2025-04-14 09:18:54 +01:00
snipe
c7e89ff879
Merge pull request #16682 from akemidx/bug/sc-28860
...
FIXED: Location Being Overwritten By Default Location
2025-04-14 09:17:52 +01:00
r-xyz
565b8f5c7f
Fixed #16689 : re-add note field in API files listing for AssetModel
2025-04-13 00:33:22 +02:00
36864
3b314086f9
New method to get latest signature event
...
This makes the print page much tidier.
2025-04-11 16:28:54 +00:00
36864
06fc140626
Optimize eager loading of log entries
2025-04-11 16:27:29 +00:00
36864
e4bfc6c5ae
Fix signatures for accessories and consumables
...
Also unifies the way these things are fetched.
2025-04-11 16:24:06 +00:00
Marcus Moore
b82d835f4f
Remove created_by since it is not available
2025-04-10 13:59:28 -07:00
Marcus Moore
d593365c9c
Create pending default status label if none exists
2025-04-10 13:38:30 -07:00
Marcus Moore
ea6a903d8a
Implement tests including test failure
2025-04-10 13:29:05 -07:00
Marcus Moore
9086e5dba7
Scaffold some asset importer tests
2025-04-10 13:03:50 -07:00
akemidx
cd10cd34f4
location update bug fix and test
2025-04-10 14:46:52 -04:00
snipe
0d6a83197a
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2025-04-09 21:29:31 +01:00
snipe
6d784e36d7
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 21:29:27 +01:00
snipe
9c88aa6974
Merge pull request #16637 from akemidx/lastnameemail
...
Fixed #8188 - Added Last Name as an email format
2025-04-09 21:27:10 +01:00
akemidx
1307146831
changing where translations live. coalescing
2025-04-09 16:21:48 -04:00
Marcus Moore
e5d7bcb629
Use declinded at for action date in log
2025-04-09 11:20:46 -07:00
Marcus Moore
c2123e307a
Add failing test
2025-04-09 11:20:07 -07:00
Marcus Moore
7a9d5bfc07
Add test for declining assets
2025-04-09 11:18:52 -07:00
Marcus Moore
aed798800c
Improve assertions
2025-04-09 11:17:57 -07:00
Marcus Moore
dbfa952a69
Improve test name
2025-04-09 11:15:25 -07:00
Marcus Moore
aa58f08b3d
Use accepted at for action date in log
2025-04-09 11:13:46 -07:00
Marcus Moore
d76871760c
Add failing test
2025-04-09 11:11:30 -07:00
Marcus Moore
d29f5fa13e
Implement tests
2025-04-09 11:07:47 -07:00
Marcus Moore
7275299165
Scaffold some tests
2025-04-09 11:02:56 -07:00
Godfrey M
9824f43780
added other target options to accessories and assets
2025-04-09 10:50:42 -07:00
snipe
1b7486c342
Merge pull request #16674 from spencerrlongg/bug/allow-avif-restore-and-logo
...
Add Support for Uploading AVIF Logo Images
2025-04-09 17:46:53 +01:00
spencerrlongg
cd9ee8af90
Add support for AVIF logo uploads and restoring avifs from public uploads
...
Extended the list of allowed file extensions and MIME types to include AVIF format in both backend file validation and the file input field for logo uploads. This update ensures compatibility with modern image formats.
2025-04-09 11:36:16 -05:00
snipe
cbf4fef45b
Merge pull request #16671 from snipe/fixed_list_view_of_asset_files
...
Partial fix for #16135 - normalized asset file listing at API endpoint
2025-04-09 06:45:32 +01:00
snipe
8892a11e7e
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:40:14 +01:00
snipe
fc390dd107
Merge pull request #16672 from snipe/added_missing_gate_to_some_location_methods
...
Added gates to printing locations
2025-04-09 06:28:38 +01:00
snipe
99dfb51d70
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:23:40 +01:00
snipe
04f8ebb4d8
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:17:08 +01:00
snipe
41fb058adb
Added gates around printing location assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 06:06:44 +01:00
snipe
f29146b319
Fixed asset file listing display at API endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:53:24 +01:00
snipe
ce0bd68716
RMB for file routes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:52:59 +01:00
snipe
f3f26b3824
Added UploadedFilesTransformer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:52:48 +01:00
snipe
7be3d6072f
Removed erroneous comment
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 05:52:35 +01:00
snipe
1d030b59df
Merge pull request #16592 from fvollmer/anonymous-ldap
...
Improve Settings: Remove username and password requirement for ldap
2025-04-09 05:19:09 +01:00
snipe
07d2d8c549
Merge pull request #16669 from snipe/translations_for_skins
...
Fixed #16130 - Added translations for skins, other settings
2025-04-09 02:37:17 +01:00
snipe
691ccbbebc
Additional branding placeholders
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 02:32:22 +01:00
snipe
9daa09277d
Added translations for skins
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 02:23:18 +01:00
snipe
79eaf62c9e
Merge pull request #16668 from spencerrlongg/bug/sc-28768
...
Handle Potentially Unsafe File Output Better During Restore
2025-04-09 01:01:59 +01:00
spencerrlongg
dd078785ac
always show unsafe files
2025-04-08 18:06:18 -05:00
spencerrlongg
12a8c54331
Handle and log skipped unsafe files during restore
...
Introduced a mechanism to track and log potentially unsafe files skipped during the restore process. These files are collected in an array and displayed as warnings before exiting, improving transparency and debugging capability.
2025-04-08 16:43:36 -05:00
Godfrey M
715fc2de59
more cleaning
2025-04-08 11:58:23 -07:00
Godfrey M
af53559ca3
cleaned up code
2025-04-08 11:54:50 -07:00
Godfrey M
17b8ea9c86
removed unnecessary code
2025-04-08 11:51:29 -07:00
Godfrey M
1ad96e891b
added option logic to licenses
2025-04-08 11:50:45 -07:00
Jeremy Price
4e2b4195b4
Grokability-ize .well-known/security.txt
2025-04-08 11:50:03 -07:00
Godfrey M
b7492928ad
reworked checkedInBy, added option logic to accessories
2025-04-08 11:43:02 -07:00
snipe
9f04254963
Merge pull request #16666 from snipe/print_view_tweaks
...
Added signature to licenses in print view, misc other fixes
2025-04-08 19:34:02 +01:00
snipe
10b8055b29
Added monospace class
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 19:10:16 +01:00
snipe
2b85ddeb74
Use correct date
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 19:10:06 +01:00
snipe
9017ae8545
Added category to consumable checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 19:09:58 +01:00
snipe
d0359a42fb
Added signature to licenses
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 18:56:34 +01:00
akemidx
7701c6097f
adding username split
2025-04-08 13:21:32 -04:00
akemidx
275e1beda2
updating for conflicts and adding test
2025-04-08 13:15:28 -04:00
Godfrey M
85b67dbb71
adds redirect to user option from checkin blades
2025-04-08 10:13:27 -07:00
akemidx
f659b7631d
Merge branch 'develop' into lastnameemail
2025-04-08 13:10:26 -04:00
Godfrey M
a602b2fd47
adds option to redirect back to checkedInBy user for assets
2025-04-08 10:09:43 -07:00
snipe
e0c6483b43
Merge pull request #16660 from snipe/cleanup_for_scoped_locations
...
Small improvements to location-by-company scoping
2025-04-08 17:57:50 +01:00
snipe
c2e12f69d8
Merge pull request #16664 from 36864/patch-1
...
Fixes #16661 : Empty signatures in print page
2025-04-08 17:57:11 +01:00
snipe
890702f66d
A few more display tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 17:47:39 +01:00
36864
dfdbc95b5c
Fix empty signatures in print page
...
Fixes snipe#16661
Assuming that whatever happens between the user accepting and signing for the asset and the print page being accessed isn't another user somehow signing for the same asset and it not being assigned to that second user.
2025-04-08 15:50:59 +00:00
snipe
ea365e5645
More fields visible
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 16:17:57 +01:00
snipe
548ae49c69
Small tweaks to table
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:30:07 +01:00
snipe
34f8f50a4a
Use localization, turned display into table
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:13:57 +01:00
snipe
da2c760227
Renamed variables, skipped breaking out of loop
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:13:19 +01:00
snipe
a96abeac5f
Use localization w/trans_choice
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:12:58 +01:00
snipe
420278c63b
Nicer layout for settings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:12:36 +01:00
snipe
e0a04fe1ce
Localized message
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:12:19 +01:00
snipe
c42f53e846
Use table layout
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 12:34:11 +01:00
snipe
44ee287cc0
Nicer formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 12:34:00 +01:00
fvollmer
a56f6148fc
Improve Settings: Remove username and password requirement for ldap
...
Since 9d62793 anonymous LDAP login is available. Remove username and password requirement in settings dialog.
2025-04-08 11:04:37 +02:00
snipe
5b1d6dbe14
Merge pull request #12577 from Toreg87/feature/locations_with_companies
...
Added #2353 : Add ability to tie locations to companies - 2023 edition
2025-04-08 09:54:37 +01:00
snipe
43c15ef134
Merge branch 'develop' into feature/locations_with_companies
2025-04-08 09:18:48 +01:00
snipe
a7203b0bbf
Updated links, added mobile apps
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 08:32:15 +01:00
snipe
a14d3ad856
Merge pull request #16493 from snipe/min_qty_in_bulk_model_edit
...
Add min_qty to asset model bulk edit
2025-04-08 08:22:03 +01:00
snipe
fcd0ca3b94
Merge branch 'develop' into min_qty_in_bulk_model_edit
2025-04-08 07:14:15 +01:00
snipe
90329a2b2f
Merge pull request #16529 from Godmartinz/location_tab_active-n-scroll_bar_fix
...
Fix active table tab and double scroll bar under locations
2025-04-08 07:12:33 +01:00
snipe
7448f67e12
Merge pull request #16658 from snipe/fix_bad_data_on_permission_groups
...
Set empty array if group permission is a string or null
2025-04-08 07:10:02 +01:00
snipe
22be89fbea
Set empty array if group permission is a string or null
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 07:06:56 +01:00
snipe
fe65ffc384
Merge pull request #16527 from Godmartinz/license_seat_notes_fix
...
add notes as fillable to license seat model
2025-04-08 06:49:26 +01:00
snipe
d44553c6dd
Merge pull request #16553 from marcusmoore/tests/user-show
...
Added tests around emailing and printing assigned assets
2025-04-08 06:48:39 +01:00
snipe
cfd845aefa
Merge pull request #16500 from marcusmoore/bug/sc-28644-command
...
Added command to fix bulk checkin action log entries
2025-04-08 06:44:25 +01:00
snipe
a98b277fa9
Merge pull request #16560 from spencerrlongg/bug/meta_status_multi_comp
...
Meta Status Fix for Multi Company
2025-04-08 06:43:57 +01:00
snipe
237975577d
Merge pull request #16636 from marcusmoore/tests/delete-asset-tests
...
Added tests around deleting assets
2025-04-08 06:32:40 +01:00
snipe
2275186222
Merge pull request #16652 from akemidx/feature/sc-28820
...
Username dropdown to show Usernames and not Emails as Examples
2025-04-08 06:32:19 +01:00
snipe
5a1c81954f
Merge pull request #16651 from Godmartinz/qr_code_location_option
...
Fixes #9660 - Adds location qr code option to labels
2025-04-08 05:53:48 +01:00
snipe
68e7d172a4
Merge pull request #16655 from snipe/adds_more_searchable_relations_to_activity
...
Fixed #13274 - Adds more searchable relations to activity report
2025-04-08 05:53:18 +01:00
snipe
b2e0f48ed9
Added purchase date
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 05:50:03 +01:00
snipe
733ef9e23b
Few more
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 05:44:49 +01:00
snipe
83562cfa83
Added additional searchable relations to activity report
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 05:23:39 +01:00
snipe
de426c2d2c
Merge pull request #16653 from snipe/add_audit_custom_fields
...
Fixed #13475 - Add custom fields to audit screen
2025-04-08 05:16:23 +01:00
snipe
05e66c33ee
Added audits string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 05:09:08 +01:00
snipe
744e844291
Added audit tab
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 05:08:58 +01:00
snipe
31c9ffa32b
Added audits method
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 05:08:42 +01:00
snipe
c46a9a773d
Fixed admin string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 05:08:08 +01:00
snipe
849da2fb63
Use correct audit icon
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 04:15:59 +01:00
snipe
b51939ae76
Derp. Use correct model info
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 04:07:31 +01:00
snipe
e95d7076b9
Added action_date
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 04:07:04 +01:00
snipe
d2c7385197
Updated class for error text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 04:06:54 +01:00
snipe
5beb0bf534
Added assertion for success in test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:39:17 +01:00
snipe
c59e9770b7
Removed unusued property
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:39:05 +01:00
snipe
908bb35792
Use upload file request
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:38:35 +01:00
snipe
c4d0afb8d4
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:24:33 +01:00
snipe
4b21f0d00b
Removed stray character
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:03:45 +01:00
snipe
4aeba2a96b
Try to fix tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:02:37 +01:00
snipe
74f8cb5298
Updated url in bootstrap partial
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:02:28 +01:00
snipe
62e863a0fa
Removed tooltip code
...
This throws an error currently
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:02:10 +01:00
snipe
5bbba56b0e
Added orginal values for logging
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:01:39 +01:00
snipe
e4180c2194
Removed duplicated code
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:01:29 +01:00
snipe
f4e3e6ceb6
Added display_audit to custom fields transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:01:08 +01:00
snipe
f37ed3e055
Add display_audit to custom fields controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:00:51 +01:00
snipe
9bb349d34b
Try to get the asset from the route if there is RMB
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 02:00:37 +01:00
snipe
362f14a01d
Manually invoke a validator
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 01:59:33 +01:00
snipe
226ad52f07
Better UI route
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 01:59:08 +01:00
akemidx
443a5c2348
chaning username dropdown to be usernames and not emails
2025-04-07 19:25:32 -04:00
snipe
ce460c9ab0
Updated route
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:15:09 +01:00
snipe
c344c40310
Added auditAssets() to user factory
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:10:36 +01:00
snipe
95fef9682f
Added migration
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:10:18 +01:00
snipe
241777c1fd
Added translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:10:12 +01:00
snipe
acdbf452e2
Added checkbox to custom field form
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:10:01 +01:00
snipe
b8a9db2faf
Added display_audit to custom fields list
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:09:51 +01:00
snipe
dfdc24936d
Added custom fields partial
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:09:29 +01:00
snipe
6a1bb06c13
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:09:14 +01:00
snipe
cfa8ddffc0
Keep legacy URL for audit
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:08:05 +01:00
snipe
5b524399d9
Use RMB for asset audit API
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 22:07:51 +01:00
Godfrey M
bc3b3cf86e
add psuedo example location_id for preview
2025-04-07 12:53:17 -07:00
Godfrey M
a69133e2ae
adds location qr code option to labels
2025-04-07 12:36:05 -07:00
snipe
b66618ff3f
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-07 13:54:10 +01:00
snipe
b5ef856d9e
Translate request cancel string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-05 17:24:06 +01:00
snipe
a302cc145a
Merge pull request #16643 from snipe/small_requestable_improvements
...
Text tweaks and nicer buttons for requestable items
2025-04-05 16:07:57 +01:00
snipe
d203c4e49c
Text tweaks and nicer buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-05 15:58:03 +01:00
snipe
b5c7e60408
Merge pull request #16642 from snipe/fixed_#16640-FIFO-for-requestable
...
Fixed #16640 - FIFO for requestable assets
2025-04-05 15:39:29 +01:00
snipe
3684e9c1e8
Fixed #16640 - FIFO for requestable assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-05 15:38:13 +01:00
snipe
f2c730bd57
Fix wrapping on #16628
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-05 14:10:23 +01:00
akemidx
f0bf77735d
adding last name only as a email choice
2025-04-03 23:34:04 -04:00
Marcus Moore
1b95b29832
Add tests for deleting asset via ui
2025-04-03 16:12:13 -07:00
Marcus Moore
9a8e5bf61e
Backup before running updates
2025-04-03 14:39:40 -07:00
Marcus Moore
18ef88bd67
Improve comment
2025-04-03 13:13:52 -07:00
Marcus Moore
4ba58b2546
Constrain query
2025-04-03 13:10:45 -07:00
Marcus Moore
6dd3ab2ec9
Exit early if no logs found
2025-04-03 12:56:46 -07:00
Marcus Moore
faee50c222
Use dry-run instead of dryrun
2025-04-03 12:56:07 -07:00
Jeremy Price
afd9282785
Update remaining comments from snipe/snipe-it to grokability/snipe-it
2025-04-03 12:07:05 -07:00
Jeremy Price
1344ed1d16
Update app & composer files from snipe/snipe-it to grokability/snipe-it
2025-04-03 12:04:12 -07:00
Jeremy Price
cbea096403
Update Vagrantfile files from snipe/snipe-it to grokability/snipe-it
2025-04-03 12:02:42 -07:00
Jeremy Price
094edbd114
Update css and less files from snipe/snipe-it to grokability/snipe-it
2025-04-03 12:00:51 -07:00
Jeremy Price
f016b6b988
Update relevant README sections from snipe/snipe-it to grokability/snipe-it
2025-04-03 11:54:39 -07:00
Jeremy Price
782b35e0f1
Update scripts from snipe/snipe-it to grokability/snipe-it
2025-04-03 11:51:12 -07:00
Jeremy Price
70e9c6b947
Update relevant snipe/snipe-it references to grokability/snipe-it in Docker files
2025-04-03 11:44:27 -07:00
Jeremy Price
4a457c96e8
Update Contributors links from snipe/snipe-it to grokability/snipe-it
2025-04-03 11:39:21 -07:00
Jeremy Price
2e2516825e
Update github workflows from snipe/snipe-it to grokability/snipe-it
2025-04-03 11:36:57 -07:00
snipe
ba621cb1f2
Merge pull request #16632 from uberbrady/fix_paveit_command
...
Paveit had old Doctrine code to list tables; use the new method
2025-04-03 15:39:38 +01:00
snipe
b1e2b5ab4a
Merge pull request #16623 from Godmartinz/accessories_history_view_fix
...
Fixes Accessories history table color contrast
2025-04-03 15:37:55 +01:00
snipe
7c1438c370
Merge pull request #16446 from marcusmoore/feature/improve-checkout-asset-mail-wording
...
Improved wording in asset checkout emails
2025-04-03 15:37:30 +01:00
Brady Wetherington
760768f42d
Paveit had old Doctrine code to list tables; use the new method
2025-04-03 15:35:07 +01:00
snipe
cc8c2064c1
Merge pull request #16630 from snipe/license_key_formatting
...
Fixed #16628 - added formatting for license keys
2025-04-03 15:26:14 +01:00
snipe
33a921119c
Merge pull request #16631 from snipe/add_webp_to_inline
...
Added webp as inline-able images
2025-04-03 15:25:48 +01:00
snipe
0e65498799
Added webp as inline-able images
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 15:24:03 +01:00
snipe
274c5fe4d3
Added max-width
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 15:07:10 +01:00
snipe
b7c011dd2d
Use new one line code style
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 15:03:31 +01:00
snipe
a4a99adf80
Added one-line code style
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 15:03:16 +01:00
snipe
c7890f4c3b
Use id as copy key
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 13:52:55 +01:00
snipe
6d7f061a1d
Larger key box
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 13:39:31 +01:00
snipe
45d3c0444b
Added copy to license keys
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 12:29:30 +01:00
snipe
9204309d67
Checkin/Checkout note added to language file
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 12:28:47 +01:00
snipe
a2035693e6
Added licenseKeyFormatter
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-03 12:28:30 +01:00
akemidx
392db81499
requested changes
2025-04-02 21:28:34 -04:00
snipe
abfea8e349
Merge pull request #16624 from snipe/bug/sc-28682
...
Fixed [SC-28682] - Consumable import not importing supplier and item number
2025-04-03 01:45:52 +01:00
snipe
ef20bd4aa8
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 21:41:12 +01:00
snipe
2d9be4e9e0
Added supplier_id as fillable
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 21:10:25 +01:00
snipe
36767c0a5c
Added more common fields for mapping
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 21:10:16 +01:00
snipe
0d099263e3
Removed unneeded lines
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 21:09:28 +01:00
snipe
8f50e01d18
Shrink sample CSVs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 21:09:04 +01:00
snipe
d898288397
Remove email user for comonent import type
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 21:08:54 +01:00
Marcus Moore
af88ce5801
Merge branch 'develop' into feature/improve-checkout-asset-mail-wording
2025-04-02 12:01:53 -07:00
Godfrey M
b1b248f03d
removed duplicate class from accessories history table
2025-04-02 11:29:01 -07:00
snipe
df1c7c4f95
Merge pull request #16609 from snipe/login_throttle_update
...
Updated login attempts and throttle duration
2025-04-02 18:28:34 +01:00
snipe
7120b19d3b
Fixed namespace
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 18:24:27 +01:00
snipe
2197b46658
Link to admin user
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 14:03:09 +01:00
snipe
785f576b19
Merge pull request #16621 from snipe/add_notes_to_location_sidebar
...
Fixed #16618 - added notes to location sidebar
2025-04-02 13:27:48 +01:00
snipe
31e337255a
Use adminuser instead of created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 13:26:12 +01:00
snipe
f12d173581
Fixed #16618 - added notes to location sidebar
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 13:23:33 +01:00
snipe
eb3dbb8c7a
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:49:53 +01:00
snipe
ed908be2eb
Merge pull request #16620 from snipe/#16619_fix_accessory_clone_population
...
Fixed #16619 - cloning accessory was not populating fields
2025-04-02 12:48:25 +01:00
snipe
e215c5f9ee
Fixed #16619 - accesory clone
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:43:42 +01:00
snipe
78f3c879ff
Merge pull request #16617 from snipe/add_pdf_logo_upload
...
Fixed #16257 - Added acceptance PDF logo upload
2025-04-02 12:22:43 +01:00
snipe
cb59c23f0b
Added pdf logo to the blade
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:13:34 +01:00
snipe
d0f750edea
Added pdf logo to the controller
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:13:28 +01:00
snipe
56ae9d0ba9
Nicer upload logo labels
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:10:27 +01:00
snipe
15917d5f99
Use new logo
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:10:14 +01:00
snipe
a59d69cb0d
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:10:05 +01:00
snipe
97cba45509
Added migration
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-02 12:09:57 +01:00
snipe
365ce34940
Merge pull request #16613 from marcusmoore/chore/update-rollbar
...
Update rollbar-laravel to 8.1
2025-04-02 10:48:51 +01:00
Marcus Moore
7048eceb9d
Update rollbar/rollbar-laravel
2025-04-01 16:05:32 -07:00
snipe
9d61234f0c
Merge pull request #16612 from snipe/re-fix_db_dump_ssl_fix
...
Fixes #16610 , regression in #16543
2025-04-01 21:32:15 +01:00
snipe
bef650757d
Fixes #16610 , regression in #16543
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-01 21:25:35 +01:00
snipe
cb6e7f7b6e
Merge pull request #16561 from spencerrlongg/bug/api_get_by_serial_add_pagination
...
Adds Pagination to Hardware By Serial API Request
2025-04-01 19:26:28 +01:00
snipe
c305284930
Merge pull request #15922 from spencerrlongg/feature/sc-24347
...
Requestable/Request Item API Endpoints
2025-04-01 18:15:42 +01:00
snipe
6c47f1c07f
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-01 17:44:44 +01:00
snipe
5d265f5bfd
Change to minutes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-01 15:01:34 +01:00
snipe
daaad4fe9d
Removed unneeded strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-01 14:36:53 +01:00
snipe
40ae5d421b
Updated maxLoginAttempts and throttle duration
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-01 14:36:45 +01:00
akemidx
d96498ab1f
this is a redo after a borked rebase
2025-03-31 18:33:20 -04:00
spencerrlongg
bfd827e529
added more eager loading
2025-03-31 12:28:03 -05:00
snipe
d95549bbcf
Merge pull request #16594 from uberbrady/fix_consumable_model_copy
...
Fixes [FD-47675 ] Fix consumable model number copy-to-clipboard button
2025-03-31 18:26:46 +01:00
snipe
e10071a68e
Merge pull request #16595 from uberbrady/fix_whitespace_encrypted_custom_fields_display
...
Fix whitespace encrypted custom fields display [FD-46570]
2025-03-31 18:25:13 +01:00
Brady Wetherington
92a77afd0b
Fixes the clipboard button copying whitespace at the end of custom fields
2025-03-31 13:55:38 +01:00
Brady Wetherington
1369b993a4
Fix JS copy-to-clipboard for consumable model_num
2025-03-31 13:13:37 +01:00
snipe
382414df98
Merge pull request #16559 from Godmartinz/StoreLabelSettings_fix
...
Fix Form save error when using old label engine
2025-03-31 12:39:08 +01:00
snipe
6846c7d510
Merge pull request #16536 from akemidx/moving_warranty_info
...
Moving warranty/depreciation to be with the other cost/eol values
2025-03-31 12:35:32 +01:00
snipe
1d3069fe84
Merge pull request #16540 from marcusmoore/bug/sc-28607
...
Early return null from location transformer for missing accessory
2025-03-31 12:34:22 +01:00
snipe
13940071a9
Merge pull request #16546 from marcusmoore/bug/sc-28024
...
Fixed potential bad method call and premature email sending in bulk asset checkout
2025-03-31 12:32:50 +01:00
snipe
6870698cdc
Add @ntaylor-86 as a contributor
2025-03-31 12:32:25 +01:00
snipe
4aa13c8dd4
Merge pull request #16543 from ntaylor-86/fixes/laravel-backup-ssl-error
...
Fixed #16217 : database config, added option to skip ssl on the database dump
2025-03-31 12:32:00 +01:00
snipe
44db2dc78e
Merge pull request #16520 from marcusmoore/bug/sc-28673
...
Remove unneeded eager loading for user show page
2025-03-31 12:31:12 +01:00
snipe
2e17e80ea9
[Snyk] Upgrade acorn from 8.14.0 to 8.14.1 #16587
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-31 12:30:09 +01:00
snipe
836d7ca8f9
[Snyk] Upgrade bootstrap-table from 1.24.0 to 1.24.1 #16588
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-31 12:29:00 +01:00
snipe
18e6a18389
Merge pull request #16576 from marcusmoore/fixes/api_company_note
...
Fixed notes not being saved and update for companies via api
2025-03-31 12:20:36 +01:00
snipe
1dd050ac0f
Merge pull request #16577 from marcusmoore/tests/login-logging
...
Added tests around login attempt logging
2025-03-29 23:30:05 -01:00
Marcus Moore
b8b0e3200e
Add tests around loggin login attempts
2025-03-27 17:27:28 -07:00
Marcus Moore
bc77c8c885
Add notes to $fillable
2025-03-27 10:57:34 -07:00
Marcus Moore
c095f330e1
Add failing tests
2025-03-27 10:56:33 -07:00
Marcus Moore
e0e08f284e
Add tests for creating and patching companies via api
2025-03-27 10:54:42 -07:00
spencerrlongg
e273c7cbc5
Refactor asset retrieval to support pagination.
...
Introduced offset and limit handling for API asset queries to enable proper pagination. Adjusted the total count logic to maintain consistency in responses and ensure accurate transformation of assets.
2025-03-25 15:21:18 -05:00
Godfrey M
d28cc024cf
add DefaultLabel if no label2_template is selected
2025-03-25 12:40:23 -07:00
spencerrlongg
168a3df157
Fix condition in statusMeta for correct property check
...
Updated the conditional check to use 'assigned_to' instead of 'assigned' for determining the deployment status. This ensures the code references the correct property on the model.
2025-03-25 14:39:51 -05:00
Marcus Moore
ac597b517b
Remove blank line
2025-03-24 12:39:17 -07:00
Marcus Moore
ac56640d40
Spilt test scenarios
2025-03-20 16:21:42 -07:00
Marcus Moore
ce585539aa
Improve test name
2025-03-20 16:13:13 -07:00
Marcus Moore
2cfff8e07c
Formatting
2025-03-20 16:12:31 -07:00
Marcus Moore
0ceda098ff
Spilt test scenarios
2025-03-20 16:10:01 -07:00
Marcus Moore
db81209fe1
Organize existing tests
2025-03-20 16:01:28 -07:00
Marcus Moore
02f109c3b5
Include input when redirecting back
2025-03-20 14:04:19 -07:00
Marcus Moore
0ed0a7f9f3
Avoid sending emails for asset checkouts that failed
2025-03-20 14:01:48 -07:00
Marcus Moore
b721b7d9c9
Add tests
2025-03-20 13:57:42 -07:00
Marcus Moore
976b3dc5ae
Improve test case
2025-03-20 13:38:12 -07:00
snipe
2d3514bbf8
Merge pull request #16545 from Godmartinz/activity_report_column_name_fix
...
changes translation from Admin Settings to Created By on the Activity Report
2025-03-20 19:37:42 -01:00
Marcus Moore
5dcd4b2942
Return valid error message
2025-03-20 13:26:27 -07:00
Marcus Moore
d645b42e12
Add failing test
2025-03-20 13:26:06 -07:00
Godfrey M
0ad985cbcd
change translation
2025-03-20 12:40:46 -07:00
ntaylor-86
ad5099fac9
added .env variable to the other .env files
2025-03-20 23:27:29 +10:00
ntaylor-86
32736e2f74
added .env variable and database config to skip ssl for DB DUMP
2025-03-20 23:06:15 +10:00
Marcus Moore
cef83ad652
Avoid hard failure on missing accessory in location transformer
2025-03-19 14:11:47 -07:00
Marcus Moore
e6ccff103f
Add simple null check to avoid attempting to transform missing relationship
2025-03-19 12:52:01 -07:00
akemidx
5944034b8b
moving warranty/depreciation to be with the other cost/eol values
2025-03-19 15:22:09 -04:00
Godfrey M
881cde4d98
change namesspaces and use create instead of make
2025-03-18 14:18:49 -07:00
akemidx
e408b902f0
removing depreciation from purchase cost (unneeded, should go elsewhere if wanted)
2025-03-18 16:38:44 -04:00
akemidx
a398c4ab84
reset
2025-03-18 16:37:27 -04:00
akemidx
27417cdec7
removing depreciation logic (unneeded for purchase cost)
2025-03-18 16:36:36 -04:00
Godfrey M
bf3837c49d
add checkin test for api
2025-03-18 12:54:03 -07:00
Godfrey M
66fd46fe75
add checkout test for api
2025-03-18 12:46:56 -07:00
Godfrey M
29cbf43d68
remove duplicate table class div
2025-03-18 11:48:09 -07:00
Godfrey M
07096c8a31
rename note to notes
2025-03-18 10:37:00 -07:00
Godfrey M
cbc6c2754c
add notes as fillable to license seat model
2025-03-18 10:27:56 -07:00
Jermops
711235f49c
Merge pull request #16519 from marcusmoore/bug/sc-28696
...
Fixed issue with bad email addresses in expiration alerts and upcoming audits
2025-03-18 09:15:41 -07:00
Jeremy Price
3d2d7684aa
Add console command to disable SAML logins
...
If a Snipe-IT sire has SAML enabled, and the SAML config is sufficiently
borked, the site will fail to even load the login page. That's probably
something that should be examined, but in the meantime, it'd be handy to
not have to manually edit the database to turn off SAML.
In this commit, I'm creating a saml-disable console command. And by
create, i mean i'm copypasta-ing the existing ldap-disable command.
2025-03-17 19:58:21 -07:00
Marcus Moore
9aede45918
Remove unneeded eager loads
2025-03-17 14:43:23 -07:00
Marcus Moore
b26a73e385
Filter out empty email address in alerts
2025-03-17 12:30:15 -07:00
Marcus Moore
650839b68a
Update command name
2025-03-12 17:05:16 -07:00
Marcus Moore
388dc23241
Add comments
2025-03-12 17:02:05 -07:00
Marcus Moore
32b194ddc7
Update description
2025-03-12 16:44:37 -07:00
Marcus Moore
9cea6cee26
Docblock
2025-03-12 16:42:50 -07:00
Marcus Moore
73f64c53b1
Skip logs where created_by cannot be set
2025-03-12 16:42:39 -07:00
Marcus Moore
2091f66f5b
Reorganize
2025-03-12 16:30:36 -07:00
snipe
c711278b8b
Merge pull request #16486 from marcusmoore/bug/sc-28639
...
Fixed location being automatically populated on asset checkin screen
2025-03-12 23:26:08 +00:00
snipe
ff637f1926
Merge pull request #16497 from marcusmoore/fixes/diff-in
...
Fixed various carbon displays
2025-03-12 23:17:48 +00:00
Marcus Moore
4d978e0fc6
Fix eol rate in upcoming audit notification
2025-03-12 16:04:16 -07:00
Marcus Moore
167001ed54
Fix eol rate in tests
2025-03-12 16:01:32 -07:00
Marcus Moore
25fb1abc95
Fix eol rate in AssetObserver
2025-03-12 15:58:11 -07:00
Marcus Moore
658bef447d
Fix eol rate in Actionlog
2025-03-12 15:55:13 -07:00
Marcus Moore
a28ff22d03
Fix eol rate in ReportsController
2025-03-12 15:44:06 -07:00
Marcus Moore
63a1ee0047
Fix eol rate in AssetMaintenancesController
2025-03-12 15:38:54 -07:00
Marcus Moore
ab8f4454d1
Add failing test for updating asset maintenance
2025-03-12 15:38:46 -07:00
Marcus Moore
e439f1f42b
Fix eol rate in AssetMaintenancesController
2025-03-12 15:35:46 -07:00
Marcus Moore
9be27bdf07
Add failing test for creating asset maintenance
2025-03-12 15:35:14 -07:00
snipe
bfc122469c
Merge pull request #16495 from snipe/add_highlight_for_low_qty
...
Added highlight to items when the remaining is less than the min_amt
2025-03-12 21:23:15 +00:00
snipe
036c225dcf
Fixed dashboard string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 21:22:24 +00:00
snipe
083cf78305
Added footer style for nicer number cell padding
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 21:17:41 +00:00
Marcus Moore
824271078e
Fix eol rate in AssetsController
2025-03-12 13:55:12 -07:00
Marcus Moore
1122cd8567
Fix eol rate in asset transformer
2025-03-12 13:33:15 -07:00
Marcus Moore
6cf7df22cd
Fix eol rate on asset show page
2025-03-12 13:28:34 -07:00
snipe
7421d089ff
Added formatter and centering in presenters
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 20:25:00 +00:00
snipe
bdb4bd73d2
Return an indicator for no value set
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 20:18:51 +00:00
snipe
bf88597132
Added qtySumFormatter and made seats formatter more generic
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 20:14:23 +00:00
snipe
dfacd876d5
Added remaining/min_amt to transformers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 20:13:15 +00:00
Marcus Moore
d5bc5caacd
Purge activity log of consumable bulk checkins
2025-03-12 11:57:18 -07:00
Marcus Moore
be6caf936e
Avoid logging consumable checkins
2025-03-12 11:48:14 -07:00
snipe
f1e70eb7a0
Add min_qty to asset model bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 18:27:27 +00:00
snipe
dbe78c30d5
Merge pull request #16491 from snipe/bug/sc-28671
...
Fixed new user modal pre-populating with first name and last name of acting user
2025-03-12 18:05:57 +00:00
snipe
c1601b9a8c
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 17:28:50 +00:00
snipe
aa8e9f61d2
Check for value override
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 17:28:44 +00:00
snipe
163ddc8026
Check for value override
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 17:28:29 +00:00
snipe
c73dba4a43
Better visual spacing
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-12 17:28:05 +00:00
snipe
5e61a814a7
Merge pull request #16489 from marcusmoore/bug/sc-28644
...
Fixed timestamp in action log for bulk accessory check in
2025-03-12 14:56:52 +00:00
Marcus Moore
935d3eea9f
Attempt to match and populate created_by
2025-03-11 17:17:39 -07:00
Marcus Moore
fffc606d9a
Improve output
2025-03-11 17:06:02 -07:00
Marcus Moore
c3a48182fd
Display the created_by
2025-03-11 17:03:26 -07:00
Marcus Moore
147e610062
Add todos
2025-03-11 17:00:36 -07:00
Marcus Moore
dd14eac1eb
Prompt for confirmation
2025-03-11 16:56:07 -07:00
Marcus Moore
4954d972bb
Write table of ids
2025-03-11 16:52:20 -07:00
Marcus Moore
c8177eb51e
Update timestamps
2025-03-11 16:50:16 -07:00
Marcus Moore
a8cccffa1e
Update output
2025-03-11 16:41:22 -07:00
Marcus Moore
c774e969d7
Scaffold command
2025-03-11 16:34:07 -07:00
Marcus Moore
b5fa538a54
Set created_by correctly in he action log
2025-03-11 16:05:02 -07:00
snipe
fcdc1494c2
Merge pull request #16443 from azmcnutt/feature/labels_Avery_5520_1DBarcode
...
Nice work! Thank you!
2025-03-11 22:12:09 +00:00
snipe
badb367e74
Merge pull request #16445 from ubc-cpsc/bugfix/CVE-2025-27515
...
Fixes CVE-2025-27515: Laravel has a File Validation Bypass
2025-03-11 21:55:58 +00:00
snipe
2960a13772
Upgrade webpack from 5.97.1 to 5.98.0 #16461
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-11 21:24:44 +00:00
snipe
5e10c213f6
Merge pull request #16488 from marcusmoore/bug/sc-28631
...
Nice catch!
2025-03-11 21:05:46 +00:00
snipe
b61eacbdab
Merge pull request #16473 from marcusmoore/chore/replace-form-close
...
Replaced call to Form::close()
2025-03-11 20:47:08 +00:00
Marcus Moore
e2f643e7ed
Backfill tests
2025-03-11 13:46:21 -07:00
Marcus Moore
9cbcfba4e9
Add test
2025-03-11 13:35:50 -07:00
Marcus Moore
fd854072b0
Properly handle route model bound LicenseSeat not being found
2025-03-11 13:03:00 -07:00
Marcus Moore
18b208bba2
Account for missing location
2025-03-11 11:46:38 -07:00
Marcus Moore
71d93ca3c3
Use dedicated location select component
...
Copy/paste/modify from partials.forms.edit.location-select
2025-03-11 11:41:26 -07:00
Marcus Moore
bac2760c6d
Replace Form::close
2025-03-10 12:55:35 -07:00
snipe
33c9ea4bb1
Merge pull request #16065 from marcusmoore/chore/migrate-select-helper
...
Convert Form::select to blade component
2025-03-07 01:05:58 +00:00
Marcus Moore
d88fe1f48a
Merge branch 'develop' into chore/migrate-select-helper
2025-03-06 13:39:05 -08:00
Marcus Moore
f202817852
Use translation strings
2025-03-06 12:43:59 -08:00
Joël Pittet
618d81777a
Fixes CVE-2025-27515
2025-03-06 12:33:29 -08:00
James M
0b6d810ca6
FEAT: Add Label 5520 with 1D barcode - remove 2D barcode
...
FEAT: Add Label 5520 with 1D barcode - remove 2D barcode
2025-03-06 11:12:16 -07:00
snipe
8c164d1b09
Merge pull request #16441 from snipe/added_modal_tests
...
Added modal tests
2025-03-06 15:06:08 +00:00
snipe
6d74053ca3
Added modal tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-06 15:02:55 +00:00
snipe
f42fcd25b1
Make the assets tab active by default on locations page
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-06 12:05:36 +00:00
Marcus Moore
7df636515f
Move to data providers
2025-03-05 18:20:40 -08:00
Marcus Moore
3db124e709
First pass at updating wording for asset checkout mail
2025-03-05 18:12:23 -08:00
snipe
c5dd942f3d
Merge pull request #16436 from marcusmoore/fixes/report-template-link
...
Fixed linking in saved report template dropdown
2025-03-06 01:06:18 +00:00
Marcus Moore
70de08a211
Replace hard-coded link to report template
2025-03-05 16:26:26 -08:00
Marcus Moore
d1683d1c65
Use existing translation string
2025-03-05 16:10:36 -08:00
Marcus Moore
f038254038
Have UI reflect not being able to delete accessory
2025-03-05 16:02:23 -08:00
Marcus Moore
a19582a5f3
Prevent deleting accessory that has checkouts via api
2025-03-05 15:58:34 -08:00
Marcus Moore
00cbebd1e3
Add failing test for api
2025-03-05 15:57:18 -08:00
Marcus Moore
8c21d625fc
Prevent deleting accessory that has checkouts via UI
2025-03-05 15:56:01 -08:00
snipe
64f49afce1
Merge pull request #16432 from marcusmoore/bug/sc-24475
...
Added validation around user store endpoint
2025-03-05 20:16:30 +00:00
Marcus Moore
25395e9af1
Add test for storing user
2025-03-05 11:37:03 -08:00
Marcus Moore
69009e027f
Add authorization test
2025-03-05 11:34:45 -08:00
Marcus Moore
695c9d070f
Require int for department and company ids when creating user via api
2025-03-05 11:32:04 -08:00
snipe
c9f55bfd94
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-05 17:04:57 +00:00
snipe
27d98fbb93
Merge pull request #16429 from snipe/bug/sc-28609
...
Updated HTML label colors in blue skin
2025-03-05 13:43:53 +00:00
snipe
0e1f40626f
Updated label colors in blue skin
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-05 13:40:36 +00:00
snipe
7a312d075c
Check for null on webhook url
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-05 11:59:35 +00:00
snipe
e1156be919
Merge pull request #16427 from snipe/fixed_user_modal_email
...
Fixes user create modal - check if $item is set
2025-03-05 10:52:00 +00:00
snipe
fcf7a543fd
Check if $item is set
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-05 10:47:33 +00:00
Spencer Long
6201e475cb
Merge branch 'develop' into feature/sc-24347
2025-03-04 21:20:46 -06:00
snipe
bef54983fa
Merge pull request #16421 from marcusmoore/chore/migrate-label-helpers-pt8
...
Replace calls to Form::label pt8
2025-03-05 01:01:21 +00:00
Marcus Moore
f2b44f7002
Replace Form::label in company select partial
2025-03-04 16:46:43 -08:00
Marcus Moore
de7d32f632
Replace Form::label on ldap settings page
2025-03-04 16:44:26 -08:00
snipe
fecee69de6
Use table name to avoid ambiguous query
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-05 00:43:04 +00:00
snipe
75366927f0
Fixed table name
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-05 00:41:11 +00:00
Marcus Moore
c798df2920
Replace Form::label on label settings page
2025-03-04 16:34:22 -08:00
snipe
779330af14
Merge pull request #16420 from marcusmoore/fixes/report-url
...
Fixed custom report template route
2025-03-05 00:11:30 +00:00
Marcus Moore
f01ff1f1d7
Add dedicated named route
2025-03-04 16:07:35 -08:00
Marcus Moore
1e4daf0348
Fix route
2025-03-04 16:04:28 -08:00
snipe
fae79a91f6
Merge pull request #16418 from marcusmoore/chore/custom-report-template-activity-log-removal
...
Stop reporting report template events to activity log
2025-03-04 23:28:43 +00:00
Marcus Moore
e8ee218f39
Purge activity log of report template data
2025-03-04 15:20:23 -08:00
Marcus Moore
cb5b0bd89c
Stop reporting report template creates, updates, and deletes to action log
2025-03-04 15:11:37 -08:00
snipe
0ed49fa7a0
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 22:55:58 +00:00
snipe
f25b8379e6
Merge pull request #16413 from Godmartinz/visited_link-color-change
...
Changed `visited-link` and `link` colors in default theme to be more accessible
2025-03-04 22:55:17 +00:00
snipe
bc618fcef4
Merge pull request #16414 from Godmartinz/Audit_error_fix
...
Adds audit notification for MS Teams
2025-03-04 22:54:32 +00:00
Godfrey M
7c194422f3
Merge branch 'develop' into Audit_error_fix
2025-03-04 14:51:21 -08:00
Godfrey M
49ff47fbcf
Merge branch 'develop' into visited_link-color-change
2025-03-04 14:47:48 -08:00
snipe
77c978d29a
Merge pull request #16416 from Godmartinz/expiring-asset-email-test
...
fix Expiring alert tests
2025-03-04 21:11:52 +00:00
Godfrey M
437b3cd865
fix conflicts
2025-03-04 13:08:53 -08:00
Godfrey M
3641016271
remove commented code
2025-03-04 13:08:03 -08:00
Godfrey Martinez
cc127c8e1e
Merge branch 'develop' into expiring-asset-email-test
2025-03-04 13:06:36 -08:00
Godfrey M
4bac509341
fix Expiring alert tests
2025-03-04 12:58:04 -08:00
snipe
f4f6dcb885
Updated test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 20:48:59 +00:00
snipe
d89f38bbfb
Set defaults on save
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 20:38:33 +00:00
snipe
9351cc2252
Set default to 0
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 20:38:22 +00:00
snipe
a31a732d38
Nicer UI for invert flag
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 20:38:15 +00:00
snipe
1be420b0e9
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 20:37:45 +00:00
snipe
2b0127ab0c
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 19:56:58 +00:00
snipe
8791640908
Add @Fiala06 as a contributor
2025-03-04 19:53:25 +00:00
snipe
1dacd25e6d
Check for purchase_cost before adding the “each”
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 19:50:11 +00:00
snipe
45317c0959
Merge pull request #16415 from snipe/nicer_error_message_on_model_not_found
...
Nicer model name formatting on RMB model not found
2025-03-04 19:42:45 +00:00
snipe
63e4c42445
Added strtolower
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 19:33:17 +00:00
snipe
d4e227f003
Whitespace
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 19:29:09 +00:00
snipe
bbabbe1b87
Nicer model name formatting on RMB model not found
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 19:21:46 +00:00
Marcus Moore
2a156776a4
Merge branch 'develop' into chore/migrate-select-helper
...
# Conflicts:
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
2025-03-04 11:19:38 -08:00
Godfrey M
15a09e5187
adds audit notification for MS Teams
2025-03-04 11:15:03 -08:00
Godfrey M
5eebdcddb2
changes visited and link colors
2025-03-04 10:12:45 -08:00
snipe
16b97c18e0
Shim route for asset maintenances redirect on RMB not found
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 17:16:16 +00:00
snipe
fa72696a35
Removed redundent text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 17:06:56 +00:00
snipe
9467ec2571
Nicer env text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 17:05:45 +00:00
snipe
ac3f61c96a
Fixed extra escape character
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 17:00:44 +00:00
snipe
d2e0a23994
Merge pull request #16412 from snipe/#16150_fixed_regression_in_branding_page
...
Fixed regression from #16150
2025-03-04 15:55:24 +00:00
snipe
ccea55308b
Fixed regression from #16150
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 15:53:30 +00:00
snipe
acaa3a28e7
Merge pull request #16410 from snipe/#16407_component_checkout_and_notes_fix
...
Fixed #16407 - weird layout on components for non super user
2025-03-04 15:38:20 +00:00
snipe
c4722898b7
Fixed #16407 - weird layout on components for non super user
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 15:37:25 +00:00
snipe
e19003aea5
Merge pull request #16409 from snipe/#16386_user_dropdown_fields_not_populating_on_edit
...
Fixed #16386 - some fields not populating with user data on edit
2025-03-04 15:28:11 +00:00
snipe
a09a9d3cd6
Added item to payload
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 15:26:25 +00:00
snipe
759e3794df
Small upgrader UI fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 14:57:28 +00:00
snipe
c50b14763f
Merge pull request #16403 from snipe/#16402_each_localization
...
Fixed #16402 - localize "each" string in components tab on asset view
2025-03-04 13:35:08 +00:00
snipe
369a68fe57
Fixed #16402 - Localize “each” in string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-03-04 13:33:04 +00:00
snipe
83855d44d0
Merge pull request #16251 from Godmartinz/Audit_Checkin_warning_fix
...
refactors audit notification to mail, adds test, adds alerts check to scheduler
2025-03-04 12:51:42 +00:00
snipe
6f847294ed
Merge pull request #15911 from Fiala06/patch-1
...
Fixed duplicate entries preventing LDAP sync from continuing
2025-03-04 12:49:54 +00:00
snipe
d556d1c6e7
Merge pull request #16150 from Godmartinz/add-translations-to-settings
...
Adds Translation strings to General and Branding Settings
2025-03-04 12:48:21 +00:00
snipe
3bb94e98f0
Merge pull request #16398 from marcusmoore/bug/sc-28535
...
Avoid using authenticated user's email address in email partial
2025-03-04 12:47:10 +00:00
Marcus Moore
8f5f6f3502
Avoid using authenticated user's email address in email partial
2025-03-03 16:28:08 -08:00
snipe
b3792bfa00
Merge pull request #16396 from marcusmoore/chore/migrate-checkbox-helpers-pt10
...
Replace calls to Form::checkbox pt10
2025-03-03 20:52:54 +00:00
Marcus Moore
40f7257723
Replace call to Form::checkbox
2025-03-03 12:44:50 -08:00
snipe
8486256142
Merge pull request #16381 from marcusmoore/chore/migrate-checkbox-helpers-pt9
...
Replace calls to Form::checkbox pt9
2025-03-03 20:28:21 +00:00
snipe
7f36750e33
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2025-03-03 19:54:14 +00:00
snipe
de046db106
Add @azmcnutt as a contributor
2025-03-03 19:53:30 +00:00
snipe
eb1d27a5bc
Merge pull request #16379 from azmcnutt/feature/settings_ldap_invert_active_flag
...
Feature/settings ldap invert active flag
2025-03-03 19:52:57 +00:00
Godfrey M
cc0b9f404a
merged develop, fix conflicts
2025-02-27 15:38:31 -08:00
Marcus Moore
70332696c6
Fix test by passing in required properties
2025-02-27 15:23:17 -08:00
Marcus Moore
7a9b5d61b0
Replace another Form::checkbox
2025-02-27 13:25:32 -08:00
Marcus Moore
5876259893
Replace another Form::checkbox
2025-02-27 13:19:26 -08:00
Marcus Moore
8755c54edc
Replace Form::checkbox
2025-02-27 13:13:39 -08:00
Marcus Moore
014f3b7652
Cast to boolean
2025-02-27 13:12:01 -08:00
Marcus Moore
3a2579b205
WIP: replace Form::checkbox
2025-02-27 13:08:02 -08:00
James M
149474bfe3
Update general.php
...
FIX: Spelling error
2025-02-27 12:42:47 -07:00
James M
b2b768dede
Merge branch 'snipe:develop' into develop
2025-02-27 12:25:07 -07:00
snipe
a9ed9e2a7f
Merge pull request #16378 from snipe/wrap_pdf_table_results
...
Wrap long text in PDF export in tables
2025-02-27 19:06:34 +00:00
snipe
ce8523b00a
Fixed wrapping
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 18:58:18 +00:00
snipe
7076a68d35
Wrap table results in PDF
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 18:38:10 +00:00
James M
112112d258
Feat: #14926 LDAP Active Flag - Add config option to make False = Enable
2025-02-27 10:52:12 -07:00
snipe
3928c8afe9
Merge pull request #16376 from uberbrady/improve_safety_csv_charset_detection
...
Add some safeties around the charset-detection and transliteration
2025-02-27 16:26:44 +00:00
snipe
23ce54e80c
Make sure we’re saving the last_login in 2FA auths
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 16:17:59 +00:00
Brady Wetherington
646e3e8df5
Complete failed-transliteration test, clean up error, new translation string
2025-02-27 16:10:56 +00:00
snipe
30c4e9dbf7
Use formatter for created_at on unaccepted assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 15:48:24 +00:00
snipe
27fc30a881
Nicer button layout on unaccepted assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 15:43:53 +00:00
snipe
8ac7cda4ee
Merge pull request #16366 from marcusmoore/chore/migrate-checkbox-helpers-pt7
...
Replace calls to Form::checkbox pt7
2025-02-27 15:01:31 +00:00
snipe
6f04d314a8
Merge pull request #16367 from marcusmoore/chore/migrate-checkbox-helpers-pt8
...
Replace calls to Form::checkbox pt8
2025-02-27 15:01:19 +00:00
snipe
1051b1d16d
Merge pull request #16375 from snipe/fixes_16371_name_not_included_in_reminder_emails
...
Fixed #16371 - incorrect count and missing name in acceptance reminder email
2025-02-27 15:00:04 +00:00
snipe
115bb94704
Merge pull request #16156 from marcusmoore/acceptance-reminder-subject
...
Added "Reminder" to subject line of follow up asset checkout emails
2025-02-27 14:55:59 +00:00
snipe
25807cc62f
Fixed constructor
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 14:22:48 +00:00
snipe
cd1d1b2d3e
Fixed count
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 14:22:40 +00:00
Brady Wetherington
6dcd3bfd30
Add some safeties around the charset-detection and transliteration
2025-02-27 13:44:31 +00:00
snipe
b8799f8038
Bumped bash
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-27 12:21:28 +00:00
Marcus Moore
a0dc056da8
Replace Form::checkbox on label settings page
2025-02-26 16:33:07 -08:00
Marcus Moore
27aeb518ff
Replace Form::checkbox on general settings page
2025-02-26 16:18:00 -08:00
snipe
dc619bb0dc
Merge pull request #16365 from marcusmoore/chore/migrate-checkbox-helpers-pt6
...
Replace calls to Form::checkbox pt6
2025-02-26 23:54:50 +00:00
Marcus Moore
245a16c377
Replace Form::checkbox on branding settings page
2025-02-26 15:37:07 -08:00
Marcus Moore
de3c1d159f
Replace Form::checkbox on branding settings page
2025-02-26 15:35:17 -08:00
Marcus Moore
af6d9e4a00
Replace Form::checkbox on custom report pages
2025-02-26 15:15:48 -08:00
snipe
8c8af3062e
Merge pull request #16354 from snipe/dont_checkin_for_pending_on_asset_update
...
Allow pending as an asset status type that does not automatically check the asset in
2025-02-26 21:05:11 +00:00
snipe
2ff47edb94
Merge pull request #16361 from Godmartinz/acceptancer_reminder_unlisted_email_info
...
Fixed acceptance reminder command lag on users with no associated email
2025-02-26 20:33:02 +00:00
snipe
d923d29bad
Merge pull request #16360 from spencerrlongg/bug/sc-28537
...
Add Safety Around Bulk Status Update
2025-02-26 20:32:19 +00:00
Godfrey M
899119ae2d
changes output to a table
2025-02-26 12:30:19 -08:00
snipe
e031de8e49
Merge pull request #16363 from snipe/added_a_few_more_no_interaction_calls
...
Added `--no-interaction` to additional passport commands
2025-02-26 20:19:37 +00:00
snipe
a81c520d93
Follow up for #16341
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 20:15:09 +00:00
Godfrey M
8352e81228
fix unaccepted reminder test
2025-02-26 11:50:08 -08:00
Godfrey M
fd0174ff32
remove unwanted changes to livewire
2025-02-26 11:31:41 -08:00
Godfrey M
cc26aa02b2
fix acceptance reminder command no email list
2025-02-26 11:25:21 -08:00
snipe
616f3558dd
Update example env
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 19:14:25 +00:00
spencerrlongg
d6e266cec1
make super safe
2025-02-26 13:11:49 -06:00
snipe
31516d7f24
Merge pull request #16356 from snipe/added_fields_for_model_search
...
Added name, model_number and notes for strict search
2025-02-26 12:46:13 +00:00
snipe
e79af255aa
Added name, model_number and notes for strict search
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 12:43:54 +00:00
snipe
5b0d7f4064
One more chonk
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 12:01:50 +00:00
snipe
2f6af10c5d
Bumped chunk for custom report
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 11:59:34 +00:00
snipe
afabda9235
Remove greater than 0 for alert threshold - fixes FD-47040
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 11:38:33 +00:00
snipe
1618c9ae8e
Changed confirmation message
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 10:53:41 +00:00
snipe
5344ef4a1a
Allow pending as an asset status that does not automatically check the asset in
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 10:46:38 +00:00
snipe
16420b1e00
Audit Log Number under Days to next Audit [sc-28530]
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 10:25:07 +00:00
snipe
62f66e724e
Drop errors to warnings to stop pooping on rollbar
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 09:54:13 +00:00
snipe
9b0ea51d35
Moved composer clear commands to after composer install per #16334
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 09:37:31 +00:00
snipe
992214fc66
Check for adminuser withTrashed
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-26 08:25:22 +00:00
snipe
93dab12461
Merge pull request #16342 from snipe/nicer_upgrade_script
...
Nicer upgrade.php UI
2025-02-26 07:16:28 +00:00
snipe
ea0f105180
Merge pull request #16347 from marcusmoore/chore/migrate-checkbox-helpers-pt4
...
Replace calls to Form::checkbox pt4
2025-02-26 07:05:38 +00:00
snipe
5b6da0c1e8
Merge pull request #16348 from marcusmoore/chore/migrate-checkbox-helpers-pt5
...
Replace calls to Form::checkbox pt5
2025-02-26 07:05:22 +00:00
snipe
4d7655bbe1
Merge pull request #16346 from marcusmoore/chore/migrate-checkbox-helpers-pt3
...
Replace calls to Form::checkbox pt3
2025-02-26 07:04:27 +00:00
snipe
5e3855ee5b
Merge pull request #16345 from marcusmoore/fixes/update-custom-fields
...
Fixed renaming custom fields
2025-02-26 07:03:40 +00:00
Marcus Moore
e01226a174
Replace Form::checkbox on saml settings page
2025-02-25 17:31:05 -08:00
Marcus Moore
f9ccf32af4
Replace Form::checkbox on ldap settings page
2025-02-25 17:22:44 -08:00
Marcus Moore
2c5170a218
Replace Form::checkbox on security settings page
2025-02-25 17:09:25 -08:00
Marcus Moore
15f842e2dc
Replace Form::checkbox on bulk user edit page
2025-02-25 16:00:46 -08:00
Marcus Moore
46b31dfe14
Replace Form::checkbox on user create and edit page
2025-02-25 14:32:39 -08:00
Marcus Moore
d88c79366c
Replace Form::checkbox on google settings page
2025-02-25 14:27:07 -08:00
Marcus Moore
de330a47cd
Replace Form::checkbox on asset tag settings page
2025-02-25 14:25:02 -08:00
Marcus Moore
ecd7dc2094
Replace Form::checkbox on alert settings page
2025-02-25 14:23:26 -08:00
Marcus Moore
510946e0eb
Replace Form::checkbox in logo upload partial
2025-02-25 14:20:43 -08:00
Marcus Moore
37e4a13979
Replace Form::checkbox in image upload partial
2025-02-25 14:15:12 -08:00
Marcus Moore
c73d64cdbc
Remove manual doctrine mapping for enums
2025-02-25 13:37:23 -08:00
snipe
4a0410d969
Uncomment git stash
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 16:55:39 +00:00
snipe
668b9f8fb9
Nicer upgrade.php UI
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 16:51:32 +00:00
snipe
037d2d9e84
Merge pull request #16341 from uberbrady/fix_passport_install_no_interaction
...
Fixes #16331 - Don't make passport:install command require user input
2025-02-25 16:43:49 +00:00
Brady Wetherington
bce2007b97
Fixes #16331 - Don't make passport:install command require user input
2025-02-25 16:38:40 +00:00
Brady Wetherington
09a5e5b1bd
Whoops! Need minimum 8.2, not 8.1 (probably mis-merge?)
2025-02-25 14:40:45 +00:00
snipe
7b4f4b6b7f
Merge pull request #16337 from joakimbergros/develop
...
Fixed #16173 : `useraccountcontrol` was not included in the ldap query attributes
2025-02-25 13:49:38 +00:00
Joakim Bergros
5c66334017
Added a check to see if the user has specified that is an ActiveDirectory server in the configuration before adding the useraccountcontrol attribute to the ldap query.
2025-02-25 14:22:22 +01:00
Joakim Bergros
ae82051b73
Fixed #16173 : useraccountcontrol was not included in the ldap query attributes.
...
`$results` did not include the `useraccountcontrol` and thus rendered the fallback logic void when `active_flag` was blank.
Added a condition to check if `active_flag` is blank and only then add `useraccountcontrol` to the ldap query since it is then a requirement in accordance with "we respect the userAccountControl attribute" text in the `admin/ldap` route.
[`elseif' will become true when `active_flag` is blank](b141945add/app/Console/Commands/LdapSync.php (L364) )
2025-02-25 13:55:53 +01:00
snipe
c3a2e81afd
Updated version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 12:18:22 +00:00
snipe
18c7cbbbbb
Merge pull request #16336 from snipe/change_order_in_upgrade_script
...
Fixed #16334 - Changed composer order in upgrade script
2025-02-25 12:09:15 +00:00
snipe
3718f08c72
Changed composer order in upgrade script
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 12:05:00 +00:00
snipe
b7821a69b6
Added link to the google apps script repo
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 11:07:04 +00:00
snipe
8049f21068
Updated laravel version in readme
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 11:02:00 +00:00
snipe
8140110bf9
Chnage dev docker env to en-US from en
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 10:57:38 +00:00
snipe
a4587f6322
Merge pull request #16335 from snipe/added_label_test
...
Added label test
2025-02-25 10:40:46 +00:00
snipe
163e19f1e9
Added label test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-25 10:37:06 +00:00
snipe
8a40c3ecb4
Merge pull request #16325 from spencerrlongg/bug/sc-28520
...
Remove remaining hardware references in favor of new RMB
2025-02-25 10:09:35 +00:00
spencerrlongg
d949a9689f
fix all
2025-02-24 22:35:47 -06:00
snipe
27a7c6fd10
Merge pull request #16324 from marcusmoore/chore/migrate-checkbox-helpers-p2
...
Replace calls to Form::checkbox pt2
2025-02-25 02:33:02 +00:00
Marcus Moore
4d55a67628
Merge branch 'develop' into chore/migrate-checkbox-helpers-p2
2025-02-24 16:37:59 -08:00
snipe
9d453226bd
Merge pull request #16321 from spencerrlongg/bug/sc-28515
...
Changed Parameter Name for RMB
2025-02-25 00:17:37 +00:00
snipe
cd26694767
Merge pull request #16322 from marcusmoore/fixes/fix-test-edit-route
...
Fixed edit routes in tests
2025-02-25 00:17:10 +00:00
Marcus Moore
a26cc2ced1
Use .edit routes instead of .update
2025-02-24 15:55:05 -08:00
spencerrlongg
1fd81d17a3
route model binding change
2025-02-24 17:53:41 -06:00
snipe
134045f1ec
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2025-02-24 23:46:55 +00:00
snipe
b6b6a3eec7
Remove req for 0 min
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 23:46:50 +00:00
snipe
b62714d702
Merge pull request #16062 from snipe/remove_mcrypt
...
Removed references to mcrypt
2025-02-24 23:22:32 +00:00
Brady Wetherington
271bcc66bf
Remove lib-mcrypt as a dependency
2025-02-24 23:19:08 +00:00
snipe
ced560daa9
Add @jostrander as a contributor
2025-02-24 23:16:27 +00:00
snipe
b395c9130a
Merge remote-tracking branch 'origin/master' into develop
2025-02-24 23:06:46 +00:00
snipe
ed46a757fa
Merge pull request #16320 from jostrander/fix/location-edit
...
Fixed: fix 500 on edit locations page by referencing current location
2025-02-24 23:03:01 +00:00
Jesse Ostrander
6a8a41b389
fix: reference to item location on location edit method
2025-02-24 17:34:18 -05:00
snipe
4800f4c853
Merge branch 'develop' into remove_mcrypt
2025-02-24 22:12:56 +00:00
snipe
c79ff49c85
Add @addex12 as a contributor
2025-02-24 20:30:04 +00:00
Marcus Moore
e88bba51bb
Merge branch 'develop' into acceptance-reminder-subject
2025-02-24 11:55:50 -08:00
Marcus Moore
f97211f6cd
Remove unused language string
2025-02-24 11:45:58 -08:00
Marcus Moore
027c2b3627
Change subject to "You have Unaccepted Assets."
2025-02-24 11:45:23 -08:00
snipe
ee85a392e7
Merge pull request #16316 from snipe/v8_final_merge
...
V8 final merge
2025-02-24 19:18:12 +00:00
Brady Wetherington
6c2d367124
Tweak version number and hashes
2025-02-24 18:38:53 +00:00
Brady Wetherington
982cfeca32
Merge branch 'develop'
2025-02-24 18:37:41 +00:00
snipe
5fa4f85c20
Merge pull request #16106 from marcusmoore/bug/sc-27960
...
Fixed asset show page erroring when asset not associated with model
2025-02-24 17:16:12 +00:00
snipe
43b8c0bf7b
Merge pull request #16313 from snipe/localizations/2024-02-24
...
Updated strings, added Oromo
2025-02-24 14:51:45 +00:00
snipe
54b664d679
Updated strings, added Oromo
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 14:50:23 +00:00
snipe
bf2355a297
Fixed showfile path
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 14:34:10 +00:00
snipe
2bf4ec0ae8
A few more small tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 14:24:15 +00:00
Brady Wetherington
9555825a67
Update minimum PHP version
2025-02-24 14:03:57 +00:00
snipe
0bea07e2f9
Merge pull request #16312 from snipe/small_cleanups
...
Small cleanups before release
2025-02-24 13:53:28 +00:00
snipe
22f7a9ddd4
Fixed stray tag
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:46:33 +00:00
snipe
77b417bcea
Passed user to showfile
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:43:39 +00:00
snipe
76e3c00d2d
Removed footer on tables that didn’t need it
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:41:49 +00:00
snipe
77add8abbc
Added strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:39:07 +00:00
snipe
b53957268a
Added warning if deleted
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:38:55 +00:00
snipe
ba49fc554d
Moved warning to be consistent with other FCOs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:38:47 +00:00
snipe
e60462b751
Added/updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:38:28 +00:00
snipe
a5009aa7df
Added withTrashed() to handle soft deletes with RMB
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:38:06 +00:00
snipe
e589adbe80
Updated model route
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 13:31:09 +00:00
snipe
0501c5f53c
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 11:15:03 +00:00
snipe
6a9247ba8a
Cast token policies to int
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 11:14:49 +00:00
snipe
fcf84bf63f
Fixed test namespace
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-24 11:09:54 +00:00
snipe
5ece721b00
Check for FMCS
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 15:02:45 +00:00
snipe
0e2251c810
Scope selectlist by company
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 14:59:05 +00:00
snipe
cebb9d034c
Merge pull request #16305 from snipe/bug/sc-28425
...
Fixed #16262 - Check for quantity before allowing component deletion
2025-02-23 14:17:36 +00:00
snipe
dd2b570db5
Added tighter constraints on deleting components
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 14:11:39 +00:00
snipe
2bee4532ec
Added qty error string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 13:21:58 +00:00
snipe
96248e0023
Removed soft delete from test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 13:21:49 +00:00
snipe
157801242d
Added API test, renamed test to match filter
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 13:21:36 +00:00
snipe
7b151cf692
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 13:17:20 +00:00
snipe
50c88df4cc
Merge pull request #16304 from snipe/security/snyk-updates-less-papaparse
...
Updated less and papaparse
2025-02-23 12:51:38 +00:00
snipe
d87a6868cc
Updated less and papaparse
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 12:50:09 +00:00
snipe
201f487853
Merge pull request #16303 from snipe/chore/sc-28493
...
Added tooltip for currency in table
2025-02-23 12:21:04 +00:00
snipe
069860d65f
Added tooltip for currency in table
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-23 12:19:18 +00:00
snipe
afa7391080
Merge pull request #16299 from snipe/added_checkin_checkout_indicator_for_custom_fields
...
Added checkin/checkout indicators on custom field table
2025-02-22 19:34:04 +00:00
snipe
07cf203018
Add checkin/checkout indicators on custom field table
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 19:32:34 +00:00
snipe
5f561452d2
Merge pull request #16298 from uberbrady/tooltips_custom_fields
...
Add tooltips to custom fields display, especially for icons
2025-02-22 19:17:28 +00:00
Brady Wetherington
cbe04e8514
Add tooltips to custom fields display, especially for icons
2025-02-22 19:13:09 +00:00
snipe
9b44dfd9b6
Merge pull request #16297 from snipe/add_field_to_checkin_checkout
...
Fixed #6188 - Added custom fields to checkin/checkout screens
2025-02-22 19:09:51 +00:00
snipe
9abf3029ef
Compact the method just a little
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 19:02:41 +00:00
snipe
19fb45f488
Refactor into method
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:57:18 +00:00
snipe
e983ee4d0f
Tweaked icon position
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:47:12 +00:00
snipe
40acd48eff
Tweaked some style
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:19:09 +00:00
snipe
f5eedb8d23
Added RMB and include $item so the asset fields are populated
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:13:12 +00:00
snipe
172df0d220
Save new custom field values
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:12:46 +00:00
snipe
c611cb5612
Updated loggable to check for custom fields that were passed for meta
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:12:30 +00:00
snipe
da77ddd447
Added fields to custom field edit form
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:11:56 +00:00
snipe
c727633e6b
Added language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:11:42 +00:00
snipe
10834cf638
Added migration
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:11:35 +00:00
snipe
42eda089e2
Added include for custom fields partial
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:11:27 +00:00
snipe
2434c82a75
Added if/else for custom fields model partial
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:11:04 +00:00
snipe
1b9d046f5f
Fixed test for RMB
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:08:25 +00:00
snipe
a0a0727b5c
Corrected route breadcrumbs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 18:08:13 +00:00
snipe
917b9f0293
Merge pull request #16296 from snipe/added_select_unselect_tooltip_to_presenters
...
Added select/unselect tooltip to presenters, added translation
2025-02-22 14:32:04 +00:00
snipe
bb70250007
Added select/unselect tooltip to presenters, added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 14:30:49 +00:00
snipe
346aeeda71
Merge pull request #16287 from uberbrady/better_hover_titles
...
Fixes: [sc-28423] Better tooltips on lists, Bootstrap style
2025-02-22 14:24:02 +00:00
snipe
84a29378cd
Merge pull request #16295 from snipe/#16282_adds_accessories_tab_to_assets
...
Fixed #16282 - adds accessories tab to assets
2025-02-22 14:21:32 +00:00
snipe
0cd0abe8bb
Fixed #16282 - adds accessories tab to assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 14:20:21 +00:00
snipe
7db11dc12b
Merge pull request #16277 from Godmartinz/bulk_delete_asset_bug
...
Fixes deletion of assigned assets through bulk delete
2025-02-22 12:59:37 +00:00
snipe
e0221301ff
Increased text limit on notes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 12:56:25 +00:00
snipe
b0fa059a28
Merge pull request #16285 from marcusmoore/bug/sc-28148
...
Re-added ability to add notes to assets
2025-02-22 12:55:18 +00:00
snipe
3fb00a9fa9
Merge pull request #16293 from uberbrady/fix_default_docker_image
...
Updated default Dockerfile to handle newer PHP versions
2025-02-22 12:52:37 +00:00
snipe
3ef8b047ba
Merge pull request #16294 from snipe/bug/sc-28474
...
Don’t delete avatar file on soft-delete
2025-02-22 12:52:18 +00:00
snipe
7a77de6ffe
Don’t delete avatar file on soft-delete
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 12:49:04 +00:00
Brady Wetherington
5e85891b10
Updated default Dockerfile to handle newer PHP versions
2025-02-22 12:43:30 +00:00
snipe
934da0f630
Merge pull request #16291 from uberbrady/fix_tests_and_migrations_v8
...
Fix tests and fix migrations to always explicitly include nullable()
2025-02-22 12:21:56 +00:00
snipe
cca46ea9e0
Merge pull request #16292 from snipe/add_email_list_assigned_to_bulk
...
Added ability to send user inventory via bulk UI
2025-02-22 12:20:01 +00:00
snipe
bde034593b
Updateed string
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 12:17:04 +00:00
Brady Wetherington
7e1295bac7
Fix tests and fix migrations to always explicitly include nullable()
2025-02-22 12:15:12 +00:00
snipe
d1cc0fcfac
Added ability to send user inventory via bulk UI
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 12:07:54 +00:00
snipe
056fbefb16
Merge pull request #16290 from snipe/update_php_versions_for_tests
...
Removed php 8.1, added 8.4
2025-02-22 11:11:53 +00:00
snipe
83a848980f
Removed php 8.1, added 8.4
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 11:11:01 +00:00
snipe
7b930357e4
Cast years to int
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 10:51:27 +00:00
snipe
bdab052f40
Fixed test name
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 10:51:16 +00:00
Brady Wetherington
2d1e9b237f
Better tooltips on list views, in Bootstrap style
2025-02-21 13:23:19 +00:00
Brady Wetherington
1cff49116e
Bump version numbers and upgrade requirements
2025-02-21 11:49:25 +00:00
Brady Wetherington
38c5f23a52
Merge branch 'v8' into develop
2025-02-21 11:15:44 +00:00
Marcus Moore
c6bee0c47a
Fix test
2025-02-20 13:24:01 -08:00
Marcus Moore
ae7d7f7d22
Merge branch 'develop' into bug/sc-28148
...
# Conflicts:
# routes/web.php
2025-02-20 13:23:55 -08:00
Marcus Moore
96ab828cec
Fix indent
2025-02-20 13:05:42 -08:00
Marcus Moore
43f679a554
Revert some changes from #15525
2025-02-20 12:59:16 -08:00
Marcus Moore
f1bf9fcf5c
Implement test
2025-02-20 12:51:08 -08:00
Marcus Moore
992b4c7d86
Remove old comment
2025-02-20 12:50:03 -08:00
Marcus Moore
39bb2c2adb
Implement tests
2025-02-20 12:49:58 -08:00
Marcus Moore
41129829e6
Add frontend required validation
2025-02-20 12:43:51 -08:00
Marcus Moore
44503fc423
Use translation
2025-02-20 12:41:56 -08:00
Marcus Moore
0190ccea27
Finish implementing test
2025-02-20 12:40:05 -08:00
snipe
5b63eb5a15
Merge pull request #16272 from snipe/experiments/breadcrumbs
...
Experimental WIP - added breadcrumbs, route model binding for resource routes
2025-02-20 19:21:58 +00:00
snipe
54cc427ef5
Updated tests for new RMB behavior
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 18:28:46 +00:00
snipe
e0beed0fa3
Reapplied accessory gate
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 18:28:01 +00:00
snipe
d4b24e5e57
Exception handler exceptions - exception inception!
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 18:27:45 +00:00
snipe
671b64bc6b
Fixed RMB for kits and fields
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 15:01:17 +00:00
snipe
75db0d9e66
Fixed parameter for audit
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 15:00:57 +00:00
snipe
b891992351
Nice language for audit/checkin screens accounting for null
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 15:00:35 +00:00
snipe
ddb72bf4d0
Added breadcrumbs to licenses routes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 15:00:08 +00:00
snipe
6f071722a2
Fixed kit crimbs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 14:59:50 +00:00
snipe
be9bd93588
More crombs, removed scan route that we don’t use
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 14:59:10 +00:00
snipe
44a7bdbfb5
Moved SAML gui settings routes to web.php
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 14:58:17 +00:00
snipe
0341335d14
Additional crombs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 14:57:48 +00:00
snipe
76f038d142
RMB for custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 14:57:18 +00:00
snipe
3150ad50c9
RMB for audits
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 14:57:07 +00:00
snipe
80394ef788
Revert delete because route model binding + resources routes + soft deletes = sux0r
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 12:29:37 +00:00
snipe
8a70f09dd3
Temp “fix” RMB for soft-deleted users
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-20 12:19:31 +00:00
Godfrey M
a275391557
adds test for deleting assigned asset
2025-02-19 15:59:57 -08:00
Godfrey M
eaacf29d57
fix tests
2025-02-19 15:11:16 -08:00
snipe
441fdaa54a
Merge pull request #16278 from marcusmoore/bug/sc-27234
...
Added better error handling around rendering barcodes
2025-02-19 20:54:24 +00:00
Marcus Moore
759c8c8f5c
Catch TypeError in addition to Exceptions when rendering barcodes
2025-02-19 12:36:50 -08:00
snipe
6242296930
Remove the “View” part of the breadcrumb
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 19:30:13 +00:00
snipe
d330ef9919
Added crumbs and RMB for custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 18:23:16 +00:00
snipe
0708af7d07
Made the help ring slightly less goofy looking
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 18:22:50 +00:00
Godfrey M
a534b488b2
prevents deletion of assigned assets in bulk deletion
2025-02-19 10:09:02 -08:00
snipe
3171c1b1c9
Added breadcrumbs for bulkaudit, requested, and import history
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 17:40:47 +00:00
snipe
2f2b879d98
Language refinement
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 17:40:12 +00:00
snipe
039f483ec8
Check for notes and cost before displaying them
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 16:57:24 +00:00
snipe
7f665e0005
De-uglifying the maintenances detail page
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 16:34:48 +00:00
snipe
292819afa5
Added maintenances crumbs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:29:06 +00:00
snipe
7a94b09017
Use MLB for kit group
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:07:14 +00:00
snipe
6b46d12d67
Added breadcrumbs on kits (sort of)
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:05:29 +00:00
snipe
e264907157
Added breadcrumbs on more web routes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:05:12 +00:00
snipe
32b89e937c
Fixed routes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:04:56 +00:00
snipe
0e1dc8745c
Wider custom report
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:04:45 +00:00
snipe
129d44cc70
Made icon possible for dashboard/home
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:04:34 +00:00
snipe
11b746d801
UI tweak
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:04:19 +00:00
snipe
545445d584
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:04:07 +00:00
snipe
4d72fd8667
Added additional resource crumbs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:03:53 +00:00
snipe
fca62a14f9
Fixed asset presenter to link to the company directly
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:03:29 +00:00
snipe
c8f2d9806a
Use route model binding on kits
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:03:15 +00:00
snipe
1ee5f28fca
Added angle-right and house icon
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 14:02:59 +00:00
snipe
24a17b09a5
Fixed a few more tests and strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 09:03:41 +00:00
snipe
a617c0545e
WIP license checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:39:25 +00:00
snipe
eb7e24eeb0
Asset checkout with route model binding
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:39:16 +00:00
snipe
22c58678c4
License checkout controller with route model binding
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:38:55 +00:00
snipe
4beaf6b3ec
Added item
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:38:40 +00:00
snipe
4c1856b91f
Fixed wonky quote in HTML
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:37:58 +00:00
snipe
9d299340da
Checkout license modifications (this doesn’t work yet
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:37:39 +00:00
snipe
457228d033
Route model binding on more asset methods
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:37:06 +00:00
snipe
63f4e3cc89
More breadcrumbs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 08:36:52 +00:00
snipe
cd7135ea77
More test fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 06:19:50 +00:00
snipe
347eb2bdee
Fixed route parameters and tests to match
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 05:03:56 +00:00
snipe
ecc0e76e7b
Fixed route parameters for helper
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 05:03:39 +00:00
snipe
35a89de6dd
Fixed handler for reports
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 05:03:26 +00:00
snipe
82d8e1b0a9
Added item back into edit
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 04:18:57 +00:00
snipe
5a7ffa5664
Sure, whatever I guess.
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 04:18:40 +00:00
snipe
55abd242f2
Don’t know why I need to compact this?
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 04:07:09 +00:00
snipe
217d65f64c
More changes to the error message formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 03:47:51 +00:00
snipe
fa20eb4965
Add exception for hardware vs assets :(
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 03:41:01 +00:00
snipe
560311b883
Added ->with(‘item’) back in
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 03:37:34 +00:00
snipe
3954ff20b4
More tweaks to the controllers, more breadcrumbs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 03:29:31 +00:00
snipe
989082d719
Handle the not found errors with route model binding
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 03:26:44 +00:00
snipe
644527c5a6
More resources to breadcrumb provider
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 02:49:21 +00:00
snipe
f7d213052a
Route model binding for resource groups
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 02:49:05 +00:00
snipe
972bd1ef83
Tinkering with routes for breadcrumbs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-19 00:37:09 +00:00
Marcus Moore
cf0ce1c5ea
Start to implement tests
2025-02-18 16:24:52 -08:00
Marcus Moore
3d69721af0
Scaffold tests
2025-02-18 16:16:00 -08:00
Marcus Moore
1995e1399e
Start recording ip, user agent, and source
2025-02-18 16:04:53 -08:00
Marcus Moore
79d1147f20
Add validation
2025-02-18 15:46:52 -08:00
Marcus Moore
53c084c6c0
WIP: begin to store notes
2025-02-18 15:43:58 -08:00
Marcus Moore
c165e6f400
Formatting
2025-02-18 15:20:22 -08:00
Marcus Moore
25215fd3c9
WIP: begin migrating notes to ui controller
2025-02-18 15:20:06 -08:00
Brady Wetherington
a8231bc338
Merge branch 'develop' into v8
2025-02-18 22:40:27 +00:00
snipe
4d25e8f7f0
Merge pull request #16271 from snipe/localization/2024-02-18
...
Updated language strings
2025-02-18 22:26:02 +00:00
snipe
8368576dc9
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-18 22:18:39 +00:00
snipe
071b4d1e67
Merge pull request #16245 from marcusmoore/chore/migrate-form-open-pt5
...
Replace Form::open and Form::close pt5
2025-02-18 21:23:15 +00:00
snipe
1fe170e6a1
Merge pull request #16040 from Godmartinz/template_validate_error
...
Adds a null check to label templates, adds return types for validation methods
2025-02-18 21:00:10 +00:00
snipe
612a708c8d
Merge pull request #16246 from marcusmoore/chore/migrate-form-open-pt6
...
Replace Form::open and Form::close pt6
2025-02-18 20:43:38 +00:00
snipe
580a4c476e
Merge pull request #16244 from marcusmoore/chore/migrate-form-open-pt4
...
Replace Form::open and Form::close pt4
2025-02-18 20:42:44 +00:00
snipe
c9de9ebbab
Merge pull request #16243 from marcusmoore/chore/migrate-form-open-pt3
...
Replace Form::open and Form::close pt3
2025-02-18 20:41:56 +00:00
snipe
3d0770973a
Merge pull request #16242 from marcusmoore/chore/migrate-form-open-pt2
...
Replace Form::open and Form::close pt2
2025-02-18 20:41:16 +00:00
snipe
e814cd5a9e
Merge pull request #16235 from marcusmoore/chore/migrate-form-open-pt1
...
Replace Form::open and Form::close pt1
2025-02-18 20:23:47 +00:00
Marcus Moore
e5f426ec64
Remove unneeded multipart/form-data
2025-02-18 12:19:32 -08:00
snipe
a1b0a30351
Merge pull request #16225 from marcusmoore/chore/remove-cols-from-textarea
...
Removed cols property from textarea component
2025-02-18 19:56:40 +00:00
snipe
c0f0f43dd7
Merge pull request #16188 from Godmartinz/translations-for-labels-n-ldap
...
Adds translations to LDAP and Label settings pages
2025-02-18 19:56:14 +00:00
snipe
57c07a3687
Merge pull request #16270 from snipe/feature/sc-28365_ldap_text_update
...
Updated LDAP sync text
2025-02-18 19:28:18 +00:00
snipe
6de08f46fd
Few more tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-18 19:26:36 +00:00
snipe
3554270366
Updated LDAP sync text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-18 19:25:40 +00:00
snipe
029450bcbf
Merge pull request #16269 from snipe/bug/sc-28437_fix
...
Scope API results by location ID
2025-02-18 19:05:29 +00:00
snipe
329fbf6a7c
Scope results by location ID
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-18 19:01:16 +00:00
snipe
b7d0fccabc
Merge pull request #16268 from snipe/fixed_16259_archived_assets_in_company_scope
...
Fixed #16259 - mismatch in asset count if archived assets are hidden
2025-02-18 16:35:01 +00:00
snipe
48ab94c15b
Fixed query duplication for AssetsForShow scope
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-18 16:18:12 +00:00
snipe
ac907add83
Merge pull request #16082 from marcusmoore/chore/sc-28173
...
Replace calls to Form::text
2025-02-18 14:58:40 +00:00
snipe
3d47a8ba50
Fixed name format tests ( #16236 )
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-18 14:52:52 +00:00
snipe
452185be45
Merge pull request #16199 from akemidx/feature/sc-28271
...
Adding <Last Name.First Initial> as an option for usernames
2025-02-18 14:42:54 +00:00
Brady Wetherington
14feed61d8
Merge branch 'develop' into v8
2025-02-17 16:18:02 +00:00
snipe
02a8e17704
Merge pull request #16260 from snipe/fix_for_qr_on_old_label_engine
...
Fix for QR code on old label engine
2025-02-17 10:45:51 +00:00
snipe
7553ec3e27
Fixed equals
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-17 10:44:58 +00:00
Godfrey M
4c43a06eee
add overdue asset to test
2025-02-13 11:19:49 -08:00
Godfrey M
25c8449e86
remove unused
2025-02-13 11:14:18 -08:00
Godfrey M
13e1f4a127
adds mailable
2025-02-13 11:09:39 -08:00
Godfrey M
ed96fd766c
refactors audit notification to mail, adds test, ads check to scheduler
2025-02-13 11:08:53 -08:00
snipe
c8f82cbc2b
Merge pull request #16250 from uberbrady/improve_tls_client_side_file_caching
...
Instead of saving TLS cache-files on save, cache them when used
2025-02-13 15:46:22 +00:00
Brady Wetherington
b7bd56daf7
Instead of saving TLS cache-files on save, cache them when used
2025-02-13 15:09:28 +00:00
snipe
393118f083
Merge pull request #16249 from snipe/flatten_api_return
...
Return flat JSON instead of transformed data
2025-02-13 14:28:41 +00:00
snipe
d3210c6d40
Return flat JSON instead of transformed data
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-13 14:16:32 +00:00
Marcus Moore
60d7232569
Remove unneeded Form::close from users index
2025-02-12 13:50:38 -08:00
Marcus Moore
2f1212fa1a
Remove unneeded Form::close on view status label page
2025-02-12 13:49:37 -08:00
Marcus Moore
cc4d8f2a5b
Migrate Form::close on security settings page
2025-02-12 13:47:15 -08:00
Marcus Moore
c0a3284fad
Migrate Form::open and Form::close on saml settings
2025-02-12 13:46:42 -08:00
Marcus Moore
caff608e3c
Migrate Form::open and Form::close on purge deleted records page
2025-02-12 13:41:44 -08:00
Marcus Moore
c48fa7c2cb
Migrate Form::open and Form::close on localization page
2025-02-12 13:39:04 -08:00
Marcus Moore
14b25949b8
Migrate Form::close on ldap settings page
2025-02-12 13:36:48 -08:00
Marcus Moore
2df995c2c7
Remove unneeded Form::open on label settings page
2025-02-12 13:29:02 -08:00
Marcus Moore
ad182a96fa
Migrate Form::open and Form::close on label settings
2025-02-12 13:28:40 -08:00
Marcus Moore
a728f38bd1
Migrate Form::open and Form::close on google settings page
2025-02-12 13:21:07 -08:00
Marcus Moore
894754e8dc
Migrate Form::close on general settings page
2025-02-12 13:18:55 -08:00
Marcus Moore
d141675478
Migrate Form::open and Form::close on branding settings pagee
2025-02-12 13:17:59 -08:00
Marcus Moore
8bdd80e236
Migrate Form::open and Form::close on backups page
2025-02-12 13:12:45 -08:00
Marcus Moore
c422737525
Migrate Form::open and Form::close on asset tag settings page
2025-02-12 13:11:06 -08:00
Marcus Moore
fc55786ca2
Migrate Form::close on notification settings page
2025-02-12 12:50:37 -08:00
Marcus Moore
2949fdecdd
Migrate Form::open and Form::close on unaccepted assets report page
2025-02-12 12:49:19 -08:00
Marcus Moore
d32163f881
Migrate Form::open and Form::close on custom report page
2025-02-12 12:43:51 -08:00
Marcus Moore
215fe501ac
Migrate Form::open and Form::close on activity report page
2025-02-12 12:14:00 -08:00
Marcus Moore
ef3112e526
Add missing @csrf
2025-02-12 12:11:36 -08:00
Marcus Moore
8aa0135afa
Migrate Form::open and Form::close in bulk users partial
2025-02-12 12:10:16 -08:00
snipe
ff1157a95e
Merge pull request #16232 from Godmartinz/adds-expiring-notifications
...
Expiration notifcation switched to use Mailable
2025-02-12 20:07:24 +00:00
Godfrey M
e66b690c93
removed unnecessary base_path changes
2025-02-12 12:01:43 -08:00
Godfrey M
242fd00e8a
remove commented dd
2025-02-12 11:55:28 -08:00
Godfrey M
c77a1faa69
moar unnecssary changes removed
2025-02-12 11:54:34 -08:00
Marcus Moore
540b609591
Migrate Form::open and Form::close in models bulk actions partial
2025-02-12 11:53:23 -08:00
Marcus Moore
ac5a409cdf
Migrate Form::open and Form::close in locations bulk actions partial
2025-02-12 11:51:17 -08:00
Godfrey M
4cbc751dad
removed unnecessary changes
2025-02-12 11:49:36 -08:00
Marcus Moore
1dc579ce71
Migrate Form::open and Form::close in asset bulk actions partial
2025-02-12 11:49:13 -08:00
Marcus Moore
37282fffff
Remove unneeded Form::close on model show page
2025-02-12 11:45:09 -08:00
Marcus Moore
b3e98cb7eb
Remove unneeded Form::close on model index page
2025-02-12 11:44:14 -08:00
Godfrey M
bd03d70937
adds test for expiring licenses
2025-02-12 11:43:22 -08:00
Marcus Moore
716161e626
Migrate Form::open and Form::close in upload file modal
2025-02-12 11:42:09 -08:00
Marcus Moore
93a67847ba
Migrate Form::open and Form::close on asset view
2025-02-12 11:38:19 -08:00
Godfrey M
6873244e7e
adds test for expiring asset notifications
2025-02-12 11:28:36 -08:00
Marcus Moore
c569a84f87
Migrate Form::open and Form::close on requested assets page
2025-02-12 10:52:32 -08:00
akemidx
1e07927e78
test created and passing
2025-02-11 19:35:55 -05:00
Marcus Moore
c4b8b85602
Migrate Form::open and Form::close on bulk audit page
2025-02-11 15:42:20 -08:00
Marcus Moore
464e4d11e9
Migrate Form::open and Form::close on quick scan checkin page
2025-02-11 14:24:38 -08:00
Marcus Moore
85e4a19f03
Migrate Form::open on asset audit page
2025-02-11 14:22:17 -08:00
Marcus Moore
6263d01c73
Migrate Form::close in previously changed views
2025-02-11 14:10:52 -08:00
Marcus Moore
967e646989
Migrate Form::open in depreciations view
2025-02-11 14:10:52 -08:00
Marcus Moore
e9d3b9dcde
Migrate Form::open and Form::close in manage custom fields view
2025-02-11 14:10:52 -08:00
Marcus Moore
3065ba851e
Migrate Form::open in custom fieldset view
2025-02-11 14:10:52 -08:00
Marcus Moore
80522a2505
Migrate Form::open in custom field view
2025-02-11 14:10:52 -08:00
Marcus Moore
532e6c1c1d
Migrate Form::open in profile view
2025-02-11 14:10:52 -08:00
Marcus Moore
5cf314a314
Migrate Form::open in change password view
2025-02-11 14:10:52 -08:00
snipe
c08cfb9b73
Merge pull request #16226 from snipe/add_notes_to_locations_companies_etc
...
Fixed #16184 - added notes to locations, companies, categories, manufacturers and groups
2025-02-11 19:25:10 +00:00
snipe
61591633f8
Fixed layout sorta
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 19:23:04 +00:00
Godfrey M
9b5b58687d
removed unused
2025-02-11 11:02:25 -08:00
Godfrey M
fb7bec4be4
adds expiring asset and license mail
2025-02-11 10:55:56 -08:00
snipe
9dba03646b
Pointless rename
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 18:32:51 +00:00
snipe
ddd2ce07f3
Fixed branch from weird merge down
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 01:14:35 +00:00
snipe
3de5f5882c
Added/updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 01:07:41 +00:00
Marcus Moore
73e010434e
Remove cols property
2025-02-10 16:43:39 -08:00
snipe
a9d6a5f618
Updated note partial to use generic notes text
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:39:46 +00:00
snipe
ef9cc4fceb
Added notes to blades
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:39:26 +00:00
snipe
e104decf77
Added placeholder translation array
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:35:03 +00:00
snipe
96e38da875
Created migration
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:34:50 +00:00
snipe
ff95049f7c
Added notes to factories
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:34:30 +00:00
snipe
63cb4e70bc
Added notes to presenters
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:34:10 +00:00
snipe
e6ae9cae6b
Added notes to searchable and fillable attributes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:33:51 +00:00
snipe
1f1e1401cf
Added location notes to importer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:32:58 +00:00
snipe
af1159658d
Added notes to transformers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:32:37 +00:00
snipe
4e2b22135a
Added notes to UI controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:32:07 +00:00
snipe
4ee5a4c5c3
Added notes to API controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-11 00:31:50 +00:00
snipe
aa14cfe18d
Merge pull request #16075 from marcusmoore/chore/migrate-textarea-helper
...
Convert Form::textarea to blade component
2025-02-11 00:14:23 +00:00
Marcus Moore
0797c4ac97
Merge branch 'develop' into chore/sc-28173
...
# Conflicts:
# resources/views/settings/saml.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
2025-02-10 15:57:41 -08:00
snipe
b4ea75f34f
Merge branch 'master' into chore/migrate-textarea-helper
2025-02-10 23:47:13 +00:00
Marcus Moore
00e7795414
Merge branch 'develop' into chore/migrate-select-helper
...
# Conflicts:
# resources/views/partials/forms/edit/company.blade.php
2025-02-10 15:44:02 -08:00
snipe
e37a990820
Merge remote-tracking branch 'origin/develop'
2025-02-10 22:42:58 +00:00
snipe
b54d68ebf1
Merge pull request #16212 from Godmartinz/ternary-checks-on-location-in-notifications
...
adds ternaries on check in/out hardware notifications
2025-02-10 22:28:36 +00:00
snipe
4ae2126ded
Merge pull request #16213 from marcusmoore/chore/migrate-checkbox-helpers-p1
...
Replace calls to Form::checkbox pt1
2025-02-10 22:27:19 +00:00
snipe
c420670ebb
Small fixes to accessories files handling
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-10 22:26:00 +00:00
Brady Wetherington
dae1f43359
Merge branch 'develop' into v8
2025-02-10 15:14:55 +00:00
Marcus Moore
77635c3737
Migrate Form::checkboxes on license edit view
2025-02-06 17:05:35 -08:00
Marcus Moore
b937b7e767
Migrate Form::checkboxes on asset history import page
2025-02-06 17:01:09 -08:00
Marcus Moore
38df5e8b07
Replace more Form::checkboxes
2025-02-06 15:52:23 -08:00
akemidx
d1cd670af5
oop forgot the user form bit
2025-02-06 18:05:22 -05:00
Marcus Moore
04e4b6c181
Replace Form::checkbox
2025-02-06 14:16:18 -08:00
Marcus Moore
9559c5a025
Replace Form::checkbox and inline label
2025-02-06 14:08:13 -08:00
Marcus Moore
42fa2e12db
Replace Form::checkbox
2025-02-06 13:55:33 -08:00
Godfrey M
f41583fd59
adds ternary checks on locations before pulling names in notifications
2025-02-06 11:34:14 -08:00
snipe
b48704b3af
Merge pull request #16209 from uberbrady/eliminate_preg_split_deprecation_warnings
...
Fixed #16208 - don't call preg_split() with a null
2025-02-06 13:30:53 +00:00
Brady Wetherington
de3ebfecfe
Ensure we don't call preg_split() with a null as the second parameter
2025-02-06 13:24:39 +00:00
snipe
29311b1b5b
Merge remote-tracking branch 'origin/develop'
2025-02-06 10:34:58 +00:00
snipe
b131227b71
Merge pull request #16207 from snipe/security/upgrade_papaparse
...
Upgraded papaparse to 5.5.1
2025-02-06 10:34:29 +00:00
snipe
ec45833cd8
Upgraded papaparse to 5.5.1
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-06 10:22:17 +00:00
snipe
4c2905b1f0
Merge pull request #16176 from marcusmoore/chore/migrate-form-radio
...
Replaced some calls to the Form::radio helper
2025-02-06 10:19:51 +00:00
snipe
6e51be6c57
Merge pull request #16178 from marcusmoore/chore/migrate-form-radio-helpers-pt1
...
Replaced calls to Form::radio helper on group create and edit pages
2025-02-06 10:19:35 +00:00
snipe
b195168c83
Merge pull request #16167 from Godmartinz/asset_controller_qr_check_fix
...
Adds qr code type check in getQRCode method
2025-02-06 10:18:34 +00:00
snipe
a722eca6aa
Merge pull request #16179 from marcusmoore/chore/migrate-form-radio-helpers-bulk-hardware
...
Replaced calls to Form::radio helper on bulk hardware edit page
2025-02-06 10:18:16 +00:00
snipe
1f6428ee1c
Merge pull request #16180 from marcusmoore/chore/migrate-form-radio-helpers-bulk-models
...
Replaced calls to Form::radio helper on bulk asset model edit page
2025-02-06 10:18:05 +00:00
snipe
ab10fb466c
Merge pull request #16193 from marcusmoore/chore/migrate-label-helpers-pt3
...
Replace calls to Form::label pt3
2025-02-06 10:17:26 +00:00
snipe
dcabf90409
Merge pull request #16192 from marcusmoore/chore/migrate-label-helpers-pt2
...
Replace calls to Form::label pt2
2025-02-06 10:17:11 +00:00
snipe
27752f595c
Merge pull request #16194 from marcusmoore/chore/migrate-label-helpers-pt4
...
Replace calls to Form::label pt4
2025-02-06 10:16:33 +00:00
snipe
c17598d4b4
Merge pull request #16195 from marcusmoore/chore/migrate-label-helpers-pt5
...
Replace calls to Form::label pt5
2025-02-06 10:16:17 +00:00
snipe
d74d9900da
Merge pull request #16190 from marcusmoore/chore/migrate-label-helpers-pt1
...
Replace calls to Form::label pt1
2025-02-06 10:15:43 +00:00
snipe
5505c9ab67
Merge pull request #16196 from marcusmoore/chore/migrate-label-helpers-pt6
...
Replace calls to Form::label pt6
2025-02-06 10:14:55 +00:00
snipe
8d2ffea7df
Merge pull request #16197 from marcusmoore/chore/migrate-label-helpers-pt7
...
Replace calls to Form::label in QuickStart
2025-02-06 10:06:41 +00:00
snipe
1233c939f8
Merge branch 'develop' into chore/migrate-label-helpers-pt7
2025-02-06 10:03:42 +00:00
snipe
46dd83c34e
Merge pull request #16168 from Godmartinz/print_all_assigned_location_null_check
...
Added ternary check that asset has `asset status` before checking archived
2025-02-06 10:01:10 +00:00
snipe
639aa85353
Merge pull request #16198 from marcusmoore/chore/migrate-email-helpers
...
Replace call to Form::email
2025-02-06 09:57:53 +00:00
akemidx
008b6f1db2
lastname.first initial
2025-02-05 20:11:33 -05:00
Marcus Moore
f46ad4811e
Migrate form email helper on user setup page
2025-02-05 16:44:09 -08:00
Marcus Moore
b39b24e6b9
Migrate form labels on user setup
2025-02-05 15:01:51 -08:00
Marcus Moore
7f0133a4d6
Migrate form labels on create supplier page
2025-02-05 14:42:07 -08:00
Marcus Moore
85bc8bc8f0
Migrate form label on create status label page
2025-02-05 14:40:20 -08:00
Marcus Moore
32e1d4b2ef
Migrate form labels on security settings page
2025-02-05 14:39:16 -08:00
Marcus Moore
f8d5af836f
Migrate form labels on saml settings page
2025-02-05 14:35:53 -08:00
Marcus Moore
19ceb3f5b7
Migrate form label on purge page
2025-02-05 14:29:49 -08:00
Marcus Moore
f346c55cf1
Migrate form labels on localization settings page
2025-02-05 14:29:49 -08:00
Marcus Moore
e797705dad
Migrate form labels on google settings page
2025-02-05 14:29:49 -08:00
Marcus Moore
a331e14ef2
Migrate form labels on general settings page
2025-02-05 14:19:34 -08:00
Marcus Moore
d6b4c27302
Migrate form label on branding settings page
2025-02-05 14:14:50 -08:00
Marcus Moore
f8d7291923
Migrate form labels on asset tag settings page
2025-02-05 14:11:36 -08:00
Marcus Moore
b59674ab77
Migrate form labels on settings alert page
2025-02-05 13:48:50 -08:00
Marcus Moore
0620b8b163
Migrate form label in checkout select partial
2025-02-05 13:44:00 -08:00
Marcus Moore
f639d82693
Migrate form label in user select partial
2025-02-05 13:40:27 -08:00
Marcus Moore
13d2d41f0c
Migrate form label in supplier select partial
2025-02-05 13:39:03 -08:00
Marcus Moore
015cd44136
Migrate form label in status select partial
2025-02-05 13:34:07 -08:00
Marcus Moore
4834f60a44
Migrate form label in phone input partial
2025-02-05 13:32:06 -08:00
Marcus Moore
3327e1d8f2
Migrate form label in asset model select partial
2025-02-05 13:30:14 -08:00
Marcus Moore
40e002911c
Migrate form label in manufacturer select partial
2025-02-05 13:29:06 -08:00
Marcus Moore
03bcc3b73f
Migrate form label in location select partial
2025-02-05 13:27:29 -08:00
Marcus Moore
f963df0658
Migrate form label in location profile select partial
2025-02-05 13:26:08 -08:00
Marcus Moore
0aa77d281f
Replace calls to Form::label in license-select partial
2025-02-05 13:24:02 -08:00
Marcus Moore
0988255693
Replace calls to Form::label in (unused?) kit select
2025-02-05 13:23:10 -08:00
Marcus Moore
fb9e7cf5e1
Migrate form label in fax input partial
2025-02-05 13:19:22 -08:00
Marcus Moore
ecc1bd69b9
Migrate form label in department select partial
2025-02-05 13:19:16 -08:00
Marcus Moore
830f095a6e
Migrate form label in datepicker partial
2025-02-05 13:16:28 -08:00
Marcus Moore
288f7e4e93
Migrate form label on consumable select
2025-02-05 13:12:52 -08:00
Marcus Moore
a205ae12a4
Migrate form label on (unsed?) company select partial
2025-02-05 13:11:49 -08:00
Marcus Moore
1866426f11
Migrate form label in category select partial
2025-02-05 13:02:36 -08:00
Marcus Moore
e4ab6c0c24
Migrate form label on asset select partial
2025-02-05 12:59:00 -08:00
Marcus Moore
189c148761
Migrate labels on address partial
2025-02-05 12:47:06 -08:00
Marcus Moore
8b7c1a195c
Migrate label on accessory select partial
2025-02-05 12:41:35 -08:00
Marcus Moore
d77547aecf
Migrate labels on slack component
2025-02-05 12:40:00 -08:00
Marcus Moore
478a5c0e1a
Migrate labels on bulk audit pag
2025-02-05 12:12:43 -08:00
Marcus Moore
5c6757ecf6
Migrate labels on quick checkin page
2025-02-05 12:07:17 -08:00
Godfrey M
f2981cf12b
adds translations to label settings
2025-02-05 10:55:05 -08:00
Godfrey M
c3310a0772
adds translations to LDAP settings page
2025-02-05 10:38:16 -08:00
Marcus Moore
fe485acd4a
Swap Form::radio in bulk model edit view
2025-02-04 16:18:49 -08:00
Marcus Moore
fbe19738cb
Swap Form::radio in bulk hardware edit view
2025-02-04 15:49:46 -08:00
Marcus Moore
d29a62a335
Simplify @checked
2025-02-04 13:50:08 -08:00
snipe
6cc2013102
Merge remote-tracking branch 'origin/develop'
2025-02-04 21:39:27 +00:00
snipe
39ce7b75ca
Merge pull request #16175 from Godmartinz/channel-not-found-warning-added
2025-02-04 21:38:15 +00:00
Marcus Moore
f3959323ff
Add required attribute to name field
2025-02-04 13:33:16 -08:00
Marcus Moore
0d62ab2ad4
Fix call to @checked
2025-02-04 13:31:28 -08:00
Godfrey M
cbf9239d86
adds channel not found warning
2025-02-04 11:21:56 -08:00
Marcus Moore
295875c45e
Fix and replace remaining radios on bulk user edit page
2025-02-04 11:02:40 -08:00
snipe
5e363f7dd4
Merge pull request #16166 from Godmartinz/rollbar_none-qr-code
2025-02-04 16:16:00 +00:00
Godfrey M
6bb0927f26
remove unrelated change
2025-02-03 12:30:21 -08:00
Godfrey M
24bb679305
adds check that asset has asset status before checking archived
2025-02-03 12:24:22 -08:00
Godfrey M
ddc22b4d6b
adds a check to see that qr code type is not none
2025-02-03 10:38:49 -08:00
Godfrey M
9a75131a98
removed old label artifact
2025-02-03 10:18:13 -08:00
Marcus Moore
26b4063435
Convert section items
2025-01-30 16:07:46 -08:00
Marcus Moore
8dd432c3a2
Convert section headings
2025-01-30 15:56:08 -08:00
Marcus Moore
0e390f1a9b
Temporarily order properties
2025-01-30 15:54:27 -08:00
Marcus Moore
6fb83d66a2
Revert "Re-order parameters"
...
This reverts commit bf96688aef .
2025-01-30 15:46:22 -08:00
Marcus Moore
bf96688aef
Re-order parameters
2025-01-30 15:37:05 -08:00
Marcus Moore
eb4aeb47c1
Replace Form::radio in top section of group permissions page
2025-01-30 15:36:38 -08:00
Marcus Moore
7cbb3f7e07
Add assertion
2025-01-30 11:48:55 -08:00
Marcus Moore
7e9c564d0b
Simplify test
2025-01-30 11:47:43 -08:00
Marcus Moore
fc88b2487f
Extract method
2025-01-30 11:44:37 -08:00
Marcus Moore
e94ee48f74
Extract helper
2025-01-30 10:37:11 -08:00
Marcus Moore
6a4a5d1380
Add translation
2025-01-30 10:35:31 -08:00
Marcus Moore
ab9e9b66d2
Reduce complexity
2025-01-29 16:27:18 -08:00
Marcus Moore
c15c338ffd
Merge if/else
2025-01-29 16:25:37 -08:00
Marcus Moore
d1197d015c
Add another case scenario
2025-01-29 16:24:43 -08:00
Marcus Moore
ce31ce477e
Inline additional variables
2025-01-29 16:16:47 -08:00
Marcus Moore
78f9292555
Inline variable
2025-01-29 16:15:27 -08:00
Marcus Moore
4e7c6bd2cf
Fix relationship
2025-01-29 16:14:09 -08:00
Marcus Moore
70aed45bfe
Improve naming
2025-01-29 15:56:20 -08:00
Marcus Moore
e2805f4033
Add "Reminder" to subject line
2025-01-29 15:36:45 -08:00
Marcus Moore
d254a40e0a
Scaffold tests
2025-01-29 15:21:10 -08:00
Marcus Moore
fdcb891cbb
Improve test case
2025-01-29 15:20:56 -08:00
snipe
d906f3cf62
Merge pull request #16148 from spencerrlongg/bug/sc-27619
2025-01-29 21:05:08 +00:00
Godfrey M
16d322d70e
fix translation
2025-01-29 10:38:30 -08:00
Godfrey M
2163312997
adds translations for branding and general settings
2025-01-29 10:35:26 -08:00
spencerrlongg
0defed9abe
add nullsafe
2025-01-29 11:27:02 -06:00
Godfrey M
0dfb71cfe5
added some translations to branding and general setrting
2025-01-28 11:56:10 -08:00
Marcus Moore
ac925af3d0
Replace a few radio inputs on bulk user edit page
2025-01-27 13:50:22 -08:00
Marcus Moore
4f08b2360c
Migrate radios on custom report page
2025-01-27 13:36:59 -08:00
snipe
fd60ce1198
Merge pull request #16140 from marcusmoore/chore/sc-28233
2025-01-27 19:28:41 +00:00
Marcus Moore
00cdb13803
Convert remaining Form:hidden in labels view
2025-01-27 11:23:01 -08:00
Marcus Moore
ef6d747b37
Convert some Form:hidden in labels view
2025-01-27 11:15:09 -08:00
Marcus Moore
e26abb8684
Replace Form::hidden with @csrf
2025-01-27 11:07:19 -08:00
Tobias Regnery
4e0bcac1a1
Furhter validation for scoped locations
...
There is a new validator introduced that checks on object update (assets, users, etc.) if the company matches the locations company.
In case of the creation of a new location it must be checked that the parent matches the own company.
On updating a location a check for every related object must be made to see if the company matches the location.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com >
2025-01-24 11:12:11 +01:00
Tobias Regnery
6921df9334
Check for inconsistencies before activating scoped locations
...
Before activating scoped location all locations and their related objects will be checked.
If there are locations with different companies than the related objects error out.
Because this operation is quite slow, bail out on the first inconsistent entry.
There is a new artisan command introduced that checks every location.
Depending on the size of the database, this will take very long.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com >
2025-01-23 15:26:04 +01:00
Marcus Moore
82801242d3
Merge branch 'develop' into chore/sc-28173
...
# Conflicts:
# resources/views/settings/alerts.blade.php
2025-01-22 14:54:53 -08:00
snipe
e53ed2319c
Merge pull request #16118 from marcusmoore/fixes/undefined-key-in-asset-observer
2025-01-22 22:30:55 +00:00
Marcus Moore
8f512e5941
Replace isset with the more appropriate array_key_exists
2025-01-22 14:28:35 -08:00
Marcus Moore
8a1b6b0684
Add isset check
2025-01-22 14:15:35 -08:00
snipe
5ac6caf257
Merge remote-tracking branch 'origin/develop'
2025-01-22 21:49:55 +00:00
snipe
36f460d32b
Default to localStorage for bootstap table cookies
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-22 21:48:03 +00:00
snipe
802fcbafa0
Merge pull request #16116 from marcusmoore/bug/sc-20259
2025-01-22 18:50:12 +00:00
Marcus Moore
1098b8cd9d
Avoid trying to divide by zero
2025-01-22 10:21:30 -08:00
Marcus Moore
da8999f59a
Add failing test
2025-01-22 10:21:18 -08:00
snipe
bebc1f4d0d
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2025-01-22 17:31:17 +00:00
snipe
1212267da3
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-22 17:30:41 +00:00
snipe
d696ed8a5a
Merge pull request #16107 from marcusmoore/chore/migrate-password-helper
2025-01-22 17:28:23 +00:00
Marcus Moore
c3d17c5727
Remove value for readonly
2025-01-22 09:27:40 -08:00
snipe
cb25d0f2f3
Merge pull request #16115 from snipe/localization/2025-01-22
2025-01-22 17:21:54 +00:00
snipe
be535671bc
Updated language files
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-22 17:09:41 +00:00
snipe
63838f6e74
Merge pull request #16108 from marcusmoore/chore/migrate-form-submit-helper
2025-01-22 13:16:24 +00:00
Marcus Moore
5ddf0dd789
Migrate form submit helper
2025-01-21 16:36:22 -08:00
Marcus Moore
b003890dd2
Migrate password helpers
2025-01-21 16:14:20 -08:00
Marcus Moore
31097bdc37
Formatting
2025-01-21 10:25:53 -08:00
Marcus Moore
e733d2a5d0
Backfill test
2025-01-21 10:24:15 -08:00
Marcus Moore
6a35fa7ba3
Account for missing asset model
2025-01-21 10:14:27 -08:00
Marcus Moore
370666b5bd
Fix indenting
2025-01-21 10:12:56 -08:00
snipe
8db8d4beba
Merge pull request #16105 from snipe/use_url_fragment_for_file_uploads
2025-01-21 18:10:10 +00:00
snipe
d5309c7d94
Added fragment to uploads for redirect
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-21 18:06:00 +00:00
snipe
fb857ccf56
Merge remote-tracking branch 'origin/develop'
2025-01-20 21:07:04 +00:00
snipe
2668960bb9
Merge pull request #16102 from snipe/added_serial_search_to_activity_report
2025-01-20 21:06:23 +00:00
snipe
8e4878fac0
Added serial as relation search
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 21:00:01 +00:00
snipe
d4ef0f8aa8
Merge remote-tracking branch 'origin/develop'
2025-01-20 20:26:33 +00:00
snipe
752d89d177
Merge pull request #16101 from snipe/standarize_modelfile_api
2025-01-20 20:23:50 +00:00
snipe
0d7304eb8b
Use transformer for model files
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 20:20:35 +00:00
snipe
48ff7cdbe8
Prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 17:00:02 +00:00
snipe
ca446ad7df
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2025-01-20 16:59:55 +00:00
snipe
5afcd8ddb3
Merge pull request #16099 from snipe/add_id_to_locations_importer
...
Fixed #16097 - added location ID to location importer
2025-01-20 16:58:24 +00:00
snipe
5273408631
Check for matching ID
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 16:53:48 +00:00
snipe
713c9fdd6f
Derp
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 16:46:22 +00:00
snipe
0a5c41ce23
Log error
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 16:42:53 +00:00
snipe
48a916ab77
Check that the ID has a value
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 16:38:31 +00:00
snipe
67ab602e3b
Merge pull request #16090 from snipe/fixes/s3_support_for_eulas
...
Fixed #16000 - add S3 support for eula PDF downloads
2025-01-20 16:26:11 +00:00
snipe
801328ec42
Fixed #16097 - allow location update by ID in importer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 16:23:13 +00:00
snipe
4fe83467ee
Removed log error
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 16:20:31 +00:00
Brady Wetherington
dd34f07989
Fix custom translator for new Laravel 11 syntax
2025-01-20 15:24:06 +00:00
snipe
27a7a89990
Updated bootstrap tables to 1.24.0
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-20 15:06:00 +00:00
snipe
5dafa3c5c9
Merge remote-tracking branch 'origin/develop'
2025-01-20 15:00:01 +00:00
Brady Wetherington
6b242f47e4
Initial work at putting together a v8 branch
2025-01-20 14:54:28 +00:00
snipe
446c7fb483
Merge pull request #16096 from uberbrady/detect_csv_encodings_v2
2025-01-20 14:42:07 +00:00
Brady Wetherington
17c9c93456
Made composer changes for v8
2025-01-20 14:04:57 +00:00
Brady Wetherington
bbb2af7f53
remove log messages
2025-01-20 13:52:26 +00:00
Brady Wetherington
d65206c7fe
Move tests to UI-side
2025-01-20 13:49:42 +00:00
snipe
954ffbfcaf
Merge remote-tracking branch 'origin/develop'
2025-01-17 19:11:18 +00:00
snipe
327491c3a4
Merge pull request #16091 from snipe/hide_password_reset_if_ldap
2025-01-17 19:09:23 +00:00
snipe
02eeb7f916
Added extrab option in bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 19:04:23 +00:00
snipe
e9ad43afbe
Better hide reset password functionality for LDAP users
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 18:51:08 +00:00
snipe
434068a2ed
Fixes #16000 - add S3 support for eula PDF downloads
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 17:49:19 +00:00
snipe
b6f05bff1f
Merge branch 'develop' into feature/locations_with_companies
2025-01-17 17:18:17 +00:00
snipe
7f5ea30904
Prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 17:09:00 +00:00
snipe
53b6ccbac0
Merge remote-tracking branch 'origin/develop'
2025-01-17 17:07:44 +00:00
snipe
7e65d68392
Merge pull request #16089 from snipe/fixes/15017_card_view
...
Fixes #15017 - card view for mobile
2025-01-17 17:04:04 +00:00
snipe
b3d35beeb9
Fixes #15017 - card view for mobile
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 16:58:30 +00:00
snipe
eaa0e9d1fa
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 16:38:46 +00:00
snipe
fed7c2dc16
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 16:38:04 +00:00
snipe
79951c3f17
Set support footer to on in reset demo script
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 16:37:00 +00:00
snipe
221ffb446c
Fixed #15946 - added comtent type to webhook test
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 16:36:43 +00:00
Godfrey M
0eb34cb979
adds period to translation
2025-01-16 13:24:32 -08:00
Godfrey M
79a4c83879
add spaces
2025-01-16 13:23:16 -08:00
snipe
57f80290a1
Merge pull request #16081 from marcusmoore/fixes/zerofill-count-on-setup
2025-01-16 21:22:02 +00:00
Marcus Moore
4b2ede7a71
Use 0 for zerofill_count if nothing provided
2025-01-16 12:20:14 -08:00
snipe
5e465fa417
Merge remote-tracking branch 'origin/master' into develop
2025-01-16 19:06:02 +00:00
snipe
de5d66f5d2
Comment out ad-hoc note button for now
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-16 19:05:52 +00:00
Brady Wetherington
a50c8c6269
Automatically detect character encoding of CSV files when processsing them
...
to handle non-UTF-8 file types. Added a new test case and enhanced the test
rigs to be able to write non-UTF-8 files.
Final cleanup
2025-01-16 17:03:37 +00:00
Marcus Moore
cb56f89954
Merge branch 'develop' into chore/sc-28173
...
# Conflicts:
# resources/views/settings/alerts.blade.php
2025-01-15 16:54:10 -08:00
Marcus Moore
96379d0a62
Use provided zerofill_count
2025-01-15 16:39:50 -08:00
Marcus Moore
68988524d6
Replace Form::text in certain views
2025-01-15 16:31:16 -08:00
Marcus Moore
c278900581
Replace Form::text in certain views
2025-01-15 15:58:33 -08:00
snipe
bbc9ed5778
Fixed audit date default on bulk audit
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-15 22:28:50 +00:00
snipe
1d0c156d2e
Increased due for checkin warning
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-15 22:12:18 +00:00
snipe
7de5e2e7ef
One more audot field increase
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-15 22:11:22 +00:00
snipe
8d935b34eb
Fixed audit interval input width
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-15 22:07:53 +00:00
snipe
9830959f11
Fixed input width on audit interval
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-15 22:07:15 +00:00
Marcus Moore
8e790fdc47
Replace Form::text in certain views
2025-01-15 13:37:00 -08:00
Marcus Moore
0ef20c524f
Replace Form::text in certain views
2025-01-15 13:01:32 -08:00
Marcus Moore
5ccaf2c23e
Replace Form::text in certain views
2025-01-15 12:23:43 -08:00
Marcus Moore
bec9511df1
Add more spacing for input values to be displayed
2025-01-15 12:10:05 -08:00
Marcus Moore
017948c3bb
Replace Form::text in certain views
2025-01-15 12:07:33 -08:00
Marcus Moore
1cb72e3e9c
Replace Form::text in certain views
2025-01-15 11:53:22 -08:00
Marcus Moore
e45f563b50
Convert Form::textareas to blade component
2025-01-14 13:16:31 -08:00
Godfrey M
69d255f584
adds validation rules for label names
2025-01-14 12:07:59 -08:00
Godfrey Martinez
dd08642a7c
Merge pull request #25 from Godmartinz/template_validate_error_p2
...
remove try catch, add validation rules for label template
2025-01-14 09:52:09 -08:00
Godfrey M
3ac0877418
remove try/catch, add rules for template
2025-01-14 09:50:43 -08:00
snipe
37b39956b5
Merge pull request #16071 from snipe/bug/sc-28149
2025-01-14 14:35:24 +00:00
snipe
9a4fd81c70
Use correct icon for ad-hoc notes on assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-14 14:34:17 +00:00
snipe
0bb2e98af3
Built assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-14 12:33:59 +00:00
snipe
1c8d94c953
Merge pull request #15525 from akemidx/updated_ad_hoc_notes
2025-01-14 11:33:21 +00:00
Marcus Moore
9573428201
Introduce textarea component
2025-01-13 16:34:12 -08:00
Marcus Moore
abb50fcd09
Delete unused partials
2025-01-13 16:21:19 -08:00
Marcus Moore
3fadeebd82
Convert additional Form::select to blade component
2025-01-13 16:20:02 -08:00
Marcus Moore
9a043da005
Convert additional Form::select to blade component
2025-01-13 16:16:49 -08:00
Marcus Moore
3eb307a019
Convert additional Form::select to blade component
2025-01-13 15:58:15 -08:00
Marcus Moore
888c96718c
Convert additional Form::select to blade component
2025-01-13 15:38:51 -08:00
Marcus Moore
bc3f236b86
Weaken comparsion so string and int keys match
2025-01-13 15:38:45 -08:00
Marcus Moore
1f4cc0a4b4
Convert additional Form::select to blade component
2025-01-13 15:23:43 -08:00
snipe
ca11efd3ee
Merge pull request #16036 from Godmartinz/unaccepted_assets_reports_memory_fix
2025-01-13 22:23:30 +00:00
snipe
4a6a94a50e
Merge pull request #16010 from AnouarTouati/dev-container-fixes
2025-01-13 22:23:13 +00:00
Marcus Moore
589ec3a564
Convert additional Form::select to blade component
2025-01-13 13:08:59 -08:00
snipe
2d65b38155
Merge pull request #16011 from AnouarTouati/dev-docker-improv
2025-01-13 21:00:04 +00:00
Marcus Moore
2206b0a699
Convert additional Form::select to blade component
2025-01-13 12:50:18 -08:00
Marcus Moore
d74454620a
Convert Form::select to blade component
2025-01-13 12:45:49 -08:00
Marcus Moore
ed0cec5ba6
Introduce select component
2025-01-13 12:17:01 -08:00
snipe
99526cfc2c
Remove mcrypt and legacy recrypter
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-13 19:54:00 +00:00
snipe
587449ef97
Merge pull request #15981 from akemidx/bug/sc-27551
2025-01-13 17:35:58 +00:00
snipe
06ffac9d7d
Merge pull request #16046 from uberbrady/ldap_asset_location_switch_fix
2025-01-13 17:33:13 +00:00
snipe
e32ed03f66
Merge pull request #16061 from snipe/moved_keywords_on_admin_settings
2025-01-13 17:10:01 +00:00
snipe
a7543b407f
Added a few more words
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-13 17:07:22 +00:00
snipe
98b1ba1e39
Moved keywords in lang file
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-13 17:04:48 +00:00
snipe
e03ed7567a
Merge pull request #15747 from NebelKreis/feature/custom-data-options-for-2d-barcode
2025-01-13 15:20:56 +00:00
Nebel
9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode
2025-01-13 15:49:32 +01:00
snipe
3f5c166417
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2025-01-13 13:59:41 +00:00
snipe
cf091377b6
Add @brlin-tw as a contributor
2025-01-13 13:59:34 +00:00
snipe
0cc7a7014f
Merge pull request #16053 from brlin-tw/patch-1
...
Fixed #16054 : fix incorrect compose service name in the APP_KEY generation command of the Docker env file
2025-01-13 13:59:05 +00:00
snipe
4790ad53e3
Updated font-awesome to 6.7.2
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-13 13:57:45 +00:00
snipe
62dc075834
Add @aHVzY2g as a contributor
2025-01-13 13:55:28 +00:00
snipe
41da04cd22
Merge pull request #16018 from aHVzY2g/patch-3
2025-01-13 13:55:04 +00:00
Marlon Spangenberg
0c4fc56b80
increased label/field size to 2.5, reduced supported fields to 3
2025-01-13 12:20:56 +01:00
Marlon Spangenberg
907f0553d4
moved label value into the same line, changed label font to freemono
2025-01-13 12:14:30 +01:00
snipe
224f04db6c
Merge pull request #16050 from Godmartinz/inactive-slack-hook
...
Adds try/catch around notification failing with an inactive webhook for better user experience
2025-01-10 11:23:41 +00:00
snipe
f0bcf78941
Merge pull request #16051 from marcusmoore/testing/checkoutable-acceptance-factory-fix
...
Update related asset when checkout acceptance created via factory
2025-01-10 11:22:50 +00:00
林博仁 Buo-ren Lin
c08a4a2b0a
Fixed #16054 : fix incorrect compose service name in the APP_KEY generation command of the Docker env file
...
This resolves the following error:
```
$ docker compose run --rm snipe-it php artisan key:generate --show
no such service: snipe-it
```
and is also how it is done in the documentation.
Fixes #16054 .
Refer-to: APP_KEY | Docker | Snipe-IT documentation <https://snipe-it.readme.io/docs/docker#app_key >
Signed-off-by: Buo-ren Lin (OSSII) <buoren.lin@ossii.com.tw >
2025-01-10 11:29:49 +08:00
Marcus Moore
8597984787
Update asset's assigned_to and assigned_type after creating
2025-01-09 15:09:57 -08:00
Godfrey M
001ccf1ce9
adds translation string instead of hardcoded message
2025-01-09 14:47:07 -08:00
Godfrey M
082a974ee3
changed from redirect with error to with warning
2025-01-09 14:26:54 -08:00
Godfrey M
152c23b8f3
changed log from warning to error
2025-01-09 12:55:25 -08:00
Godfrey M
b635822a85
add try/catch around notification failing for inactive slack hooks
2025-01-09 12:51:54 -08:00
snipe
ec85e4b5b0
Upgrade less from 4.2.0 to 4.2.1 #15996
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-09 20:42:04 +00:00
snipe
1acb7e0fe4
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2025-01-09 20:38:47 +00:00
snipe
5914004a57
Add @AnouarTouati as a contributor
2025-01-09 16:13:05 +00:00
snipe
c5afc66d46
Merge pull request #16009 from AnouarTouati/prod-docker-fixes
2025-01-09 16:12:37 +00:00
snipe
bc69660247
Merge pull request #16049 from snipe/localization/update_strings-2025-01-09
2025-01-09 16:02:03 +00:00
snipe
71c7c64fde
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-09 15:54:51 +00:00
snipe
c284ac5287
Merge pull request #16047 from snipe/bug/sc-28054
2025-01-09 15:19:13 +00:00
snipe
639afe5b9b
Check for blank OR null on formatter
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-09 15:11:22 +00:00
Brady Wetherington
049b9c542b
Conditionally update assets when user's location moves via LDAP
2025-01-09 13:43:59 +00:00
Godfrey M
0118504cd3
adds redirect to render and save if template is null
2025-01-08 15:32:23 -08:00
Godfrey M
f4e69679ca
add a try catch around template validation
2025-01-08 12:13:31 -08:00
Godfrey M
ce7a8ad808
add a space
2025-01-08 09:48:45 -08:00
Godfrey M
c17c011488
checks if template is null, adds return types for validation methods
2025-01-08 09:47:20 -08:00
Godfrey M
92762896ef
moar removal
2025-01-07 15:10:46 -08:00
Godfrey M
c699baf519
removed commented out code, and unrelated crap
2025-01-07 15:10:00 -08:00
Godfrey M
97b765b5cc
improved reports query, could be further optimized
2025-01-07 15:06:09 -08:00
snipe
40b41e646d
Merge pull request #16033 from Godmartinz/barcode-fix
2025-01-07 19:59:30 +00:00
snipe
63853db450
Merge pull request #16035 from marcusmoore/fixes/unaccepted-assets-reminder
2025-01-07 19:58:23 +00:00
Marcus Moore
48dd3252cb
Fix parameter order
2025-01-07 11:47:16 -08:00
snipe
ee6f60e63c
Merge pull request #16034 from Godmartinz/fix-locale-check
2025-01-07 19:00:32 +00:00
Godfrey M
f6abf90ba0
fix locale check
2025-01-07 10:51:48 -08:00
Godfrey M
83ee0e0fb6
untangled code visibility from each label engine
2025-01-07 10:37:59 -08:00
Godfrey M
94f44d1b77
fix label type values in db and defaults. update help text
2025-01-07 10:00:52 -08:00
Godfrey M
e12c7473f8
tinkering with the polymorphic eager load
2025-01-07 09:08:36 -08:00
snipe
407d69b370
Merge pull request #16031 from snipe/make_backups_more_configurable
2025-01-07 11:25:17 +00:00
snipe
774e795d97
Pull backup:clean settings into config
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-07 11:17:43 +00:00
snipe
f698f74d3e
Merge pull request #16028 from marcusmoore/fixes/report-template-column
...
Fixed migration causing issues with mariadb
2025-01-06 22:58:30 +00:00
Marcus Moore
80f9159f4d
Change options to text type
2025-01-06 14:29:18 -08:00
Godfrey M
0ec25d55a0
Merge branch 'develop' into unaccepted_assets_reports_memory_fix
2025-01-06 12:28:17 -08:00
Godfrey M
bb03e00279
fix deprecation on asset obs get unaccept report to populate
2025-01-06 11:26:45 -08:00
snipe
4d3db2ab44
Merge pull request #15919 from Godmartinz/table_dropdownmenu-fix
...
Removed the `table-responsive` div from several index blades
2025-01-06 18:11:19 +00:00
snipe
c3d52af546
Merge pull request #16024 from snipe/fixes/#15977
...
Fixed #15977 - Set order by on companies
2025-01-06 16:12:42 +00:00
snipe
9672a13402
Set order by on companies
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-06 16:11:18 +00:00
snipe
9564f7fdb8
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-06 12:46:17 +00:00
aHVzY2g
eba1f03363
Added: TZe_24mm_D.php modified TZe_24mm_A that includes 1D code
...
New label format for TZe_24mm that includes all fields of TZe_24mm_A with the addition of the 1D code at the bottom of the label.
2025-01-03 11:10:44 +01:00
snipe
c7ca4d061f
Merge pull request #16013 from ubc-cpsc/bugfix/CVE-2024-56521-tcpdf
...
Fixes tecnickcom/tcpdf security CVEs
2024-12-30 23:22:32 +00:00
Joël Pittet
115f08ee49
Fixes tecnickcom/tcpdf security CVES: CVE-2024-56522, CVE-2024-56527, CVE-2024-56519, CVE-2024-56521
2024-12-30 13:59:03 -08:00
Anouar Touati
e33c680679
Improvement: Change the logging channel to storage/logs/laravel.log file in dev container
2024-12-29 11:13:47 -05:00
Anouar Touati
1e8ec783b4
following docs for prod docker without specifying APP_VERSION will now get latest version as doc says
2024-12-29 11:05:02 -05:00
Anouar Touati
a6ed958687
Fixed: dev dependencies are not installed in dev container
2024-12-29 11:02:09 -05:00
Anouar Touati
4354f50168
Fixed: Debug mode is not enabled in dev container
2024-12-29 11:02:09 -05:00
snipe
8fc1227974
Merge pull request #16003 from snipe/asset_maintenance_api_fix
...
Check for valid asset before accessing properties
2024-12-26 10:31:47 +00:00
snipe
d410f168bd
Removed extra checks, since we already check higher up
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-26 10:28:27 +00:00
snipe
b38f9ad33c
Updated return types
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-26 10:18:00 +00:00
snipe
f8311815ee
Check for valid asset before accessing properties
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-26 10:17:45 +00:00
snipe
3edb501973
Fixed typo sanitze to sanitize
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-25 20:45:19 +00:00
snipe
49918d3302
Merge pull request #15992 from marcusmoore/fixes/reset-demo-command
...
Fixed reset demo command
2024-12-19 23:24:37 +00:00
Marcus Moore
876ab44a16
Update settings property keys
2024-12-19 15:18:27 -08:00
snipe
15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template
...
Saved Custom Report Templates
2024-12-19 22:43:59 +00:00
snipe
1434522149
Merge pull request #15912 from marcusmoore/bug/harden-checkout-validation-v2
...
Harden asset checkout validation
2024-12-19 22:42:06 +00:00
snipe
23af5fb06e
Merge pull request #15964 from marcusmoore/testing/accessories-ui
...
Added Accessory UI tests
2024-12-19 22:40:34 +00:00
snipe
6b8c1eb523
Merge branch 'develop' into testing/accessories-ui
2024-12-19 22:38:04 +00:00
snipe
0984194ec6
Merge pull request #15965 from marcusmoore/testing/consumable-ui
...
Added Consumable UI tests
2024-12-19 22:36:47 +00:00
snipe
26264e1d55
Merge branch 'develop' into testing/consumable-ui
2024-12-19 22:34:10 +00:00
snipe
dc5dedd5a3
Merge pull request #15975 from marcusmoore/testing/license-checkin
...
Added tests around license checkin
2024-12-19 22:33:03 +00:00
snipe
d49bfb562a
Merge branch 'develop' into testing/license-checkin
2024-12-19 22:29:31 +00:00
snipe
f90dd9d74d
Merge pull request #15976 from marcusmoore/testing/ui-render
...
Added simple front end render tests
2024-12-19 22:27:35 +00:00
snipe
8d24c0af0d
Merge pull request #15982 from spencerrlongg/bug/sc-27228
...
Update Checkout Button Permission for Predefined Kits
2024-12-19 22:25:51 +00:00
snipe
174a01cb6b
Merge pull request #15991 from snipe/added_some_sorting_on_audit_report
...
Added a few order options on audit report
2024-12-19 22:24:57 +00:00
snipe
360e0ff534
Added a few order options on audit report
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-19 22:19:33 +00:00
snipe
4f2721e93f
Merge pull request #15986 from Godmartinz/fix-settings-seeder
...
Renames variables to match columns for label settings
2024-12-19 19:06:28 +00:00
snipe
0dce3b8b8c
Merge pull request #15987 from spencerrlongg/bug/sc-27192
...
Add `string` to Password Reset Username Rules
2024-12-18 20:09:14 +00:00
spencerrlongg
5042c2b30a
oops, rm dump
2024-12-18 13:58:18 -06:00
spencerrlongg
b45cf6124f
add note
2024-12-18 13:57:18 -06:00
Godfrey M
c8f280ac90
change barcode column names in seeder
2024-12-18 09:50:55 -08:00
spencerrlongg
7eb936883a
rm note
2024-12-17 16:38:29 -06:00
akemidx
c3b5a92a48
added builder
2024-12-17 17:11:52 -05:00
spencerrlongg
eb054897d6
Remove leftover testing logic and fix checkout permissions
...
Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit.
2024-12-17 16:06:10 -06:00
akemidx
f6dbda4056
fixing count to not used trashed
2024-12-17 17:03:46 -05:00
akemidx
5992d2a1d2
adding to controller
2024-12-17 15:43:13 -05:00
Marcus Moore
a53976967a
Use correct id
2024-12-17 10:31:35 -08:00
Marcus Moore
1be7508340
Add simple tests to ensure views render
2024-12-16 17:45:10 -08:00
Marcus Moore
af135fa42c
Add permissions property to group factory
2024-12-16 17:37:58 -08:00
Marcus Moore
7aa5195e87
Add tests for license checkin
2024-12-16 14:39:24 -08:00
snipe
04c3481734
Merge pull request #15973 from uberbrady/next_try_accessories_to_locations_rebased
...
Next try accessories to locations rebased
2024-12-16 20:25:25 +00:00
Brady Wetherington
582b462326
Removed inadvertently added files.
2024-12-16 16:55:54 +00:00
snipe
b233715796
Fixed property
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
b93fc80011
Fixed admin -> adminuser property
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
41a6b34768
Added new test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
17a6a871ae
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
5fceef1dc3
Updated routes with new endpoints
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
9b04d2e51c
Updated route in view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
51b426f0b4
Added accessory transformer to assets transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
021c4f2598
Added assets endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
ac96b8d4ae
Added assignedAccessories method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
bc8719e336
Specify created_by in the API call as well
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
bd38d64e66
Removed create() method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
74b5d6d12b
Updated transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
ddd11939a5
No need to include assigned_to
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
3caa5f2042
Fixed user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
5226d507d4
Updated route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
274b659905
Added new route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
a0b9714d72
Updated user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
36aea52ae0
Fixed variable in test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:34 +00:00
snipe
e0643cd744
Added currency and history icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:35:30 +00:00
snipe
27fab0f573
Use history icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:34:51 +00:00
snipe
183a4d49d8
Refactor of #15235 - added accessory checkout to locations, assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 16:34:49 +00:00
snipe
edacc4eb54
Merge pull request #15446 from Godmartinz/barcode_settings_hide
...
Refactored Barcode Settings into Label Settings
2024-12-16 16:09:34 +00:00
snipe
1e7d7a147b
Merge pull request #15972 from snipe/upgrade_fontawesome
...
Updated font awesome
2024-12-16 15:55:14 +00:00
snipe
8ee549efbf
Bumped font-awesome to 6.7.0
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-16 15:51:23 +00:00
Marcus Moore
699476da90
Scaffold and implement some license checkin tests
2024-12-12 17:33:34 -08:00
Marcus Moore
d763feb803
Add consumable ui tests
2024-12-12 16:41:46 -08:00
Marcus Moore
d3bfa75251
Add accessory ui tests
2024-12-12 14:30:58 -08:00
Godfrey M
833af55806
Merge branch 'develop' into barcode_settings_hide
2024-12-12 12:05:29 -08:00
snipe
d1246c65bd
Merge pull request #15963 from snipe/localization/updated_strings_2024-12-12
2024-12-12 19:24:09 +00:00
snipe
38db890660
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-12 19:22:56 +00:00
snipe
01c18f6303
Merge pull request #15962 from snipe/fixes_rb-18772
2024-12-12 17:40:40 +00:00
snipe
c5e2aed164
Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-12 17:37:08 +00:00
snipe
4d1d2fedb7
Merge pull request #15960 from uberbrady/improve_restore_cleaner_utf8
2024-12-12 17:05:10 +00:00
snipe
ab6363a124
Merge pull request #15959 from snipe/remove_settings_api_endpoints
2024-12-12 16:53:15 +00:00
Brady Wetherington
a0e7dcf4ff
Fixes to 'clean' mode to better handle character sets and zero-values
2024-12-12 16:50:36 +00:00
snipe
da33f1815a
Removed index and destroy settinga API endpoints
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-12 16:46:19 +00:00
snipe
f089d1f0a4
Merge pull request #15944 from marcusmoore/bug/required-display-for-selects
2024-12-12 01:42:26 +00:00
spencerrlongg
72f58b0405
leaving this here for notes etc
2024-12-11 19:13:51 -06:00
snipe
4bd6c2171c
Merge pull request #15957 from Godmartinz/fix-checkout-notif-parameters
2024-12-12 00:38:21 +00:00
Marcus Moore
67494c1b0b
Fix validation messages for select2 inputs
2024-12-11 16:26:23 -08:00
Godfrey M
3264149a2c
fix other mailables
2024-12-11 16:26:18 -08:00
Marcus Moore
8417fcb604
Revert "Show frontend "required" validation for model and status selects"
...
This reverts commit 10a7ae8d47 .
2024-12-11 16:25:45 -08:00
Godfrey M
331fbb66bd
fix other mailables
2024-12-11 16:25:04 -08:00
Godfrey M
400833f834
reversed order of the acceptance and note paramter
2024-12-11 16:14:06 -08:00
snipe
a7e6b8ea3f
Merge pull request #15956 from marcusmoore/bug/sc-27731
2024-12-11 23:52:33 +00:00
Marcus Moore
6e31d0f2c3
Use appropriate category for licenses when seeding
2024-12-11 15:39:41 -08:00
snipe
b9a660683c
Merge pull request #15955 from ubc-cpsc/bugfix/GHSA-c2pc-g5qf-rfrf
2024-12-11 20:42:13 +00:00
Joël Pittet
014350a26b
Fix league/commonmark's quadratic complexity bugs may lead to a denial of service
2024-12-11 12:04:45 -08:00
snipe
06a0ac895d
Fixed #15928 - updated method name to setCreatedBy from SetUserId
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-11 18:34:18 +00:00
snipe
34a47e9e44
Add @sgross-emlix as a contributor
2024-12-11 18:09:53 +00:00
snipe
f5a9e4bafa
Fixes #15952 - fixed typo in content-type
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-11 18:09:19 +00:00
snipe
66339481cf
Merge pull request #15954 from Godmartinz/null_fix-for-reminder-command
2024-12-11 17:38:59 +00:00
Godfrey M
2e97b56deb
add null safe operator to acceptance reminder
2024-12-11 09:27:27 -08:00
akemidx
8adb62fd3a
width fix
2024-12-10 19:17:01 -05:00
akemidx
43537d414b
removed redundancy.
2024-12-10 16:42:55 -05:00
snipe
5014a95d9a
Updated supported versions
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-10 13:27:59 +00:00
akemidx
f2fab57187
cancel button pull to left.
...
added pull right to save
2024-12-09 19:28:57 -05:00
Marcus Moore
10a7ae8d47
Show frontend "required" validation for model and status selects
2024-12-09 16:09:51 -08:00
snipe
5f0efd8cdb
Merge pull request #15940 from snipe/reove_gh_templates
2024-12-09 19:35:31 +00:00
spencerrlongg
03c90d7b60
note, will come back to this once question is answered
2024-12-09 13:29:06 -06:00
snipe
31155b5351
Removed issue/PR templates
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-09 19:28:51 +00:00
snipe
cc8f72c3f9
Merge pull request #15914 from Godmartinz/send_reminder_emails
2024-12-09 19:23:13 +00:00
snipe
a0bab70def
Merge pull request #15939 from uberbrady/fix_ldap_asset_location_updater
2024-12-09 17:56:23 +00:00
Brady Wetherington
b5c8251539
Only update asset locations to assets checked out to users.
2024-12-09 17:40:10 +00:00
snipe
0149ed75fd
Merge pull request #15565 from spencerrlongg/bug/sc-25921
2024-12-09 17:00:10 +00:00
snipe
f72635955d
Merge pull request #15925 from Godmartinz/refactor-unaccepted-assets-reminder-notif
2024-12-09 16:40:21 +00:00
Godfrey M
5120cddda4
delete notification version of reminder
2024-12-05 16:02:55 -08:00
Godfrey M
97398f1e68
adds testing to unaccepted reminder command
2024-12-05 12:41:33 -08:00
Godfrey M
281ff6ad5d
wrap comment
2024-12-05 11:52:34 -08:00
Godfrey M
9d49b01958
cleans up the Unaccepted Asset reminder variables
2024-12-05 11:46:56 -08:00
Godfrey M
3f8916ea2e
fix duplicate emails being sent in unaccepted reminder command
2024-12-05 11:37:03 -08:00
Godfrey M
f6b9ae6aee
missed a spot
2024-12-05 10:18:35 -08:00
Godfrey M
de41def2b3
fixed conditionals
2024-12-05 10:15:57 -08:00
Godfrey M
52b051e940
add mail class for unaccepted assets reminders
2024-12-05 10:08:39 -08:00
snipe
a137e31797
Merge pull request #15920 from akemidx/asset-category-in-emails
2024-12-04 21:46:43 +00:00
spencerrlongg
513c78a09f
Refactor CheckoutRequest actions for consistency
...
Renamed CheckoutRequest action classes to include "Action" in their names for consistency and clarity. Enhanced error handling in controllers to standardize error responses with translations. Updated usage of the renamed action classes throughout the code to ensure proper integration.
2024-12-03 17:51:12 -06:00
spencerrlongg
0103f20193
Merge branch 'develop' into feature/sc-24347
2024-12-03 16:05:39 -06:00
akemidx
ca0f8ace99
fixed
2024-12-03 16:57:28 -05:00
akemidx
6252f0ac5e
layout / added category id
2024-12-03 16:10:42 -05:00
Godfrey M
b85b4b1e1b
remove table-responsive div from several index bladees
2024-12-03 10:26:14 -08:00
snipe
43d66a8fcc
Merge pull request #15918 from Godmartinz/mail_name_fix
...
Adds `MAIL_FROM_NAME` to mail envelope
2024-12-03 17:17:26 +00:00
Godfrey M
e5284c03e2
fix typo
2024-12-03 09:10:50 -08:00
Godfrey M
16283b8fc0
adds mail from name to mail envelope
2024-12-03 09:08:39 -08:00
Godfrey M
983b78edd9
add property check
2024-12-02 14:27:04 -08:00
snipe
2ad1407d51
Merge pull request #15909 from Godmartinz/checkin-out-notifications
...
Fixed general webhook option notifications not firing
2024-12-02 22:03:32 +00:00
Godfrey M
ab67c48352
fix unaccepted assets report resend acceptance
2024-12-02 13:03:09 -08:00
Marcus Moore
1d0d14876c
Harden asset checkout validation
2024-12-02 12:49:02 -08:00
Fiala06
bdb0e6c2a3
Update LdapSync.php
...
Fix for duplicate entries preventing the sync from continuing.
SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry '13178-6' for key 'PRIMARY' (Connection: mysql, SQL: insert into users_groups (group_id, user_id) values (6, 13178))
2024-12-02 11:07:37 -08:00
snipe
14730184c9
Fixed sr-only blank text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-02 18:48:02 +00:00
snipe
8ff099e802
Merge pull request #15910 from marcusmoore/chore/include-testing-variable
...
Included MAIL_FROM_ADDR in phpunit configuration
2024-12-02 18:34:08 +00:00
Marcus Moore
ea1f8328b9
Include MAIL_FROM_ADDR in phpunit configuration
2024-12-02 10:23:02 -08:00
Godfrey M
99464fcd86
fixes general webhook not firing
2024-12-02 10:19:24 -08:00
snipe
93d4d24194
Fixed funky layout in importer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-02 17:56:15 +00:00
snipe
1bbe9bf6c9
Merge remote-tracking branch 'origin/develop'
2024-12-02 17:43:03 +00:00
snipe
6874f703bf
Some CSS twiddling
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-02 17:42:26 +00:00
snipe
a7d5b3944e
Merge pull request #15908 from snipe/revert-15892-bug/harden-checkout-validation
...
Revert "Hardened asset checkout validation by requiring integer"
2024-12-02 17:42:02 +00:00
Marcus Moore
b5e83899c6
Revert "Hardened asset checkout validation by requiring integer"
2024-12-02 09:37:21 -08:00
snipe
dcd586e3cd
Merge remote-tracking branch 'origin/develop'
2024-12-02 17:17:20 +00:00
snipe
1246ab1de7
Fixed bulk user form in user detail view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-02 17:14:36 +00:00
Brady Wetherington
eccdcc373e
parent 2220828b00
...
author Brady Wetherington <bwetherington@grokability.com > 1728320853 +0100
committer Brady Wetherington <bwetherington@grokability.com > 1733158021 +0000
Prevent setting assigned_to without setting assigned_type
Fixed tests to include assigned_type when setting assigned_to
Add new tests for assigned_to without assigned_type
Added tighter validation to assigned_to and assigned_type, new tests
Fixed wrong comment
Fixed tests to include assigned_type when setting assigned_to
Add new tests for assigned_to without assigned_type
Fixed wrong comment
2024-12-02 16:53:08 +00:00
snipe
5a4a3aa8f3
Merge remote-tracking branch 'origin/develop'
2024-12-02 15:59:25 +00:00
snipe
2220828b00
Merge pull request #15904 from snipe/fixes/#15901
...
Fixed #15901 - re-added required indicator on text and select custom fields
2024-12-02 15:51:32 +00:00
snipe
716c67d4b8
Fixed #15901 - re-added required indicator on text and select custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-12-02 15:45:07 +00:00
snipe
ee4a54be24
Fixed order by notes for users
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-27 15:48:13 +00:00
snipe
46be1ada60
Merge pull request #15892 from marcusmoore/bug/harden-checkout-validation
...
Hardened asset checkout validation by requiring integer
2024-11-27 14:55:11 +00:00
snipe
e1c0a80c20
Merge remote-tracking branch 'origin/develop'
2024-11-27 13:52:03 +00:00
snipe
2cb1b6d462
Use transformer on API update
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-27 13:51:53 +00:00
snipe
37ac7fe25c
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-11-26 20:38:46 +00:00
snipe
11f83b4cd9
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-11-26 20:12:14 +00:00
snipe
0f1d10bd69
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-26 20:12:09 +00:00
snipe
82108f8a18
Merge pull request #15208 from akemidx/feature/sc-26415
...
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
2024-11-26 20:11:04 +00:00
akemidx
a7dae10a82
fixing line
2024-11-26 15:06:25 -05:00
akemidx
2727210c78
requested changes from pr
2024-11-26 15:04:54 -05:00
Marcus Moore
fcbd5dcae5
Harden asset checkout validation by requiring ints
2024-11-26 11:33:17 -08:00
snipe
fa80716320
Merge pull request #15890 from Godmartinz/mobile-view-fix
...
Mobile view fix
2024-11-26 19:13:39 +00:00
Godfrey M
15c9df0ab1
fix mobile view for asset and user
2024-11-26 10:59:31 -08:00
snipe
6ee0c93c87
Merge remote-tracking branch 'origin/develop'
2024-11-26 18:47:22 +00:00
snipe
37e091adbb
Merge pull request #15889 from Godmartinz/Fix-user-API-location-update
...
Fixed Users API `update` from clearing `location_id` unnecessarily
2024-11-26 18:45:20 +00:00
Godfrey M
021e82927e
fixed mobile view of assets
2024-11-26 10:42:59 -08:00
Godfrey M
60642cd902
fix user api update from clearing location_id unnecessarily
2024-11-26 09:58:17 -08:00
snipe
fd07550803
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-11-25 14:19:05 +00:00
snipe
30b481bc93
Updated version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-25 14:18:31 +00:00
snipe
25bfd3e845
Merge remote-tracking branch 'origin/develop'
2024-11-25 13:05:28 +00:00
snipe
0f18ee86f7
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-25 13:05:05 +00:00
snipe
4a5f65616f
Merge remote-tracking branch 'origin/develop'
2024-11-25 12:56:08 +00:00
snipe
f125c90c94
Merge pull request #15870 from marcusmoore/bug/sc-26857
...
Always call resizeCanvas
2024-11-22 00:59:36 +00:00
akemidx
0d608552ef
orange bar for requirednessness
2024-11-21 19:09:54 -05:00
akemidx
dd223fc215
commit for testing
2024-11-21 19:01:27 -05:00
Marcus Moore
87756cac66
Remove debugging
2024-11-21 14:30:17 -08:00
Marcus Moore
9f49c25401
WIP: move signature pad creation up and add debugging
2024-11-21 13:12:13 -08:00
Marcus Moore
d0378070c8
Always call resizeCanvas
2024-11-21 12:38:53 -08:00
snipe
9f395d1f6a
Merge remote-tracking branch 'origin/develop'
2024-11-21 19:58:49 +00:00
snipe
feba860a90
Merge pull request #15850 from akemidx/bug/sc-27448
...
Adding colon to password translation string
2024-11-21 19:58:04 +00:00
akemidx
424316df9f
fixing colon placements
2024-11-21 14:32:22 -05:00
snipe
b7aedb7dcb
Merge pull request #15818 from spencerrlongg/bug/sc-27213
...
Resolves Validation for Encrypted Numeric and Alpha Custom Fields
2024-11-21 19:25:27 +00:00
snipe
8b38dc83f6
Merge pull request #15851 from marcusmoore/testing/api-component-checkin
...
Fixed bug in component checkins via api
2024-11-21 19:24:12 +00:00
snipe
ad2b85393b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-11-21 19:23:10 +00:00
snipe
85c1b0ec57
[Snyk] Upgrade jquery-ui from 1.14.0 to 1.14.1 #15868
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-21 19:22:08 +00:00
snipe
b99b56b32b
Merge remote-tracking branch 'origin/develop'
2024-11-21 14:41:42 +00:00
snipe
2a21cce4f5
Merge pull request #15839 from Godmartinz/fix-mail-envelope-variable
...
replace env with config variable for from address
2024-11-21 14:41:04 +00:00
snipe
3a683d84a7
Merge pull request #15859 from Godmartinz/remove_name_null_warning
...
Adds a ternary for blank emails for mail notifications
2024-11-21 14:38:03 +00:00
snipe
e05f443886
Merge pull request #15864 from marcusmoore/testing/api-component-checkout
...
Added tests for component checkout api endpoint
2024-11-21 14:37:45 +00:00
Marcus Moore
d65254c4ec
Add tests for component checkout api endpoint
2024-11-20 15:34:08 -08:00
Godfrey M
6969b8be47
remove the changes to mail.from.address default
2024-11-20 14:25:57 -08:00
snipe
0a3bca078c
Merge pull request #15860 from marcusmoore/tests/switch-to-file-for-sqlite-in-action
...
Improved speed of sqlite tests in GitHub Actions
2024-11-20 22:09:11 +00:00
Marcus Moore
9bbd802fce
Use database file for sqlite in GitHub Action for tests
2024-11-20 12:33:58 -08:00
Marcus Moore
f932a4fc76
Always run validation on checkin
2024-11-20 12:25:06 -08:00
Godfrey M
f7c1fc852d
no checked out to email doesnt trigger a 500
2024-11-20 08:29:28 -08:00
snipe
5522def054
Merge pull request #15854 from NebelKreis/feature/add-category-to-asset-mails
...
Added #15803 : Category Field to Asset Related Mails
2024-11-20 13:51:34 +00:00
snipe
8cd4b3303e
Merge pull request #15847 from NebelKreis/feature/hardware-label-generation-api
...
Added #15677 : API Route for Generating Asset Labels
2024-11-20 11:14:28 +00:00
NebelKreis
d5c141dc59
Fix: Removed setting validation as it is not strictly necessary
2024-11-20 11:55:48 +01:00
NebelKreis
7618169d79
Feature: Added category to asset requested email
2024-11-20 11:22:19 +01:00
NebelKreis
eb026248a8
Feature: Added category to asset acceptance/decline email
2024-11-20 10:59:59 +01:00
NebelKreis
4304af0508
Feature: Added category to asset checkin email
2024-11-20 10:27:37 +01:00
NebelKreis
61eff02fcb
Feature: Added category to asset checkout email
2024-11-20 10:27:22 +01:00
snipe
cca76005a2
Merge pull request #15852 from marcusmoore/testing/ui-delete-component
...
Added tests around deleting component via ui
2024-11-20 01:27:19 +00:00
Marcus Moore
54f5f46e31
Improve check for image existence
2024-11-19 16:44:42 -08:00
Marcus Moore
51a0767be9
Add tests around deleting component via ui
2024-11-19 16:44:19 -08:00
Marcus Moore
da4c877ed8
Use === over ==
2024-11-19 16:13:53 -08:00
Marcus Moore
e8cad0df69
Formatting
2024-11-19 16:13:30 -08:00
Marcus Moore
59fe53842d
Add tests around component check ins via api
2024-11-19 16:11:23 -08:00
akemidx
1e513312eb
adding colon to password translation
2024-11-19 16:58:10 -05:00
Godfrey M
99de639be4
fix mail.from.address variables in config, simplify envelop[ variable
2024-11-19 09:32:11 -08:00
Godfrey M
b513575643
add testing example var MAIL_FROM_ADDR
2024-11-19 09:10:52 -08:00
spencerrlongg
22602c7997
use existing validation strings
2024-11-19 08:59:47 -06:00
snipe
d10f118128
Merge remote-tracking branch 'origin/develop'
2024-11-19 13:55:55 +00:00
snipe
5a5f1082fb
Merge pull request #15848 from snipe/chore/sc-27531
...
Indicate requiredness on status select on bulk user checkin+delete
2024-11-19 13:55:22 +00:00
snipe
30a6a678d4
Indicate requiredness on status select on bulk user checkin+delete
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-19 13:50:18 +00:00
snipe
4384f8dcbb
Merge remote-tracking branch 'origin/develop'
2024-11-19 13:32:02 +00:00
snipe
d576016a1c
Merge pull request #15845 from snipe/bug/sc-27523
...
Fixed variable name to correctly log created_by and date for bulk user delete/checkin
2024-11-19 13:29:21 +00:00
snipe
15a31bd141
Fixed variable name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-19 13:22:44 +00:00
NebelKreis
5639a84d90
Feature: Added API route for asset label generation
2024-11-19 14:16:58 +01:00
NebelKreis
66d6b01307
Feature: Added translations for label generation API endpoint
2024-11-19 14:16:06 +01:00
NebelKreis
889aff43c2
Feature: Added API endpoint for generating asset labels
2024-11-19 14:13:05 +01:00
snipe
8f7223128f
Merge pull request #15757 from akemidx/bug/sc-26944
...
FIXED: Bulk Delete page not showing full information
2024-11-19 12:34:57 +00:00
snipe
53cfcb7143
Merge pull request #15843 from snipe/viclou-patch-1
...
Update README.md - small typo
2024-11-19 10:50:28 +00:00
snipe
d60ac0c78d
Merge pull request #15840 from marcusmoore/fixes/migration-rollbacks
...
Fixed a couple migrate:rollback issues
2024-11-19 10:20:58 +00:00
victoria
a328c7a64c
Update README.md
...
typo mosrt to most under Join our Community links
2024-11-18 23:03:31 -10:00
Godfrey M
f533cdc07a
update default from address to alternate config variable
2024-11-18 12:39:28 -08:00
Marcus Moore
f5206078d4
Fix rollback for webhook_endpoint by using correct column type
2024-11-18 12:25:02 -08:00
Marcus Moore
0209d27081
Fix rollback for created_by
2024-11-18 12:24:47 -08:00
Godfrey M
d14f43fbbe
replace env with config variable for from address
2024-11-18 10:54:03 -08:00
spencerrlongg
b71a90a3c5
this should be all it takes to fix this, i think
2024-11-18 12:44:24 -06:00
snipe
8d321edca8
Merge remote-tracking branch 'origin/develop'
2024-11-15 18:59:40 +00:00
snipe
3fb543bf03
Merge pull request #15828 from snipe/bug/sc-27500
...
Fixed admin user not showing in download all activity report
2024-11-15 18:59:07 +00:00
snipe
e8d1093376
Fixed admin user not showing in download all activity report
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-15 18:51:45 +00:00
snipe
66e82a345a
Merge remote-tracking branch 'origin/develop'
2024-11-15 13:18:25 +00:00
snipe
187e231c0e
Fixed #15825
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-15 13:18:15 +00:00
snipe
caf92748fc
Merge remote-tracking branch 'origin/develop'
2024-11-14 20:57:18 +00:00
snipe
09b7db5103
Additional fix for #15817
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 20:57:09 +00:00
snipe
5381c4e1e3
Merge remote-tracking branch 'origin/develop'
2024-11-14 20:53:17 +00:00
snipe
add3edba20
Merge pull request #15822 from snipe/add_model_number_to_view_assets
...
Fixed #15820 - added model number to view-assets
2024-11-14 20:52:44 +00:00
snipe
b4a2a4e1ec
Fixed #15820 - added model number to view-assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 20:51:18 +00:00
snipe
f2faf58786
Merge pull request #15817 from Godmartinz/label_fix
...
Removes asset tag if 2D code is not present
2024-11-14 20:49:31 +00:00
spencerrlongg
124f9c84c2
oops, something went wrong translation
2024-11-14 13:45:47 -06:00
snipe
96a4391d5c
Merge remote-tracking branch 'origin/develop'
2024-11-14 19:05:08 +00:00
snipe
7b7a848a43
Merge pull request #15819 from snipe/fixes_asset_file_deletion
...
Corrected route name for delete action on filestable on assets
2024-11-14 18:01:56 +00:00
snipe
636e466b8a
Fixed delete model file route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 17:58:20 +00:00
snipe
838a6d03bd
Corrected route name for filestable on assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 17:51:49 +00:00
spencerrlongg
8465806536
rm unnecessary imports
2024-11-14 11:51:41 -06:00
Godfrey M
0f1f6bc6a5
fixed rest of dymos
2024-11-14 09:45:52 -08:00
spencerrlongg
95cd779334
translations and attribute names
2024-11-14 11:42:35 -06:00
snipe
0a7d1a27ee
Merge remote-tracking branch 'origin/develop'
2024-11-14 17:10:16 +00:00
snipe
306c97b5b5
Merge pull request #15816 from Godmartinz/Teams_fix
...
replace the via() channel for MS Teams (deprecated)
2024-11-14 17:09:47 +00:00
Godfrey M
23038ab209
removes tag if qr code is not present
2024-11-14 08:54:12 -08:00
Godfrey M
702621ec57
replace the via channel class
2024-11-14 08:38:18 -08:00
snipe
0be123b115
Merge remote-tracking branch 'origin/develop'
2024-11-14 14:47:18 +00:00
snipe
c093b4531d
Fixed anchor links
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 14:47:09 +00:00
snipe
517e923f70
Merge remote-tracking branch 'origin/develop'
2024-11-14 14:42:44 +00:00
snipe
a0b8483878
Removed extra sort
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 14:41:11 +00:00
snipe
075e3503b1
Removed Twitter links
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 14:38:51 +00:00
snipe
d427d9e5af
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 12:25:10 +00:00
snipe
940f1c2ecc
Fixed #15812 - regression in action_type search
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 12:24:15 +00:00
snipe
3e131d515d
Add @maciej-poleszczyk as a contributor
2024-11-14 11:06:55 +00:00
snipe
364410a586
Merge pull request #15558 from maciej-poleszczyk/develop
...
Fixing #15064 - to not fail ldap sync on single data issue with ldap …
2024-11-14 11:06:18 +00:00
snipe
70d9ef428c
Merge pull request #15811 from snipe/small_fix_for_embiguous_created_by
...
Specify table name in select for models controller
2024-11-14 10:20:16 +00:00
snipe
4e28650ca9
Specify table name in select
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 10:18:39 +00:00
spencerrlongg
8c6869fd34
note and rm dump and comment
2024-11-13 21:59:32 -06:00
spencerrlongg
7e7cbc4cc8
seems to work just fine now, needs translations
2024-11-13 21:54:25 -06:00
spencerrlongg
25163d1756
working except for null 🤔
2024-11-13 21:46:23 -06:00
spencerrlongg
3982201d0e
this should work in theory - local is screwy though
2024-11-13 21:38:09 -06:00
snipe
647ef6a4b7
Versioning stuff is hard - fixed v7.0.14 to v7.1.14
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 01:11:29 +00:00
snipe
a060f603b5
Versioning stuff is hard - fixed v7.0.14 to v7.1.14
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-14 01:11:01 +00:00
snipe
a89e17212e
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 23:46:30 +00:00
snipe
f7dcfca66c
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 23:46:04 +00:00
akemidx
efeef5cdc4
removing || parts of if else
2024-11-13 18:29:58 -05:00
akemidx
9cb411c500
removing required form div container
2024-11-13 18:06:04 -05:00
snipe
eb57652548
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/_all-skins.css
# public/css/dist/skins/_all-skins.min.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
2024-11-13 22:57:00 +00:00
snipe
cb7e47a3a3
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 22:55:33 +00:00
Marcus Moore
92f33c08f7
Merge branch 'develop' into saving_custom_report_template
2024-11-13 14:54:00 -08:00
snipe
0ba861920f
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 22:51:20 +00:00
snipe
e185b2b781
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 22:50:13 +00:00
snipe
3bf33aa682
Merge remote-tracking branch 'origin/develop'
2024-11-13 22:39:01 +00:00
snipe
5084843f9d
Merge pull request #15809 from marcusmoore/fixes/teams
...
Fixed Microsoft Teams notifications
2024-11-13 22:38:24 +00:00
Marcus Moore
e80a456e04
Remove duplicate method
2024-11-13 14:35:20 -08:00
Marcus Moore
c399d797b4
Add conditional for microsoft team integration version
2024-11-13 14:29:01 -08:00
Marcus Moore
ac3ae651b1
Remove incorrect typehint
2024-11-13 14:15:43 -08:00
snipe
73383c688e
Merge pull request #15782 from Toreg87/fixes/indentation_userscontroller
...
Fix Indentation in UsersController
2024-11-13 21:21:40 +00:00
snipe
24456f723b
Merge remote-tracking branch 'origin/develop'
2024-11-13 21:21:08 +00:00
snipe
9d2cbc4bb9
Add @DarrenRainey as a contributor
2024-11-13 21:20:45 +00:00
snipe
796a397d08
Merge pull request #15807 from DarrenRainey/develop
...
Patch for whitespace causing HTTP 500 errors.
2024-11-13 21:20:26 +00:00
snipe
19bf549450
Merge remote-tracking branch 'origin/develop'
2024-11-13 21:17:40 +00:00
snipe
381c6e05bb
Merge pull request #15808 from Godmartinz/check-license-for-email-boolean
...
Fixed checkin/checkout email boolean check for Licenses
2024-11-13 21:17:08 +00:00
snipe
ada8e77b85
Added location to asset view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 21:16:08 +00:00
Godfrey M
1061df8c8b
fix user checkout license category email check
2024-11-13 13:07:28 -08:00
Darren Rainey
823af33d1f
Patch for whitespace causing HTTP 500 errors.
...
Patch for whitespace causing HTTP 500 errors.
Patch that adds qoutes around MAIL_FROM_NAME and MAIL_REPLYTO_NAME as current script will generate a .env file which causes an 500 error preventing the site from loading.
Log File: /var/log/apache2/error.log:
The environment file is invalid!
Failed to parse dotenv file. Encountered unexpected whitespace at [Asset Management System].
2024-11-13 20:58:36 +00:00
snipe
02ba13be26
Merge pull request #15730 from akemidx/bug/sc-26974-2
...
FIXED: Login button can disappear under some circumstances
2024-11-13 20:47:20 +00:00
snipe
0a87b0b790
Merge pull request #15784 from Godmartinz/Fieldset_table_borders
...
Fixed dark background to fieldsets and right border
2024-11-13 20:40:25 +00:00
snipe
8feb9c49b0
Merge remote-tracking branch 'origin/develop'
2024-11-13 20:39:45 +00:00
snipe
f2fc11035f
Merge pull request #15806 from Godmartinz/improved-checkoutable-logging
...
improved logging in checkoutable listener
2024-11-13 20:39:21 +00:00
snipe
3c08760aeb
Merge pull request #15802 from snipe/features/import_models
...
Ability to import asset models (separate from assets)
2024-11-13 20:37:31 +00:00
Godfrey M
8389c03450
improved logging in checkoutable listener
2024-11-13 12:19:16 -08:00
snipe
ab2e7a315a
Merge pull request #15805 from Godmartinz/license-markdown-fix
...
Fixed license serial gate in markdown
2024-11-13 20:13:28 +00:00
Godfrey M
d7b60b3482
fix serial check in markdown
2024-11-13 11:59:22 -08:00
snipe
52dceda5a2
Merge pull request #15804 from snipe/update_laravel
...
Updated laravel, additional packages for CVE-2024-52301
2024-11-13 19:49:12 +00:00
snipe
92ae7267d0
Updated laravel, additional packages
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 19:43:39 +00:00
snipe
7ccbc60ec0
Chaneg to ucfirst for Assetmodel -> AssetModel
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 19:35:56 +00:00
snipe
2e340f9a23
Two more case fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 19:18:38 +00:00
snipe
304fddb1d1
Removed unused test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:59:32 +00:00
snipe
1caf73f9da
Fixed casing, fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:58:30 +00:00
spencerrlongg
4841b89109
scratch code for this issue
2024-11-13 12:45:39 -06:00
snipe
6f700ccc95
Added relationship for adminuser
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:42:44 +00:00
snipe
6fee533283
Updated CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:42:35 +00:00
snipe
4a18946dd7
Added created by to imports
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:42:27 +00:00
snipe
7c3f9ba6af
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:42:03 +00:00
snipe
d3602c0595
Allow sorting on admin name in API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:23:26 +00:00
snipe
1aef7edc43
Added created by to the import itself
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:23:11 +00:00
snipe
d4018a2834
Added created_by to models API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:22:57 +00:00
snipe
0c3b8cb114
Moved created by to create only
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:22:46 +00:00
snipe
b6dbb8879a
Added created by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:22:30 +00:00
snipe
3a1fb615e7
Added admin sort scope
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:22:05 +00:00
snipe
8c3b50dbf2
Added created by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:21:36 +00:00
snipe
54f7917fbe
Added created by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:21:27 +00:00
snipe
d7e5fe50eb
Use auth facade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:21:19 +00:00
snipe
0a6096e528
Updated method name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:21:00 +00:00
snipe
0ae1db6fe3
Added created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:20:47 +00:00
snipe
4d3137e15a
Added $accessory->created_by = auth()->id();
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 18:18:46 +00:00
snipe
66aaafc4f2
Updated variable name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 17:08:20 +00:00
snipe
85dbbdbbcb
wtf
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 16:53:19 +00:00
snipe
813b304a01
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 16:49:58 +00:00
snipe
2f943bc052
Better error messaging for bad fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 16:44:09 +00:00
snipe
74ca561ab0
Fixed welcome email toggle
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 16:43:57 +00:00
snipe
69e36738fe
Updated CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 16:28:10 +00:00
snipe
4afe873f24
Fixed tests, updated CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 16:21:40 +00:00
snipe
220902a8b4
Merge branch 'develop' into features/import_models
2024-11-13 15:51:36 +00:00
snipe
3740b58580
Re-added assetmodel import factory
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 15:46:25 +00:00
snipe
3d3e3a9557
Squashed commit of the following:
...
commit c012bf0ece
Merge: 787340b98 947351af6
Author: snipe <snipe@snipe.net >
Date: Wed Nov 13 00:55:53 2024 +0000
Merge pull request #15799 from Godmartinz/update_deprecated_trigger_for_ms_teams
Updated deprecated trigger for ms teams
commit 947351af67
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Nov 12 16:49:02 2024 -0800
removed unused variabl
commit 4e0d70e0b8
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Nov 12 15:44:14 2024 -0800
checkin notif was missing
commit 832ccc6aa3
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Nov 12 15:35:09 2024 -0800
updated deprecated trigger for ms teams
commit 787340b987
Merge: 6bec57395 c62a02225
Author: snipe <snipe@snipe.net >
Date: Tue Nov 12 22:35:11 2024 +0000
Merge pull request #14441 from Godmartinz/ldap_location-resync
Fixes Assets location not being resynced when Users location is updated via LDAP
commit 6bec573956
Merge: b6ad69fac 1fc5bb54e
Author: snipe <snipe@snipe.net >
Date: Mon Nov 11 13:54:09 2024 +0000
Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance
Check that the file exists before trying to download stored EULA
commit 1fc5bb54e1
Author: snipe <snipe@snipe.net >
Date: Mon Nov 11 13:50:53 2024 +0000
Check that the file exists before trying to download
Signed-off-by: snipe <snipe@snipe.net >
commit b6ad69fac2
Merge: 357ef7e37 47b2cdb84
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 18:05:20 2024 +0000
Merge pull request #15793 from snipe/allow_eol_explicit
Allow user to specify null for calculation or explicit on bulk edit
commit 47b2cdb846
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 18:04:13 2024 +0000
Allow user to specify null for calculation or explicit on bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit 357ef7e375
Merge: 000f3171e 6928b1b27
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 17:48:25 2024 +0000
Merge pull request #15792 from snipe/edit_eol_from_bulk
Added EOL date to bulk asset edit
commit 6928b1b273
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 17:47:10 2024 +0000
Added eol date to bulk asset edit
Signed-off-by: snipe <snipe@snipe.net >
commit 000f3171e3
Author: snipe <snipe@snipe.net >
Date: Fri Nov 8 10:28:01 2024 +0000
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
Signed-off-by: snipe <snipe@snipe.net >
commit 5ef3183a52
Merge: a41529dbc 050831868
Author: snipe <snipe@snipe.net >
Date: Thu Nov 7 11:44:06 2024 +0000
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
Improved indexes on manager_id for locations and users, including del…
commit 050831868e
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Nov 7 11:39:27 2024 +0000
Improved indexes on manager_id for locations and users, including deleted_at
commit a41529dbc4
Merge: aa168fcb5 4fcf5ac7d
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 21:22:45 2024 +0000
Merge pull request #15780 from uberbrady/add_manager_indexes
Add new indexes to locations and users for faster manager lookups
commit 4fcf5ac7da
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Nov 6 21:19:41 2024 +0000
Add new indexes to locations and users for faster manager lookups
commit aa168fcb5b
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 18:41:52 2024 +0000
Updated BS table to 1.23.5
Signed-off-by: snipe <snipe@snipe.net >
commit 9c1c93ad52
Merge: b96a31253 ad99b8b45
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 18:40:35 2024 +0000
Merge pull request #15774 from marcusmoore/feature/sc-27350
Added Checkout ID column to user accessory table
commit ad99b8b456
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Nov 6 10:37:31 2024 -0800
Use generic ID translation
commit b96a312539
Merge: 654f67b6a bab1e58ea
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 18:29:22 2024 +0000
Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
commit bab1e58ea4
Author: Joël Pittet <pittet@cs.ubc.ca >
Date: Wed Nov 6 09:46:11 2024 -0800
symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736
commit 654f67b6ac
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 14:05:42 2024 +0000
Updated webpack
Signed-off-by: snipe <snipe@snipe.net >
commit 3965bcd7c1
Merge: 287f4addf 2362cb5e5
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 14:02:44 2024 +0000
Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests
Fixed notifications for licenses and asset to asset checkoutables
commit 2362cb5e52
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Nov 4 16:32:46 2024 -0800
refactor to getNotifiables
commit e7cb4a75eb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Nov 4 15:56:53 2024 -0800
Show accessory checkout id in user accessory table
commit 93494ac554
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Nov 4 15:17:58 2024 -0800
put dataprovider back in for tests
commit 0d707a1851
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Nov 4 15:13:10 2024 -0800
fixes notifications for licenses and asset to asset checkouables
commit 287f4addf0
Merge: f32ebdc7a 2e96d478f
Author: snipe <snipe@snipe.net >
Date: Mon Nov 4 20:06:24 2024 +0000
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
Revert "Added the display of logs when tests fail in GitHub Actions"
commit 2e96d478f1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Nov 4 11:04:17 2024 -0800
Revert "Added the display of logs when tests fail in GitHub Actions"
commit f32ebdc7ac
Merge: 5897d37fc d6c7dc8e1
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 22:39:58 2024 +0000
Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file
Added missing Livewire file
commit d6c7dc8e1c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 31 15:37:01 2024 -0700
Add missing livewire file
commit 5897d37fcf
Merge: 49de07045 21a27dcac
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 20:54:01 2024 +0000
Merge pull request #15763 from Godmartinz/no_to_email_check
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
commit 21a27dcac1
Merge: 379138076 49de07045
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:55:46 2024 -0700
fixed conflicts
commit 3791380764
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:52:47 2024 -0700
remove unused uses
commit 7a0f79ecd2
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:51:22 2024 -0700
remove test route
commit 97a449e80e
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:50:13 2024 -0700
removes instanceof User check
commit e65942064e
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:45:29 2024 -0700
send emails even if target has no email
commit 49de07045a
Merge: 7e996c40f 73772a013
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 17:53:17 2024 +0000
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
Fixed MS Team Notifications to utilize workflows after deprecation
commit 7e996c40f5
Merge: 73e8f160c 69e74bbdd
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 02:51:42 2024 +0000
Merge pull request #15758 from snipe/jerm/fix-deprecation-warning
Fix ${var} deprecation warning in License model
commit 69e74bbdd3
Author: Jeremy Price <jeremy@grokability.com >
Date: Wed Oct 30 19:43:54 2024 -0700
Fix ${var} deprecation warning in License model
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219
This simple fix switches the offending statements to {$var} syntax.
commit 73e8f160cf
Merge: f68df1fa0 bd23772fe
Author: snipe <snipe@snipe.net >
Date: Wed Oct 30 19:29:09 2024 +0000
Merge pull request #15756 from Godmartinz/cc-email-array
changes `admin_cc_email` validation to allow an array
commit bd23772fe9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 11:42:15 2024 -0700
changes cc_email validation to allow array
commit 73772a0138
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 11:12:31 2024 -0700
change button text
commit b26cae372c
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 10:40:23 2024 -0700
merged in develop
commit d6ba303f39
Merge: 9a0eee8f0 f68df1fa0
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 10:27:45 2024 -0700
Merge branch 'develop' into refacto_ms_teams_notifs
# Conflicts:
# app/Listeners/CheckoutableListener.php
commit f68df1fa06
Author: snipe <snipe@snipe.net >
Date: Wed Oct 30 13:21:13 2024 +0000
Made type searchable in action logs
Signed-off-by: snipe <snipe@snipe.net >
commit f0813e03bf
Merge: 05875ebd1 58ff641f8
Author: snipe <snipe@snipe.net >
Date: Wed Oct 30 12:18:41 2024 +0000
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
Separated Notifications and Emails: Check ins and Check outs
commit 05875ebd1f
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 22:04:35 2024 +0000
Updated translations
Signed-off-by: snipe <snipe@snipe.net >
commit 9a0eee8f03
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 15:03:43 2024 -0700
revert testing variables
commit 6128765d1f
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 15:03:03 2024 -0700
change wording on notification button
commit c24f79c025
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 14:58:43 2024 -0700
update method comment
commit e7c4343c90
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 14:56:48 2024 -0700
readd checkin accessory format
commit c0620c27ff
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 14:30:34 2024 -0700
adds back laravels channel formats
commit ed81973fe6
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 13:57:42 2024 -0700
adds notifications for deprecation
commit 2d318b394c
Merge: 86d784bd5 5c4971612
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 18:41:49 2024 +0000
Merge pull request #15744 from marcusmoore/chore/action-tests-debugging
Added the display of logs when tests fail in GitHub Actions
commit b987b3dc00
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 10:57:48 2024 -0700
adds back the laravel channels package and applies a deprecated check
commit 5c49716129
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 28 10:24:35 2024 -0700
Dump logs on test failure
commit 86d784bd59
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 13:37:59 2024 +0000
Fixed #15740 - use non-translated strings for icons
Signed-off-by: snipe <snipe@snipe.net >
commit 589f9cccdf
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 12:04:10 2024 +0000
Fixed #15732
Signed-off-by: snipe <snipe@snipe.net >
commit 4d848e45e6
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 11:55:24 2024 +0000
Fixed #15736
Signed-off-by: snipe <snipe@snipe.net >
commit 58ff641f82
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 22:53:53 2024 -0700
removed unused variables
commit ce68f550d8
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 16:01:17 2024 -0700
remove alert emails from cc
commit 6f0c1b12b1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 15:04:54 2024 -0700
this adds check out message for consumables
commit 278bc5e52a
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:59:10 2024 -0700
ads check in and checkout message for license seats
commit cce75a8185
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:48:23 2024 -0700
adds check in and checkout messag for accessories
commit e27ff13377
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:39:40 2024 -0700
adds check in and checkout message for assets
commit 56365495a1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:26:42 2024 -0700
remove unnecessary fields in accessory checkout mail
commit 18da80e6de
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:24:00 2024 -0700
fix checkoutable listener for microsoft teams
commit 18760e3fa1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 12:21:51 2024 -0700
replaces teams notification package, passes integration test
commit 57107c487c
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 09:40:10 2024 -0700
fixed last test, definetly the last test
commit dfc63641dc
Merge: 07a51ec8b b6340532d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 11:40:50 2024 +0100
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
Fix multi create partial failure (fixes: [RB-18591])
commit 07a51ec8b1
Merge: e0ec6795b 727c0e458
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 10:03:10 2024 +0100
Merge pull request #15712 from Godmartinz/fix_import-progress-bar
Upgraded `livewire v3.5.9 => v3.5.12`
commit 6329f5b87e
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 17:33:23 2024 -0700
removed unused variable from test
commit e0ec6795b5
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 01:27:50 2024 +0100
Use crucial for seeded data
Signed-off-by: snipe <snipe@snipe.net >
commit 15073a0d38
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 17:27:37 2024 -0700
last test to fix
commit a80c09c16d
Merge: ab3b9c451 5509d756b
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 17:23:55 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
commit 5509d756b7
Merge: 55ba6279a b16a978f1
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 01:12:11 2024 +0100
Merge pull request #15722 from Godmartinz/fix_component_factory
Fixed Component Factory: use manufacturer factory for `manufactuer_id`
commit b16a978f1b
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 16:25:51 2024 -0700
uses manufacturer factory for manufactuer_id
commit ab3b9c4510
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 16:24:01 2024 -0700
remove unnecessary code from checkinasset notification
commit 2cc2b2b1df
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 16:06:27 2024 -0700
apply array_filter to cc emails to prevent errors
commit 62d06b44d6
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:43:42 2024 -0700
set fallback from email address to service.snipe-it.io
commit f29a383179
Merge: fd74c3510 55ba6279a
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:15:14 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
# Conflicts:
# app/Notifications/CheckoutConsumableNotification.php
commit fd74c35102
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:08:29 2024 -0700
remove old notify by mail from consumable notification
commit c681946b1d
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:05:39 2024 -0700
added component markdown changes
commit 257d25bd9e
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 14:56:54 2024 -0700
removed import notification from test, feature is not present in project
commit 6c34a5c52c
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 14:54:21 2024 -0700
conditionally check cc emails, initiate variables
commit 1b5f4415ae
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 14:44:45 2024 -0700
corrected cc email behavior
commit 55ba6279a4
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 19:14:17 2024 +0100
Use trans_choice on alert menu
Signed-off-by: snipe <snipe@snipe.net >
commit a9eea830e3
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 19:05:34 2024 +0100
Added manufacturer and model number to component seeders
Signed-off-by: snipe <snipe@snipe.net >
commit af564935d5
Merge: d58f87862 3ee76be7e
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 17:56:04 2024 +0100
Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components
Fixed #15695 - Added manufacturer and model_number to components
commit 3ee76be7e3
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 17:50:22 2024 +0100
Added manufacturer and model_number to components
Signed-off-by: snipe <snipe@snipe.net >
commit d58f87862c
Merge: 5da3ce356 0b6859c49
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 15:09:50 2024 +0100
Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable
Fixed #15717 - Added ability to checkout consumables in variable qty via API
commit 0b6859c491
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 15:05:35 2024 +0100
Added ability to checkout consumables in variable qty
Signed-off-by: snipe <snipe@snipe.net >
commit 1e9922a0b0
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 16:14:36 2024 -0700
fix moar tests
commit ead27accac
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 15:45:52 2024 -0700
fixed accessory tests and notifiable target
commit 727c0e458c
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:34:39 2024 -0700
remove translation
commit 870dc747db
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:27:32 2024 -0700
oops
commit 0fb3d83fac
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:26:54 2024 -0700
revert controller change
commit 0d59ccd6a6
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:23:26 2024 -0700
upgraded livewire v3.5.9 => v3.5.12
commit 5da3ce3564
Merge: c3bbca30a 5ecd2b629
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:10:20 2024 +0100
Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes
Fixed custom field checkboxes on asset edit page
commit c3bbca30ad
Merge: dccb788a8 37f14fff3
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:07:50 2024 +0100
Merge pull request #15710 from snipe/fixes_lightbox_for_avif
Fixes #15701 - load avif files properly in lightbox
commit 37f14fff3b
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:07:28 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit eb6c51fabd
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:04:57 2024 +0100
Fixes #15701 - load avif files properly in lightbox
Signed-off-by: snipe <snipe@snipe.net >
commit 5ecd2b6293
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 22 14:04:05 2024 -0700
Default checkbox elements to an empty array
commit 1e31592c55
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 11:49:06 2024 -0700
messing with the tests
commit dccb788a88
Merge: 5e1d792bb d10fe77ee
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 17:44:30 2024 +0100
Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
commit d10fe77ee7
Merge: e1882ee6d 5e1d792bb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 22 09:38:31 2024 -0700
Merge branch 'develop' into fixes/get-id-for-current-user
commit 5e1d792bba
Merge: 9cf71976f 780ed91a1
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:52:28 2024 +0100
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing
Fixed #15686 : Corrected capitalization for dashboard section titles by removing strtolower()
commit 9cf71976f6
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:51:42 2024 +0100
Fixed #15706 - Removed purchase order number from asset import
Signed-off-by: snipe <snipe@snipe.net >
commit 15745d9737
Merge: bd97955b9 3f74ff25d
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:39:44 2024 +0100
Merge pull request #15566 from Godmartinz/status-label-error-message
Fixed Status Labels Error Message
commit bd97955b9e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:38:46 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net >
commit 252d99421c
Merge: 5767a98ad db8170162
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:26:48 2024 +0100
Merge pull request #15689 from snipe/better_handle_inline_files
Better handle inline files in file listing
commit 5767a98ad8
Merge: 0c820cbc0 524a44272
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:26:23 2024 +0100
Merge pull request #15649 from bryanlopezinc/ImproveImporting
Improve import performance
commit 0c820cbc0d
Merge: 147fcfb8e 3153bbb13
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:56:12 2024 +0100
Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue
Custom Field Existence Validation Issue
commit db81701621
Merge: a05c33feb 147fcfb8e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:44:24 2024 +0100
Merge branch 'develop' into better_handle_inline_files
commit a05c33febf
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:43:19 2024 +0100
Squashed commit of the following:
commit 147fcfb8eb
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a5942
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e08
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c3
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit 46ad1d072f
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit bcb4bd9eb4
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
Signed-off-by: snipe <snipe@snipe.net >
commit 147fcfb8eb
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a5942
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e08
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c3
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit e1882ee6d2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:21:45 2024 -0700
Add comment
commit 7eee239378
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:20:28 2024 -0700
use is_numeric instead of is_int
commit 4188849ae1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:19:48 2024 -0700
Add failing test case
commit 787e651778
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 16:52:21 2024 +0100
Fixed todos with log message
Signed-off-by: snipe <snipe@snipe.net >
commit ef9b6e3b07
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 16:34:54 2024 +0100
Code cleanup
Signed-off-by: snipe <snipe@snipe.net >
commit 06c599cc17
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 16:34:03 2024 +0100
Added method to show or download file
Signed-off-by: snipe <snipe@snipe.net >
commit 6105323877
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 14:11:20 2024 +0100
Use plural class name for src
Signed-off-by: snipe <snipe@snipe.net >
commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit a8d853c44a
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 15:26:27 2024 -0700
Remove focus group tags
commit 7e1b47708e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 15:18:41 2024 -0700
Fix failing test ensuring company id is an integer
commit 979e4502ff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 15:14:39 2024 -0700
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company
commit ff113ef523
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 14:56:58 2024 -0700
typo fix
commit 99dd51a965
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 14:53:18 2024 -0700
Improve name
commit 15c2169477
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 14:31:05 2024 -0700
Scaffold additional tests
commit 50fa6ce335
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 14:12:22 2024 -0700
Scaffold tests
commit 7ae76e7db9
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:55:03 2024 -0700
remove viewdata array from 3 tests
commit b98058ca98
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:48:26 2024 -0700
fix tests pt 3
commit 83e8186d9e
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:39:56 2024 -0700
fix assertSent to AssertNotSent on some test
commit cdd4fef7df
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:34:55 2024 -0700
attempt to fix tests p2
commit dceb8e305f
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:11:39 2024 -0700
attempt to fix tests
commit 123cdeb858
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:39:48 2024 -0700
add email check to listener
commit 496b44e887
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:28:57 2024 -0700
merged composer lock from dev
commit a690cc3582
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:26:55 2024 -0700
removing my composer stuff again..for the last time
commit ceb3f5cea6
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:19:50 2024 -0700
added mail-gun and http-client to 8.1
commit 65735a31f1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:18:34 2024 -0700
removed symfony/mailgun-mailer symfony/http-client
commit 285d6897cf
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:05:36 2024 -0700
added a coulple test adjustments and moved mail send logic to listener
commit 159a1d3f43
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 11:48:55 2024 -0700
Be more explicit
commit d1149730be
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 16:31:17 2024 +0100
Apply blade component to files views
Signed-off-by: snipe <snipe@snipe.net >
commit 46ad1d072f
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit 780ed91a10
Author: NebelKreis <leipold.johannes@web.de >
Date: Thu Oct 17 16:09:25 2024 +0200
Fix: Removed strtolower() from dashboard titles
This fix ensures the correct capitalization in different languages.
commit bcb4bd9eb4
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 9a79483375
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 16:59:18 2024 -0700
removed namespaces from routing
commit ed6034065b
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 16:47:36 2024 -0700
removed test route
commit a7754c1a7f
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 16:46:52 2024 -0700
fixed asset checkout markdown, and notifiable variable
commit 0e9b3c9119
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:27:39 2024 +0100
Check for existence before trying to get the icon
Signed-off-by: snipe <snipe@snipe.net >
commit 4933aa5784
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:27:04 2024 +0100
Add StorageHelper to app config
Signed-off-by: snipe <snipe@snipe.net >
commit d67addc69e
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:21:43 2024 +0100
Removed filetype column - it’s dumb
Signed-off-by: snipe <snipe@snipe.net >
commit 02c80ff18a
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:18:40 2024 +0100
Added comment
Signed-off-by: snipe <snipe@snipe.net >
commit c01190fac2
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:18:34 2024 +0100
Conditionally add content-type
Signed-off-by: snipe <snipe@snipe.net >
commit 017884f843
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:09:09 2024 +0100
Added checks and filetype display
Signed-off-by: snipe <snipe@snipe.net >
commit c49921f50f
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:08:54 2024 +0100
Removed unused (maybe?) API endpoint
Signed-off-by: snipe <snipe@snipe.net >
commit c49abb6aea
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:08:38 2024 +0100
Refactor the UserFilesController show method for simpler inlining
Signed-off-by: snipe <snipe@snipe.net >
commit ccd2019448
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:08:04 2024 +0100
Removed unusded use statements
Signed-off-by: snipe <snipe@snipe.net >
commit 96191a5e93
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:07:54 2024 +0100
Added method to decide if the file should be inlinable
Signed-off-by: snipe <snipe@snipe.net >
commit c56affd663
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:07:37 2024 +0100
Added SVG icon
Signed-off-by: snipe <snipe@snipe.net >
commit 02bda3cd95
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:53:05 2024 -0700
adds Checkout Consumable mailable and slackwebhook channel to notifs
commit 02ff646da4
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:44:45 2024 -0700
adds checkin license mailable
commit 4becdca8aa
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:39:20 2024 -0700
removes toMail from license notificaqtion
commit 2584d60344
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:38:49 2024 -0700
adds Licenses seat checkout Mailable
commit f1d83a3f28
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:30:53 2024 -0700
forgot to add asset checkout markdown to projet
commit c39df34bdf
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:29:50 2024 -0700
forgot to add accessory mail to project
commit dcdf600b78
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:27:34 2024 -0700
adds Checkin and Checkout mailables and listner logic
commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit 9710436d54
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 13:12:07 2024 -0700
adds Mailables for asset checkin and out
commit 16cffe9a9d
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 12:53:35 2024 -0700
simplified checkout webhook call
commit 9e1b86f586
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 12:51:19 2024 -0700
sends checkout notification via webhook
commit 3ab2521cb0
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 12:21:33 2024 -0700
email comes through, no picture and html markup appear though.
commit 604a964462
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Oct 16 11:52:24 2024 -0700
Improve scenario descriptions
commit 2f72c66614
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Oct 16 11:30:06 2024 -0700
Add additional case
commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
commit cba1a56040
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 15 17:38:11 2024 -0700
Improve readability?
commit d9afde4610
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 15 17:00:22 2024 -0700
Write failing test
commit 9f06a0e441
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 15 14:01:28 2024 -0700
handle some edge cases, null values clean up variable names
commit 42095c0167
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 15 13:02:22 2024 -0700
Add reference link
commit f8476f7133
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 15 12:49:52 2024 -0700
finished the construct and mail call in the listner
commit b29d032bf0
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 15 11:28:27 2024 -0700
adds checkoutAssetMail class, and content method
commit 2500375400
Merge: 16c8264e7 e4e1d0d50
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 17:34:35 2024 +0100
Merge pull request #15672 from uberbrady/ldap_location_fixes
Clean up how we use the '$location' in LDAP sync command
commit e4e1d0d50a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Tue Oct 15 17:26:31 2024 +0100
Clean up how we use the '$location' in LDAP sync command
commit 16c8264e76
Merge: 914a64720 0ae9ce0aa
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 16:42:34 2024 +0100
Merge pull request #15671 from snipe/bug/sc-27147
Bug/sc 27147
commit 0ae9ce0aa9
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 16:41:45 2024 +0100
Cannot sort by updated at on Users [sc-27147]
Signed-off-by: snipe <snipe@snipe.net >
commit 50b8f180b3
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 16:41:39 2024 +0100
More logical grouping in allow_columns
Signed-off-by: snipe <snipe@snipe.net >
commit 914a647204
Merge: 69b6080bd e9225ff3e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 12:47:15 2024 +0100
Merge pull request #15669 from snipe/remlove_ou_requirenedess
Fixed #15663 - remove requiredness for OU
commit e9225ff3ea
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 12:43:10 2024 +0100
Switch to regular HTML for input form field
Signed-off-by: snipe <snipe@snipe.net >
commit d0d4159088
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 12:42:09 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit 69b6080bd8
Merge: ddead359d b997d728f
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 10:31:29 2024 +0100
Merge pull request #15666 from snipe/updated_readme_llm
Added LLM note
commit b997d728fb
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 10:30:34 2024 +0100
Added LLM note
Signed-off-by: snipe <snipe@snipe.net >
commit ddead359d0
Merge: 0d35335da f3c4e5566
Author: snipe <snipe@snipe.net >
Date: Mon Oct 14 14:29:34 2024 +0100
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2
Refactor asset creation with API
commit f3c4e55667
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Mon Oct 14 15:14:41 2024 +0200
Refactor asset creation with API
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
commit 0d35335da7
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 16:06:17 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net >
commit feaa714304
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 14:23:57 2024 +0100
Nicer disabled button
Signed-off-by: snipe <snipe@snipe.net >
commit e1a70023b1
Merge: de62359c6 fb4fe3004
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:45:48 2024 +0100
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
commit de62359c67
Merge: 12bda8fc7 3dc64cc5e
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:29:34 2024 +0100
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories
Added tests for accessory api controller
commit 12bda8fc7b
Merge: 8aa298f6b b054017c9
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:27:18 2024 +0100
Merge pull request #15653 from snipe/15651_admin_user_on_maintenances
Fixed #15651 - admin user now displaying on maintenances page
commit fb4fe30049
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Fri Oct 11 12:09:09 2024 +0200
Fix asset creation with API and FullMultipleCompanySupport
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
commit b054017c9f
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:16:24 2024 +0100
Fixed #15651 - admin user now displaying on maintenances page
Signed-off-by: snipe <snipe@snipe.net >
commit 524a442724
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com >
Date: Thu Oct 10 23:32:07 2024 +0100
Improved import performance
commit 8aa298f6b0
Merge: 1f3465773 b5b93fdd3
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:30:53 2024 +0100
Merge pull request #15644 from snipe/form_requests_for_settings
Form requests for settings
commit 1f34657734
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:30:35 2024 +0100
Fixed test
Signed-off-by: snipe <snipe@snipe.net >
commit 0856ee648e
Merge: 94a074a19 1dafc970d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:23:14 2024 +0100
Merge pull request #15648 from snipe/update_packages
Updated livewire to 3.5.2
commit 1dafc970df
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:19:57 2024 +0100
Updated livewire to 3.5.2
Signed-off-by: snipe <snipe@snipe.net >
commit 94a074a193
Merge: 2d49e1eff b34a7c8aa
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 01:11:10 2024 +0100
Merge pull request #15601 from snipe/check_db_on_healthcheck
Fixed #15439 - check database on healthcheck
commit 2d49e1eff2
Merge: 705bc6f0c c2663ea1e
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 01:09:11 2024 +0100
Merge pull request #15637 from akemidx/bug/sc-26614
FIXED: Badge counter showing deleted assets on User page
commit 705bc6f0c0
Merge: 3ee571374 67a605c9a
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 01:08:25 2024 +0100
Merge pull request #15642 from uberbrady/fix_bulk_checkout
Fix bulk checkout to users, assets, and locations
commit b5b93fdd3a
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 00:27:00 2024 +0100
Make ldap username required
Signed-off-by: snipe <snipe@snipe.net >
commit d9432baf7a
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 23:51:20 2024 +0100
Mlore ldap style improvements
Signed-off-by: snipe <snipe@snipe.net >
commit 90be2a4498
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:26:30 2024 +0100
Use newer naming convention for errors
Signed-off-by: snipe <snipe@snipe.net >
commit 3886da8941
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:49 2024 +0100
Remove form request from get LDAP method
Signed-off-by: snipe <snipe@snipe.net >
commit 130e0c6242
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:37 2024 +0100
More validation
Signed-off-by: snipe <snipe@snipe.net >
commit 4361a10818
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:30 2024 +0100
Added string
Signed-off-by: snipe <snipe@snipe.net >
commit aa8048ac15
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:25 2024 +0100
Blade changes for ldap
Signed-off-by: snipe <snipe@snipe.net >
commit 710e738e8e
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:16 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net >
commit 3705b91439
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:51:34 2024 +0100
Added more validation
Signed-off-by: snipe <snipe@snipe.net >
commit 707bdad192
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:56 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net >
commit 242fe33f97
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:42 2024 +0100
Switch to regular HTML input
Signed-off-by: snipe <snipe@snipe.net >
commit ded79469c1
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:29 2024 +0100
Remove unused controller method
Signed-off-by: snipe <snipe@snipe.net >
commit d9fbf330e5
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:15 2024 +0100
Fixed translations
Signed-off-by: snipe <snipe@snipe.net >
commit 2cb9ac26cd
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:57:04 2024 +0100
Renamed test
Signed-off-by: snipe <snipe@snipe.net >
commit 185bc966e6
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:46:47 2024 +0100
Cleaned up use statements in tests
Signed-off-by: snipe <snipe@snipe.net >
commit a7f7e4938f
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:31:56 2024 +0100
Added form action
Signed-off-by: snipe <snipe@snipe.net >
commit 2883e79193
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:55 2024 +0100
Removed unecessary assets creation
Signed-off-by: snipe <snipe@snipe.net >
commit 9c4191ae0a
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:42 2024 +0100
Basic tests
Signed-off-by: snipe <snipe@snipe.net >
commit 3a77b83e9c
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:34 2024 +0100
Added space
Signed-off-by: snipe <snipe@snipe.net >
commit d9be2b5a5e
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:25 2024 +0100
Trying to use the email_array translation
Signed-off-by: snipe <snipe@snipe.net >
commit 69c43c610c
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:00 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit 4f957bcf71
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:34:53 2024 +0100
Required flag
Signed-off-by: snipe <snipe@snipe.net >
commit 5cda7cce48
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:21:40 2024 +0100
Only accept a positive number for thresholds
Signed-off-by: snipe <snipe@snipe.net >
commit 41b94e7128
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:19:26 2024 +0100
Fixed form input group
Signed-off-by: snipe <snipe@snipe.net >
commit aa55fa6ff4
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:16:34 2024 +0100
Switch to form requests for settings
Signed-off-by: snipe <snipe@snipe.net >
commit 67a605c9a5
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Oct 9 17:01:26 2024 +0100
Fix bulk checkout to users, assets, and locations
commit c2663ea1e0
Author: akemidx <kojotek.dx@gmail.com >
Date: Tue Oct 8 16:38:33 2024 -0400
withouttrashed
commit 3ee5713740
Merge: ab8a22f77 56e7ea667
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 23:13:15 2024 +0100
Merge pull request #15631 from snipe/test/importer-tests
Add importer tests
commit ab8a22f77e
Merge: 26d7572bc 8c9132aff
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 22:56:23 2024 +0100
Merge pull request #15630 from marcusmoore/bug/sc-27028
Only show EULA when available on print users page
commit 56e7ea6677
Merge: 32551d55d 803532667
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 22:29:35 2024 +0100
Merge pull request #15616 from marcusmoore/test/importer-test-updates
Improve importer tests
commit 26d7572bcc
Merge: 382ebef8c ee046a868
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 22:28:53 2024 +0100
Merge pull request #15603 from marcusmoore/fixes/add-reguard
Added `Model::reguard()` to importer
commit 8c9132aff9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 7 14:22:49 2024 -0700
Hide EULA text and button when nothing will be displayed
commit 382ebef8ca
Merge: 2be88cb95 f76da4844
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 21:26:21 2024 +0100
Merge pull request #15621 from sniff122/develop
Docker Env: Change trusted proxies to RFC1918
commit 2be88cb955
Merge: 7fc498a59 3f36d5f9b
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 11:14:24 2024 +0100
Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users
Removed duplicate JS and removed line break before user section
commit 3f36d5f9b3
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 11:08:02 2024 +0100
Removed duplicate CSS and removed line break before user section
Signed-off-by: snipe <snipe@snipe.net >
commit f76da48448
Author: Lewis Foster <lewis@sniff122.tech >
Date: Sat Oct 5 18:27:42 2024 +0100
Docker Env: Change trusted proxies to RFC1918
commit 8035326675
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 16:53:19 2024 -0700
Add test
commit dfdd85abb1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 15:14:07 2024 -0700
Remove unused imports
commit 063ea1892b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 15:02:03 2024 -0700
Add trait to clean up files after test runs
commit e213053775
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:59:58 2024 -0700
Swap factory syntax
commit 88d549e7c5
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:40:37 2024 -0700
Remove unused data provider method
commit 983a25aa5f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:39:54 2024 -0700
Simplify permission tests
commit bde05d6ed9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:15:49 2024 -0700
Use new() instead of times()
commit b5ffe54bd0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:15:02 2024 -0700
Swap assertEquals parameter order
commit 863c0a8b60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 11:43:02 2024 -0700
Fix import_type for accessory state
commit 32551d55d7
Merge: 7fc498a59 e807cfab8
Author: Marcus Moore <mmoore@grokability.com >
Date: Thu Oct 3 11:39:21 2024 -0700
Merge pull request #15579 from bryanlopezinc/ImportTests
Add Import data tests
commit 7fc498a597
Merge: 78ca1026f cb281c640
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 17:39:18 2024 +0100
Merge pull request #15613 from snipe/css_fixes_for_long_values
Smarter word-wrapping on long text
commit cb281c6408
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 17:33:46 2024 +0100
Tweaked line height
Signed-off-by: snipe <snipe@snipe.net >
commit f483cd448f
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 17:27:37 2024 +0100
Smarter work-wrapping on long text
Signed-off-by: snipe <snipe@snipe.net >
commit 78ca1026fd
Merge: 3699d7936 722d5a58e
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:24:32 2024 +0100
Merge pull request #15612 from snipe/fixes_print_assigned_in_profile
Fixes print assigned in profile
commit 722d5a58e7
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:19:38 2024 +0100
Added isset on users
Signed-off-by: snipe <snipe@snipe.net >
commit 7461c3e0ca
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:19:27 2024 +0100
Change controller to assume a collection. (This is dumb, but whatever)
Signed-off-by: snipe <snipe@snipe.net >
commit 3c0f4181ae
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:19:06 2024 +0100
Use the newer button style
Signed-off-by: snipe <snipe@snipe.net >
commit 3699d79363
Merge: 54fbd0540 350b627ce
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 14:34:00 2024 +0100
Merge pull request #15610 from uberbrady/fix_numeric_sort_bug
Fix numeric sort 'ambiguous order clause' error
commit 350b627ce1
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Oct 3 14:23:40 2024 +0100
Fix numeric sort 'ambiguous order clause' error
commit ee046a8688
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Oct 2 10:50:40 2024 -0700
Add matching Model::reguard()
commit b34a7c8aad
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 15:48:35 2024 +0100
Removed die()
Signed-off-by: snipe <snipe@snipe.net >
commit f92bf5dc20
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 15:39:27 2024 +0100
Updated language for failure
Signed-off-by: snipe <snipe@snipe.net >
commit 4d9e85026a
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 15:36:01 2024 +0100
Fixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net >
commit 54fbd0540d
Merge: b483bb163 4db735808
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 12:40:49 2024 +0100
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
commit b483bb1633
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 12:40:45 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net >
commit 4db7358086
Merge: 0dd6f41f6 b9cfdf2e5
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 12:38:46 2024 +0100
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug
Fixed divide by zero bug in depreciation transformer
commit 0dd6f41f66
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 11:04:55 2024 +0100
Simplified 2fa if/else
Signed-off-by: snipe <snipe@snipe.net >
commit 684c20ae39
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 11:00:49 2024 +0100
Fixed parenthasis
Signed-off-by: snipe <snipe@snipe.net >
commit 3153bbb13f
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 17:04:18 2024 -0500
dumb fix
commit 3dc64cc5e0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 1 13:35:39 2024 -0700
Reference accessory checkout and not the accessory
commit c32f4e34b4
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:35:49 2024 +0100
Minor formatting fix
Signed-off-by: snipe <snipe@snipe.net >
commit ca1886cebc
Merge: 45ab49eea a79dfea40
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:31:38 2024 +0100
Merge pull request #15594 from snipe/localizations/update-2024-10-01
Updated strings
commit a79dfea40a
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:30:58 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net >
commit 45ab49eeab
Merge: 97d00e5aa 8232618a9
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:26:42 2024 +0100
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors
Catch Errors Around Request Notifications
commit 8232618a9f
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 14:26:32 2024 -0500
change the other one too
commit 9a651b567d
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 14:24:03 2024 -0500
change error to warning
commit 97d00e5aa8
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:08:54 2024 +0100
Fixed erroneous form tag on anchor
Signed-off-by: snipe <snipe@snipe.net >
commit 5b90d79494
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 1 11:50:48 2024 -0700
Use created_by
commit b9cfdf2e54
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 1 11:41:59 2024 -0700
reworked monthly depreciation variable value
commit 1139acd9f3
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 13:36:47 2024 -0500
catch errors around request notifications
commit b7ad80bd31
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 1 11:24:24 2024 -0700
fix monthly depreciation value
commit 5ffd1b8daa
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 1 11:02:39 2024 -0700
fixes if statement in transformer
commit 9a2117466e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 18:23:40 2024 +0100
Removed placeholder
Signed-off-by: snipe <snipe@snipe.net >
commit 7e3a062984
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 18:23:07 2024 +0100
Use <th> for table header in bulk interstitial
Signed-off-by: snipe <snipe@snipe.net >
commit d274fb6963
Merge: cfc04a1d1 27ba641aa
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:32:48 2024 +0100
Merge pull request #15589 from snipe/adds_checkin_action_on_asset_delete
Adds checkin action on asset delete via View UI
commit 27ba641aa5
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:30:34 2024 +0100
Added checkin on delete to API
Signed-off-by: snipe <snipe@snipe.net >
commit 5823197e6f
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:29:02 2024 +0100
Added checkin action on delete for checked out assets
Signed-off-by: snipe <snipe@snipe.net >
commit cfc04a1d12
Merge: 12da43303 cae8aa784
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:08:58 2024 +0100
Merge pull request #15588 from snipe/added_more_maxlengths
Added maxlengths to additional fields
commit cae8aa7840
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:02:54 2024 +0100
Added maxlengths to additional fields
Signed-off-by: snipe <snipe@snipe.net >
commit 12da43303f
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 01:44:05 2024 +0100
Fixed #15584 - regression with required css change
Signed-off-by: snipe <snipe@snipe.net >
commit fdfea390fb
Merge: d609ed50a 5689e940b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 30 12:59:27 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b04afbbc85
Merge: b964ce102 3f311ba2f
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 19:26:08 2024 +0100
Merge pull request #15564 from uberbrady/improve_autoclose
Get us better debugging output for new Github Stale Action
commit b964ce1025
Merge: 6217cba20 68e3f375f
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 19:25:05 2024 +0100
Merge pull request #15583 from Godmartinz/remove-sortable-from-depreciations
Removed sortablity for current value column in depreciations report
commit 6217cba201
Merge: 5689e940b b32ab6a06
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 19:24:19 2024 +0100
Merge pull request #15524 from Godmartinz/double-notif-bug
Fixed double webhook notifications // Separated email and webhook notifications.
commit 68e3f375fc
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 30 11:15:49 2024 -0700
removes sortablity from current value column
commit 5689e940b8
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 18:23:12 2024 +0100
Fixed #15581 - missing bracker
Signed-off-by: snipe <snipe@snipe.net >
commit e807cfab86
Merge: 0b3f45856 001348c63
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com >
Date: Mon Sep 30 12:47:52 2024 +0100
Merge branch 'develop' into importTests
commit 0b3f458561
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com >
Date: Mon Sep 30 12:42:41 2024 +0100
Added tests for Import feature
commit 001348c638
Author: snipe <snipe@snipe.net >
Date: Sun Sep 29 14:33:42 2024 +0100
Unset required on checkout select :(
Related to the discussion at #15552
Signed-off-by: snipe <snipe@snipe.net >
commit 1b041af862
Merge: 260b15368 d120585f9
Author: snipe <snipe@snipe.net >
Date: Sun Sep 29 11:25:01 2024 +0100
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 260b153689
Merge: 36b27fcda 05d74f7a9
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 16:09:51 2024 +0100
Merge pull request #15573 from snipe/fixed_requiredness_indicator
Fixes for requiredness indicator in UI
commit 05d74f7a92
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 15:42:03 2024 +0100
Covered setup pages too
Signed-off-by: snipe <snipe@snipe.net >
commit dc85588d7f
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 15:31:44 2024 +0100
Don’t show password as required if editing
Signed-off-by: snipe <snipe@snipe.net >
commit 585f998cae
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 15:28:06 2024 +0100
Fixes for requiredness display
Signed-off-by: snipe <snipe@snipe.net >
commit d120585f94
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 14:07:30 2024 +0100
Check for valid eula for license, consumable
Signed-off-by: snipe <snipe@snipe.net >
commit 166a700342
Merge: 6c85ba349 36b27fcda
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 13:37:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 36b27fcda3
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 13:37:14 2024 +0100
Check for valid category before getting the eula
Signed-off-by: snipe <snipe@snipe.net >
commit a44490e448
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 13:07:24 2024 +0100
Nowrap on files column
Signed-off-by: snipe <snipe@snipe.net >
commit 9aada2ec70
Merge: ac6411743 ef82f954e
Author: snipe <snipe@snipe.net >
Date: Thu Sep 26 09:09:35 2024 +0100
Merge pull request #15498 from Godmartinz/Modal_fix
Refactoring modals with partials and fixing misalignments
commit 3f74ff25d2
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 16:19:09 2024 -0700
fixed error message
commit ef82f954e5
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 15:47:57 2024 -0700
fixed required css, and user input lengths
commit 3f311ba2fb
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 25 21:27:45 2024 +0100
Get us better debugging output for new Github Stale Action
commit 96953aa2ed
Merge: e609b3976 b797c37ac
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com >
Date: Wed Sep 25 12:50:01 2024 -0700
Merge pull request #23 from Godmartinz/Modal_fix_p3
replace duplicate code with partials
commit b797c37acb
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 12:48:05 2024 -0700
replace duplicate code with partials
commit 6c85ba3495
Merge: 9f8473e25 ac6411743
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:45:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ac6411743b
Merge: 9b03f4649 3f0245f88
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:35:58 2024 +0100
Merge pull request #15563 from snipe/refined_gates_on_user_bulk
Update for #15534 - Refined gates on user bulk
commit 3f0245f88f
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:33:00 2024 +0100
Make controller gate match dropdown gate
Signed-off-by: snipe <snipe@snipe.net >
commit c02647a0fa
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:32:03 2024 +0100
Moved merge into delete gate, since they do technically delete
Signed-off-by: snipe <snipe@snipe.net >
commit edca3f432c
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:30:58 2024 +0100
Removed gate for delete
Signed-off-by: snipe <snipe@snipe.net >
commit 2218c94aa3
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:29:23 2024 +0100
Gates the dropdown based on user permissions
Signed-off-by: snipe <snipe@snipe.net >
commit e609b39760
Merge: 0bc98e971 12522a379
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com >
Date: Wed Sep 25 12:09:26 2024 -0700
Merge pull request #22 from Godmartinz/Modal_fix_p2
Modal fix p2
commit 12522a3791
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 12:07:15 2024 -0700
fix spacing issues
commit f6d7ea19e4
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 19:44:39 2024 +0100
Set view as base permission, drill down for more intrusive actions
Signed-off-by: snipe <snipe@snipe.net >
commit 18ddffe8f9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 11:42:16 2024 -0700
fix partial variable intialization, fix width of input fields
commit 9b03f46490
Merge: cb6e5042d fac4833b5
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 19:32:01 2024 +0100
Merge pull request #15534 from marcusmoore/bulk-print-users
Added the ability to bulk print users
commit 926a319552
Merge: 0bc98e971 cb6e5042d
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 11:10:24 2024 -0700
Merge branch 'develop' into Modal_fix_p2
commit 9f8473e254
Merge: 0e61d0b19 cb6e5042d
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 18:36:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb6e5042d9
Merge: c1a887b48 ba69259f2
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 18:32:59 2024 +0100
Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status
Fixed #13396 - do not allow checkout to undeployable status types
commit c1a887b48b
Merge: ba1220484 658c94ad8
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 18:32:21 2024 +0100
Merge pull request #15561 from snipe/fixes/adds_action_date_to_sorting
Changed `action_date` to `created_at` in activity report
commit 658c94ad8b
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 17:25:15 2024 +0100
Changed action_date to created_at
Signed-off-by: snipe <snipe@snipe.net >
commit 0e61d0b195
Merge: abdddbec4 ba1220484
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 15:51:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ba12204842
Merge: eeabc8dc9 1c3babaca
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 15:51:14 2024 +0100
Merge pull request #15555 from snipe/fixes/user_file_upload
Fixed case on `$logAction` for user file upload
commit 1c3babacaf
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 15:46:57 2024 +0100
Fixed case on logAction for usewr file upload
Signed-off-by: snipe <snipe@snipe.net >
commit abdddbec44
Merge: a425c2b76 eeabc8dc9
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 11:58:25 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit eeabc8dc9d
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 11:33:45 2024 +0100
Dev assets
Signed-off-by: snipe <snipe@snipe.net >
commit 21f8ac8e52
Merge: c38222e95 2a2666be0
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 11:31:23 2024 +0100
Merge pull request #15552 from Godmartinz/ragged-form-inputs
Fixed input field misalignments
commit a425c2b765
Merge: 34eb10ff7 c38222e95
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 10:52:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 2a2666be0b
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Sep 24 13:24:50 2024 -0700
makes required a pseudo field
commit c38222e956
Merge: 8cf1e4dce 0ce5832b6
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 18:10:53 2024 +0100
Merge pull request #15549 from snipe/fixes/#15548_unify_audit_api_endpoints
Fixes #15548 - unify audit api endpoints
commit 0ce5832b6c
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 17:29:40 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net >
commit b6340532d7
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Tue Sep 24 17:15:39 2024 +0100
Improve the error and success messages and linking
commit 5fb43dd159
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 16:55:56 2024 +0100
Handle `audit` *and* `audits` for urls
Signed-off-by: snipe <snipe@snipe.net >
commit de57d71bf1
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 16:30:24 2024 +0100
Fixed #15548 - unify audit due/overdue APIs
Signed-off-by: snipe <snipe@snipe.net >
commit ba69259f2d
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 15:35:00 2024 +0100
Fixed #13396 - do not allow checkout to undeployable status types
Signed-off-by: snipe <snipe@snipe.net >
commit c71411465a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Tue Sep 24 15:17:35 2024 +0100
First pass at better-handling those annoying Rollbars we keep getting
commit 8cf1e4dceb
Merge: ab0c009c0 66249a37e
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 11:10:20 2024 +0100
Merge pull request #15544 from snipe/bug/sc-26855
Fixed app settings view on mobile
commit 66249a37ed
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 11:08:31 2024 +0100
Tweaked styles
Signed-off-by: snipe <snipe@snipe.net >
commit 96712cb398
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 10:55:26 2024 +0100
Fixed app settings view on mobile
Signed-off-by: snipe <snipe@snipe.net >
commit fac4833b58
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 17:15:16 2024 -0700
Remove unused import
commit a12c9d053f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:44:25 2024 -0700
Hide label when printing
commit 8b3b68b308
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:43:14 2024 -0700
Show or hide all eulas at once when printing multiple users
commit 4b02db5031
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:26:22 2024 -0700
Add authorization check in bulk users controller
commit ab90c0cf05
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:10:40 2024 -0700
Add missing eager load in bulk users controller
commit cef7ddc719
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:10:21 2024 -0700
Add eager loads to userscontroller
commit 3870095a28
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 15:50:24 2024 -0700
Fix Cannot read properties of undefined error by removing snipe-table class from eula table
commit a02e250b22
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 15:26:15 2024 -0700
Add page breaks for each user
commit 8ac5c0e471
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 14:05:47 2024 -0700
Re-combine layout and view
commit a2d4dcf6e8
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 12:49:36 2024 -0700
Use bulk actions menu
commit 54044bfa5e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 10:57:57 2024 -0700
Add eager loads
commit e493cc964d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 10:48:07 2024 -0700
Remove AssetCountForSidebar middleware from print view
commit 29af210f4f
Merge: 5128fd49e ab0c009c0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 10:26:20 2024 -0700
Merge branch 'develop' into bulk-print-users
commit 34eb10ff73
Merge: 7d7d58769 ab0c009c0
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:45:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab0c009c0d
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:45:10 2024 +0100
Fixed seeder
Signed-off-by: snipe <snipe@snipe.net >
commit 7d7d58769c
Merge: 245d5dc46 b68805cf8
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:13:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b68805cf83
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:11:52 2024 +0100
Small fix for notifications checkout
Signed-off-by: snipe <snipe@snipe.net >
commit 245d5dc469
Merge: 4ab478bb9 7d858129d
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 17:28:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
commit 7d858129d9
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:44:19 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net >
commit 65ce63bc9b
Merge: 5eea9d195 54fba2f54
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:42:07 2024 +0100
Merge pull request #15537 from snipe/snyk/updated_jspdf_autotable
Updated jspdf autotable
commit 54fba2f547
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:40:41 2024 +0100
Update jspdf autotable
Signed-off-by: snipe <snipe@snipe.net >
commit 5eea9d1950
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:33:56 2024 +0100
Corrected text warning translation
Signed-off-by: snipe <snipe@snipe.net >
commit b84a634ec7
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:33:35 2024 +0100
Corrected comment
Signed-off-by: snipe <snipe@snipe.net >
commit 2fc88a0e08
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:33:26 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net >
commit bc540b6564
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:02:28 2024 +0100
Requestable status not saving with manual [sc-26848]
Signed-off-by: snipe <snipe@snipe.net >
commit f53b852dff
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:53:52 2024 +0100
Make created_by equal one in the seeder
Signed-off-by: snipe <snipe@snipe.net >
commit b83d1a043f
Merge: cdb7ccb8f b21c303e5
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:47:31 2024 +0100
Merge pull request #15519 from snipe/features/add_created_at_created_by
Change `user_id` to `created_by`
commit 4ab478bb97
Merge: d96c5e1ba cdb7ccb8f
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:44:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b21c303e56
Merge: b88f2054d cdb7ccb8f
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:43:50 2024 +0100
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
commit 5128fd49e6
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:27:25 2024 -0700
Allow printing all users
commit 2d2d5bdc7e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:23:47 2024 -0700
Pass user in array
commit 8364d26c9b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:18:26 2024 -0700
Extract parent layout
commit efd6d7625f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:16:05 2024 -0700
Remove bad closing tag
commit bdf5708bfc
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:10:43 2024 -0700
Remove accidental line
commit e95703cb18
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:10:07 2024 -0700
Use eager load
commit 7ad4a29970
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 16:54:39 2024 -0700
Add eager loading
commit cdb7ccb8f3
Merge: 8270947ed d446773fd
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 21:54:03 2024 +0100
Merge pull request #15532 from spencerrlongg/bug/15253
Catch Exceptions on Checkout Notification
commit 8270947ed2
Merge: 4f7c8e0c3 8e1111c68
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 21:49:27 2024 +0100
Merge pull request #13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
commit 4f7c8e0c3d
Merge: d7bde3784 3ea5d4ee4
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 21:36:09 2024 +0100
Merge pull request #14671 from Robert-Azelis/patch-6
[FIX] Update EOL date when used bulk update of purchase date
commit d609ed50a4
Merge: d639d6fbc d7bde3784
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 13:20:55 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b88f2054dd
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:38:34 2024 +0100
Refactor isDeletable on companies
Signed-off-by: snipe <snipe@snipe.net >
commit d7914e238d
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:34:54 2024 +0100
Added created by to company on save
Signed-off-by: snipe <snipe@snipe.net >
commit d7bde37842
Merge: 454796e52 4facc4007
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:33:10 2024 +0100
Merge pull request #15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync
Added #15506 : Explicitly request used LDAP attributes
commit 454796e52a
Merge: eef487d61 7c85ad54e
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:32:03 2024 +0100
Merge pull request #15518 from snipe/sort_by_numeric_custom_fields
Fixed #11634 - Sort by numeric columns for numeric custom fields
commit eef487d61b
Merge: dddbf27d7 71dbc7abb
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:31:02 2024 +0100
Merge pull request #15531 from Godmartinz/status-doesnt-update-in-email
Fixed mail notification field `status label` not updating
commit 71dbc7abb0
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Sep 19 12:23:07 2024 -0700
refreshed the assetstatus relationship
commit d639d6fbc1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 12:21:54 2024 -0700
Add tests for accessory select list endpoint
commit 74088ea581
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:13:38 2024 +0100
Optimize isDeletable counts
Signed-off-by: snipe <snipe@snipe.net >
commit fff069824b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 12:11:03 2024 -0700
Add tests for update accessory endpoint
commit d446773fdd
Author: spencerrlongg <spencer@spencerlong.com >
Date: Thu Sep 19 14:05:48 2024 -0500
catch exceptions on notification
commit f283b5fbe8
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:56:39 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net >
commit a5be18bb14
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 11:55:15 2024 -0700
Add test for limit and offset
commit eb6f05faf7
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:41:46 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net >
commit 118183ff58
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:41:39 2024 +0100
Removed footer
Signed-off-by: snipe <snipe@snipe.net >
commit 2137890496
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 11:33:20 2024 -0700
Remove dead code
commit ebf6ce6980
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:27:10 2024 +0100
Refactor for fewer queries
Signed-off-by: snipe <snipe@snipe.net >
commit 9b22d6d493
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 11:24:01 2024 -0700
Add tests for accessory checkouts endpoint
commit 5ebf0ed2b2
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:19:14 2024 +0100
Updated variable
Signed-off-by: snipe <snipe@snipe.net >
commit 836893cba5
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:35:00 2024 +0100
Added id to report
Signed-off-by: snipe <snipe@snipe.net >
commit cd98b3817d
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:26:08 2024 +0100
Removed duplicate line
Signed-off-by: snipe <snipe@snipe.net >
commit 727806372c
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:22:11 2024 +0100
Added created_by to status label
Signed-off-by: snipe <snipe@snipe.net >
commit 5e1c736d49
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:04:50 2024 +0100
Added created_by for manufacturers
Signed-off-by: snipe <snipe@snipe.net >
commit 6579fa72da
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:56:05 2024 +0100
Added scoping for categories and companies
Signed-off-by: snipe <snipe@snipe.net >
commit 82d6e1510f
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:41:05 2024 +0100
Order by created_by for depreciations
Signed-off-by: snipe <snipe@snipe.net >
commit 822ea96dfd
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:31:46 2024 +0100
Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net >
commit b247fc33b9
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:28:01 2024 +0100
Added legacy comment
Signed-off-by: snipe <snipe@snipe.net >
commit 2dcae780c0
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:26:21 2024 +0100
Reapply deleted code
Signed-off-by: snipe <snipe@snipe.net >
commit 5c3180ffa0
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:25:09 2024 +0100
Removed duplicate code
Signed-off-by: snipe <snipe@snipe.net >
commit 65eba30038
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:23:34 2024 +0100
Fixed markdown in acceptance reminder
Signed-off-by: snipe <snipe@snipe.net >
commit bbce7b40ca
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:20:56 2024 +0100
Additional consistencies
Signed-off-by: snipe <snipe@snipe.net >
commit 02a29c71ef
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:01:48 2024 +0100
Added created_by
Signed-off-by: snipe <snipe@snipe.net >
commit 6699995972
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:01:36 2024 +0100
Added created_by to components
Signed-off-by: snipe <snipe@snipe.net >
commit 951f03094a
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:01:17 2024 +0100
Added created_by to kits
Signed-off-by: snipe <snipe@snipe.net >
commit 354b00ef15
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:45:51 2024 +0100
Made method name consistent
Signed-off-by: snipe <snipe@snipe.net >
commit c93229179b
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:45:39 2024 +0100
Added order by created_by to accessories
Signed-off-by: snipe <snipe@snipe.net >
commit a77a7065d7
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:34:10 2024 +0100
Added order by admin to assets
Signed-off-by: snipe <snipe@snipe.net >
commit 4363e8b34c
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:20:42 2024 +0100
Updated importer
Signed-off-by: snipe <snipe@snipe.net >
commit 9adb2c24f3
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:06:36 2024 +0100
Squashed commit of the following:
commit dddbf27d78
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net >
commit fcefcc8184
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net >
commit 634a4afa75
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:04:54 2024 +0100
Fixed 1001 query on license
Signed-off-by: snipe <snipe@snipe.net >
commit 7650628d30
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:00:59 2024 +0100
Removed free seat count from fillable
Signed-off-by: snipe <snipe@snipe.net >
commit 7f690a6238
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 15:58:32 2024 +0100
Fixed variable name
Signed-off-by: snipe <snipe@snipe.net >
commit b32ab6a06c
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 18 16:36:24 2024 -0700
import User model
commit 4ff5fc1ff9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 18 16:19:35 2024 -0700
clean up variables
commit 86f13a9735
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 16:13:34 2024 -0700
Add index test
commit c40209f500
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 18 15:23:44 2024 -0700
seperates emails and webhook notifications
commit a071fff954
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 12:32:14 2024 -0700
Implement tests
commit 8b50ef077d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:58:33 2024 -0700
Implement test
commit 607f29030f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:53:27 2024 -0700
Stub out test
commit a6bcd3c0c2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:47:59 2024 -0700
Add validation test
commit 9b293afaac
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:28:29 2024 -0700
Remove more dead code
commit 636c776620
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:27:37 2024 -0700
Remove dead code
commit d5f659024c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:27:09 2024 -0700
Add test for logging
commit 832e50a71e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:19:41 2024 -0700
Implement test
commit fa19686248
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:18:21 2024 -0700
Implement test
commit c021609c13
Merge: 7b31df7c1 dddbf27d7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 10:42:58 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit 655abe8be5
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:32:59 2024 +0100
Fixed requestable user_id
Signed-off-by: snipe <snipe@snipe.net >
commit d96c5e1ba4
Merge: a807646d3 dddbf27d7
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:20:55 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit dddbf27d78
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net >
commit bae9982833
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:18:14 2024 +0100
Updated request methods
Signed-off-by: snipe <snipe@snipe.net >
commit a807646d39
Merge: 83b4bf9cf fcefcc818
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:48:09 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit abe79df6dc
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:47:30 2024 +0100
Added translation
Signed-off-by: snipe <snipe@snipe.net >
commit fcefcc8184
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 1582d81e5b
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 22:16:41 2024 +0100
Change `user_id` to `created_by`
Signed-off-by: snipe <snipe@snipe.net >
commit 7c85ad54eb
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 19:44:03 2024 +0100
Sort by numeric columns for numeric custom fields
Signed-off-by: snipe <snipe@snipe.net >
commit 7b31df7c14
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Sep 17 09:11:58 2024 -0700
Begin additional test case
commit 83b4bf9cf8
Merge: 9ff211105 6c996b775
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 15:54:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c996b7759
Merge: fe5fc6e0c 9e957baeb
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 15:54:11 2024 +0100
Merge pull request #15516 from snipe/fixes/fmcs_edit_user
Fixed check for outside assets on user update validation
commit 9e957baeb5
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 15:46:45 2024 +0100
Fixed check for outside assets on user update validation
Signed-off-by: snipe <snipe@snipe.net >
commit 12fd9cd97a
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 17:00:08 2024 -0700
Update interface name
commit 9e03c4ba6f
Merge: 8eb1c487b 3519a82dd
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:58:46 2024 -0700
Merge branch 'testing/fmcs' into testing/fmcs-accessories
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit 8eb1c487bc
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:52:10 2024 -0700
implement FMCS test for accessory index
commit e835637ef0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:40:10 2024 -0700
Add accessory checkin test
commit eb35608bb5
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:35:33 2024 -0700
Remove call handled by form request
commit 3f07f682de
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:35:21 2024 -0700
Migrate existing tests to TestsPermissionsRequirement
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit fe5fc6e0ce
Merge: 62747a009 15183c482
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 15:56:31 2024 +0100
Merge pull request #15471 from Godmartinz/Edit_side-panel
Fixes margin for the sidebar menus while using rtl languages
commit 62747a0090
Merge: b465cc98d c6c5cb73c
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 15:02:55 2024 +0100
Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing
Fixed misalignment of consumables with smaller media
commit 9ff2111055
Merge: 1328366a4 b465cc98d
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 14:52:48 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b465cc98d8
Merge: 8774da392 4debaaea3
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 14:45:06 2024 +0100
Merge pull request #15510 from snipe/bulk_users_locale_fix
Fixed #15504 - allow nulling/not changing locale in user bulk edit
commit 4debaaea39
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 14:31:10 2024 +0100
Fixed #15504 - allow nulling/not changing locale in user bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit 1328366a48
Merge: 7e14f8c6d 8774da392
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 12:38:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4facc4007e
Author: setpill <37372069+setpill@users.noreply.github.com >
Date: Fri Sep 13 17:05:48 2024 +0200
feat: Explicitly request LDAP attributes during sync
commit 31da47e046
Author: setpill <37372069+setpill@users.noreply.github.com >
Date: Fri Sep 13 17:05:28 2024 +0200
refactor: Put LDAP attribute mapping in array
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 0bc98e971f
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Sep 12 12:26:19 2024 -0700
refactoring modals with partials and fixing misalignments
commit 8774da3921
Merge: ab3b65531 a97530367
Author: snipe <snipe@snipe.net >
Date: Thu Sep 12 16:08:44 2024 +0100
Merge pull request #15492 from snipe/fixes/edit_to_archived_warning
Fix - warn user on changing status to undeployable when editing
commit c6c5cb73cf
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 11 10:49:27 2024 -0700
fixes consumables positioning with smaller media
commit a97530367d
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 17:29:22 2024 +0100
Fixed tests again
Signed-off-by: snipe <snipe@snipe.net >
commit 43250ae881
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 17:04:09 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net >
commit 04e96b8f20
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 16:43:41 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 98323185de
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 16:43:33 2024 +0100
Null and warn if editing asset to a non-deployabe state
Signed-off-by: snipe <snipe@snipe.net >
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
commit 7e14f8c6d6
Merge: fddbdafb9 ab3b65531
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 12:25:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab3b655312
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 12:25:09 2024 +0100
Fixed #15483 - show EOL by default
Signed-off-by: snipe <snipe@snipe.net >
commit 601d8d7e5f
Merge: 4f0f72b29 ca01261c1
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 09:46:58 2024 +0100
Merge pull request #15486 from marcusmoore/fixes/custom-field-values
Fixed a couple bugs in CustomFieldSetDefaultValuesForModel component
commit ca01261c1f
Merge: 6423df213 4f0f72b29
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Sep 10 16:05:39 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
commit 15183c4822
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Sep 10 11:05:03 2024 -0700
rephrased the ternary <-correctly spelled
commit fddbdafb99
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 19:03:56 2024 +0100
Fixed conflict
Signed-off-by: snipe <snipe@snipe.net >
commit a5dbece1a9
Merge: 713bb104e 4f0f72b29
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 19:00:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 4f0f72b29e
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 18:15:12 2024 +0100
Fixed version
Signed-off-by: snipe <snipe@snipe.net >
commit 4183d1834f
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 18:14:03 2024 +0100
Pre-release assets
Signed-off-by: snipe <snipe@snipe.net >
commit 713bb104ec
Merge: 7f2cae4f2 4998d60f3
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 14:46:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4998d60f39
Merge: f6bf2d03c 7cf30003b
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 14:43:27 2024 +0100
Merge pull request #15481 from snipe/localizations/2024-09-10
Updated translations
commit 7cf30003b6
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 14:41:08 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net >
commit f6bf2d03c4
Merge: 6f44441a8 7c8955b12
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:04:58 2024 +0100
Merge pull request #15445 from Godmartinz/eula_confusion
Fixed priority for category eula vs default eula
commit 6f44441a8b
Merge: e7e5dfbdf 76c9015aa
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:04:23 2024 +0100
Merge pull request #15469 from marcusmoore/accessory_tests
Added UI tests for creating accessories
commit e7e5dfbdfa
Merge: d62315fbe 5d5f42129
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:04:08 2024 +0100
Merge pull request #15470 from marcusmoore/company_tests
Added UI tests for creating companies
commit d62315fbe4
Merge: 7f3f77dec 22a2cc025
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:03:55 2024 +0100
Merge pull request #15472 from marcusmoore/testing/dashboard_counts
Added test for dashboard counts
commit 7f3f77dec8
Merge: 82e56c683 0820dd9da
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:03:46 2024 +0100
Merge pull request #15473 from marcusmoore/testing/accessory_api_tests
Added some permission tests for accessory api endpoints
commit 82e56c6832
Merge: 549dec9f9 dc6a5bf99
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 09:37:02 2024 +0100
Merge pull request #15474 from marcusmoore/bug/sc-26730
Fixed login success message not being displayed
commit 76c9015aa9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 16:51:40 2024 -0700
Add test case
commit 5d5f421294
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 16:49:43 2024 -0700
Add test case
commit 367f02af86
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 16:34:04 2024 -0700
more partials and includes
commit 7a1c721eca
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 16:22:56 2024 -0700
making modal partials for reuse
commit 6423df2133
Merge: 51d63d57c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 16:07:37 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
commit dc6a5bf998
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 14:54:19 2024 -0700
Reflash session so login message is displayed
commit 0820dd9da4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 14:36:32 2024 -0700
Update test names
commit aa6ab2df60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 14:35:38 2024 -0700
Add permission tests for some accessory api endpoints
commit 22a2cc0256
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 13:21:10 2024 -0700
Add test for dashboard counts
commit 57fab0268b
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 13:02:25 2024 -0700
made it a terenary
commit ad5768d8b2
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 12:45:11 2024 -0700
fixes margin for the sidebar using rtl languages
commit 35533c39d5
Merge: d4426e468 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 12:18:02 2024 -0700
Merge branch 'develop' into company_tests
commit de403f6e07
Merge: 010f66f4c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 12:17:53 2024 -0700
Merge branch 'develop' into accessory_tests
commit 549dec9f9e
Merge: b2a634924 0e9f7153c
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 20:13:01 2024 +0100
Merge pull request #15468 from marcusmoore/coverage
Added coverage commands for Herd users
commit d4426e4686
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 11:03:00 2024 -0700
Add simple tests for company creation via UI
commit b2a6349243
Merge: ce97e2a30 c5dbc5f6b
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 10:06:42 2024 +0100
Merge pull request #15465 from snipe/update_city_on_bulk_user_edit
Correctly save user’s city on bulk edit
commit c5dbc5f6b8
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 10:01:07 2024 +0100
Correctly save user’s city on bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit 7f2cae4f26
Merge: e34f549e4 ce97e2a30
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 03:56:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ce97e2a30f
Merge: e1fcfc8dc 7d9a0eba0
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 03:54:28 2024 +0100
Merge pull request #15463 from snipe/consumables_order_by_remaining
Added ability to sort on qty and remaining for consumables
commit 7d9a0eba04
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 03:49:58 2024 +0100
Added ability to sort on qty and remaining for consumables
Signed-off-by: snipe <snipe@snipe.net >
commit 010f66f4c9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:48:11 2024 -0700
Add validation test
commit 9c6718b459
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:46:35 2024 -0700
Organize
commit 9f832a93c9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:44:52 2024 -0700
Ensure user is stored
commit 487d88c012
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:43:01 2024 -0700
Add some ui tests for accessories
commit 0e9f7153c0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:13:45 2024 -0700
Add composer commands for generating coverage reports via Herd
commit 7c8955b126
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 4 12:38:35 2024 -0700
revert changes to label view
commit 20fa4c39f9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 4 12:26:44 2024 -0700
adds setEula to support\settings
commit f04a4a3cf5
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 4 12:21:49 2024 -0700
adds test
commit cf07186ae8
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Sep 3 12:23:23 2024 -0700
gives priority to default eula being checked vs catregory eula
commit 51d63d57c6
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Sep 3 12:22:43 2024 -0700
Hide the "Add default values" checkbox if no fieldset selected
commit e34f549e4c
Merge: a8813cca9 e1fcfc8dc
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 19:16:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e1fcfc8dc1
Merge: 13dbf9ee7 9fe8a866e
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 19:14:49 2024 +0100
Merge pull request #15440 from snipe/fixes/user_api_put_patch
Fixes #15435 - user api put patch API route regression
commit 9fe8a866e0
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 19:07:21 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net >
commit e8e3060a75
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 18:51:22 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 6aaf2f623f
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 18:49:55 2024 +0100
Removed extra route
Signed-off-by: snipe <snipe@snipe.net >
commit dfbccf50e8
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 18:48:09 2024 +0100
Added patch/put back into resource routes
Signed-off-by: snipe <snipe@snipe.net >
commit a8813cca94
Merge: 9fef27a44 13dbf9ee7
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:48:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 13dbf9ee74
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:48:42 2024 +0100
Added icon for dept
Signed-off-by: snipe <snipe@snipe.net >
commit f8bbb7ad9b
Merge: 12fa50597 3c7d455ee
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:47:25 2024 +0100
Merge pull request #15431 from snipe/add_employee_num_to_asset_overview
Added employee number to asset view
commit 3c7d455ee3
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:38:38 2024 +0100
Added employee number to asset view
Signed-off-by: snipe <snipe@snipe.net >
commit 9fef27a448
Merge: d2b88a510 12fa50597
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:07:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 12fa505972
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:07:30 2024 +0100
Disabmiguate licenses company_id
Signed-off-by: snipe <snipe@snipe.net >
commit d2b88a5107
Merge: 4e35f389d 4e4930ba6
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:02:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4e4930ba62
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:01:48 2024 +0100
Check for array
Signed-off-by: snipe <snipe@snipe.net >
commit 4e35f389df
Merge: e5b9d9a28 76301bc30
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 20:07:03 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 76301bc30d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 20:05:03 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit 964e105cf9
Merge: 6fd24c7e1 abb422153
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 19:20:03 2024 +0100
Merge pull request #15415 from snipe/rules/prevent_company_switch
Validation rules to prevent switching user companies if items are assigned to them
commit 6fd24c7e14
Merge: e4ebabdab 231bc1e2d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 18:55:11 2024 +0100
Merge pull request #15418 from snipe/added_multiple_for_custom_report
Fixed #15416 - Added multiple selects for custom report
commit 231bc1e2de
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 18:31:34 2024 +0100
Updated blade selectors
Signed-off-by: snipe <snipe@snipe.net >
commit 37d04b7176
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 17:52:01 2024 +0100
Some CSS tweaks for select2
Signed-off-by: snipe <snipe@snipe.net >
commit e62a802926
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 17:51:44 2024 +0100
Use whereIn instead of where =
Signed-off-by: snipe <snipe@snipe.net >
commit 69e981364a
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 17:51:20 2024 +0100
Made multiple select
Signed-off-by: snipe <snipe@snipe.net >
commit e5b9d9a28b
Merge: 4111ef0d7 e4ebabdab
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 15:04:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
commit abb4221539
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 14:55:18 2024 +0100
Validation rules to prevent switchng user companies if assets are assigned
Signed-off-by: snipe <snipe@snipe.net >
commit e4ebabdaba
Merge: b64ed254e da1e38329
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 14:19:51 2024 +0100
Merge pull request #15414 from uberbrady/fix_create_user
Use the null-safe property accessor for new-user creation
commit da1e383295
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Aug 29 14:09:23 2024 +0100
Use the null-safe property accessor for new-user creation
commit b64ed254e0
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 13:49:09 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net >
commit ba291edc42
Merge: c197644ba ec2ea955d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 13:18:52 2024 +0100
Merge pull request #15412 from uberbrady/ImprovePatchPurchasePrice
Fix [FD-43836] PATCH of purchase_cost for assets for comma as decimal separator
commit ec2ea955d8
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Aug 29 12:35:14 2024 +0100
Fix PATCH of purchase_cost for assets for comma as decimal separator
commit c197644ba7
Merge: 29b30cc5d a8cd1027f
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:38:15 2024 +0100
Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
commit 29b30cc5d3
Merge: a89f17a14 6af27516d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:29:44 2024 +0100
Merge pull request #15411 from snipe/snyk/upgrade-webpack
Upgraded webpack
commit 6af27516dc
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:29:00 2024 +0100
Upgraded webpack
Signed-off-by: snipe <snipe@snipe.net >
commit a89f17a145
Merge: 68c708bde de0565f5b
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:25:56 2024 +0100
Merge pull request #15410 from snipe/snyk/upgrade-jquery-ui
Updated jquery UI
commit de0565f5b3
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:24:06 2024 +0100
Updated jquery UI
Signed-off-by: snipe <snipe@snipe.net >
commit 4111ef0d78
Merge: cfa56e221 68c708bde
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:20:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 68c708bdef
Merge: 58e366a06 5581950fe
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:18:34 2024 +0100
Merge pull request #15409 from snipe/fixes-string
Corrected language string
commit 5581950fee
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:17:17 2024 +0100
Corrected language string
Signed-off-by: snipe <snipe@snipe.net >
commit cfa56e2219
Merge: 7f1dfcc93 58e366a06
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:08:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 58e366a063
Merge: 26f28a862 b06c52776
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:08:02 2024 +0100
Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid
Check that the user exists before trying to print
commit b06c527767
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:06:30 2024 +0100
Check that the user exists before trying to print
Signed-off-by: snipe <snipe@snipe.net >
commit 7f1dfcc935
Merge: 6f3fb21fe 26f28a862
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 14:29:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 26f28a862a
Merge: e8da7e2df 94c981e22
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 14:26:03 2024 +0100
Merge pull request #15404 from snipe/bug/sc-26717-model-delete
Set image to null if model is deleted
commit 94c981e22c
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 14:23:49 2024 +0100
Set image to null if model is deleted
Signed-off-by: snipe <snipe@snipe.net >
commit 6f3fb21fef
Merge: a48e79a1f e8da7e2df
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:50:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e8da7e2df2
Merge: 7b5b559ba d635c86e0
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:46:48 2024 +0100
Merge pull request #15403 from snipe/clean_up_depreciations
Fixed #15392 - filter by depreciation when showing models
commit d635c86e00
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:46:30 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 406ff6984b
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:42:23 2024 +0100
Added click to select on models table
Signed-off-by: snipe <snipe@snipe.net >
commit c6ddc501c5
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:40:12 2024 +0100
Filter by depreciation_id
Signed-off-by: snipe <snipe@snipe.net >
commit 4839181beb
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:40:01 2024 +0100
Added counts to API
Signed-off-by: snipe <snipe@snipe.net >
commit 63a05c89a7
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:39:52 2024 +0100
Added counts to show method
Signed-off-by: snipe <snipe@snipe.net >
commit 385c4f69f7
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:39:43 2024 +0100
Added counts to depreciation transformer
Signed-off-by: snipe <snipe@snipe.net >
commit 486cd8c8c9
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:39:09 2024 +0100
Nicer formatting for searchableAttributes
Signed-off-by: snipe <snipe@snipe.net >
commit eb5d93b3c2
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:38:55 2024 +0100
Added assets relationship
Signed-off-by: snipe <snipe@snipe.net >
commit a5ff623484
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:38:43 2024 +0100
Added asset, license, model count to API
Signed-off-by: snipe <snipe@snipe.net >
commit b5a4389815
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:38:31 2024 +0100
Added badge count, fixed model bulk edit menu
Signed-off-by: snipe <snipe@snipe.net >
commit 7b5b559baa
Merge: 64c4433b9 67a992974
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 11:57:29 2024 +0100
Merge pull request #15401 from snipe/fixes-15397-new-window-for-label
Opens label new window
commit 67a9929745
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 11:56:54 2024 +0100
Opens label new window
Signed-off-by: snipe <snipe@snipe.net >
commit a48e79a1fc
Merge: c207d4843 64c4433b9
Author: snipe <snipe@snipe.net >
Date: Tue Aug 27 07:37:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 64c4433b98
Merge: d3e8e0663 22bc088f6
Author: snipe <snipe@snipe.net >
Date: Tue Aug 27 07:36:37 2024 +0100
Merge pull request #15396 from snipe/add_start_end_date_to_users_edit
Added `start_date` and `end_date` to user bulk edit
commit 22bc088f6f
Author: snipe <snipe@snipe.net >
Date: Tue Aug 27 07:21:19 2024 +0100
Added start_date and end_date to user bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit d3e8e06638
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 14:07:06 2024 +0100
Add @swift2512 as a contributor
commit c207d48430
Merge: 991e48696 1b933f7ad
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 14:01:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1b933f7add
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 13:47:17 2024 +0100
Added s to fa icons
Signed-off-by: snipe <snipe@snipe.net >
commit 991e48696a
Merge: 797488504 3fe891a05
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:26:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3fe891a05b
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:25:27 2024 +0100
Removed a few more commas
Signed-off-by: snipe <snipe@snipe.net >
commit 7974885041
Merge: 4ef85bd52 f4c5b712f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:24:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit f4c5b712f4
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:24:07 2024 +0100
Removed colons
Signed-off-by: snipe <snipe@snipe.net >
commit 4ef85bd529
Merge: 6eab83a85 4c8dc7818
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:58:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4c8dc7818d
Merge: aa86e07cd 5c43a1f87
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:57:00 2024 +0100
Merge pull request #15389 from snipe/added_generate_label_to_button_stack
Fixed #15388 - Moved generate label button
commit 5c43a1f87c
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:54:49 2024 +0100
Use proper style for buttons
Signed-off-by: snipe <snipe@snipe.net >
commit d3b265de8e
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:48:36 2024 +0100
Moved button on hardware
Signed-off-by: snipe <snipe@snipe.net >
commit 263151658f
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:44:09 2024 +0100
Moved general label button
Signed-off-by: snipe <snipe@snipe.net >
commit 6eab83a85a
Merge: cce1f87da aa86e07cd
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:22:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit aa86e07cd2
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:22:39 2024 +0100
Fixed #15385 - small icon tweaks
Signed-off-by: snipe <snipe@snipe.net >
commit cce1f87da6
Merge: b460e8dc8 d92fa5de6
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:18:30 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d92fa5de65
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:17:25 2024 +0100
fa-fw on settings icon
Signed-off-by: snipe <snipe@snipe.net >
commit b460e8dc83
Merge: 50cb7e65c c589140ea
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:42:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit c589140ea0
Merge: cc2c8f76d 52894615c
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:42:04 2024 +0100
Merge pull request #15383 from snipe/re-adds-checkout-button
Fixed #15378 - Corrected gate on checkin button on asset view
commit 52894615ce
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:40:41 2024 +0100
More specific gate for checkin
Signed-off-by: snipe <snipe@snipe.net >
commit 8546bbdd65
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:38:47 2024 +0100
Fixed gate for checkout button
Signed-off-by: snipe <snipe@snipe.net >
commit 50cb7e65c9
Merge: 821dd158d cc2c8f76d
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:32:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cc2c8f76d0
Merge: 1ffa69c43 3957d670d
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:31:29 2024 +0100
Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command
Fixes the `acceptance-reminder` command
commit 1ffa69c43c
Merge: 78d355f13 f85ebd7ff
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:28:20 2024 +0100
Merge pull request #15380 from snipe/fixed/fixed_nav_bracket
Added pull-right to angle bracket
commit f85ebd7ffd
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:27:39 2024 +0100
Added pull-right to angle bracket
Signed-off-by: snipe <snipe@snipe.net >
commit 78d355f136
Merge: ec0346e4a af0a95be1
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:20:23 2024 +0100
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error
Fixed custom field defaults being prematurely updated
commit ec0346e4a8
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:19:08 2024 +0100
Add @setpill as a contributor
commit fc5eb37776
Merge: 833dace2b 1d7853cbf
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:18:41 2024 +0100
Merge pull request #15379 from setpill/fix/load-trustproxies-middleware
fixed #15374 : load TrustProxies middleware in Kernel.php
commit 9a73311a99
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 17:04:04 2024 -0700
Fix nested checkboxes being updated as a group
commit aec781e7df
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 16:03:30 2024 -0700
Be a little more explicit
commit 1d7853cbfe
Author: setpill <37372069+setpill@users.noreply.github.com >
Date: Thu Aug 22 19:45:53 2024 +0200
fixed #15374 : load TrustProxies middleware in Kernel.php
commit 7f3c86165b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 13:58:31 2024 -0700
Conditionally disable Add default values checkbox
commit 10b45812c4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 13:38:01 2024 -0700
Improve id for checkboxes and radio buttons
commit c3165717ed
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 13:20:04 2024 -0700
Handle old input
commit d0a351a132
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 12:59:03 2024 -0700
Add comment
commit 68749e7e87
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 12:58:35 2024 -0700
Simplify logic
commit 0abb5637e0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 12:54:54 2024 -0700
WIP: handle old input
commit af0a95be12
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit d67975cb62
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 663b2fd844
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit bcace9d019
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit b59bf3e7dc
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 3957d670d0
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Aug 22 10:04:46 2024 -0700
fixes send acceptance reminder query
commit 821dd158d1
Merge: 6c9a40268 833dace2b
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 15:50:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 833dace2b4
Merge: ec365b080 56e31d230
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 15:00:16 2024 +0100
Merge pull request #15373 from snipe/fixes/#15366_custom_fields
Fixed #15366 use the non-admin edit encrypted custom fields permissions
commit 56e31d2303
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 14:58:09 2024 +0100
Fixed #15366 - use permission for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net >
commit ec365b0804
Merge: ca8864c06 aef0ac68c
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 14:49:13 2024 +0100
Merge pull request #15372 from StarlessNights/update-docker-compose-files
Fixed #15371 : docker-compose files updated.
commit aef0ac68c3
Author: Iisakki Jaakkola <iihaja@utu.fi >
Date: Thu Aug 22 16:10:00 2024 +0300
Need to use the long format for redis too in docker-compose file.
commit f12f9a816f
Author: Iisakki Jaakkola <iihaja@utu.fi >
Date: Thu Aug 22 15:47:12 2024 +0300
Update the official docker-compose file too while at it.
commit a000d6454f
Author: Iisakki Jaakkola <iihaja@utu.fi >
Date: Thu Aug 22 15:46:40 2024 +0300
Fix non-functional development docker-compose file.
commit ca8864c061
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:28:52 2024 +0100
Fixed small layout quirks in asset view
Signed-off-by: snipe <snipe@snipe.net >
commit 423f4f9126
Merge: 456c7d8d9 5fa0c87ab
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:25:41 2024 +0100
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset
Adds location select to the create new user via asset checkout
commit 456c7d8d91
Merge: 54cfe3f6e d4d19569e
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:20:56 2024 +0100
Merge pull request #15065 from Godmartinz/explicit_eol_removal_command
Adds `snipeit:remove-explicit-eols` command
commit 54cfe3f6e6
Merge: 5e0b18104 bb465dbfa
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:20:10 2024 +0100
Merge pull request #15156 from uberbrady/re-add-stalebot
Re-add stalebot-esque github Action
commit 5e0b18104d
Merge: ec0b9b198 8b5d3f7fb
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:59:20 2024 +0100
Merge pull request #15369 from snipe/fixes/checkbox_on_restore
Fixed checkbox layout on modal from #15296
commit 8b5d3f7fbd
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:56:32 2024 +0100
Fixed extra closing p tag
Signed-off-by: snipe <snipe@snipe.net >
commit 744f43676d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:53:16 2024 +0100
Fixed checkbox layout on modal from #15296
Signed-off-by: snipe <snipe@snipe.net >
commit ec0b9b198f
Merge: 94300d81d 738ef442f
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:43:07 2024 +0100
Merge pull request #15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
commit 6c9a402685
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:20:52 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net >
commit 1b310f3a24
Merge: c54bff0f8 94300d81d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:20:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 94300d81d6
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:19:32 2024 +0100
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net >
commit bc9ea5a2ec
Merge: 4635a6efc 963911f2e
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:18:06 2024 +0100
Merge pull request #15352 from Godmartinz/mobile_breakpoint
Fixed Mobile misalignment of info on Assets and Users view pages
commit 4635a6efc3
Merge: 9608414ea d29b3bfb9
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:17:49 2024 +0100
Merge pull request #15360 from snipe/more_print_fixes
More print fixes for asset view
commit 9608414eae
Merge: 47d8e2f8b 5efddf6f5
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:06:13 2024 +0100
Merge pull request #15367 from snipe/fixes/15344_added_freeform_to_country_select2
Fixed #15344 - make select2 for countries freeform-ish
commit 5efddf6f5b
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:01:39 2024 +0100
Allow clear on country dropdown
Signed-off-by: snipe <snipe@snipe.net >
commit 305dc049a4
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:01:28 2024 +0100
Added asterisk help text
Signed-off-by: snipe <snipe@snipe.net >
commit 3ac0702094
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 10:13:22 2024 +0100
Fixed #15344 - make select2 for countries freeform-ish
Signed-off-by: snipe <snipe@snipe.net >
commit 47d8e2f8b9
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 09:42:05 2024 +0100
Add @Scarzy as a contributor
commit a2246b9645
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit 1d89759706
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 206f8fe605
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit 21d2217619
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit 833bcb282f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 83dd9ce20e
Merge: 6fdce3c53 a8eb76fd8
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 23:15:24 2024 +0100
Merge pull request #15362 from r-xyz/model-files-api
Added #9413 : AssetModel files endpoints to API
commit a8eb76fd8d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 22:25:41 2024 +0200
Fixed model files API routes.
commit cd7db5c4a8
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 22:24:08 2024 +0200
Fix some typos in models file handler.
commit da7313bc9d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 20:24:22 2024 +0200
Fix models files API routes.
commit 4ec361c718
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 19:49:51 2024 +0200
Add AssetModel files endpoints to API
commit 738ef442fd
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 21 13:16:51 2024 +0100
Rename .env var to have DB_ prefix for sanitize-by-default setting
commit d29b3bfb9a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 13:06:16 2024 +0100
Few more hidden-print classes
Signed-off-by: snipe <snipe@snipe.net >
commit 6fdce3c536
Merge: 01c4fe611 1ab29ec3a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 13:02:50 2024 +0100
Merge pull request #15358 from r-xyz/rename-docker-startup
Renamed docker startup scripts coherently.
commit 912bbf0e32
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 13:02:21 2024 +0100
More print fixes
Signed-off-by: snipe <snipe@snipe.net >
commit c54bff0f83
Merge: d3f30ced9 01c4fe611
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 12:24:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 01c4fe6113
Merge: 7e475a078 0fa9f5797
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 12:12:23 2024 +0100
Merge pull request #15359 from uberbrady/improve_windows_upgrade
Fixed #15190 - Improvements to upgrade.php script to improve Windows experience
commit 0fa9f57971
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 21 11:53:38 2024 +0100
Improvements to upgrade.php script to improve Windows experience
commit 1ab29ec3a4
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 11:52:09 2024 +0200
Rename docker startup scripts coherently.
commit 7e475a0786
Merge: d0acf5b8a 26b3c62ab
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:41:17 2024 +0100
Merge pull request #15357 from snipe/tighten_category_view_translations
Fixed #15330 - Cleaned up category title
commit 26b3c62ab8
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:29:51 2024 +0100
Cleaned up category title
Signed-off-by: snipe <snipe@snipe.net >
commit d3f30ced94
Merge: 973e2e575 d0acf5b8a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:13:57 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d0acf5b8a6
Merge: 09033b19a 74fbc2382
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:12:58 2024 +0100
Merge pull request #15356 from snipe/validate_location_parent
Fixed #15341 - validate parent ID
commit 74fbc23823
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:09:35 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net >
commit a23dee52f2
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 09:58:47 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 4d03f1e110
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 09:46:18 2024 +0100
Fixed #15341 - validate parent ID
Signed-off-by: snipe <snipe@snipe.net >
commit 963911f2e1
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Aug 21 00:23:10 2024 -0700
changed order of info stgack
commit 59832126cb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 16:52:51 2024 -0700
Improve comment
commit 680cce3ee2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 16:42:29 2024 -0700
Align indents
commit 6c5ec6a16c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 16:41:24 2024 -0700
Get datepicker working
commit 5d1f98bf93
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 15:38:43 2024 -0700
Simplify by directly wire:modeling
commit 9d484077ae
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Aug 20 14:24:37 2024 -0700
missed a file
commit 9858b0f37f
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Aug 20 14:23:55 2024 -0700
fixes info tab for users and assets
commit 973e2e5756
Merge: 46ed07642 09033b19a
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:45:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
commit 09033b19a7
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:44:13 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net >
commit 46ed076428
Merge: d3a555ce9 5fdeb9c41
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:42:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 5fdeb9c413
Merge: 22d373407 6c450d133
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:42:08 2024 +0100
Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20
Updated languages
commit 22d3734075
Merge: d99b306ae eca6b03f4
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:34:38 2024 +0100
Merge pull request #15350 from marcusmoore/icon-component-updates
Fixed icon not rotated and simplified component
commit eca6b03f44
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 11:08:53 2024 -0700
Allow id to be rendered
commit bbdbec7197
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 11:00:39 2024 -0700
Rely on $attributes behavior rendering passed attributes
commit 6c450d1338
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 18:18:17 2024 +0100
Updated languages
Signed-off-by: snipe <snipe@snipe.net >
commit a8cd1027f3
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Aug 20 11:40:15 2024 -0500
rm commented code
commit d3a555ce91
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:49:39 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net >
commit 0f8e041809
Merge: e8a22f3c5 d99b306ae
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:49:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
commit d99b306ae9
Merge: f597d6433 74136761d
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:46:55 2024 +0100
Merge pull request #15345 from snipe/add_trim_strings_middleware
Added TrimStrings middleware
commit 74136761df
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:45:13 2024 +0100
Added TrimStrings middleware
Signed-off-by: snipe <snipe@snipe.net >
commit f597d64339
Merge: 64bed01a9 0072f1500
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:17:26 2024 +0100
Merge pull request #15342 from snipe/snyk/bs-tables
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
commit 0072f1500e
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:16:27 2024 +0100
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
Signed-off-by: snipe <snipe@snipe.net >
commit 64bed01a91
Merge: f8c72fb0a f6319e11e
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:13:43 2024 +0100
Merge pull request #15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
commit f6319e11e7
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:11:27 2024 +0100
Added fa-fw to sidebar elements
Signed-off-by: snipe <snipe@snipe.net >
commit 5d9f988df3
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:01:49 2024 +0100
Added fw class to topnav icons
Signed-off-by: snipe <snipe@snipe.net >
commit f8c72fb0ac
Merge: 886514a25 fa765667f
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 09:57:03 2024 +0100
Merge pull request #15112 from marcusmoore/livewire-importer-improvements
Improved handling attempted access of deleted files in importer
commit 8e1111c681
Merge: 697595d96 886514a25
Author: akemidx <kojotek.dx@gmail.com >
Date: Mon Aug 19 19:33:44 2024 -0400
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
commit 886514a25f
Merge: cb40a82e7 434bdcd6d
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 22:46:08 2024 +0100
Merge pull request #15336 from marcusmoore/fixes/remove-displayed-parentheses
Fixed `)` being added to expected asset checkin report email header
commit fa765667f2
Merge: 94d8a547b cb40a82e7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Aug 19 14:41:58 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 434bdcd6d4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Aug 19 14:31:47 2024 -0700
Add missing parentheses to conditional
commit be5f3f38f8
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 14:48:12 2024 +0100
Settings pages
Signed-off-by: snipe <snipe@snipe.net >
commit 08c3a25b39
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 14:16:57 2024 +0100
Little more padding
Signed-off-by: snipe <snipe@snipe.net >
commit 34cd4b6244
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 14:15:36 2024 +0100
Added links to apple/google maps
Signed-off-by: snipe <snipe@snipe.net >
commit d89c8682be
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:46:31 2024 +0100
Reversed location button ordering
Signed-off-by: snipe <snipe@snipe.net >
commit 6f024849e9
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:39:24 2024 +0100
Few more
Signed-off-by: snipe <snipe@snipe.net >
commit e048f0955f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:27:21 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net >
commit 479b2b4fd3
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:23:08 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net >
commit 84f14a05bd
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:20:19 2024 +0100
Fixed logging for asset model restore
Signed-off-by: snipe <snipe@snipe.net >
commit 8d52fa51b1
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:20:06 2024 +0100
Fixed suppliers buttons
Signed-off-by: snipe <snipe@snipe.net >
commit 229d8b9bf5
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:19:59 2024 +0100
Added location restore
Signed-off-by: snipe <snipe@snipe.net >
commit eb8d43a804
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 12:32:44 2024 +0100
Updated buttons on models
Signed-off-by: snipe <snipe@snipe.net >
commit f82266fade
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:58:31 2024 +0100
Cleaned up presenters
Signed-off-by: snipe <snipe@snipe.net >
commit b4b6f7a35f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:58:21 2024 +0100
Added css-consumable to overrides for table headers
Signed-off-by: snipe <snipe@snipe.net >
commit 0bc995b87f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:58:05 2024 +0100
Updated more icons
Signed-off-by: snipe <snipe@snipe.net >
commit 59725f2031
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:57:40 2024 +0100
Removed extra debugging in test
Signed-off-by: snipe <snipe@snipe.net >
commit 00bc9ac806
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 22:39:14 2024 +0100
Fixed spacing
Signed-off-by: snipe <snipe@snipe.net >
commit f200960a57
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 22:26:57 2024 +0100
Aaaand more
Signed-off-by: snipe <snipe@snipe.net >
commit c700127f1a
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 22:09:00 2024 +0100
Updated user view
Signed-off-by: snipe <snipe@snipe.net >
commit ae2f9571b4
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 21:57:37 2024 +0100
And still more
Signed-off-by: snipe <snipe@snipe.net >
commit a77dcad336
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 20:30:53 2024 +0100
More links
Signed-off-by: snipe <snipe@snipe.net >
commit 7ace9324b4
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 20:30:22 2024 +0100
Added padlock sound
Signed-off-by: snipe <snipe@snipe.net >
commit d2e889e927
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 19:21:59 2024 +0100
Still more
Signed-off-by: snipe <snipe@snipe.net >
commit 803bdb457c
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:48:19 2024 +0100
Added calendar
Signed-off-by: snipe <snipe@snipe.net >
commit 7c9b1f6e38
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:39:22 2024 +0100
Added the plus icon
Signed-off-by: snipe <snipe@snipe.net >
commit d545537a43
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:34:13 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net >
commit 4d8904938d
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:24:26 2024 +0100
Added calendar icon for datepickers
Signed-off-by: snipe <snipe@snipe.net >
commit 0c09f2b2c0
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:13:49 2024 +0100
Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net >
commit bffba02511
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 17:26:44 2024 +0100
Updated icons
Signed-off-by: snipe <snipe@snipe.net >
commit 901f4df7ee
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 17:03:36 2024 +0100
Added more icons
Signed-off-by: snipe <snipe@snipe.net >
commit 9337cba340
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:53:58 2024 +0100
Added download
Signed-off-by: snipe <snipe@snipe.net >
commit 2b0c67c263
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:51:00 2024 +0100
Load the icon helper
Signed-off-by: snipe <snipe@snipe.net >
commit da71f031f5
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:48:24 2024 +0100
Use icon in hardware view
Signed-off-by: snipe <snipe@snipe.net >
commit d2e585baa7
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:47:45 2024 +0100
Added icon blade
Signed-off-by: snipe <snipe@snipe.net >
commit a102c085df
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:47:37 2024 +0100
Added icon helper
Signed-off-by: snipe <snipe@snipe.net >
commit e8a22f3c5b
Merge: d843cf8dc cb40a82e7
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 04:55:04 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb40a82e79
Merge: 7e6ff3cbe 4253acad4
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 04:54:23 2024 +0100
Merge pull request #15324 from snipe/jerk_prevention
Prevent passing an array as login
commit 4253acad4c
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 04:51:36 2024 +0100
Prevent passing an array as login
Signed-off-by: snipe <snipe@snipe.net >
commit d843cf8dcc
Merge: 1013dcae6 7e6ff3cbe
Author: snipe <snipe@snipe.net >
Date: Sat Aug 17 00:52:10 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1013dcae61
Merge: c30c649aa e7ef3bf51
Author: snipe <snipe@snipe.net >
Date: Sat Aug 17 00:38:44 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 70e5e0f9df
Author: spencerrlongg <spencer@spencerlong.com >
Date: Fri Aug 16 12:52:06 2024 -0500
get rid of dd
commit dec4691c73
Author: spencerrlongg <spencer@spencerlong.com >
Date: Fri Aug 16 12:50:09 2024 -0500
should be good to go now
commit c30c649aaa
Merge: bb1385369 ad6d09b6a
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 16:44:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit bb1385369c
Merge: c1caf6088 43b338d61
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 16:18:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit c1caf6088e
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 13:12:13 2024 +0100
Prod assets
Signed-off-by: snipe <snipe@snipe.net >
commit 12dfe71ea8
Merge: ca8926871 ea2b1b074
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 12:48:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ca89268716
Merge: ec5731353 3167ee91d
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 11:02:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 94d8a547b8
Merge: 6521c0252 b39a7c6f0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 13:47:49 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 43b109fac0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 13:20:22 2024 -0700
Use cached values for textarea and radio input
commit 75c1e7658f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 10:43:41 2024 -0700
Improve method name
commit e7c9c799bb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 10:40:23 2024 -0700
Add wire:keys
commit 6ab976f353
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 10:32:33 2024 -0700
Use cached values for text input
commit ec5731353a
Merge: 3283704fe b39a7c6f0
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 15:53:52 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3283704fe8
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 12:25:08 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net >
commit 540df32046
Merge: 85486fa58 594f50664
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 12:24:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 85486fa58c
Merge: 3618df2ec 10dc1f136
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:53:54 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3618df2ec5
Merge: a201f22fd 8f7bce7aa
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:44:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit a201f22fdb
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:36:12 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net >
commit 6070d530cf
Merge: 6c0cf9447 4d66f7c93
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:35:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c0cf94473
Merge: bf4b91516 381003eea
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:28:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 9622e05cf5
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 18:41:06 2024 -0500
correct api test
commit afaf53cdfc
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 18:14:21 2024 -0500
failing ui test
commit f031309f8f
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 16:09:15 2024 -0500
set up api controller for route/model binding
commit 20ec420ba3
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 13:53:29 2024 -0500
not quite done, api side needs some work
commit ab63a19aff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 14 11:01:51 2024 -0700
Initialize concept of cached values
commit a70b94e707
Merge: 120cfd13c 3e2945709
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 11:36:19 2024 -0500
Merge branch 'refs/heads/develop' into bug/sc-26584
commit 008bf036b5
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 14 16:09:34 2024 +0100
Got rid of weird namespace declaration and commented-out data-toggle line
commit cc5ad456e6
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 14 15:59:21 2024 +0100
Expose the 'sanitize' system for backup restores to the web GUI
commit bf4b915168
Merge: 0a9c2e354 0f1e5181a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 14 10:45:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0a9c2e354f
Merge: 47f1b3b14 e54400718
Author: snipe <snipe@snipe.net >
Date: Wed Aug 14 10:02:43 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 038e86954b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 13 17:30:53 2024 -0700
Improve property name
commit f6c1642bf2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 13 17:01:35 2024 -0700
Use computed fields in CustomFieldSetDefaultValuesForModel component
commit 120cfd13c5
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Aug 13 14:07:40 2024 -0500
translation
commit 09f2739298
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Aug 13 13:45:41 2024 -0500
works, un-reassignable licenses are an issue
commit 47f1b3b14e
Merge: 198b76ebc 3044af941
Author: snipe <snipe@snipe.net >
Date: Tue Aug 13 16:48:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 198b76ebc2
Merge: 5546f9676 6e84c29ce
Author: snipe <snipe@snipe.net >
Date: Tue Aug 13 15:47:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 5546f9676a
Merge: 46caa478d 9e73eaf95
Author: snipe <snipe@snipe.net >
Date: Tue Aug 13 13:51:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ec863df007
Author: spencerrlongg <spencer@spencerlong.com >
Date: Mon Aug 12 16:58:53 2024 -0500
rm conditional that might be unnecessary
commit cc3b8e0681
Author: spencerrlongg <spencer@spencerlong.com >
Date: Mon Aug 12 16:58:21 2024 -0500
this should more or less work, but i need to determine if this is the best way
commit ff145abbe7
Author: spencerrlongg <spencer@spencerlong.com >
Date: Mon Aug 12 16:13:03 2024 -0500
use array for eager loading, makes ide prettier
commit 46caa478d2
Merge: 4d8569e75 e6106aa7c
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 20:47:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4d8569e754
Merge: 4dc57f95e c9f8a84d4
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 18:01:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4dc57f95e2
Merge: 316ee6f81 9d354ca65
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 16:38:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 316ee6f810
Merge: 509cc812e 3f2139349
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 16:30:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 509cc812ea
Merge: d5f66bc0d e7fb29fce
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 15:58:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d5f66bc0dd
Merge: 1e213c31e ce5be8ac2
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 10:10:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1e213c31ef
Merge: 91874dfe0 1777bb4b9
Author: snipe <snipe@snipe.net >
Date: Sun Aug 11 10:26:16 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 91874dfe0b
Merge: 0e6eda5e8 5c6c655cd
Author: snipe <snipe@snipe.net >
Date: Sat Aug 10 19:37:37 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0e6eda5e8a
Merge: 24560b936 60eb60215
Author: snipe <snipe@snipe.net >
Date: Sat Aug 10 18:29:41 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 24560b9362
Author: snipe <snipe@snipe.net >
Date: Sat Aug 10 18:24:49 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net >
commit 6521c02526
Merge: 8d1cc22c5 9350a2018
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 7 15:20:39 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
# Conflicts:
# resources/views/livewire/importer.blade.php
commit bb465dbfaa
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Jul 24 15:09:23 2024 +0100
Cut down run number to 100 from 1000
commit 8cbcc237c0
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Jul 24 13:27:31 2024 +0100
Cleanup of Stale workflow for GH - set to debug-mode to start
commit 97e3af8fc9
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Sat Jun 29 00:59:47 2024 +0100
WIP on new GitHub-backed stalebot settings
commit 914e29210a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Jun 26 18:53:01 2024 +0100
Initial rough stab at re-implementing stalebot
commit 8d1cc22c58
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Jul 18 12:00:01 2024 -0700
Turn on legacy binding since other components still use it
commit 7685de45f2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 17:12:14 2024 -0700
Turn off legacy binding
commit 199e68ff29
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 17:10:12 2024 -0700
Simplify computed propery
commit 81bffccf01
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 16:28:26 2024 -0700
Use better error message
commit cfca1514c0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 16:22:44 2024 -0700
Swap file_id for activeFileId
commit b4ed01243b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 13:40:41 2024 -0700
Add more details
commit 3772a21a51
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 13:37:24 2024 -0700
Move comment up
commit 04b6cb763f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 10:58:48 2024 -0700
Add todo
commit dd32341502
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 17:21:18 2024 -0700
Display message if attempting to delete non-existent file
commit f58e3114a2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 17:17:45 2024 -0700
Simplify destroy method and update list
commit eba494ad8c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 17:03:42 2024 -0700
Make $activeFile a computed property
commit 7e89b58746
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 16:08:42 2024 -0700
Move files to computed property
commit b7744105a0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 14:20:41 2024 -0700
Migrate import type to component
commit 69263f0e5b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 13:30:29 2024 -0700
Migrate header row to component
commit 017530ba4b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 12:02:50 2024 -0700
Make updating hook more specific
commit c8dad528a8
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Jul 15 16:15:58 2024 -0700
Migrate a couple items out of mount
commit 256e989ba1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Jul 15 15:49:18 2024 -0700
Add test for importer
commit 9793016603
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Jul 11 13:32:16 2024 -0700
Remove unneeded AuthorizesRequests
commit 9e06f2d17f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Jul 11 13:22:10 2024 -0700
Remove commented code
commit d4d19569ee
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Jul 11 10:52:47 2024 -0700
adds execution timer
commit 43c7504f89
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Jul 11 10:03:51 2024 -0700
adds an all option, adds help context for all, seperates logic
commit 1fa6a763bc
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 11:09:57 2024 -0700
updated description
commit 726308bfd5
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:58:45 2024 -0700
removed typo
commit 22ddb695f2
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:57:47 2024 -0700
better description
commit 09b2feac54
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:56:44 2024 -0700
updates assets with selected model to inherit asset model eol
commit 57e1df86c8
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:21:24 2024 -0700
finds model and collects assets with such model
commit 3ea5d4ee40
Author: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com >
Date: Thu May 2 12:55:17 2024 +0200
Update BulkAssetsController.php
Fix for bulk updarte of purchase date to calculate new EOL
commit 5fa0c87ab0
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Apr 30 12:02:11 2024 -0700
null debugbar
commit 75aa01791a
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Apr 30 11:54:33 2024 -0700
adds location select to the create new user vice asset checkout
commit c62a022252
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Mar 21 14:34:47 2024 -0700
replaced for loop with eloquent query update
commit 866f0a9f56
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Mar 19 11:58:49 2024 -0700
syncs assets location to users location
commit 05a8d3030b
Author: Godfrey M <godmartinz@gmail.com >
Date: Sat Mar 16 19:54:48 2024 -0700
correct column name
commit 595dad0f18
Author: Godfrey M <godmartinz@gmail.com >
Date: Sat Mar 16 19:51:40 2024 -0700
updates all assets assigned to user with new location
commit 697595d963
Merge: 0bdd8a591 9502525a4
Author: akemidx <116301219+akemidx@users.noreply.github.com >
Date: Tue Nov 21 16:07:26 2023 -0500
Merge branch 'develop' into eol_date_range_for_reports
commit 0bdd8a5917
Author: akemidx <kojotek.dx@gmail.com >
Date: Wed Aug 2 16:40:38 2023 -0400
fixing key names
commit e35dd2daa1
Author: akemidx <kojotek.dx@gmail.com >
Date: Wed Jul 26 17:45:18 2023 -0400
asset_eol_date stuff
commit f71b69a739
Author: akemidx <kojotek.dx@gmail.com >
Date: Wed Jul 26 17:31:06 2023 -0400
adding eol fields
commit 499a3debcd
Author: akemidx <kojotek.dx@gmail.com >
Date: Tue Jul 11 14:08:55 2023 -0400
this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 15:45:01 +00:00
snipe
503d044fb8
Don’t show new user welcome if location or asset model import
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 15:36:02 +00:00
snipe
752221ee84
Removed error log
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 15:35:34 +00:00
snipe
f87ebb4710
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 15:16:18 +00:00
snipe
abab062756
Added fieldset and depreciation import
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 15:16:08 +00:00
snipe
6f25ed3c59
More nuance to human boolean check
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 15:15:34 +00:00
snipe
6c2cfe0405
Removed log line
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 14:48:24 +00:00
snipe
d1ba16d0eb
Added requestable to fillable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 14:48:05 +00:00
snipe
b3f84f7293
Added aliases, removed depreciation from import
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 14:47:55 +00:00
snipe
e38c2139f8
Merge remote-tracking branch 'origin/develop'
2024-11-13 01:43:17 +00:00
snipe
615edbbd43
Updated seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-13 01:42:39 +00:00
snipe
c012bf0ece
Merge pull request #15799 from Godmartinz/update_deprecated_trigger_for_ms_teams
...
Updated deprecated trigger for ms teams
2024-11-13 00:55:53 +00:00
Godfrey M
947351af67
removed unused variabl
2024-11-12 16:49:02 -08:00
Godfrey M
4e0d70e0b8
checkin notif was missing
2024-11-12 15:44:14 -08:00
Godfrey M
832ccc6aa3
updated deprecated trigger for ms teams
2024-11-12 15:35:09 -08:00
snipe
48713cbddf
Added additional helper files to assetmodel importer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-12 22:40:00 +00:00
snipe
787340b987
Merge pull request #14441 from Godmartinz/ldap_location-resync
...
Fixes Assets location not being resynced when Users location is updated via LDAP
2024-11-12 22:35:11 +00:00
Marcus Moore
53de97db4e
Merge branch 'develop' into saving_custom_report_template
2024-11-12 10:36:07 -08:00
Marcus Moore
5574c5fa49
Improve comments
2024-11-12 10:35:22 -08:00
Marcus Moore
7373e2019c
Improve comment
2024-11-12 10:01:32 -08:00
snipe
22c79d8e1b
Squashed commit of the following:
...
commit 6bec573956
Merge: b6ad69fac 1fc5bb54e
Author: snipe <snipe@snipe.net >
Date: Mon Nov 11 13:54:09 2024 +0000
Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance
Check that the file exists before trying to download stored EULA
commit 1fc5bb54e1
Author: snipe <snipe@snipe.net >
Date: Mon Nov 11 13:50:53 2024 +0000
Check that the file exists before trying to download
Signed-off-by: snipe <snipe@snipe.net >
commit b6ad69fac2
Merge: 357ef7e37 47b2cdb84
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 18:05:20 2024 +0000
Merge pull request #15793 from snipe/allow_eol_explicit
Allow user to specify null for calculation or explicit on bulk edit
commit 47b2cdb846
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 18:04:13 2024 +0000
Allow user to specify null for calculation or explicit on bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit 357ef7e375
Merge: 000f3171e 6928b1b27
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 17:48:25 2024 +0000
Merge pull request #15792 from snipe/edit_eol_from_bulk
Added EOL date to bulk asset edit
commit 6928b1b273
Author: snipe <snipe@snipe.net >
Date: Sun Nov 10 17:47:10 2024 +0000
Added eol date to bulk asset edit
Signed-off-by: snipe <snipe@snipe.net >
commit 000f3171e3
Author: snipe <snipe@snipe.net >
Date: Fri Nov 8 10:28:01 2024 +0000
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
Signed-off-by: snipe <snipe@snipe.net >
commit 5ef3183a52
Merge: a41529dbc 050831868
Author: snipe <snipe@snipe.net >
Date: Thu Nov 7 11:44:06 2024 +0000
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
Improved indexes on manager_id for locations and users, including del…
commit 050831868e
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Nov 7 11:39:27 2024 +0000
Improved indexes on manager_id for locations and users, including deleted_at
commit a41529dbc4
Merge: aa168fcb5 4fcf5ac7d
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 21:22:45 2024 +0000
Merge pull request #15780 from uberbrady/add_manager_indexes
Add new indexes to locations and users for faster manager lookups
commit 4fcf5ac7da
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Nov 6 21:19:41 2024 +0000
Add new indexes to locations and users for faster manager lookups
commit aa168fcb5b
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 18:41:52 2024 +0000
Updated BS table to 1.23.5
Signed-off-by: snipe <snipe@snipe.net >
commit 9c1c93ad52
Merge: b96a31253 ad99b8b45
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 18:40:35 2024 +0000
Merge pull request #15774 from marcusmoore/feature/sc-27350
Added Checkout ID column to user accessory table
commit ad99b8b456
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Nov 6 10:37:31 2024 -0800
Use generic ID translation
commit b96a312539
Merge: 654f67b6a bab1e58ea
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 18:29:22 2024 +0000
Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
commit bab1e58ea4
Author: Joël Pittet <pittet@cs.ubc.ca >
Date: Wed Nov 6 09:46:11 2024 -0800
symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736
commit 654f67b6ac
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 14:05:42 2024 +0000
Updated webpack
Signed-off-by: snipe <snipe@snipe.net >
commit 3965bcd7c1
Merge: 287f4addf 2362cb5e5
Author: snipe <snipe@snipe.net >
Date: Wed Nov 6 14:02:44 2024 +0000
Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests
Fixed notifications for licenses and asset to asset checkoutables
commit 2362cb5e52
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Nov 4 16:32:46 2024 -0800
refactor to getNotifiables
commit e7cb4a75eb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Nov 4 15:56:53 2024 -0800
Show accessory checkout id in user accessory table
commit 93494ac554
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Nov 4 15:17:58 2024 -0800
put dataprovider back in for tests
commit 0d707a1851
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Nov 4 15:13:10 2024 -0800
fixes notifications for licenses and asset to asset checkouables
commit 287f4addf0
Merge: f32ebdc7a 2e96d478f
Author: snipe <snipe@snipe.net >
Date: Mon Nov 4 20:06:24 2024 +0000
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
Revert "Added the display of logs when tests fail in GitHub Actions"
commit 2e96d478f1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Nov 4 11:04:17 2024 -0800
Revert "Added the display of logs when tests fail in GitHub Actions"
commit f32ebdc7ac
Merge: 5897d37fc d6c7dc8e1
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 22:39:58 2024 +0000
Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file
Added missing Livewire file
commit d6c7dc8e1c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 31 15:37:01 2024 -0700
Add missing livewire file
commit 5897d37fcf
Merge: 49de07045 21a27dcac
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 20:54:01 2024 +0000
Merge pull request #15763 from Godmartinz/no_to_email_check
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
commit 21a27dcac1
Merge: 379138076 49de07045
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:55:46 2024 -0700
fixed conflicts
commit 3791380764
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:52:47 2024 -0700
remove unused uses
commit 7a0f79ecd2
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:51:22 2024 -0700
remove test route
commit 97a449e80e
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:50:13 2024 -0700
removes instanceof User check
commit e65942064e
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 31 12:45:29 2024 -0700
send emails even if target has no email
commit 49de07045a
Merge: 7e996c40f 73772a013
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 17:53:17 2024 +0000
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
Fixed MS Team Notifications to utilize workflows after deprecation
commit 7e996c40f5
Merge: 73e8f160c 69e74bbdd
Author: snipe <snipe@snipe.net >
Date: Thu Oct 31 02:51:42 2024 +0000
Merge pull request #15758 from snipe/jerm/fix-deprecation-warning
Fix ${var} deprecation warning in License model
commit 69e74bbdd3
Author: Jeremy Price <jeremy@grokability.com >
Date: Wed Oct 30 19:43:54 2024 -0700
Fix ${var} deprecation warning in License model
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219
This simple fix switches the offending statements to {$var} syntax.
commit 73e8f160cf
Merge: f68df1fa0 bd23772fe
Author: snipe <snipe@snipe.net >
Date: Wed Oct 30 19:29:09 2024 +0000
Merge pull request #15756 from Godmartinz/cc-email-array
changes `admin_cc_email` validation to allow an array
commit bd23772fe9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 11:42:15 2024 -0700
changes cc_email validation to allow array
commit 73772a0138
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 11:12:31 2024 -0700
change button text
commit b26cae372c
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 10:40:23 2024 -0700
merged in develop
commit d6ba303f39
Merge: 9a0eee8f0 f68df1fa0
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 30 10:27:45 2024 -0700
Merge branch 'develop' into refacto_ms_teams_notifs
# Conflicts:
# app/Listeners/CheckoutableListener.php
commit f68df1fa06
Author: snipe <snipe@snipe.net >
Date: Wed Oct 30 13:21:13 2024 +0000
Made type searchable in action logs
Signed-off-by: snipe <snipe@snipe.net >
commit f0813e03bf
Merge: 05875ebd1 58ff641f8
Author: snipe <snipe@snipe.net >
Date: Wed Oct 30 12:18:41 2024 +0000
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
Separated Notifications and Emails: Check ins and Check outs
commit 05875ebd1f
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 22:04:35 2024 +0000
Updated translations
Signed-off-by: snipe <snipe@snipe.net >
commit 9a0eee8f03
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 15:03:43 2024 -0700
revert testing variables
commit 6128765d1f
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 15:03:03 2024 -0700
change wording on notification button
commit c24f79c025
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 14:58:43 2024 -0700
update method comment
commit e7c4343c90
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 14:56:48 2024 -0700
readd checkin accessory format
commit c0620c27ff
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 14:30:34 2024 -0700
adds back laravels channel formats
commit ed81973fe6
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 13:57:42 2024 -0700
adds notifications for deprecation
commit 2d318b394c
Merge: 86d784bd5 5c4971612
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 18:41:49 2024 +0000
Merge pull request #15744 from marcusmoore/chore/action-tests-debugging
Added the display of logs when tests fail in GitHub Actions
commit b987b3dc00
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Oct 28 10:57:48 2024 -0700
adds back the laravel channels package and applies a deprecated check
commit 5c49716129
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 28 10:24:35 2024 -0700
Dump logs on test failure
commit 86d784bd59
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 13:37:59 2024 +0000
Fixed #15740 - use non-translated strings for icons
Signed-off-by: snipe <snipe@snipe.net >
commit 589f9cccdf
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 12:04:10 2024 +0000
Fixed #15732
Signed-off-by: snipe <snipe@snipe.net >
commit 4d848e45e6
Author: snipe <snipe@snipe.net >
Date: Mon Oct 28 11:55:24 2024 +0000
Fixed #15736
Signed-off-by: snipe <snipe@snipe.net >
commit 58ff641f82
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 22:53:53 2024 -0700
removed unused variables
commit ce68f550d8
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 16:01:17 2024 -0700
remove alert emails from cc
commit 6f0c1b12b1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 15:04:54 2024 -0700
this adds check out message for consumables
commit 278bc5e52a
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:59:10 2024 -0700
ads check in and checkout message for license seats
commit cce75a8185
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:48:23 2024 -0700
adds check in and checkout messag for accessories
commit e27ff13377
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:39:40 2024 -0700
adds check in and checkout message for assets
commit 56365495a1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:26:42 2024 -0700
remove unnecessary fields in accessory checkout mail
commit 18da80e6de
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 14:24:00 2024 -0700
fix checkoutable listener for microsoft teams
commit 18760e3fa1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 12:21:51 2024 -0700
replaces teams notification package, passes integration test
commit 57107c487c
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 24 09:40:10 2024 -0700
fixed last test, definetly the last test
commit dfc63641dc
Merge: 07a51ec8b b6340532d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 11:40:50 2024 +0100
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
Fix multi create partial failure (fixes: [RB-18591])
commit 07a51ec8b1
Merge: e0ec6795b 727c0e458
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 10:03:10 2024 +0100
Merge pull request #15712 from Godmartinz/fix_import-progress-bar
Upgraded `livewire v3.5.9 => v3.5.12`
commit 6329f5b87e
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 17:33:23 2024 -0700
removed unused variable from test
commit e0ec6795b5
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 01:27:50 2024 +0100
Use crucial for seeded data
Signed-off-by: snipe <snipe@snipe.net >
commit 15073a0d38
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 17:27:37 2024 -0700
last test to fix
commit a80c09c16d
Merge: ab3b9c451 5509d756b
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 17:23:55 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
commit 5509d756b7
Merge: 55ba6279a b16a978f1
Author: snipe <snipe@snipe.net >
Date: Thu Oct 24 01:12:11 2024 +0100
Merge pull request #15722 from Godmartinz/fix_component_factory
Fixed Component Factory: use manufacturer factory for `manufactuer_id`
commit b16a978f1b
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 16:25:51 2024 -0700
uses manufacturer factory for manufactuer_id
commit ab3b9c4510
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 16:24:01 2024 -0700
remove unnecessary code from checkinasset notification
commit 2cc2b2b1df
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 16:06:27 2024 -0700
apply array_filter to cc emails to prevent errors
commit 62d06b44d6
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:43:42 2024 -0700
set fallback from email address to service.snipe-it.io
commit f29a383179
Merge: fd74c3510 55ba6279a
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:15:14 2024 -0700
Merge branch 'develop' into seperating_notification_n_mail
# Conflicts:
# app/Notifications/CheckoutConsumableNotification.php
commit fd74c35102
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:08:29 2024 -0700
remove old notify by mail from consumable notification
commit c681946b1d
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 15:05:39 2024 -0700
added component markdown changes
commit 257d25bd9e
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 14:56:54 2024 -0700
removed import notification from test, feature is not present in project
commit 6c34a5c52c
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 14:54:21 2024 -0700
conditionally check cc emails, initiate variables
commit 1b5f4415ae
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 23 14:44:45 2024 -0700
corrected cc email behavior
commit 55ba6279a4
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 19:14:17 2024 +0100
Use trans_choice on alert menu
Signed-off-by: snipe <snipe@snipe.net >
commit a9eea830e3
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 19:05:34 2024 +0100
Added manufacturer and model number to component seeders
Signed-off-by: snipe <snipe@snipe.net >
commit af564935d5
Merge: d58f87862 3ee76be7e
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 17:56:04 2024 +0100
Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components
Fixed #15695 - Added manufacturer and model_number to components
commit 3ee76be7e3
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 17:50:22 2024 +0100
Added manufacturer and model_number to components
Signed-off-by: snipe <snipe@snipe.net >
commit d58f87862c
Merge: 5da3ce356 0b6859c49
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 15:09:50 2024 +0100
Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable
Fixed #15717 - Added ability to checkout consumables in variable qty via API
commit 0b6859c491
Author: snipe <snipe@snipe.net >
Date: Wed Oct 23 15:05:35 2024 +0100
Added ability to checkout consumables in variable qty
Signed-off-by: snipe <snipe@snipe.net >
commit 1e9922a0b0
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 16:14:36 2024 -0700
fix moar tests
commit ead27accac
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 15:45:52 2024 -0700
fixed accessory tests and notifiable target
commit 727c0e458c
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:34:39 2024 -0700
remove translation
commit 870dc747db
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:27:32 2024 -0700
oops
commit 0fb3d83fac
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:26:54 2024 -0700
revert controller change
commit 0d59ccd6a6
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 14:23:26 2024 -0700
upgraded livewire v3.5.9 => v3.5.12
commit 5da3ce3564
Merge: c3bbca30a 5ecd2b629
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:10:20 2024 +0100
Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes
Fixed custom field checkboxes on asset edit page
commit c3bbca30ad
Merge: dccb788a8 37f14fff3
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:07:50 2024 +0100
Merge pull request #15710 from snipe/fixes_lightbox_for_avif
Fixes #15701 - load avif files properly in lightbox
commit 37f14fff3b
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:07:28 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit eb6c51fabd
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 22:04:57 2024 +0100
Fixes #15701 - load avif files properly in lightbox
Signed-off-by: snipe <snipe@snipe.net >
commit 5ecd2b6293
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 22 14:04:05 2024 -0700
Default checkbox elements to an empty array
commit 1e31592c55
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 22 11:49:06 2024 -0700
messing with the tests
commit dccb788a88
Merge: 5e1d792bb d10fe77ee
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 17:44:30 2024 +0100
Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
commit d10fe77ee7
Merge: e1882ee6d 5e1d792bb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 22 09:38:31 2024 -0700
Merge branch 'develop' into fixes/get-id-for-current-user
commit 5e1d792bba
Merge: 9cf71976f 780ed91a1
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:52:28 2024 +0100
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing
Fixed #15686 : Corrected capitalization for dashboard section titles by removing strtolower()
commit 9cf71976f6
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:51:42 2024 +0100
Fixed #15706 - Removed purchase order number from asset import
Signed-off-by: snipe <snipe@snipe.net >
commit 15745d9737
Merge: bd97955b9 3f74ff25d
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:39:44 2024 +0100
Merge pull request #15566 from Godmartinz/status-label-error-message
Fixed Status Labels Error Message
commit bd97955b9e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:38:46 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net >
commit 252d99421c
Merge: 5767a98ad db8170162
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:26:48 2024 +0100
Merge pull request #15689 from snipe/better_handle_inline_files
Better handle inline files in file listing
commit 5767a98ad8
Merge: 0c820cbc0 524a44272
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 16:26:23 2024 +0100
Merge pull request #15649 from bryanlopezinc/ImproveImporting
Improve import performance
commit 0c820cbc0d
Merge: 147fcfb8e 3153bbb13
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:56:12 2024 +0100
Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue
Custom Field Existence Validation Issue
commit db81701621
Merge: a05c33feb 147fcfb8e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:44:24 2024 +0100
Merge branch 'develop' into better_handle_inline_files
commit a05c33febf
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:43:19 2024 +0100
Squashed commit of the following:
commit 147fcfb8eb
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a5942
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e08
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c3
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit 46ad1d072f
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit bcb4bd9eb4
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
Signed-off-by: snipe <snipe@snipe.net >
commit 147fcfb8eb
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a5942
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e08
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c3
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit e1882ee6d2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:21:45 2024 -0700
Add comment
commit 7eee239378
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:20:28 2024 -0700
use is_numeric instead of is_int
commit 4188849ae1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:19:48 2024 -0700
Add failing test case
commit 787e651778
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 16:52:21 2024 +0100
Fixed todos with log message
Signed-off-by: snipe <snipe@snipe.net >
commit ef9b6e3b07
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 16:34:54 2024 +0100
Code cleanup
Signed-off-by: snipe <snipe@snipe.net >
commit 06c599cc17
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 16:34:03 2024 +0100
Added method to show or download file
Signed-off-by: snipe <snipe@snipe.net >
commit 6105323877
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 14:11:20 2024 +0100
Use plural class name for src
Signed-off-by: snipe <snipe@snipe.net >
commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit a8d853c44a
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 15:26:27 2024 -0700
Remove focus group tags
commit 7e1b47708e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 15:18:41 2024 -0700
Fix failing test ensuring company id is an integer
commit 979e4502ff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 15:14:39 2024 -0700
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company
commit ff113ef523
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 14:56:58 2024 -0700
typo fix
commit 99dd51a965
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 14:53:18 2024 -0700
Improve name
commit 15c2169477
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 14:31:05 2024 -0700
Scaffold additional tests
commit 50fa6ce335
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 14:12:22 2024 -0700
Scaffold tests
commit 7ae76e7db9
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:55:03 2024 -0700
remove viewdata array from 3 tests
commit b98058ca98
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:48:26 2024 -0700
fix tests pt 3
commit 83e8186d9e
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:39:56 2024 -0700
fix assertSent to AssertNotSent on some test
commit cdd4fef7df
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:34:55 2024 -0700
attempt to fix tests p2
commit dceb8e305f
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 13:11:39 2024 -0700
attempt to fix tests
commit 123cdeb858
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:39:48 2024 -0700
add email check to listener
commit 496b44e887
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:28:57 2024 -0700
merged composer lock from dev
commit a690cc3582
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:26:55 2024 -0700
removing my composer stuff again..for the last time
commit ceb3f5cea6
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:19:50 2024 -0700
added mail-gun and http-client to 8.1
commit 65735a31f1
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:18:34 2024 -0700
removed symfony/mailgun-mailer symfony/http-client
commit 285d6897cf
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Oct 17 12:05:36 2024 -0700
added a coulple test adjustments and moved mail send logic to listener
commit 159a1d3f43
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 11:48:55 2024 -0700
Be more explicit
commit d1149730be
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 16:31:17 2024 +0100
Apply blade component to files views
Signed-off-by: snipe <snipe@snipe.net >
commit 46ad1d072f
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit 780ed91a10
Author: NebelKreis <leipold.johannes@web.de >
Date: Thu Oct 17 16:09:25 2024 +0200
Fix: Removed strtolower() from dashboard titles
This fix ensures the correct capitalization in different languages.
commit bcb4bd9eb4
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 9a79483375
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 16:59:18 2024 -0700
removed namespaces from routing
commit ed6034065b
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 16:47:36 2024 -0700
removed test route
commit a7754c1a7f
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 16:46:52 2024 -0700
fixed asset checkout markdown, and notifiable variable
commit 0e9b3c9119
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:27:39 2024 +0100
Check for existence before trying to get the icon
Signed-off-by: snipe <snipe@snipe.net >
commit 4933aa5784
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:27:04 2024 +0100
Add StorageHelper to app config
Signed-off-by: snipe <snipe@snipe.net >
commit d67addc69e
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:21:43 2024 +0100
Removed filetype column - it’s dumb
Signed-off-by: snipe <snipe@snipe.net >
commit 02c80ff18a
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:18:40 2024 +0100
Added comment
Signed-off-by: snipe <snipe@snipe.net >
commit c01190fac2
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:18:34 2024 +0100
Conditionally add content-type
Signed-off-by: snipe <snipe@snipe.net >
commit 017884f843
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:09:09 2024 +0100
Added checks and filetype display
Signed-off-by: snipe <snipe@snipe.net >
commit c49921f50f
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:08:54 2024 +0100
Removed unused (maybe?) API endpoint
Signed-off-by: snipe <snipe@snipe.net >
commit c49abb6aea
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:08:38 2024 +0100
Refactor the UserFilesController show method for simpler inlining
Signed-off-by: snipe <snipe@snipe.net >
commit ccd2019448
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:08:04 2024 +0100
Removed unusded use statements
Signed-off-by: snipe <snipe@snipe.net >
commit 96191a5e93
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:07:54 2024 +0100
Added method to decide if the file should be inlinable
Signed-off-by: snipe <snipe@snipe.net >
commit c56affd663
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 00:07:37 2024 +0100
Added SVG icon
Signed-off-by: snipe <snipe@snipe.net >
commit 02bda3cd95
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:53:05 2024 -0700
adds Checkout Consumable mailable and slackwebhook channel to notifs
commit 02ff646da4
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:44:45 2024 -0700
adds checkin license mailable
commit 4becdca8aa
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:39:20 2024 -0700
removes toMail from license notificaqtion
commit 2584d60344
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:38:49 2024 -0700
adds Licenses seat checkout Mailable
commit f1d83a3f28
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:30:53 2024 -0700
forgot to add asset checkout markdown to projet
commit c39df34bdf
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:29:50 2024 -0700
forgot to add accessory mail to project
commit dcdf600b78
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 15:27:34 2024 -0700
adds Checkin and Checkout mailables and listner logic
commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit 9710436d54
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 13:12:07 2024 -0700
adds Mailables for asset checkin and out
commit 16cffe9a9d
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 12:53:35 2024 -0700
simplified checkout webhook call
commit 9e1b86f586
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 12:51:19 2024 -0700
sends checkout notification via webhook
commit 3ab2521cb0
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Oct 16 12:21:33 2024 -0700
email comes through, no picture and html markup appear though.
commit 604a964462
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Oct 16 11:52:24 2024 -0700
Improve scenario descriptions
commit 2f72c66614
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Oct 16 11:30:06 2024 -0700
Add additional case
commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
commit cba1a56040
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 15 17:38:11 2024 -0700
Improve readability?
commit d9afde4610
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 15 17:00:22 2024 -0700
Write failing test
commit 9f06a0e441
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 15 14:01:28 2024 -0700
handle some edge cases, null values clean up variable names
commit 42095c0167
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 15 13:02:22 2024 -0700
Add reference link
commit f8476f7133
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 15 12:49:52 2024 -0700
finished the construct and mail call in the listner
commit b29d032bf0
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 15 11:28:27 2024 -0700
adds checkoutAssetMail class, and content method
commit 2500375400
Merge: 16c8264e7 e4e1d0d50
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 17:34:35 2024 +0100
Merge pull request #15672 from uberbrady/ldap_location_fixes
Clean up how we use the '$location' in LDAP sync command
commit e4e1d0d50a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Tue Oct 15 17:26:31 2024 +0100
Clean up how we use the '$location' in LDAP sync command
commit 16c8264e76
Merge: 914a64720 0ae9ce0aa
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 16:42:34 2024 +0100
Merge pull request #15671 from snipe/bug/sc-27147
Bug/sc 27147
commit 0ae9ce0aa9
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 16:41:45 2024 +0100
Cannot sort by updated at on Users [sc-27147]
Signed-off-by: snipe <snipe@snipe.net >
commit 50b8f180b3
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 16:41:39 2024 +0100
More logical grouping in allow_columns
Signed-off-by: snipe <snipe@snipe.net >
commit 914a647204
Merge: 69b6080bd e9225ff3e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 12:47:15 2024 +0100
Merge pull request #15669 from snipe/remlove_ou_requirenedess
Fixed #15663 - remove requiredness for OU
commit e9225ff3ea
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 12:43:10 2024 +0100
Switch to regular HTML for input form field
Signed-off-by: snipe <snipe@snipe.net >
commit d0d4159088
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 12:42:09 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit 69b6080bd8
Merge: ddead359d b997d728f
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 10:31:29 2024 +0100
Merge pull request #15666 from snipe/updated_readme_llm
Added LLM note
commit b997d728fb
Author: snipe <snipe@snipe.net >
Date: Tue Oct 15 10:30:34 2024 +0100
Added LLM note
Signed-off-by: snipe <snipe@snipe.net >
commit ddead359d0
Merge: 0d35335da f3c4e5566
Author: snipe <snipe@snipe.net >
Date: Mon Oct 14 14:29:34 2024 +0100
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2
Refactor asset creation with API
commit f3c4e55667
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Mon Oct 14 15:14:41 2024 +0200
Refactor asset creation with API
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
commit 0d35335da7
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 16:06:17 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net >
commit feaa714304
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 14:23:57 2024 +0100
Nicer disabled button
Signed-off-by: snipe <snipe@snipe.net >
commit e1a70023b1
Merge: de62359c6 fb4fe3004
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:45:48 2024 +0100
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
commit de62359c67
Merge: 12bda8fc7 3dc64cc5e
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:29:34 2024 +0100
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories
Added tests for accessory api controller
commit 12bda8fc7b
Merge: 8aa298f6b b054017c9
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:27:18 2024 +0100
Merge pull request #15653 from snipe/15651_admin_user_on_maintenances
Fixed #15651 - admin user now displaying on maintenances page
commit fb4fe30049
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Fri Oct 11 12:09:09 2024 +0200
Fix asset creation with API and FullMultipleCompanySupport
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
commit b054017c9f
Author: snipe <snipe@snipe.net >
Date: Fri Oct 11 11:16:24 2024 +0100
Fixed #15651 - admin user now displaying on maintenances page
Signed-off-by: snipe <snipe@snipe.net >
commit 524a442724
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com >
Date: Thu Oct 10 23:32:07 2024 +0100
Improved import performance
commit 8aa298f6b0
Merge: 1f3465773 b5b93fdd3
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:30:53 2024 +0100
Merge pull request #15644 from snipe/form_requests_for_settings
Form requests for settings
commit 1f34657734
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:30:35 2024 +0100
Fixed test
Signed-off-by: snipe <snipe@snipe.net >
commit 0856ee648e
Merge: 94a074a19 1dafc970d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:23:14 2024 +0100
Merge pull request #15648 from snipe/update_packages
Updated livewire to 3.5.2
commit 1dafc970df
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 12:19:57 2024 +0100
Updated livewire to 3.5.2
Signed-off-by: snipe <snipe@snipe.net >
commit 94a074a193
Merge: 2d49e1eff b34a7c8aa
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 01:11:10 2024 +0100
Merge pull request #15601 from snipe/check_db_on_healthcheck
Fixed #15439 - check database on healthcheck
commit 2d49e1eff2
Merge: 705bc6f0c c2663ea1e
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 01:09:11 2024 +0100
Merge pull request #15637 from akemidx/bug/sc-26614
FIXED: Badge counter showing deleted assets on User page
commit 705bc6f0c0
Merge: 3ee571374 67a605c9a
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 01:08:25 2024 +0100
Merge pull request #15642 from uberbrady/fix_bulk_checkout
Fix bulk checkout to users, assets, and locations
commit b5b93fdd3a
Author: snipe <snipe@snipe.net >
Date: Thu Oct 10 00:27:00 2024 +0100
Make ldap username required
Signed-off-by: snipe <snipe@snipe.net >
commit d9432baf7a
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 23:51:20 2024 +0100
Mlore ldap style improvements
Signed-off-by: snipe <snipe@snipe.net >
commit 90be2a4498
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:26:30 2024 +0100
Use newer naming convention for errors
Signed-off-by: snipe <snipe@snipe.net >
commit 3886da8941
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:49 2024 +0100
Remove form request from get LDAP method
Signed-off-by: snipe <snipe@snipe.net >
commit 130e0c6242
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:37 2024 +0100
More validation
Signed-off-by: snipe <snipe@snipe.net >
commit 4361a10818
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:30 2024 +0100
Added string
Signed-off-by: snipe <snipe@snipe.net >
commit aa8048ac15
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:25 2024 +0100
Blade changes for ldap
Signed-off-by: snipe <snipe@snipe.net >
commit 710e738e8e
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 22:15:16 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net >
commit 3705b91439
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:51:34 2024 +0100
Added more validation
Signed-off-by: snipe <snipe@snipe.net >
commit 707bdad192
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:56 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net >
commit 242fe33f97
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:42 2024 +0100
Switch to regular HTML input
Signed-off-by: snipe <snipe@snipe.net >
commit ded79469c1
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:29 2024 +0100
Remove unused controller method
Signed-off-by: snipe <snipe@snipe.net >
commit d9fbf330e5
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 20:33:15 2024 +0100
Fixed translations
Signed-off-by: snipe <snipe@snipe.net >
commit 2cb9ac26cd
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:57:04 2024 +0100
Renamed test
Signed-off-by: snipe <snipe@snipe.net >
commit 185bc966e6
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:46:47 2024 +0100
Cleaned up use statements in tests
Signed-off-by: snipe <snipe@snipe.net >
commit a7f7e4938f
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:31:56 2024 +0100
Added form action
Signed-off-by: snipe <snipe@snipe.net >
commit 2883e79193
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:55 2024 +0100
Removed unecessary assets creation
Signed-off-by: snipe <snipe@snipe.net >
commit 9c4191ae0a
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:42 2024 +0100
Basic tests
Signed-off-by: snipe <snipe@snipe.net >
commit 3a77b83e9c
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:34 2024 +0100
Added space
Signed-off-by: snipe <snipe@snipe.net >
commit d9be2b5a5e
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:25 2024 +0100
Trying to use the email_array translation
Signed-off-by: snipe <snipe@snipe.net >
commit 69c43c610c
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 19:30:00 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit 4f957bcf71
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:34:53 2024 +0100
Required flag
Signed-off-by: snipe <snipe@snipe.net >
commit 5cda7cce48
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:21:40 2024 +0100
Only accept a positive number for thresholds
Signed-off-by: snipe <snipe@snipe.net >
commit 41b94e7128
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:19:26 2024 +0100
Fixed form input group
Signed-off-by: snipe <snipe@snipe.net >
commit aa55fa6ff4
Author: snipe <snipe@snipe.net >
Date: Wed Oct 9 18:16:34 2024 +0100
Switch to form requests for settings
Signed-off-by: snipe <snipe@snipe.net >
commit 67a605c9a5
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Oct 9 17:01:26 2024 +0100
Fix bulk checkout to users, assets, and locations
commit c2663ea1e0
Author: akemidx <kojotek.dx@gmail.com >
Date: Tue Oct 8 16:38:33 2024 -0400
withouttrashed
commit 3ee5713740
Merge: ab8a22f77 56e7ea667
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 23:13:15 2024 +0100
Merge pull request #15631 from snipe/test/importer-tests
Add importer tests
commit ab8a22f77e
Merge: 26d7572bc 8c9132aff
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 22:56:23 2024 +0100
Merge pull request #15630 from marcusmoore/bug/sc-27028
Only show EULA when available on print users page
commit 56e7ea6677
Merge: 32551d55d 803532667
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 22:29:35 2024 +0100
Merge pull request #15616 from marcusmoore/test/importer-test-updates
Improve importer tests
commit 26d7572bcc
Merge: 382ebef8c ee046a868
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 22:28:53 2024 +0100
Merge pull request #15603 from marcusmoore/fixes/add-reguard
Added `Model::reguard()` to importer
commit 8c9132aff9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 7 14:22:49 2024 -0700
Hide EULA text and button when nothing will be displayed
commit 382ebef8ca
Merge: 2be88cb95 f76da4844
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 21:26:21 2024 +0100
Merge pull request #15621 from sniff122/develop
Docker Env: Change trusted proxies to RFC1918
commit 2be88cb955
Merge: 7fc498a59 3f36d5f9b
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 11:14:24 2024 +0100
Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users
Removed duplicate JS and removed line break before user section
commit 3f36d5f9b3
Author: snipe <snipe@snipe.net >
Date: Mon Oct 7 11:08:02 2024 +0100
Removed duplicate CSS and removed line break before user section
Signed-off-by: snipe <snipe@snipe.net >
commit f76da48448
Author: Lewis Foster <lewis@sniff122.tech >
Date: Sat Oct 5 18:27:42 2024 +0100
Docker Env: Change trusted proxies to RFC1918
commit 8035326675
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 16:53:19 2024 -0700
Add test
commit dfdd85abb1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 15:14:07 2024 -0700
Remove unused imports
commit 063ea1892b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 15:02:03 2024 -0700
Add trait to clean up files after test runs
commit e213053775
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:59:58 2024 -0700
Swap factory syntax
commit 88d549e7c5
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:40:37 2024 -0700
Remove unused data provider method
commit 983a25aa5f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:39:54 2024 -0700
Simplify permission tests
commit bde05d6ed9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:15:49 2024 -0700
Use new() instead of times()
commit b5ffe54bd0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 13:15:02 2024 -0700
Swap assertEquals parameter order
commit 863c0a8b60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 3 11:43:02 2024 -0700
Fix import_type for accessory state
commit 32551d55d7
Merge: 7fc498a59 e807cfab8
Author: Marcus Moore <mmoore@grokability.com >
Date: Thu Oct 3 11:39:21 2024 -0700
Merge pull request #15579 from bryanlopezinc/ImportTests
Add Import data tests
commit 7fc498a597
Merge: 78ca1026f cb281c640
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 17:39:18 2024 +0100
Merge pull request #15613 from snipe/css_fixes_for_long_values
Smarter word-wrapping on long text
commit cb281c6408
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 17:33:46 2024 +0100
Tweaked line height
Signed-off-by: snipe <snipe@snipe.net >
commit f483cd448f
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 17:27:37 2024 +0100
Smarter work-wrapping on long text
Signed-off-by: snipe <snipe@snipe.net >
commit 78ca1026fd
Merge: 3699d7936 722d5a58e
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:24:32 2024 +0100
Merge pull request #15612 from snipe/fixes_print_assigned_in_profile
Fixes print assigned in profile
commit 722d5a58e7
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:19:38 2024 +0100
Added isset on users
Signed-off-by: snipe <snipe@snipe.net >
commit 7461c3e0ca
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:19:27 2024 +0100
Change controller to assume a collection. (This is dumb, but whatever)
Signed-off-by: snipe <snipe@snipe.net >
commit 3c0f4181ae
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 16:19:06 2024 +0100
Use the newer button style
Signed-off-by: snipe <snipe@snipe.net >
commit 3699d79363
Merge: 54fbd0540 350b627ce
Author: snipe <snipe@snipe.net >
Date: Thu Oct 3 14:34:00 2024 +0100
Merge pull request #15610 from uberbrady/fix_numeric_sort_bug
Fix numeric sort 'ambiguous order clause' error
commit 350b627ce1
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Oct 3 14:23:40 2024 +0100
Fix numeric sort 'ambiguous order clause' error
commit ee046a8688
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Oct 2 10:50:40 2024 -0700
Add matching Model::reguard()
commit b34a7c8aad
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 15:48:35 2024 +0100
Removed die()
Signed-off-by: snipe <snipe@snipe.net >
commit f92bf5dc20
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 15:39:27 2024 +0100
Updated language for failure
Signed-off-by: snipe <snipe@snipe.net >
commit 4d9e85026a
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 15:36:01 2024 +0100
Fixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net >
commit 54fbd0540d
Merge: b483bb163 4db735808
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 12:40:49 2024 +0100
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
commit b483bb1633
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 12:40:45 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net >
commit 4db7358086
Merge: 0dd6f41f6 b9cfdf2e5
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 12:38:46 2024 +0100
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug
Fixed divide by zero bug in depreciation transformer
commit 0dd6f41f66
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 11:04:55 2024 +0100
Simplified 2fa if/else
Signed-off-by: snipe <snipe@snipe.net >
commit 684c20ae39
Author: snipe <snipe@snipe.net >
Date: Wed Oct 2 11:00:49 2024 +0100
Fixed parenthasis
Signed-off-by: snipe <snipe@snipe.net >
commit 3153bbb13f
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 17:04:18 2024 -0500
dumb fix
commit 3dc64cc5e0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 1 13:35:39 2024 -0700
Reference accessory checkout and not the accessory
commit c32f4e34b4
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:35:49 2024 +0100
Minor formatting fix
Signed-off-by: snipe <snipe@snipe.net >
commit ca1886cebc
Merge: 45ab49eea a79dfea40
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:31:38 2024 +0100
Merge pull request #15594 from snipe/localizations/update-2024-10-01
Updated strings
commit a79dfea40a
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:30:58 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net >
commit 45ab49eeab
Merge: 97d00e5aa 8232618a9
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:26:42 2024 +0100
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors
Catch Errors Around Request Notifications
commit 8232618a9f
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 14:26:32 2024 -0500
change the other one too
commit 9a651b567d
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 14:24:03 2024 -0500
change error to warning
commit 97d00e5aa8
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 20:08:54 2024 +0100
Fixed erroneous form tag on anchor
Signed-off-by: snipe <snipe@snipe.net >
commit 5b90d79494
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Oct 1 11:50:48 2024 -0700
Use created_by
commit b9cfdf2e54
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 1 11:41:59 2024 -0700
reworked monthly depreciation variable value
commit 1139acd9f3
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Oct 1 13:36:47 2024 -0500
catch errors around request notifications
commit b7ad80bd31
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 1 11:24:24 2024 -0700
fix monthly depreciation value
commit 5ffd1b8daa
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Oct 1 11:02:39 2024 -0700
fixes if statement in transformer
commit 9a2117466e
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 18:23:40 2024 +0100
Removed placeholder
Signed-off-by: snipe <snipe@snipe.net >
commit 7e3a062984
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 18:23:07 2024 +0100
Use <th> for table header in bulk interstitial
Signed-off-by: snipe <snipe@snipe.net >
commit d274fb6963
Merge: cfc04a1d1 27ba641aa
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:32:48 2024 +0100
Merge pull request #15589 from snipe/adds_checkin_action_on_asset_delete
Adds checkin action on asset delete via View UI
commit 27ba641aa5
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:30:34 2024 +0100
Added checkin on delete to API
Signed-off-by: snipe <snipe@snipe.net >
commit 5823197e6f
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:29:02 2024 +0100
Added checkin action on delete for checked out assets
Signed-off-by: snipe <snipe@snipe.net >
commit cfc04a1d12
Merge: 12da43303 cae8aa784
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:08:58 2024 +0100
Merge pull request #15588 from snipe/added_more_maxlengths
Added maxlengths to additional fields
commit cae8aa7840
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 14:02:54 2024 +0100
Added maxlengths to additional fields
Signed-off-by: snipe <snipe@snipe.net >
commit 12da43303f
Author: snipe <snipe@snipe.net >
Date: Tue Oct 1 01:44:05 2024 +0100
Fixed #15584 - regression with required css change
Signed-off-by: snipe <snipe@snipe.net >
commit fdfea390fb
Merge: d609ed50a 5689e940b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 30 12:59:27 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b04afbbc85
Merge: b964ce102 3f311ba2f
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 19:26:08 2024 +0100
Merge pull request #15564 from uberbrady/improve_autoclose
Get us better debugging output for new Github Stale Action
commit b964ce1025
Merge: 6217cba20 68e3f375f
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 19:25:05 2024 +0100
Merge pull request #15583 from Godmartinz/remove-sortable-from-depreciations
Removed sortablity for current value column in depreciations report
commit 6217cba201
Merge: 5689e940b b32ab6a06
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 19:24:19 2024 +0100
Merge pull request #15524 from Godmartinz/double-notif-bug
Fixed double webhook notifications // Separated email and webhook notifications.
commit 68e3f375fc
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 30 11:15:49 2024 -0700
removes sortablity from current value column
commit 5689e940b8
Author: snipe <snipe@snipe.net >
Date: Mon Sep 30 18:23:12 2024 +0100
Fixed #15581 - missing bracker
Signed-off-by: snipe <snipe@snipe.net >
commit e807cfab86
Merge: 0b3f45856 001348c63
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com >
Date: Mon Sep 30 12:47:52 2024 +0100
Merge branch 'develop' into importTests
commit 0b3f458561
Author: bryanlopezinc <bryanlopez2kul2@yahoo.com >
Date: Mon Sep 30 12:42:41 2024 +0100
Added tests for Import feature
commit 001348c638
Author: snipe <snipe@snipe.net >
Date: Sun Sep 29 14:33:42 2024 +0100
Unset required on checkout select :(
Related to the discussion at #15552
Signed-off-by: snipe <snipe@snipe.net >
commit 1b041af862
Merge: 260b15368 d120585f9
Author: snipe <snipe@snipe.net >
Date: Sun Sep 29 11:25:01 2024 +0100
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 260b153689
Merge: 36b27fcda 05d74f7a9
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 16:09:51 2024 +0100
Merge pull request #15573 from snipe/fixed_requiredness_indicator
Fixes for requiredness indicator in UI
commit 05d74f7a92
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 15:42:03 2024 +0100
Covered setup pages too
Signed-off-by: snipe <snipe@snipe.net >
commit dc85588d7f
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 15:31:44 2024 +0100
Don’t show password as required if editing
Signed-off-by: snipe <snipe@snipe.net >
commit 585f998cae
Author: snipe <snipe@snipe.net >
Date: Sat Sep 28 15:28:06 2024 +0100
Fixes for requiredness display
Signed-off-by: snipe <snipe@snipe.net >
commit d120585f94
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 14:07:30 2024 +0100
Check for valid eula for license, consumable
Signed-off-by: snipe <snipe@snipe.net >
commit 166a700342
Merge: 6c85ba349 36b27fcda
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 13:37:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 36b27fcda3
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 13:37:14 2024 +0100
Check for valid category before getting the eula
Signed-off-by: snipe <snipe@snipe.net >
commit a44490e448
Author: snipe <snipe@snipe.net >
Date: Fri Sep 27 13:07:24 2024 +0100
Nowrap on files column
Signed-off-by: snipe <snipe@snipe.net >
commit 9aada2ec70
Merge: ac6411743 ef82f954e
Author: snipe <snipe@snipe.net >
Date: Thu Sep 26 09:09:35 2024 +0100
Merge pull request #15498 from Godmartinz/Modal_fix
Refactoring modals with partials and fixing misalignments
commit 3f74ff25d2
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 16:19:09 2024 -0700
fixed error message
commit ef82f954e5
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 15:47:57 2024 -0700
fixed required css, and user input lengths
commit 3f311ba2fb
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 25 21:27:45 2024 +0100
Get us better debugging output for new Github Stale Action
commit 96953aa2ed
Merge: e609b3976 b797c37ac
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com >
Date: Wed Sep 25 12:50:01 2024 -0700
Merge pull request #23 from Godmartinz/Modal_fix_p3
replace duplicate code with partials
commit b797c37acb
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 12:48:05 2024 -0700
replace duplicate code with partials
commit 6c85ba3495
Merge: 9f8473e25 ac6411743
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:45:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ac6411743b
Merge: 9b03f4649 3f0245f88
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:35:58 2024 +0100
Merge pull request #15563 from snipe/refined_gates_on_user_bulk
Update for #15534 - Refined gates on user bulk
commit 3f0245f88f
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:33:00 2024 +0100
Make controller gate match dropdown gate
Signed-off-by: snipe <snipe@snipe.net >
commit c02647a0fa
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:32:03 2024 +0100
Moved merge into delete gate, since they do technically delete
Signed-off-by: snipe <snipe@snipe.net >
commit edca3f432c
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:30:58 2024 +0100
Removed gate for delete
Signed-off-by: snipe <snipe@snipe.net >
commit 2218c94aa3
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 20:29:23 2024 +0100
Gates the dropdown based on user permissions
Signed-off-by: snipe <snipe@snipe.net >
commit e609b39760
Merge: 0bc98e971 12522a379
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com >
Date: Wed Sep 25 12:09:26 2024 -0700
Merge pull request #22 from Godmartinz/Modal_fix_p2
Modal fix p2
commit 12522a3791
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 12:07:15 2024 -0700
fix spacing issues
commit f6d7ea19e4
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 19:44:39 2024 +0100
Set view as base permission, drill down for more intrusive actions
Signed-off-by: snipe <snipe@snipe.net >
commit 18ddffe8f9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 11:42:16 2024 -0700
fix partial variable intialization, fix width of input fields
commit 9b03f46490
Merge: cb6e5042d fac4833b5
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 19:32:01 2024 +0100
Merge pull request #15534 from marcusmoore/bulk-print-users
Added the ability to bulk print users
commit 926a319552
Merge: 0bc98e971 cb6e5042d
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 25 11:10:24 2024 -0700
Merge branch 'develop' into Modal_fix_p2
commit 9f8473e254
Merge: 0e61d0b19 cb6e5042d
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 18:36:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb6e5042d9
Merge: c1a887b48 ba69259f2
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 18:32:59 2024 +0100
Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status
Fixed #13396 - do not allow checkout to undeployable status types
commit c1a887b48b
Merge: ba1220484 658c94ad8
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 18:32:21 2024 +0100
Merge pull request #15561 from snipe/fixes/adds_action_date_to_sorting
Changed `action_date` to `created_at` in activity report
commit 658c94ad8b
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 17:25:15 2024 +0100
Changed action_date to created_at
Signed-off-by: snipe <snipe@snipe.net >
commit 0e61d0b195
Merge: abdddbec4 ba1220484
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 15:51:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ba12204842
Merge: eeabc8dc9 1c3babaca
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 15:51:14 2024 +0100
Merge pull request #15555 from snipe/fixes/user_file_upload
Fixed case on `$logAction` for user file upload
commit 1c3babacaf
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 15:46:57 2024 +0100
Fixed case on logAction for usewr file upload
Signed-off-by: snipe <snipe@snipe.net >
commit abdddbec44
Merge: a425c2b76 eeabc8dc9
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 11:58:25 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit eeabc8dc9d
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 11:33:45 2024 +0100
Dev assets
Signed-off-by: snipe <snipe@snipe.net >
commit 21f8ac8e52
Merge: c38222e95 2a2666be0
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 11:31:23 2024 +0100
Merge pull request #15552 from Godmartinz/ragged-form-inputs
Fixed input field misalignments
commit a425c2b765
Merge: 34eb10ff7 c38222e95
Author: snipe <snipe@snipe.net >
Date: Wed Sep 25 10:52:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 2a2666be0b
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Sep 24 13:24:50 2024 -0700
makes required a pseudo field
commit c38222e956
Merge: 8cf1e4dce 0ce5832b6
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 18:10:53 2024 +0100
Merge pull request #15549 from snipe/fixes/#15548_unify_audit_api_endpoints
Fixes #15548 - unify audit api endpoints
commit 0ce5832b6c
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 17:29:40 2024 +0100
Removed debugging
Signed-off-by: snipe <snipe@snipe.net >
commit b6340532d7
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Tue Sep 24 17:15:39 2024 +0100
Improve the error and success messages and linking
commit 5fb43dd159
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 16:55:56 2024 +0100
Handle `audit` *and* `audits` for urls
Signed-off-by: snipe <snipe@snipe.net >
commit de57d71bf1
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 16:30:24 2024 +0100
Fixed #15548 - unify audit due/overdue APIs
Signed-off-by: snipe <snipe@snipe.net >
commit ba69259f2d
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 15:35:00 2024 +0100
Fixed #13396 - do not allow checkout to undeployable status types
Signed-off-by: snipe <snipe@snipe.net >
commit c71411465a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Tue Sep 24 15:17:35 2024 +0100
First pass at better-handling those annoying Rollbars we keep getting
commit 8cf1e4dceb
Merge: ab0c009c0 66249a37e
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 11:10:20 2024 +0100
Merge pull request #15544 from snipe/bug/sc-26855
Fixed app settings view on mobile
commit 66249a37ed
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 11:08:31 2024 +0100
Tweaked styles
Signed-off-by: snipe <snipe@snipe.net >
commit 96712cb398
Author: snipe <snipe@snipe.net >
Date: Tue Sep 24 10:55:26 2024 +0100
Fixed app settings view on mobile
Signed-off-by: snipe <snipe@snipe.net >
commit fac4833b58
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 17:15:16 2024 -0700
Remove unused import
commit a12c9d053f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:44:25 2024 -0700
Hide label when printing
commit 8b3b68b308
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:43:14 2024 -0700
Show or hide all eulas at once when printing multiple users
commit 4b02db5031
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:26:22 2024 -0700
Add authorization check in bulk users controller
commit ab90c0cf05
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:10:40 2024 -0700
Add missing eager load in bulk users controller
commit cef7ddc719
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 16:10:21 2024 -0700
Add eager loads to userscontroller
commit 3870095a28
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 15:50:24 2024 -0700
Fix Cannot read properties of undefined error by removing snipe-table class from eula table
commit a02e250b22
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 15:26:15 2024 -0700
Add page breaks for each user
commit 8ac5c0e471
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 14:05:47 2024 -0700
Re-combine layout and view
commit a2d4dcf6e8
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 12:49:36 2024 -0700
Use bulk actions menu
commit 54044bfa5e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 10:57:57 2024 -0700
Add eager loads
commit e493cc964d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 10:48:07 2024 -0700
Remove AssetCountForSidebar middleware from print view
commit 29af210f4f
Merge: 5128fd49e ab0c009c0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 23 10:26:20 2024 -0700
Merge branch 'develop' into bulk-print-users
commit 34eb10ff73
Merge: 7d7d58769 ab0c009c0
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:45:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab0c009c0d
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:45:10 2024 +0100
Fixed seeder
Signed-off-by: snipe <snipe@snipe.net >
commit 7d7d58769c
Merge: 245d5dc46 b68805cf8
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:13:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b68805cf83
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 19:11:52 2024 +0100
Small fix for notifications checkout
Signed-off-by: snipe <snipe@snipe.net >
commit 245d5dc469
Merge: 4ab478bb9 7d858129d
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 17:28:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
commit 7d858129d9
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:44:19 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net >
commit 65ce63bc9b
Merge: 5eea9d195 54fba2f54
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:42:07 2024 +0100
Merge pull request #15537 from snipe/snyk/updated_jspdf_autotable
Updated jspdf autotable
commit 54fba2f547
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:40:41 2024 +0100
Update jspdf autotable
Signed-off-by: snipe <snipe@snipe.net >
commit 5eea9d1950
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:33:56 2024 +0100
Corrected text warning translation
Signed-off-by: snipe <snipe@snipe.net >
commit b84a634ec7
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:33:35 2024 +0100
Corrected comment
Signed-off-by: snipe <snipe@snipe.net >
commit 2fc88a0e08
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:33:26 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net >
commit bc540b6564
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 14:02:28 2024 +0100
Requestable status not saving with manual [sc-26848]
Signed-off-by: snipe <snipe@snipe.net >
commit f53b852dff
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:53:52 2024 +0100
Make created_by equal one in the seeder
Signed-off-by: snipe <snipe@snipe.net >
commit b83d1a043f
Merge: cdb7ccb8f b21c303e5
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:47:31 2024 +0100
Merge pull request #15519 from snipe/features/add_created_at_created_by
Change `user_id` to `created_by`
commit 4ab478bb97
Merge: d96c5e1ba cdb7ccb8f
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:44:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b21c303e56
Merge: b88f2054d cdb7ccb8f
Author: snipe <snipe@snipe.net >
Date: Fri Sep 20 13:43:50 2024 +0100
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
commit 5128fd49e6
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:27:25 2024 -0700
Allow printing all users
commit 2d2d5bdc7e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:23:47 2024 -0700
Pass user in array
commit 8364d26c9b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:18:26 2024 -0700
Extract parent layout
commit efd6d7625f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:16:05 2024 -0700
Remove bad closing tag
commit bdf5708bfc
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:10:43 2024 -0700
Remove accidental line
commit e95703cb18
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 17:10:07 2024 -0700
Use eager load
commit 7ad4a29970
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 16:54:39 2024 -0700
Add eager loading
commit cdb7ccb8f3
Merge: 8270947ed d446773fd
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 21:54:03 2024 +0100
Merge pull request #15532 from spencerrlongg/bug/15253
Catch Exceptions on Checkout Notification
commit 8270947ed2
Merge: 4f7c8e0c3 8e1111c68
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 21:49:27 2024 +0100
Merge pull request #13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
commit 4f7c8e0c3d
Merge: d7bde3784 3ea5d4ee4
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 21:36:09 2024 +0100
Merge pull request #14671 from Robert-Azelis/patch-6
[FIX] Update EOL date when used bulk update of purchase date
commit d609ed50a4
Merge: d639d6fbc d7bde3784
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 13:20:55 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit b88f2054dd
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:38:34 2024 +0100
Refactor isDeletable on companies
Signed-off-by: snipe <snipe@snipe.net >
commit d7914e238d
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:34:54 2024 +0100
Added created by to company on save
Signed-off-by: snipe <snipe@snipe.net >
commit d7bde37842
Merge: 454796e52 4facc4007
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:33:10 2024 +0100
Merge pull request #15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync
Added #15506 : Explicitly request used LDAP attributes
commit 454796e52a
Merge: eef487d61 7c85ad54e
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:32:03 2024 +0100
Merge pull request #15518 from snipe/sort_by_numeric_custom_fields
Fixed #11634 - Sort by numeric columns for numeric custom fields
commit eef487d61b
Merge: dddbf27d7 71dbc7abb
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:31:02 2024 +0100
Merge pull request #15531 from Godmartinz/status-doesnt-update-in-email
Fixed mail notification field `status label` not updating
commit 71dbc7abb0
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Sep 19 12:23:07 2024 -0700
refreshed the assetstatus relationship
commit d639d6fbc1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 12:21:54 2024 -0700
Add tests for accessory select list endpoint
commit 74088ea581
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 20:13:38 2024 +0100
Optimize isDeletable counts
Signed-off-by: snipe <snipe@snipe.net >
commit fff069824b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 12:11:03 2024 -0700
Add tests for update accessory endpoint
commit d446773fdd
Author: spencerrlongg <spencer@spencerlong.com >
Date: Thu Sep 19 14:05:48 2024 -0500
catch exceptions on notification
commit f283b5fbe8
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:56:39 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net >
commit a5be18bb14
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 11:55:15 2024 -0700
Add test for limit and offset
commit eb6f05faf7
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:41:46 2024 +0100
Eager load adminuser
Signed-off-by: snipe <snipe@snipe.net >
commit 118183ff58
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:41:39 2024 +0100
Removed footer
Signed-off-by: snipe <snipe@snipe.net >
commit 2137890496
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 11:33:20 2024 -0700
Remove dead code
commit ebf6ce6980
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:27:10 2024 +0100
Refactor for fewer queries
Signed-off-by: snipe <snipe@snipe.net >
commit 9b22d6d493
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 19 11:24:01 2024 -0700
Add tests for accessory checkouts endpoint
commit 5ebf0ed2b2
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 19:19:14 2024 +0100
Updated variable
Signed-off-by: snipe <snipe@snipe.net >
commit 836893cba5
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:35:00 2024 +0100
Added id to report
Signed-off-by: snipe <snipe@snipe.net >
commit cd98b3817d
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:26:08 2024 +0100
Removed duplicate line
Signed-off-by: snipe <snipe@snipe.net >
commit 727806372c
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:22:11 2024 +0100
Added created_by to status label
Signed-off-by: snipe <snipe@snipe.net >
commit 5e1c736d49
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 18:04:50 2024 +0100
Added created_by for manufacturers
Signed-off-by: snipe <snipe@snipe.net >
commit 6579fa72da
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:56:05 2024 +0100
Added scoping for categories and companies
Signed-off-by: snipe <snipe@snipe.net >
commit 82d6e1510f
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:41:05 2024 +0100
Order by created_by for depreciations
Signed-off-by: snipe <snipe@snipe.net >
commit 822ea96dfd
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:31:46 2024 +0100
Use auth()->id() instead of Auth::id()
Signed-off-by: snipe <snipe@snipe.net >
commit b247fc33b9
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:28:01 2024 +0100
Added legacy comment
Signed-off-by: snipe <snipe@snipe.net >
commit 2dcae780c0
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:26:21 2024 +0100
Reapply deleted code
Signed-off-by: snipe <snipe@snipe.net >
commit 5c3180ffa0
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:25:09 2024 +0100
Removed duplicate code
Signed-off-by: snipe <snipe@snipe.net >
commit 65eba30038
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:23:34 2024 +0100
Fixed markdown in acceptance reminder
Signed-off-by: snipe <snipe@snipe.net >
commit bbce7b40ca
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:20:56 2024 +0100
Additional consistencies
Signed-off-by: snipe <snipe@snipe.net >
commit 02a29c71ef
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:01:48 2024 +0100
Added created_by
Signed-off-by: snipe <snipe@snipe.net >
commit 6699995972
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:01:36 2024 +0100
Added created_by to components
Signed-off-by: snipe <snipe@snipe.net >
commit 951f03094a
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 17:01:17 2024 +0100
Added created_by to kits
Signed-off-by: snipe <snipe@snipe.net >
commit 354b00ef15
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:45:51 2024 +0100
Made method name consistent
Signed-off-by: snipe <snipe@snipe.net >
commit c93229179b
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:45:39 2024 +0100
Added order by created_by to accessories
Signed-off-by: snipe <snipe@snipe.net >
commit a77a7065d7
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:34:10 2024 +0100
Added order by admin to assets
Signed-off-by: snipe <snipe@snipe.net >
commit 4363e8b34c
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:20:42 2024 +0100
Updated importer
Signed-off-by: snipe <snipe@snipe.net >
commit 9adb2c24f3
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:06:36 2024 +0100
Squashed commit of the following:
commit dddbf27d78
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net >
commit fcefcc8184
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net >
commit 634a4afa75
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:04:54 2024 +0100
Fixed 1001 query on license
Signed-off-by: snipe <snipe@snipe.net >
commit 7650628d30
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 16:00:59 2024 +0100
Removed free seat count from fillable
Signed-off-by: snipe <snipe@snipe.net >
commit 7f690a6238
Author: snipe <snipe@snipe.net >
Date: Thu Sep 19 15:58:32 2024 +0100
Fixed variable name
Signed-off-by: snipe <snipe@snipe.net >
commit b32ab6a06c
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 18 16:36:24 2024 -0700
import User model
commit 4ff5fc1ff9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 18 16:19:35 2024 -0700
clean up variables
commit 86f13a9735
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 16:13:34 2024 -0700
Add index test
commit c40209f500
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 18 15:23:44 2024 -0700
seperates emails and webhook notifications
commit a071fff954
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 12:32:14 2024 -0700
Implement tests
commit 8b50ef077d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:58:33 2024 -0700
Implement test
commit 607f29030f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:53:27 2024 -0700
Stub out test
commit a6bcd3c0c2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:47:59 2024 -0700
Add validation test
commit 9b293afaac
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:28:29 2024 -0700
Remove more dead code
commit 636c776620
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:27:37 2024 -0700
Remove dead code
commit d5f659024c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:27:09 2024 -0700
Add test for logging
commit 832e50a71e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:19:41 2024 -0700
Implement test
commit fa19686248
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 11:18:21 2024 -0700
Implement test
commit c021609c13
Merge: 7b31df7c1 dddbf27d7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 18 10:42:58 2024 -0700
Merge branch 'develop' into testing/fmcs-accessories
commit 655abe8be5
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:32:59 2024 +0100
Fixed requestable user_id
Signed-off-by: snipe <snipe@snipe.net >
commit d96c5e1ba4
Merge: a807646d3 dddbf27d7
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:20:55 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit dddbf27d78
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net >
commit bae9982833
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:18:14 2024 +0100
Updated request methods
Signed-off-by: snipe <snipe@snipe.net >
commit a807646d39
Merge: 83b4bf9cf fcefcc818
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:48:09 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit abe79df6dc
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:47:30 2024 +0100
Added translation
Signed-off-by: snipe <snipe@snipe.net >
commit fcefcc8184
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 1582d81e5b
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 22:16:41 2024 +0100
Change `user_id` to `created_by`
Signed-off-by: snipe <snipe@snipe.net >
commit 7c85ad54eb
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 19:44:03 2024 +0100
Sort by numeric columns for numeric custom fields
Signed-off-by: snipe <snipe@snipe.net >
commit 7b31df7c14
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Sep 17 09:11:58 2024 -0700
Begin additional test case
commit 83b4bf9cf8
Merge: 9ff211105 6c996b775
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 15:54:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c996b7759
Merge: fe5fc6e0c 9e957baeb
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 15:54:11 2024 +0100
Merge pull request #15516 from snipe/fixes/fmcs_edit_user
Fixed check for outside assets on user update validation
commit 9e957baeb5
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 15:46:45 2024 +0100
Fixed check for outside assets on user update validation
Signed-off-by: snipe <snipe@snipe.net >
commit 12fd9cd97a
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 17:00:08 2024 -0700
Update interface name
commit 9e03c4ba6f
Merge: 8eb1c487b 3519a82dd
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:58:46 2024 -0700
Merge branch 'testing/fmcs' into testing/fmcs-accessories
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit 8eb1c487bc
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:52:10 2024 -0700
implement FMCS test for accessory index
commit e835637ef0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:40:10 2024 -0700
Add accessory checkin test
commit eb35608bb5
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:35:33 2024 -0700
Remove call handled by form request
commit 3f07f682de
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:35:21 2024 -0700
Migrate existing tests to TestsPermissionsRequirement
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit fe5fc6e0ce
Merge: 62747a009 15183c482
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 15:56:31 2024 +0100
Merge pull request #15471 from Godmartinz/Edit_side-panel
Fixes margin for the sidebar menus while using rtl languages
commit 62747a0090
Merge: b465cc98d c6c5cb73c
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 15:02:55 2024 +0100
Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing
Fixed misalignment of consumables with smaller media
commit 9ff2111055
Merge: 1328366a4 b465cc98d
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 14:52:48 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit b465cc98d8
Merge: 8774da392 4debaaea3
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 14:45:06 2024 +0100
Merge pull request #15510 from snipe/bulk_users_locale_fix
Fixed #15504 - allow nulling/not changing locale in user bulk edit
commit 4debaaea39
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 14:31:10 2024 +0100
Fixed #15504 - allow nulling/not changing locale in user bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit 1328366a48
Merge: 7e14f8c6d 8774da392
Author: snipe <snipe@snipe.net >
Date: Mon Sep 16 12:38:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4facc4007e
Author: setpill <37372069+setpill@users.noreply.github.com >
Date: Fri Sep 13 17:05:48 2024 +0200
feat: Explicitly request LDAP attributes during sync
commit 31da47e046
Author: setpill <37372069+setpill@users.noreply.github.com >
Date: Fri Sep 13 17:05:28 2024 +0200
refactor: Put LDAP attribute mapping in array
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 0bc98e971f
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Sep 12 12:26:19 2024 -0700
refactoring modals with partials and fixing misalignments
commit 8774da3921
Merge: ab3b65531 a97530367
Author: snipe <snipe@snipe.net >
Date: Thu Sep 12 16:08:44 2024 +0100
Merge pull request #15492 from snipe/fixes/edit_to_archived_warning
Fix - warn user on changing status to undeployable when editing
commit c6c5cb73cf
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 11 10:49:27 2024 -0700
fixes consumables positioning with smaller media
commit a97530367d
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 17:29:22 2024 +0100
Fixed tests again
Signed-off-by: snipe <snipe@snipe.net >
commit 43250ae881
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 17:04:09 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net >
commit 04e96b8f20
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 16:43:41 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 98323185de
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 16:43:33 2024 +0100
Null and warn if editing asset to a non-deployabe state
Signed-off-by: snipe <snipe@snipe.net >
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
commit 7e14f8c6d6
Merge: fddbdafb9 ab3b65531
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 12:25:28 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ab3b655312
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 12:25:09 2024 +0100
Fixed #15483 - show EOL by default
Signed-off-by: snipe <snipe@snipe.net >
commit 601d8d7e5f
Merge: 4f0f72b29 ca01261c1
Author: snipe <snipe@snipe.net >
Date: Wed Sep 11 09:46:58 2024 +0100
Merge pull request #15486 from marcusmoore/fixes/custom-field-values
Fixed a couple bugs in CustomFieldSetDefaultValuesForModel component
commit ca01261c1f
Merge: 6423df213 4f0f72b29
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Sep 10 16:05:39 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
commit 15183c4822
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Sep 10 11:05:03 2024 -0700
rephrased the ternary <-correctly spelled
commit fddbdafb99
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 19:03:56 2024 +0100
Fixed conflict
Signed-off-by: snipe <snipe@snipe.net >
commit a5dbece1a9
Merge: 713bb104e 4f0f72b29
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 19:00:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 4f0f72b29e
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 18:15:12 2024 +0100
Fixed version
Signed-off-by: snipe <snipe@snipe.net >
commit 4183d1834f
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 18:14:03 2024 +0100
Pre-release assets
Signed-off-by: snipe <snipe@snipe.net >
commit 713bb104ec
Merge: 7f2cae4f2 4998d60f3
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 14:46:15 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4998d60f39
Merge: f6bf2d03c 7cf30003b
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 14:43:27 2024 +0100
Merge pull request #15481 from snipe/localizations/2024-09-10
Updated translations
commit 7cf30003b6
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 14:41:08 2024 +0100
Updated strings
Signed-off-by: snipe <snipe@snipe.net >
commit f6bf2d03c4
Merge: 6f44441a8 7c8955b12
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:04:58 2024 +0100
Merge pull request #15445 from Godmartinz/eula_confusion
Fixed priority for category eula vs default eula
commit 6f44441a8b
Merge: e7e5dfbdf 76c9015aa
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:04:23 2024 +0100
Merge pull request #15469 from marcusmoore/accessory_tests
Added UI tests for creating accessories
commit e7e5dfbdfa
Merge: d62315fbe 5d5f42129
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:04:08 2024 +0100
Merge pull request #15470 from marcusmoore/company_tests
Added UI tests for creating companies
commit d62315fbe4
Merge: 7f3f77dec 22a2cc025
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:03:55 2024 +0100
Merge pull request #15472 from marcusmoore/testing/dashboard_counts
Added test for dashboard counts
commit 7f3f77dec8
Merge: 82e56c683 0820dd9da
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 11:03:46 2024 +0100
Merge pull request #15473 from marcusmoore/testing/accessory_api_tests
Added some permission tests for accessory api endpoints
commit 82e56c6832
Merge: 549dec9f9 dc6a5bf99
Author: snipe <snipe@snipe.net >
Date: Tue Sep 10 09:37:02 2024 +0100
Merge pull request #15474 from marcusmoore/bug/sc-26730
Fixed login success message not being displayed
commit 76c9015aa9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 16:51:40 2024 -0700
Add test case
commit 5d5f421294
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 16:49:43 2024 -0700
Add test case
commit 367f02af86
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 16:34:04 2024 -0700
more partials and includes
commit 7a1c721eca
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 16:22:56 2024 -0700
making modal partials for reuse
commit 6423df2133
Merge: 51d63d57c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 16:07:37 2024 -0700
Merge branch 'develop' into fixes/custom-field-values
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
commit dc6a5bf998
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 14:54:19 2024 -0700
Reflash session so login message is displayed
commit 0820dd9da4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 14:36:32 2024 -0700
Update test names
commit aa6ab2df60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 14:35:38 2024 -0700
Add permission tests for some accessory api endpoints
commit 22a2cc0256
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 13:21:10 2024 -0700
Add test for dashboard counts
commit 57fab0268b
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 13:02:25 2024 -0700
made it a terenary
commit ad5768d8b2
Author: Godfrey M <godmartinz@gmail.com >
Date: Mon Sep 9 12:45:11 2024 -0700
fixes margin for the sidebar using rtl languages
commit 35533c39d5
Merge: d4426e468 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 12:18:02 2024 -0700
Merge branch 'develop' into company_tests
commit de403f6e07
Merge: 010f66f4c 549dec9f9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 12:17:53 2024 -0700
Merge branch 'develop' into accessory_tests
commit 549dec9f9e
Merge: b2a634924 0e9f7153c
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 20:13:01 2024 +0100
Merge pull request #15468 from marcusmoore/coverage
Added coverage commands for Herd users
commit d4426e4686
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 9 11:03:00 2024 -0700
Add simple tests for company creation via UI
commit b2a6349243
Merge: ce97e2a30 c5dbc5f6b
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 10:06:42 2024 +0100
Merge pull request #15465 from snipe/update_city_on_bulk_user_edit
Correctly save user’s city on bulk edit
commit c5dbc5f6b8
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 10:01:07 2024 +0100
Correctly save user’s city on bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit 7f2cae4f26
Merge: e34f549e4 ce97e2a30
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 03:56:05 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ce97e2a30f
Merge: e1fcfc8dc 7d9a0eba0
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 03:54:28 2024 +0100
Merge pull request #15463 from snipe/consumables_order_by_remaining
Added ability to sort on qty and remaining for consumables
commit 7d9a0eba04
Author: snipe <snipe@snipe.net >
Date: Mon Sep 9 03:49:58 2024 +0100
Added ability to sort on qty and remaining for consumables
Signed-off-by: snipe <snipe@snipe.net >
commit 010f66f4c9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:48:11 2024 -0700
Add validation test
commit 9c6718b459
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:46:35 2024 -0700
Organize
commit 9f832a93c9
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:44:52 2024 -0700
Ensure user is stored
commit 487d88c012
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:43:01 2024 -0700
Add some ui tests for accessories
commit 0e9f7153c0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Sep 4 15:13:45 2024 -0700
Add composer commands for generating coverage reports via Herd
commit 7c8955b126
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 4 12:38:35 2024 -0700
revert changes to label view
commit 20fa4c39f9
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 4 12:26:44 2024 -0700
adds setEula to support\settings
commit f04a4a3cf5
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Sep 4 12:21:49 2024 -0700
adds test
commit cf07186ae8
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Sep 3 12:23:23 2024 -0700
gives priority to default eula being checked vs catregory eula
commit 51d63d57c6
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Sep 3 12:22:43 2024 -0700
Hide the "Add default values" checkbox if no fieldset selected
commit e34f549e4c
Merge: a8813cca9 e1fcfc8dc
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 19:16:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e1fcfc8dc1
Merge: 13dbf9ee7 9fe8a866e
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 19:14:49 2024 +0100
Merge pull request #15440 from snipe/fixes/user_api_put_patch
Fixes #15435 - user api put patch API route regression
commit 9fe8a866e0
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 19:07:21 2024 +0100
Updated test
Signed-off-by: snipe <snipe@snipe.net >
commit e8e3060a75
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 18:51:22 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 6aaf2f623f
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 18:49:55 2024 +0100
Removed extra route
Signed-off-by: snipe <snipe@snipe.net >
commit dfbccf50e8
Author: snipe <snipe@snipe.net >
Date: Mon Sep 2 18:48:09 2024 +0100
Added patch/put back into resource routes
Signed-off-by: snipe <snipe@snipe.net >
commit a8813cca94
Merge: 9fef27a44 13dbf9ee7
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:48:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 13dbf9ee74
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:48:42 2024 +0100
Added icon for dept
Signed-off-by: snipe <snipe@snipe.net >
commit f8bbb7ad9b
Merge: 12fa50597 3c7d455ee
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:47:25 2024 +0100
Merge pull request #15431 from snipe/add_employee_num_to_asset_overview
Added employee number to asset view
commit 3c7d455ee3
Author: snipe <snipe@snipe.net >
Date: Sat Aug 31 13:38:38 2024 +0100
Added employee number to asset view
Signed-off-by: snipe <snipe@snipe.net >
commit 9fef27a448
Merge: d2b88a510 12fa50597
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:07:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 12fa505972
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:07:30 2024 +0100
Disabmiguate licenses company_id
Signed-off-by: snipe <snipe@snipe.net >
commit d2b88a5107
Merge: 4e35f389d 4e4930ba6
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:02:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4e4930ba62
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 21:01:48 2024 +0100
Check for array
Signed-off-by: snipe <snipe@snipe.net >
commit 4e35f389df
Merge: e5b9d9a28 76301bc30
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 20:07:03 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 76301bc30d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 20:05:03 2024 +0100
Fixed typo
Signed-off-by: snipe <snipe@snipe.net >
commit 964e105cf9
Merge: 6fd24c7e1 abb422153
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 19:20:03 2024 +0100
Merge pull request #15415 from snipe/rules/prevent_company_switch
Validation rules to prevent switching user companies if items are assigned to them
commit 6fd24c7e14
Merge: e4ebabdab 231bc1e2d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 18:55:11 2024 +0100
Merge pull request #15418 from snipe/added_multiple_for_custom_report
Fixed #15416 - Added multiple selects for custom report
commit 231bc1e2de
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 18:31:34 2024 +0100
Updated blade selectors
Signed-off-by: snipe <snipe@snipe.net >
commit 37d04b7176
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 17:52:01 2024 +0100
Some CSS tweaks for select2
Signed-off-by: snipe <snipe@snipe.net >
commit e62a802926
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 17:51:44 2024 +0100
Use whereIn instead of where =
Signed-off-by: snipe <snipe@snipe.net >
commit 69e981364a
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 17:51:20 2024 +0100
Made multiple select
Signed-off-by: snipe <snipe@snipe.net >
commit e5b9d9a28b
Merge: 4111ef0d7 e4ebabdab
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 15:04:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
commit abb4221539
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 14:55:18 2024 +0100
Validation rules to prevent switchng user companies if assets are assigned
Signed-off-by: snipe <snipe@snipe.net >
commit e4ebabdaba
Merge: b64ed254e da1e38329
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 14:19:51 2024 +0100
Merge pull request #15414 from uberbrady/fix_create_user
Use the null-safe property accessor for new-user creation
commit da1e383295
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Aug 29 14:09:23 2024 +0100
Use the null-safe property accessor for new-user creation
commit b64ed254e0
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 13:49:09 2024 +0100
Fixed tests
Signed-off-by: snipe <snipe@snipe.net >
commit ba291edc42
Merge: c197644ba ec2ea955d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 13:18:52 2024 +0100
Merge pull request #15412 from uberbrady/ImprovePatchPurchasePrice
Fix [FD-43836] PATCH of purchase_cost for assets for comma as decimal separator
commit ec2ea955d8
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Aug 29 12:35:14 2024 +0100
Fix PATCH of purchase_cost for assets for comma as decimal separator
commit c197644ba7
Merge: 29b30cc5d a8cd1027f
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:38:15 2024 +0100
Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
commit 29b30cc5d3
Merge: a89f17a14 6af27516d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:29:44 2024 +0100
Merge pull request #15411 from snipe/snyk/upgrade-webpack
Upgraded webpack
commit 6af27516dc
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:29:00 2024 +0100
Upgraded webpack
Signed-off-by: snipe <snipe@snipe.net >
commit a89f17a145
Merge: 68c708bde de0565f5b
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:25:56 2024 +0100
Merge pull request #15410 from snipe/snyk/upgrade-jquery-ui
Updated jquery UI
commit de0565f5b3
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:24:06 2024 +0100
Updated jquery UI
Signed-off-by: snipe <snipe@snipe.net >
commit 4111ef0d78
Merge: cfa56e221 68c708bde
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:20:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 68c708bdef
Merge: 58e366a06 5581950fe
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:18:34 2024 +0100
Merge pull request #15409 from snipe/fixes-string
Corrected language string
commit 5581950fee
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:17:17 2024 +0100
Corrected language string
Signed-off-by: snipe <snipe@snipe.net >
commit cfa56e2219
Merge: 7f1dfcc93 58e366a06
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:08:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 58e366a063
Merge: 26f28a862 b06c52776
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:08:02 2024 +0100
Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid
Check that the user exists before trying to print
commit b06c527767
Author: snipe <snipe@snipe.net >
Date: Thu Aug 29 11:06:30 2024 +0100
Check that the user exists before trying to print
Signed-off-by: snipe <snipe@snipe.net >
commit 7f1dfcc935
Merge: 6f3fb21fe 26f28a862
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 14:29:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 26f28a862a
Merge: e8da7e2df 94c981e22
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 14:26:03 2024 +0100
Merge pull request #15404 from snipe/bug/sc-26717-model-delete
Set image to null if model is deleted
commit 94c981e22c
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 14:23:49 2024 +0100
Set image to null if model is deleted
Signed-off-by: snipe <snipe@snipe.net >
commit 6f3fb21fef
Merge: a48e79a1f e8da7e2df
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:50:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit e8da7e2df2
Merge: 7b5b559ba d635c86e0
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:46:48 2024 +0100
Merge pull request #15403 from snipe/clean_up_depreciations
Fixed #15392 - filter by depreciation when showing models
commit d635c86e00
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:46:30 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 406ff6984b
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:42:23 2024 +0100
Added click to select on models table
Signed-off-by: snipe <snipe@snipe.net >
commit c6ddc501c5
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:40:12 2024 +0100
Filter by depreciation_id
Signed-off-by: snipe <snipe@snipe.net >
commit 4839181beb
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:40:01 2024 +0100
Added counts to API
Signed-off-by: snipe <snipe@snipe.net >
commit 63a05c89a7
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:39:52 2024 +0100
Added counts to show method
Signed-off-by: snipe <snipe@snipe.net >
commit 385c4f69f7
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:39:43 2024 +0100
Added counts to depreciation transformer
Signed-off-by: snipe <snipe@snipe.net >
commit 486cd8c8c9
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:39:09 2024 +0100
Nicer formatting for searchableAttributes
Signed-off-by: snipe <snipe@snipe.net >
commit eb5d93b3c2
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:38:55 2024 +0100
Added assets relationship
Signed-off-by: snipe <snipe@snipe.net >
commit a5ff623484
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:38:43 2024 +0100
Added asset, license, model count to API
Signed-off-by: snipe <snipe@snipe.net >
commit b5a4389815
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 12:38:31 2024 +0100
Added badge count, fixed model bulk edit menu
Signed-off-by: snipe <snipe@snipe.net >
commit 7b5b559baa
Merge: 64c4433b9 67a992974
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 11:57:29 2024 +0100
Merge pull request #15401 from snipe/fixes-15397-new-window-for-label
Opens label new window
commit 67a9929745
Author: snipe <snipe@snipe.net >
Date: Wed Aug 28 11:56:54 2024 +0100
Opens label new window
Signed-off-by: snipe <snipe@snipe.net >
commit a48e79a1fc
Merge: c207d4843 64c4433b9
Author: snipe <snipe@snipe.net >
Date: Tue Aug 27 07:37:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 64c4433b98
Merge: d3e8e0663 22bc088f6
Author: snipe <snipe@snipe.net >
Date: Tue Aug 27 07:36:37 2024 +0100
Merge pull request #15396 from snipe/add_start_end_date_to_users_edit
Added `start_date` and `end_date` to user bulk edit
commit 22bc088f6f
Author: snipe <snipe@snipe.net >
Date: Tue Aug 27 07:21:19 2024 +0100
Added start_date and end_date to user bulk edit
Signed-off-by: snipe <snipe@snipe.net >
commit d3e8e06638
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 14:07:06 2024 +0100
Add @swift2512 as a contributor
commit c207d48430
Merge: 991e48696 1b933f7ad
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 14:01:38 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1b933f7add
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 13:47:17 2024 +0100
Added s to fa icons
Signed-off-by: snipe <snipe@snipe.net >
commit 991e48696a
Merge: 797488504 3fe891a05
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:26:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3fe891a05b
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:25:27 2024 +0100
Removed a few more commas
Signed-off-by: snipe <snipe@snipe.net >
commit 7974885041
Merge: 4ef85bd52 f4c5b712f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:24:19 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit f4c5b712f4
Author: snipe <snipe@snipe.net >
Date: Mon Aug 26 10:24:07 2024 +0100
Removed colons
Signed-off-by: snipe <snipe@snipe.net >
commit 4ef85bd529
Merge: 6eab83a85 4c8dc7818
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:58:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4c8dc7818d
Merge: aa86e07cd 5c43a1f87
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:57:00 2024 +0100
Merge pull request #15389 from snipe/added_generate_label_to_button_stack
Fixed #15388 - Moved generate label button
commit 5c43a1f87c
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:54:49 2024 +0100
Use proper style for buttons
Signed-off-by: snipe <snipe@snipe.net >
commit d3b265de8e
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:48:36 2024 +0100
Moved button on hardware
Signed-off-by: snipe <snipe@snipe.net >
commit 263151658f
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 17:44:09 2024 +0100
Moved general label button
Signed-off-by: snipe <snipe@snipe.net >
commit 6eab83a85a
Merge: cce1f87da aa86e07cd
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:22:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit aa86e07cd2
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:22:39 2024 +0100
Fixed #15385 - small icon tweaks
Signed-off-by: snipe <snipe@snipe.net >
commit cce1f87da6
Merge: b460e8dc8 d92fa5de6
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:18:30 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d92fa5de65
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 15:17:25 2024 +0100
fa-fw on settings icon
Signed-off-by: snipe <snipe@snipe.net >
commit b460e8dc83
Merge: 50cb7e65c c589140ea
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:42:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit c589140ea0
Merge: cc2c8f76d 52894615c
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:42:04 2024 +0100
Merge pull request #15383 from snipe/re-adds-checkout-button
Fixed #15378 - Corrected gate on checkin button on asset view
commit 52894615ce
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:40:41 2024 +0100
More specific gate for checkin
Signed-off-by: snipe <snipe@snipe.net >
commit 8546bbdd65
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 08:38:47 2024 +0100
Fixed gate for checkout button
Signed-off-by: snipe <snipe@snipe.net >
commit 50cb7e65c9
Merge: 821dd158d cc2c8f76d
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:32:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cc2c8f76d0
Merge: 1ffa69c43 3957d670d
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:31:29 2024 +0100
Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command
Fixes the `acceptance-reminder` command
commit 1ffa69c43c
Merge: 78d355f13 f85ebd7ff
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:28:20 2024 +0100
Merge pull request #15380 from snipe/fixed/fixed_nav_bracket
Added pull-right to angle bracket
commit f85ebd7ffd
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:27:39 2024 +0100
Added pull-right to angle bracket
Signed-off-by: snipe <snipe@snipe.net >
commit 78d355f136
Merge: ec0346e4a af0a95be1
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:20:23 2024 +0100
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error
Fixed custom field defaults being prematurely updated
commit ec0346e4a8
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:19:08 2024 +0100
Add @setpill as a contributor
commit fc5eb37776
Merge: 833dace2b 1d7853cbf
Author: snipe <snipe@snipe.net >
Date: Fri Aug 23 07:18:41 2024 +0100
Merge pull request #15379 from setpill/fix/load-trustproxies-middleware
fixed #15374 : load TrustProxies middleware in Kernel.php
commit 9a73311a99
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 17:04:04 2024 -0700
Fix nested checkboxes being updated as a group
commit aec781e7df
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 16:03:30 2024 -0700
Be a little more explicit
commit 1d7853cbfe
Author: setpill <37372069+setpill@users.noreply.github.com >
Date: Thu Aug 22 19:45:53 2024 +0200
fixed #15374 : load TrustProxies middleware in Kernel.php
commit 7f3c86165b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 13:58:31 2024 -0700
Conditionally disable Add default values checkbox
commit 10b45812c4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 13:38:01 2024 -0700
Improve id for checkboxes and radio buttons
commit c3165717ed
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 13:20:04 2024 -0700
Handle old input
commit d0a351a132
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 12:59:03 2024 -0700
Add comment
commit 68749e7e87
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 12:58:35 2024 -0700
Simplify logic
commit 0abb5637e0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 22 12:54:54 2024 -0700
WIP: handle old input
commit af0a95be12
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit d67975cb62
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 663b2fd844
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit bcace9d019
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit b59bf3e7dc
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 3957d670d0
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Aug 22 10:04:46 2024 -0700
fixes send acceptance reminder query
commit 821dd158d1
Merge: 6c9a40268 833dace2b
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 15:50:20 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 833dace2b4
Merge: ec365b080 56e31d230
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 15:00:16 2024 +0100
Merge pull request #15373 from snipe/fixes/#15366_custom_fields
Fixed #15366 use the non-admin edit encrypted custom fields permissions
commit 56e31d2303
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 14:58:09 2024 +0100
Fixed #15366 - use permission for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net >
commit ec365b0804
Merge: ca8864c06 aef0ac68c
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 14:49:13 2024 +0100
Merge pull request #15372 from StarlessNights/update-docker-compose-files
Fixed #15371 : docker-compose files updated.
commit aef0ac68c3
Author: Iisakki Jaakkola <iihaja@utu.fi >
Date: Thu Aug 22 16:10:00 2024 +0300
Need to use the long format for redis too in docker-compose file.
commit f12f9a816f
Author: Iisakki Jaakkola <iihaja@utu.fi >
Date: Thu Aug 22 15:47:12 2024 +0300
Update the official docker-compose file too while at it.
commit a000d6454f
Author: Iisakki Jaakkola <iihaja@utu.fi >
Date: Thu Aug 22 15:46:40 2024 +0300
Fix non-functional development docker-compose file.
commit ca8864c061
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:28:52 2024 +0100
Fixed small layout quirks in asset view
Signed-off-by: snipe <snipe@snipe.net >
commit 423f4f9126
Merge: 456c7d8d9 5fa0c87ab
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:25:41 2024 +0100
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset
Adds location select to the create new user via asset checkout
commit 456c7d8d91
Merge: 54cfe3f6e d4d19569e
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:20:56 2024 +0100
Merge pull request #15065 from Godmartinz/explicit_eol_removal_command
Adds `snipeit:remove-explicit-eols` command
commit 54cfe3f6e6
Merge: 5e0b18104 bb465dbfa
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 13:20:10 2024 +0100
Merge pull request #15156 from uberbrady/re-add-stalebot
Re-add stalebot-esque github Action
commit 5e0b18104d
Merge: ec0b9b198 8b5d3f7fb
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:59:20 2024 +0100
Merge pull request #15369 from snipe/fixes/checkbox_on_restore
Fixed checkbox layout on modal from #15296
commit 8b5d3f7fbd
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:56:32 2024 +0100
Fixed extra closing p tag
Signed-off-by: snipe <snipe@snipe.net >
commit 744f43676d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:53:16 2024 +0100
Fixed checkbox layout on modal from #15296
Signed-off-by: snipe <snipe@snipe.net >
commit ec0b9b198f
Merge: 94300d81d 738ef442f
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 12:43:07 2024 +0100
Merge pull request #15296 from uberbrady/expose_restore_sanitize
Expose the 'sanitize' system for backup restores to the web GUI
commit 6c9a402685
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:20:52 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net >
commit 1b310f3a24
Merge: c54bff0f8 94300d81d
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:20:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 94300d81d6
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:19:32 2024 +0100
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net >
commit bc9ea5a2ec
Merge: 4635a6efc 963911f2e
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:18:06 2024 +0100
Merge pull request #15352 from Godmartinz/mobile_breakpoint
Fixed Mobile misalignment of info on Assets and Users view pages
commit 4635a6efc3
Merge: 9608414ea d29b3bfb9
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:17:49 2024 +0100
Merge pull request #15360 from snipe/more_print_fixes
More print fixes for asset view
commit 9608414eae
Merge: 47d8e2f8b 5efddf6f5
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:06:13 2024 +0100
Merge pull request #15367 from snipe/fixes/15344_added_freeform_to_country_select2
Fixed #15344 - make select2 for countries freeform-ish
commit 5efddf6f5b
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:01:39 2024 +0100
Allow clear on country dropdown
Signed-off-by: snipe <snipe@snipe.net >
commit 305dc049a4
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 11:01:28 2024 +0100
Added asterisk help text
Signed-off-by: snipe <snipe@snipe.net >
commit 3ac0702094
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 10:13:22 2024 +0100
Fixed #15344 - make select2 for countries freeform-ish
Signed-off-by: snipe <snipe@snipe.net >
commit 47d8e2f8b9
Author: snipe <snipe@snipe.net >
Date: Thu Aug 22 09:42:05 2024 +0100
Add @Scarzy as a contributor
commit a2246b9645
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 17:00:32 2024 -0700
Simplify assertions
commit 1d89759706
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:44 2024 -0700
Implement fix
commit 206f8fe605
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:59:38 2024 -0700
Add test case
commit 21d2217619
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:54:16 2024 -0700
Point test to correct endpoint
commit 833bcb282f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 21 16:49:29 2024 -0700
Add failing test
commit 83dd9ce20e
Merge: 6fdce3c53 a8eb76fd8
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 23:15:24 2024 +0100
Merge pull request #15362 from r-xyz/model-files-api
Added #9413 : AssetModel files endpoints to API
commit a8eb76fd8d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 22:25:41 2024 +0200
Fixed model files API routes.
commit cd7db5c4a8
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 22:24:08 2024 +0200
Fix some typos in models file handler.
commit da7313bc9d
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 20:24:22 2024 +0200
Fix models files API routes.
commit 4ec361c718
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 19:49:51 2024 +0200
Add AssetModel files endpoints to API
commit 738ef442fd
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 21 13:16:51 2024 +0100
Rename .env var to have DB_ prefix for sanitize-by-default setting
commit d29b3bfb9a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 13:06:16 2024 +0100
Few more hidden-print classes
Signed-off-by: snipe <snipe@snipe.net >
commit 6fdce3c536
Merge: 01c4fe611 1ab29ec3a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 13:02:50 2024 +0100
Merge pull request #15358 from r-xyz/rename-docker-startup
Renamed docker startup scripts coherently.
commit 912bbf0e32
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 13:02:21 2024 +0100
More print fixes
Signed-off-by: snipe <snipe@snipe.net >
commit c54bff0f83
Merge: d3f30ced9 01c4fe611
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 12:24:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 01c4fe6113
Merge: 7e475a078 0fa9f5797
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 12:12:23 2024 +0100
Merge pull request #15359 from uberbrady/improve_windows_upgrade
Fixed #15190 - Improvements to upgrade.php script to improve Windows experience
commit 0fa9f57971
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 21 11:53:38 2024 +0100
Improvements to upgrade.php script to improve Windows experience
commit 1ab29ec3a4
Author: r-xyz <100710244+r-xyz@users.noreply.github.com >
Date: Wed Aug 21 11:52:09 2024 +0200
Rename docker startup scripts coherently.
commit 7e475a0786
Merge: d0acf5b8a 26b3c62ab
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:41:17 2024 +0100
Merge pull request #15357 from snipe/tighten_category_view_translations
Fixed #15330 - Cleaned up category title
commit 26b3c62ab8
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:29:51 2024 +0100
Cleaned up category title
Signed-off-by: snipe <snipe@snipe.net >
commit d3f30ced94
Merge: 973e2e575 d0acf5b8a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:13:57 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d0acf5b8a6
Merge: 09033b19a 74fbc2382
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:12:58 2024 +0100
Merge pull request #15356 from snipe/validate_location_parent
Fixed #15341 - validate parent ID
commit 74fbc23823
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 10:09:35 2024 +0100
Updated tests
Signed-off-by: snipe <snipe@snipe.net >
commit a23dee52f2
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 09:58:47 2024 +0100
Added tests
Signed-off-by: snipe <snipe@snipe.net >
commit 4d03f1e110
Author: snipe <snipe@snipe.net >
Date: Wed Aug 21 09:46:18 2024 +0100
Fixed #15341 - validate parent ID
Signed-off-by: snipe <snipe@snipe.net >
commit 963911f2e1
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Aug 21 00:23:10 2024 -0700
changed order of info stgack
commit 59832126cb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 16:52:51 2024 -0700
Improve comment
commit 680cce3ee2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 16:42:29 2024 -0700
Align indents
commit 6c5ec6a16c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 16:41:24 2024 -0700
Get datepicker working
commit 5d1f98bf93
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 15:38:43 2024 -0700
Simplify by directly wire:modeling
commit 9d484077ae
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Aug 20 14:24:37 2024 -0700
missed a file
commit 9858b0f37f
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Aug 20 14:23:55 2024 -0700
fixes info tab for users and assets
commit 973e2e5756
Merge: 46ed07642 09033b19a
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:45:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
commit 09033b19a7
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:44:13 2024 +0100
Bumped hash
Signed-off-by: snipe <snipe@snipe.net >
commit 46ed076428
Merge: d3a555ce9 5fdeb9c41
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:42:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 5fdeb9c413
Merge: 22d373407 6c450d133
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:42:08 2024 +0100
Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20
Updated languages
commit 22d3734075
Merge: d99b306ae eca6b03f4
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 19:34:38 2024 +0100
Merge pull request #15350 from marcusmoore/icon-component-updates
Fixed icon not rotated and simplified component
commit eca6b03f44
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 11:08:53 2024 -0700
Allow id to be rendered
commit bbdbec7197
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 20 11:00:39 2024 -0700
Rely on $attributes behavior rendering passed attributes
commit 6c450d1338
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 18:18:17 2024 +0100
Updated languages
Signed-off-by: snipe <snipe@snipe.net >
commit a8cd1027f3
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Aug 20 11:40:15 2024 -0500
rm commented code
commit d3a555ce91
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:49:39 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net >
commit 0f8e041809
Merge: e8a22f3c5 d99b306ae
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:49:32 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
commit d99b306ae9
Merge: f597d6433 74136761d
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:46:55 2024 +0100
Merge pull request #15345 from snipe/add_trim_strings_middleware
Added TrimStrings middleware
commit 74136761df
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 11:45:13 2024 +0100
Added TrimStrings middleware
Signed-off-by: snipe <snipe@snipe.net >
commit f597d64339
Merge: 64bed01a9 0072f1500
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:17:26 2024 +0100
Merge pull request #15342 from snipe/snyk/bs-tables
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
commit 0072f1500e
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:16:27 2024 +0100
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
Signed-off-by: snipe <snipe@snipe.net >
commit 64bed01a91
Merge: f8c72fb0a f6319e11e
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:13:43 2024 +0100
Merge pull request #15327 from snipe/update_button_style
Update icons to use blade components, standardize button colors and format
commit f6319e11e7
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:11:27 2024 +0100
Added fa-fw to sidebar elements
Signed-off-by: snipe <snipe@snipe.net >
commit 5d9f988df3
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 10:01:49 2024 +0100
Added fw class to topnav icons
Signed-off-by: snipe <snipe@snipe.net >
commit f8c72fb0ac
Merge: 886514a25 fa765667f
Author: snipe <snipe@snipe.net >
Date: Tue Aug 20 09:57:03 2024 +0100
Merge pull request #15112 from marcusmoore/livewire-importer-improvements
Improved handling attempted access of deleted files in importer
commit 8e1111c681
Merge: 697595d96 886514a25
Author: akemidx <kojotek.dx@gmail.com >
Date: Mon Aug 19 19:33:44 2024 -0400
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
commit 886514a25f
Merge: cb40a82e7 434bdcd6d
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 22:46:08 2024 +0100
Merge pull request #15336 from marcusmoore/fixes/remove-displayed-parentheses
Fixed `)` being added to expected asset checkin report email header
commit fa765667f2
Merge: 94d8a547b cb40a82e7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Aug 19 14:41:58 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 434bdcd6d4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Aug 19 14:31:47 2024 -0700
Add missing parentheses to conditional
commit be5f3f38f8
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 14:48:12 2024 +0100
Settings pages
Signed-off-by: snipe <snipe@snipe.net >
commit 08c3a25b39
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 14:16:57 2024 +0100
Little more padding
Signed-off-by: snipe <snipe@snipe.net >
commit 34cd4b6244
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 14:15:36 2024 +0100
Added links to apple/google maps
Signed-off-by: snipe <snipe@snipe.net >
commit d89c8682be
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:46:31 2024 +0100
Reversed location button ordering
Signed-off-by: snipe <snipe@snipe.net >
commit 6f024849e9
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:39:24 2024 +0100
Few more
Signed-off-by: snipe <snipe@snipe.net >
commit e048f0955f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:27:21 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net >
commit 479b2b4fd3
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:23:08 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net >
commit 84f14a05bd
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:20:19 2024 +0100
Fixed logging for asset model restore
Signed-off-by: snipe <snipe@snipe.net >
commit 8d52fa51b1
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:20:06 2024 +0100
Fixed suppliers buttons
Signed-off-by: snipe <snipe@snipe.net >
commit 229d8b9bf5
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 13:19:59 2024 +0100
Added location restore
Signed-off-by: snipe <snipe@snipe.net >
commit eb8d43a804
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 12:32:44 2024 +0100
Updated buttons on models
Signed-off-by: snipe <snipe@snipe.net >
commit f82266fade
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:58:31 2024 +0100
Cleaned up presenters
Signed-off-by: snipe <snipe@snipe.net >
commit b4b6f7a35f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:58:21 2024 +0100
Added css-consumable to overrides for table headers
Signed-off-by: snipe <snipe@snipe.net >
commit 0bc995b87f
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:58:05 2024 +0100
Updated more icons
Signed-off-by: snipe <snipe@snipe.net >
commit 59725f2031
Author: snipe <snipe@snipe.net >
Date: Mon Aug 19 11:57:40 2024 +0100
Removed extra debugging in test
Signed-off-by: snipe <snipe@snipe.net >
commit 00bc9ac806
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 22:39:14 2024 +0100
Fixed spacing
Signed-off-by: snipe <snipe@snipe.net >
commit f200960a57
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 22:26:57 2024 +0100
Aaaand more
Signed-off-by: snipe <snipe@snipe.net >
commit c700127f1a
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 22:09:00 2024 +0100
Updated user view
Signed-off-by: snipe <snipe@snipe.net >
commit ae2f9571b4
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 21:57:37 2024 +0100
And still more
Signed-off-by: snipe <snipe@snipe.net >
commit a77dcad336
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 20:30:53 2024 +0100
More links
Signed-off-by: snipe <snipe@snipe.net >
commit 7ace9324b4
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 20:30:22 2024 +0100
Added padlock sound
Signed-off-by: snipe <snipe@snipe.net >
commit d2e889e927
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 19:21:59 2024 +0100
Still more
Signed-off-by: snipe <snipe@snipe.net >
commit 803bdb457c
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:48:19 2024 +0100
Added calendar
Signed-off-by: snipe <snipe@snipe.net >
commit 7c9b1f6e38
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:39:22 2024 +0100
Added the plus icon
Signed-off-by: snipe <snipe@snipe.net >
commit d545537a43
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:34:13 2024 +0100
More icons
Signed-off-by: snipe <snipe@snipe.net >
commit 4d8904938d
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:24:26 2024 +0100
Added calendar icon for datepickers
Signed-off-by: snipe <snipe@snipe.net >
commit 0c09f2b2c0
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 18:13:49 2024 +0100
Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net >
commit bffba02511
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 17:26:44 2024 +0100
Updated icons
Signed-off-by: snipe <snipe@snipe.net >
commit 901f4df7ee
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 17:03:36 2024 +0100
Added more icons
Signed-off-by: snipe <snipe@snipe.net >
commit 9337cba340
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:53:58 2024 +0100
Added download
Signed-off-by: snipe <snipe@snipe.net >
commit 2b0c67c263
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:51:00 2024 +0100
Load the icon helper
Signed-off-by: snipe <snipe@snipe.net >
commit da71f031f5
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:48:24 2024 +0100
Use icon in hardware view
Signed-off-by: snipe <snipe@snipe.net >
commit d2e585baa7
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:47:45 2024 +0100
Added icon blade
Signed-off-by: snipe <snipe@snipe.net >
commit a102c085df
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 15:47:37 2024 +0100
Added icon helper
Signed-off-by: snipe <snipe@snipe.net >
commit e8a22f3c5b
Merge: d843cf8dc cb40a82e7
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 04:55:04 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit cb40a82e79
Merge: 7e6ff3cbe 4253acad4
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 04:54:23 2024 +0100
Merge pull request #15324 from snipe/jerk_prevention
Prevent passing an array as login
commit 4253acad4c
Author: snipe <snipe@snipe.net >
Date: Sun Aug 18 04:51:36 2024 +0100
Prevent passing an array as login
Signed-off-by: snipe <snipe@snipe.net >
commit d843cf8dcc
Merge: 1013dcae6 7e6ff3cbe
Author: snipe <snipe@snipe.net >
Date: Sat Aug 17 00:52:10 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1013dcae61
Merge: c30c649aa e7ef3bf51
Author: snipe <snipe@snipe.net >
Date: Sat Aug 17 00:38:44 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 70e5e0f9df
Author: spencerrlongg <spencer@spencerlong.com >
Date: Fri Aug 16 12:52:06 2024 -0500
get rid of dd
commit dec4691c73
Author: spencerrlongg <spencer@spencerlong.com >
Date: Fri Aug 16 12:50:09 2024 -0500
should be good to go now
commit c30c649aaa
Merge: bb1385369 ad6d09b6a
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 16:44:02 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit bb1385369c
Merge: c1caf6088 43b338d61
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 16:18:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit c1caf6088e
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 13:12:13 2024 +0100
Prod assets
Signed-off-by: snipe <snipe@snipe.net >
commit 12dfe71ea8
Merge: ca8926871 ea2b1b074
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 12:48:42 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ca89268716
Merge: ec5731353 3167ee91d
Author: snipe <snipe@snipe.net >
Date: Fri Aug 16 11:02:56 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 94d8a547b8
Merge: 6521c0252 b39a7c6f0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 13:47:49 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
commit 43b109fac0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 13:20:22 2024 -0700
Use cached values for textarea and radio input
commit 75c1e7658f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 10:43:41 2024 -0700
Improve method name
commit e7c9c799bb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 10:40:23 2024 -0700
Add wire:keys
commit 6ab976f353
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Aug 15 10:32:33 2024 -0700
Use cached values for text input
commit ec5731353a
Merge: 3283704fe b39a7c6f0
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 15:53:52 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3283704fe8
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 12:25:08 2024 +0100
Updated assets
Signed-off-by: snipe <snipe@snipe.net >
commit 540df32046
Merge: 85486fa58 594f50664
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 12:24:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
commit 85486fa58c
Merge: 3618df2ec 10dc1f136
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:53:54 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 3618df2ec5
Merge: a201f22fd 8f7bce7aa
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:44:39 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit a201f22fdb
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:36:12 2024 +0100
Bumped version
Signed-off-by: snipe <snipe@snipe.net >
commit 6070d530cf
Merge: 6c0cf9447 4d66f7c93
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:35:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 6c0cf94473
Merge: bf4b91516 381003eea
Author: snipe <snipe@snipe.net >
Date: Thu Aug 15 10:28:08 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 9622e05cf5
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 18:41:06 2024 -0500
correct api test
commit afaf53cdfc
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 18:14:21 2024 -0500
failing ui test
commit f031309f8f
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 16:09:15 2024 -0500
set up api controller for route/model binding
commit 20ec420ba3
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 13:53:29 2024 -0500
not quite done, api side needs some work
commit ab63a19aff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 14 11:01:51 2024 -0700
Initialize concept of cached values
commit a70b94e707
Merge: 120cfd13c 3e2945709
Author: spencerrlongg <spencer@spencerlong.com >
Date: Wed Aug 14 11:36:19 2024 -0500
Merge branch 'refs/heads/develop' into bug/sc-26584
commit 008bf036b5
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 14 16:09:34 2024 +0100
Got rid of weird namespace declaration and commented-out data-toggle line
commit cc5ad456e6
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Aug 14 15:59:21 2024 +0100
Expose the 'sanitize' system for backup restores to the web GUI
commit bf4b915168
Merge: 0a9c2e354 0f1e5181a
Author: snipe <snipe@snipe.net >
Date: Wed Aug 14 10:45:13 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0a9c2e354f
Merge: 47f1b3b14 e54400718
Author: snipe <snipe@snipe.net >
Date: Wed Aug 14 10:02:43 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 038e86954b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 13 17:30:53 2024 -0700
Improve property name
commit f6c1642bf2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Aug 13 17:01:35 2024 -0700
Use computed fields in CustomFieldSetDefaultValuesForModel component
commit 120cfd13c5
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Aug 13 14:07:40 2024 -0500
translation
commit 09f2739298
Author: spencerrlongg <spencer@spencerlong.com >
Date: Tue Aug 13 13:45:41 2024 -0500
works, un-reassignable licenses are an issue
commit 47f1b3b14e
Merge: 198b76ebc 3044af941
Author: snipe <snipe@snipe.net >
Date: Tue Aug 13 16:48:06 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 198b76ebc2
Merge: 5546f9676 6e84c29ce
Author: snipe <snipe@snipe.net >
Date: Tue Aug 13 15:47:00 2024 +0100
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
commit 5546f9676a
Merge: 46caa478d 9e73eaf95
Author: snipe <snipe@snipe.net >
Date: Tue Aug 13 13:51:33 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit ec863df007
Author: spencerrlongg <spencer@spencerlong.com >
Date: Mon Aug 12 16:58:53 2024 -0500
rm conditional that might be unnecessary
commit cc3b8e0681
Author: spencerrlongg <spencer@spencerlong.com >
Date: Mon Aug 12 16:58:21 2024 -0500
this should more or less work, but i need to determine if this is the best way
commit ff145abbe7
Author: spencerrlongg <spencer@spencerlong.com >
Date: Mon Aug 12 16:13:03 2024 -0500
use array for eager loading, makes ide prettier
commit 46caa478d2
Merge: 4d8569e75 e6106aa7c
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 20:47:45 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4d8569e754
Merge: 4dc57f95e c9f8a84d4
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 18:01:21 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 4dc57f95e2
Merge: 316ee6f81 9d354ca65
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 16:38:23 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 316ee6f810
Merge: 509cc812e 3f2139349
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 16:30:53 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 509cc812ea
Merge: d5f66bc0d e7fb29fce
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 15:58:40 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit d5f66bc0dd
Merge: 1e213c31e ce5be8ac2
Author: snipe <snipe@snipe.net >
Date: Mon Aug 12 10:10:59 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 1e213c31ef
Merge: 91874dfe0 1777bb4b9
Author: snipe <snipe@snipe.net >
Date: Sun Aug 11 10:26:16 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 91874dfe0b
Merge: 0e6eda5e8 5c6c655cd
Author: snipe <snipe@snipe.net >
Date: Sat Aug 10 19:37:37 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 0e6eda5e8a
Merge: 24560b936 60eb60215
Author: snipe <snipe@snipe.net >
Date: Sat Aug 10 18:29:41 2024 +0100
Merge remote-tracking branch 'origin/develop'
commit 24560b9362
Author: snipe <snipe@snipe.net >
Date: Sat Aug 10 18:24:49 2024 +0100
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net >
commit 6521c02526
Merge: 8d1cc22c5 9350a2018
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Aug 7 15:20:39 2024 -0700
Merge branch 'develop' into livewire-importer-improvements
# Conflicts:
# resources/views/livewire/importer.blade.php
commit bb465dbfaa
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Jul 24 15:09:23 2024 +0100
Cut down run number to 100 from 1000
commit 8cbcc237c0
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Jul 24 13:27:31 2024 +0100
Cleanup of Stale workflow for GH - set to debug-mode to start
commit 97e3af8fc9
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Sat Jun 29 00:59:47 2024 +0100
WIP on new GitHub-backed stalebot settings
commit 914e29210a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Jun 26 18:53:01 2024 +0100
Initial rough stab at re-implementing stalebot
commit 8d1cc22c58
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Jul 18 12:00:01 2024 -0700
Turn on legacy binding since other components still use it
commit 7685de45f2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 17:12:14 2024 -0700
Turn off legacy binding
commit 199e68ff29
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 17:10:12 2024 -0700
Simplify computed propery
commit 81bffccf01
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 16:28:26 2024 -0700
Use better error message
commit cfca1514c0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 16:22:44 2024 -0700
Swap file_id for activeFileId
commit b4ed01243b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 13:40:41 2024 -0700
Add more details
commit 3772a21a51
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 13:37:24 2024 -0700
Move comment up
commit 04b6cb763f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Wed Jul 17 10:58:48 2024 -0700
Add todo
commit dd32341502
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 17:21:18 2024 -0700
Display message if attempting to delete non-existent file
commit f58e3114a2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 17:17:45 2024 -0700
Simplify destroy method and update list
commit eba494ad8c
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 17:03:42 2024 -0700
Make $activeFile a computed property
commit 7e89b58746
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 16:08:42 2024 -0700
Move files to computed property
commit b7744105a0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 14:20:41 2024 -0700
Migrate import type to component
commit 69263f0e5b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 13:30:29 2024 -0700
Migrate header row to component
commit 017530ba4b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Tue Jul 16 12:02:50 2024 -0700
Make updating hook more specific
commit c8dad528a8
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Jul 15 16:15:58 2024 -0700
Migrate a couple items out of mount
commit 256e989ba1
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Jul 15 15:49:18 2024 -0700
Add test for importer
commit 9793016603
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Jul 11 13:32:16 2024 -0700
Remove unneeded AuthorizesRequests
commit 9e06f2d17f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Jul 11 13:22:10 2024 -0700
Remove commented code
commit d4d19569ee
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Jul 11 10:52:47 2024 -0700
adds execution timer
commit 43c7504f89
Author: Godfrey M <godmartinz@gmail.com >
Date: Thu Jul 11 10:03:51 2024 -0700
adds an all option, adds help context for all, seperates logic
commit 1fa6a763bc
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 11:09:57 2024 -0700
updated description
commit 726308bfd5
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:58:45 2024 -0700
removed typo
commit 22ddb695f2
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:57:47 2024 -0700
better description
commit 09b2feac54
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:56:44 2024 -0700
updates assets with selected model to inherit asset model eol
commit 57e1df86c8
Author: Godfrey M <godmartinz@gmail.com >
Date: Wed Jul 10 10:21:24 2024 -0700
finds model and collects assets with such model
commit 3ea5d4ee40
Author: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com >
Date: Thu May 2 12:55:17 2024 +0200
Update BulkAssetsController.php
Fix for bulk updarte of purchase date to calculate new EOL
commit 5fa0c87ab0
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Apr 30 12:02:11 2024 -0700
null debugbar
commit 75aa01791a
Author: Godfrey M <godmartinz@gmail.com >
Date: Tue Apr 30 11:54:33 2024 -0700
adds location select to the create new user vice asset checkout
commit 697595d963
Merge: 0bdd8a591 9502525a4
Author: akemidx <116301219+akemidx@users.noreply.github.com >
Date: Tue Nov 21 16:07:26 2023 -0500
Merge branch 'develop' into eol_date_range_for_reports
commit 0bdd8a5917
Author: akemidx <kojotek.dx@gmail.com >
Date: Wed Aug 2 16:40:38 2023 -0400
fixing key names
commit e35dd2daa1
Author: akemidx <kojotek.dx@gmail.com >
Date: Wed Jul 26 17:45:18 2023 -0400
asset_eol_date stuff
commit f71b69a739
Author: akemidx <kojotek.dx@gmail.com >
Date: Wed Jul 26 17:31:06 2023 -0400
adding eol fields
commit 499a3debcd
Author: akemidx <kojotek.dx@gmail.com >
Date: Tue Jul 11 14:08:55 2023 -0400
this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit
Signed-off-by: snipe <snipe@snipe.net >
2024-11-12 15:39:22 +00:00
snipe
9eed6cde43
Merge remote-tracking branch 'origin/develop'
2024-11-11 14:04:56 +00:00
snipe
6bec573956
Merge pull request #15794 from snipe/check_for_file_on_asset_acceptance
...
Check that the file exists before trying to download stored EULA
2024-11-11 13:54:09 +00:00
snipe
1fc5bb54e1
Check that the file exists before trying to download
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-11 13:50:53 +00:00
snipe
5d581752af
Merge remote-tracking branch 'origin/develop'
2024-11-10 18:05:52 +00:00
snipe
b6ad69fac2
Merge pull request #15793 from snipe/allow_eol_explicit
...
Allow user to specify null for calculation or explicit on bulk edit
2024-11-10 18:05:20 +00:00
snipe
47b2cdb846
Allow user to specify null for calculation or explicit on bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-10 18:04:13 +00:00
snipe
7596717a15
Merge remote-tracking branch 'origin/develop'
2024-11-10 17:49:30 +00:00
snipe
357ef7e375
Merge pull request #15792 from snipe/edit_eol_from_bulk
...
Added EOL date to bulk asset edit
2024-11-10 17:48:25 +00:00
snipe
6928b1b273
Added eol date to bulk asset edit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-10 17:47:10 +00:00
snipe
c6b9556f60
Merge remote-tracking branch 'origin/develop'
2024-11-08 10:28:26 +00:00
snipe
000f3171e3
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-08 10:28:01 +00:00
Marcus Moore
4bb19152c4
Move test
2024-11-07 17:01:47 -08:00
Marcus Moore
dc0b8c7572
Inline route helpers in tests
2024-11-07 16:54:55 -08:00
Marcus Moore
b8265d54bb
Improve comment
2024-11-07 16:42:55 -08:00
Marcus Moore
0e3efdfe87
Add string to name validation
2024-11-07 16:40:54 -08:00
Marcus Moore
363ec841d1
Re-introduce soft deletes
2024-11-07 16:40:37 -08:00
Marcus Moore
f8d0ddb3f7
Improve template name input
2024-11-07 14:17:20 -08:00
Marcus Moore
4aa5961860
Update page titles
2024-11-07 12:13:20 -08:00
Godfrey M
ca4bafc04a
adds a dark background to fieldsets, fixes right border
2024-11-07 11:34:12 -08:00
Marcus Moore
7862b74e99
Inline fields when updating
2024-11-07 11:03:03 -08:00
Marcus Moore
c5710b858e
Add test validation test for update method and remove name uniqueness constraint
2024-11-07 11:02:10 -08:00
snipe
d489527e6d
Merge remote-tracking branch 'origin/develop'
2024-11-07 13:19:52 +00:00
snipe
5ef3183a52
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
...
Improved indexes on manager_id for locations and users, including del…
2024-11-07 11:44:06 +00:00
Brady Wetherington
050831868e
Improved indexes on manager_id for locations and users, including deleted_at
2024-11-07 11:39:27 +00:00
Tobias Regnery
2db70379a6
Fix Indentation in UsersController
...
The indentation in the update-function of the UsersController is partially wrong.
Fix this to avoid confusion.
2024-11-07 09:22:42 +01:00
snipe
aa080945f6
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-11-06 21:26:21 +00:00
snipe
a41529dbc4
Merge pull request #15780 from uberbrady/add_manager_indexes
...
Add new indexes to locations and users for faster manager lookups
2024-11-06 21:22:45 +00:00
Brady Wetherington
4fcf5ac7da
Add new indexes to locations and users for faster manager lookups
2024-11-06 21:19:41 +00:00
Marcus Moore
8873137ed0
Scaffold updating template name
2024-11-06 12:29:31 -08:00
Marcus Moore
37d792352d
Update page title dynamically
2024-11-06 12:11:35 -08:00
snipe
aa168fcb5b
Updated BS table to 1.23.5
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-06 18:41:52 +00:00
snipe
9c1c93ad52
Merge pull request #15774 from marcusmoore/feature/sc-27350
...
Added Checkout ID column to user accessory table
2024-11-06 18:40:35 +00:00
Marcus Moore
ad99b8b456
Use generic ID translation
2024-11-06 10:37:31 -08:00
snipe
b96a312539
Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345
...
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
2024-11-06 18:29:22 +00:00
Joël Pittet
bab1e58ea4
symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736
2024-11-06 09:46:11 -08:00
snipe
9ce1e78c5c
Merge remote-tracking branch 'origin/develop'
2024-11-06 14:16:09 +00:00
snipe
654f67b6ac
Updated webpack
...
Signed-off-by: snipe <snipe@snipe.net >
2024-11-06 14:05:42 +00:00
snipe
3965bcd7c1
Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests
...
Fixed notifications for licenses and asset to asset checkoutables
2024-11-06 14:02:44 +00:00
NebelKreis
52e4414bc5
Feature: Added asset ID option to 2D barcode in label generation
2024-11-05 13:41:34 +01:00
NebelKreis
f96b7c5056
Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations
2024-11-05 13:40:33 +01:00
akemidx
82c38a8b18
or statement for if/else
2024-11-04 20:43:18 -05:00
akemidx
2f5e468b3c
this fixes the assigned to piece
2024-11-04 19:48:34 -05:00
Godfrey M
2362cb5e52
refactor to getNotifiables
2024-11-04 16:32:46 -08:00
Marcus Moore
e7cb4a75eb
Show accessory checkout id in user accessory table
2024-11-04 15:56:53 -08:00
Godfrey M
93494ac554
put dataprovider back in for tests
2024-11-04 15:17:58 -08:00
Godfrey M
0d707a1851
fixes notifications for licenses and asset to asset checkouables
2024-11-04 15:13:10 -08:00
Marcus Moore
4daa8e7c63
Indenting
2024-11-04 12:49:44 -08:00
Marcus Moore
41f25341fd
Populate select with selected template
2024-11-04 12:32:05 -08:00
snipe
287f4addf0
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
...
Revert "Added the display of logs when tests fail in GitHub Actions"
2024-11-04 20:06:24 +00:00
Marcus Moore
2e96d478f1
Revert "Added the display of logs when tests fail in GitHub Actions"
2024-11-04 11:04:17 -08:00
Tobias Regnery
651d1c735b
Another slightly less ugly way for backward compatibility
...
Instead of using a constructor, add a special check in the boot-method for locations.
This seems to fit better in the system and does hopefully not break the existing tests.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com >
2024-11-04 10:03:38 +01:00
Tobias Regnery
1318dc6111
Add a backward compatibility setting for locations with companies
...
Now that locations have a company_id they get restricted to the users company with FullMultipleCompanySupport.
This breaks backward compatibility, because before everyone can handle locations without restrictions.
Add a setting right below FullMultipleCompanySupport so that everyone can switch to the desired behaviour.
The default is off and the existing behaviour is preserved.
2024-11-04 10:03:38 +01:00
Tobias Regnery
1ccbf8942c
Add ability to tie locations to companies
...
Locations are the last big part of the application that can't be tied to companies.
This can be a problem with FullMultipleCompanySupport, because you can't restrict the visibility of locations to the company of the users.
In order to change this, add a company_id to the locations table and wire everything up in the views and controllers.
Aditionally add a new formatter to filter the locations to a specific company, like it is done for assets.
Locations are properly scoped to the users company if FullMultipleCompanySupport is enabled.
If a parent location of a location has a different company than the user, the location does not show up.
2024-11-04 10:03:37 +01:00
snipe
f32ebdc7ac
Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file
...
Added missing Livewire file
2024-10-31 22:39:58 +00:00
Marcus Moore
d6c7dc8e1c
Add missing livewire file
2024-10-31 15:37:01 -07:00
Godfrey M
de77eda33d
another line indent
2024-10-31 14:38:32 -07:00
Godfrey M
ee58fcc898
moved lines in for labels
2024-10-31 14:37:08 -07:00
Godfrey M
ae3cb7b37b
adds migration to update new with old if blank and remove old barcod variables
2024-10-31 14:35:13 -07:00
snipe
95dba6c426
Merge remote-tracking branch 'origin/develop'
2024-10-31 21:06:59 +00:00
snipe
5897d37fcf
Merge pull request #15763 from Godmartinz/no_to_email_check
...
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
2024-10-31 20:54:01 +00:00
Godfrey M
21a27dcac1
fixed conflicts
2024-10-31 12:55:46 -07:00
Godfrey M
3791380764
remove unused uses
2024-10-31 12:52:47 -07:00
Godfrey M
7a0f79ecd2
remove test route
2024-10-31 12:51:22 -07:00
Godfrey M
97a449e80e
removes instanceof User check
2024-10-31 12:50:13 -07:00
Godfrey M
e65942064e
send emails even if target has no email
2024-10-31 12:45:29 -07:00
Marcus Moore
5f83cb6a14
Use route model binding
2024-10-31 12:34:06 -07:00
Marcus Moore
ae24b73b32
Fix action_type from "created" to" create"
2024-10-31 12:19:41 -07:00
Marcus Moore
4aedbb52fa
Implement activity logging transformer tests
2024-10-31 12:15:05 -07:00
snipe
49de07045a
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
...
Fixed MS Team Notifications to utilize workflows after deprecation
2024-10-31 17:53:17 +00:00
snipe
7e996c40f5
Merge pull request #15758 from snipe/jerm/fix-deprecation-warning
...
Fix ${var} deprecation warning in License model
2024-10-31 02:51:42 +00:00
Jeremy Price
69e74bbdd3
Fix ${var} deprecation warning in License model
...
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated: Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219
This simple fix switches the offending statements to {$var} syntax.
2024-10-30 19:43:54 -07:00
Marcus Moore
20dab4d89d
Simplify tests
2024-10-30 16:50:55 -07:00
Marcus Moore
e871481042
Add group
2024-10-30 16:48:42 -07:00
akemidx
f10807661d
fixing bulk delete table
2024-10-30 19:26:52 -04:00
Marcus Moore
d727b03d95
Implement activity log test
2024-10-30 14:25:07 -07:00
Marcus Moore
0cc3031864
Implement deleted log
2024-10-30 14:05:27 -07:00
Marcus Moore
59e6874a4a
Scaffold test cases
2024-10-30 13:07:51 -07:00
snipe
73e8f160cf
Merge pull request #15756 from Godmartinz/cc-email-array
...
changes `admin_cc_email` validation to allow an array
2024-10-30 19:29:09 +00:00
Marcus Moore
930ef3fd11
Work on tests for activity logging
2024-10-30 12:22:59 -07:00
Godfrey M
bd23772fe9
changes cc_email validation to allow array
2024-10-30 11:42:15 -07:00
Godfrey M
73772a0138
change button text
2024-10-30 11:12:31 -07:00
Godfrey M
b26cae372c
merged in develop
2024-10-30 10:40:23 -07:00
Godfrey M
d6ba303f39
Merge branch 'develop' into refacto_ms_teams_notifs
...
# Conflicts:
# app/Listeners/CheckoutableListener.php
2024-10-30 10:27:45 -07:00
snipe
931ab103c1
Merge remote-tracking branch 'origin/develop'
2024-10-30 13:21:25 +00:00
snipe
f68df1fa06
Made type searchable in action logs
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-30 13:21:13 +00:00
snipe
f0813e03bf
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
...
Separated Notifications and Emails: Check ins and Check outs
2024-10-30 12:18:41 +00:00
Marcus Moore
35f8a71c71
Test organization
2024-10-29 16:17:12 -07:00
Marcus Moore
86762c5e90
Remove marker test case
2024-10-29 16:12:34 -07:00
Marcus Moore
3c75fc2ced
Move test
2024-10-29 16:12:13 -07:00
Marcus Moore
702edf7908
Remove x from select dropdown
2024-10-29 15:34:00 -07:00
Marcus Moore
54b4db86d2
Revert "Add soft deletes"
...
This reverts commit 0eadab49f1 .
2024-10-29 15:33:49 -07:00
Marcus Moore
0eadab49f1
Add soft deletes
2024-10-29 15:26:18 -07:00
Marcus Moore
45e98e0282
Merge branch 'develop' into saving_custom_report_template
2024-10-29 15:20:52 -07:00
Marcus Moore
b97c54a54b
Improve handling of old data for text inputs
2024-10-29 11:25:54 -07:00
NebelKreis
e22296fd79
Feature: Added serial number option to 2D barcode in label generation
2024-10-29 13:49:05 +01:00
NebelKreis
6c17d7d732
Fix: Corrected path in translation function
...
Updated the translation function to use the correct path, ensuring that instead of displaying the translation path as plain text, the appropriate translation is now shown as intended.
2024-10-29 11:45:29 +01:00
snipe
05875ebd1f
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-28 22:04:35 +00:00
Godfrey M
9a0eee8f03
revert testing variables
2024-10-28 15:03:43 -07:00
Godfrey M
6128765d1f
change wording on notification button
2024-10-28 15:03:03 -07:00
Godfrey M
c24f79c025
update method comment
2024-10-28 14:58:43 -07:00
Godfrey M
e7c4343c90
readd checkin accessory format
2024-10-28 14:56:48 -07:00
Marcus Moore
0d58ac61bc
Make options required in model
2024-10-28 14:48:19 -07:00
Marcus Moore
7c08fbe144
Update test name
2024-10-28 14:43:05 -07:00
Marcus Moore
7777147af5
Add custom-reporting group
2024-10-28 14:42:44 -07:00
Marcus Moore
2042733dc0
Switch to array syntax
2024-10-28 14:37:52 -07:00
Godfrey M
c0620c27ff
adds back laravels channel formats
2024-10-28 14:30:34 -07:00
Marcus Moore
d4cf392387
Organize tests
2024-10-28 14:24:47 -07:00
Marcus Moore
c881727747
Add redirect for missing template
2024-10-28 14:12:19 -07:00
Godfrey M
ed81973fe6
adds notifications for deprecation
2024-10-28 13:57:42 -07:00
Marcus Moore
ee00699cb3
Remove unused strings
2024-10-28 13:07:29 -07:00
Marcus Moore
b45749af16
Update translation strings
2024-10-28 13:06:19 -07:00
Marcus Moore
54dec8d30d
Add translations
2024-10-28 12:56:42 -07:00
snipe
2d318b394c
Merge pull request #15744 from marcusmoore/chore/action-tests-debugging
...
Added the display of logs when tests fail in GitHub Actions
2024-10-28 18:41:49 +00:00
Godfrey M
b987b3dc00
adds back the laravel channels package and applies a deprecated check
2024-10-28 10:57:48 -07:00
Marcus Moore
5c49716129
Dump logs on test failure
2024-10-28 10:24:35 -07:00
NebelKreis
6f3fb47e4a
Feature: Added asset tag option to barcode in label generation
2024-10-28 15:39:04 +01:00
snipe
755604677c
Merge remote-tracking branch 'origin/develop'
2024-10-28 13:38:19 +00:00
snipe
86d784bd59
Fixed #15740 - use non-translated strings for icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-28 13:37:59 +00:00
snipe
65f4f3def2
Merge remote-tracking branch 'origin/develop'
2024-10-28 12:04:20 +00:00
snipe
589f9cccdf
Fixed #15732
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-28 12:04:10 +00:00
snipe
42ec2fa05f
Merge remote-tracking branch 'origin/develop'
2024-10-28 11:55:43 +00:00
snipe
4d848e45e6
Fixed #15736
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-28 11:55:24 +00:00
Godfrey M
58ff641f82
removed unused variables
2024-10-24 22:53:53 -07:00
Godfrey M
ce68f550d8
remove alert emails from cc
2024-10-24 16:01:17 -07:00
Godfrey M
6f0c1b12b1
this adds check out message for consumables
2024-10-24 15:04:54 -07:00
Godfrey M
278bc5e52a
ads check in and checkout message for license seats
2024-10-24 14:59:10 -07:00
Godfrey M
cce75a8185
adds check in and checkout messag for accessories
2024-10-24 14:48:23 -07:00
Godfrey M
e27ff13377
adds check in and checkout message for assets
2024-10-24 14:39:40 -07:00
Godfrey M
56365495a1
remove unnecessary fields in accessory checkout mail
2024-10-24 14:26:42 -07:00
Godfrey M
18da80e6de
fix checkoutable listener for microsoft teams
2024-10-24 14:24:00 -07:00
akemidx
b29a2a6ae4
removing header color from login button
2024-10-24 17:23:03 -04:00
Godfrey M
18760e3fa1
replaces teams notification package, passes integration test
2024-10-24 12:21:51 -07:00
Godfrey M
57107c487c
fixed last test, definetly the last test
2024-10-24 09:40:10 -07:00
snipe
dfc63641dc
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
...
Fix multi create partial failure (fixes: [RB-18591])
2024-10-24 11:40:50 +01:00
snipe
3445b543ea
Merge remote-tracking branch 'origin/develop'
2024-10-24 10:04:02 +01:00
snipe
07a51ec8b1
Merge pull request #15712 from Godmartinz/fix_import-progress-bar
...
Upgraded `livewire v3.5.9 => v3.5.12`
2024-10-24 10:03:10 +01:00
snipe
15ffd69ac0
Merge remote-tracking branch 'origin/develop'
2024-10-24 01:40:10 +01:00
Godfrey M
6329f5b87e
removed unused variable from test
2024-10-23 17:33:23 -07:00
snipe
e0ec6795b5
Use crucial for seeded data
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-24 01:27:50 +01:00
Godfrey M
15073a0d38
last test to fix
2024-10-23 17:27:37 -07:00
Godfrey M
a80c09c16d
Merge branch 'develop' into seperating_notification_n_mail
2024-10-23 17:23:55 -07:00
snipe
5509d756b7
Merge pull request #15722 from Godmartinz/fix_component_factory
...
Fixed Component Factory: use manufacturer factory for `manufactuer_id`
2024-10-24 01:12:11 +01:00
Marcus Moore
7238238d1f
Use created_by instead of user_id
2024-10-23 16:40:03 -07:00
Godfrey M
b16a978f1b
uses manufacturer factory for manufactuer_id
2024-10-23 16:25:51 -07:00
Godfrey M
ab3b9c4510
remove unnecessary code from checkinasset notification
2024-10-23 16:24:01 -07:00
Marcus Moore
84f6638f50
Add authorization check
2024-10-23 16:11:10 -07:00
Godfrey M
2cc2b2b1df
apply array_filter to cc emails to prevent errors
2024-10-23 16:06:27 -07:00
Godfrey M
62d06b44d6
set fallback from email address to service.snipe-it.io
2024-10-23 15:43:42 -07:00
Marcus Moore
e390a95bd3
Improve back button behavior
2024-10-23 15:42:09 -07:00
Marcus Moore
3616c92148
Reflash template name
2024-10-23 15:40:54 -07:00
Marcus Moore
2fcc7e1188
Make template name required
2024-10-23 15:24:58 -07:00
Marcus Moore
8a06f4ad82
Improve label
2024-10-23 15:21:02 -07:00
Godfrey M
f29a383179
Merge branch 'develop' into seperating_notification_n_mail
...
# Conflicts:
# app/Notifications/CheckoutConsumableNotification.php
2024-10-23 15:15:14 -07:00
Godfrey M
fd74c35102
remove old notify by mail from consumable notification
2024-10-23 15:08:29 -07:00
Godfrey M
c681946b1d
added component markdown changes
2024-10-23 15:05:39 -07:00
Godfrey M
257d25bd9e
removed import notification from test, feature is not present in project
2024-10-23 14:56:54 -07:00
Godfrey M
6c34a5c52c
conditionally check cc emails, initiate variables
2024-10-23 14:54:21 -07:00
Godfrey M
1b5f4415ae
corrected cc email behavior
2024-10-23 14:44:45 -07:00
Marcus Moore
853e14f369
Fix width
2024-10-23 13:24:06 -07:00
Marcus Moore
c1aa33862d
Add error message for eol start and end fields
2024-10-23 13:22:21 -07:00
Marcus Moore
30dc5fa0cf
Allow retrieving eol start and end dates
2024-10-23 13:21:44 -07:00
Marcus Moore
94e168fa15
Fix label
2024-10-23 13:17:20 -07:00
snipe
7bbe23995d
Merge remote-tracking branch 'origin/develop'
2024-10-23 19:14:36 +01:00
snipe
55ba6279a4
Use trans_choice on alert menu
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-23 19:14:17 +01:00
snipe
a9eea830e3
Added manufacturer and model number to component seeders
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-23 19:05:34 +01:00
spencerrlongg
c76cccbb68
rm extraneous methods in exception
2024-10-23 12:56:36 -05:00
snipe
574f2e096d
Merge remote-tracking branch 'origin/develop'
2024-10-23 17:57:37 +01:00
snipe
af564935d5
Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components
...
Fixed #15695 - Added manufacturer and model_number to components
2024-10-23 17:56:04 +01:00
snipe
3ee76be7e3
Added manufacturer and model_number to components
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-23 17:50:22 +01:00
snipe
e15e33b648
Merge remote-tracking branch 'origin/develop'
2024-10-23 15:14:29 +01:00
snipe
d58f87862c
Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable
...
Fixed #15717 - Added ability to checkout consumables in variable qty via API
2024-10-23 15:09:50 +01:00
snipe
0b6859c491
Added ability to checkout consumables in variable qty
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-23 15:05:35 +01:00
spencerrlongg
fdb6970f36
this is pretty much done
2024-10-23 01:41:27 -05:00
spencerrlongg
b0d7eb2168
cancel action finished
2024-10-22 22:44:28 -05:00
spencerrlongg
79e6eafafa
cancelled scaffolded out
2024-10-22 22:33:29 -05:00
spencerrlongg
3ee008e871
revert
2024-10-22 20:54:20 -05:00
spencerrlongg
48c812d345
bunch of cleanup, split cancel out
2024-10-22 20:48:27 -05:00
Marcus Moore
4217d7402b
Improve tests
2024-10-22 17:50:40 -07:00
Marcus Moore
3d28a9090c
Improve test
2024-10-22 17:38:22 -07:00
Marcus Moore
271de1eceb
Improve tests
2024-10-22 17:37:23 -07:00
Marcus Moore
b6aae1f8a9
Group routes
2024-10-22 17:30:34 -07:00
Marcus Moore
c313a78c3c
Remove outdated @since annotations
2024-10-22 17:04:23 -07:00
Marcus Moore
37d65dac3d
Add todo
2024-10-22 17:01:37 -07:00
Marcus Moore
5ebf013d4e
Add comment
2024-10-22 16:54:38 -07:00
Marcus Moore
02c22c9efb
Add test case
2024-10-22 16:52:59 -07:00
Godfrey M
1e9922a0b0
fix moar tests
2024-10-22 16:14:36 -07:00
Godfrey M
ead27accac
fixed accessory tests and notifiable target
2024-10-22 15:45:52 -07:00
spencerrlongg
8a99cc1391
test working
2024-10-22 17:25:58 -05:00
Marcus Moore
d953519db6
Merge branch 'develop' into saving_custom_report_template
2024-10-22 15:11:18 -07:00
Godfrey M
727c0e458c
remove translation
2024-10-22 14:34:39 -07:00
Godfrey M
870dc747db
oops
2024-10-22 14:27:32 -07:00
Godfrey M
0fb3d83fac
revert controller change
2024-10-22 14:26:54 -07:00
Godfrey M
0d59ccd6a6
upgraded livewire v3.5.9 => v3.5.12
2024-10-22 14:23:26 -07:00
Marcus Moore
dd97e4ea82
Update permission tests
2024-10-22 14:22:19 -07:00
snipe
1979ada656
Merge remote-tracking branch 'origin/develop'
2024-10-22 22:10:53 +01:00
snipe
5da3ce3564
Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes
...
Fixed custom field checkboxes on asset edit page
2024-10-22 22:10:20 +01:00
snipe
c536dbc741
Merge remote-tracking branch 'origin/develop'
2024-10-22 22:08:59 +01:00
snipe
c3bbca30ad
Merge pull request #15710 from snipe/fixes_lightbox_for_avif
...
Fixes #15701 - load avif files properly in lightbox
2024-10-22 22:07:50 +01:00
snipe
37f14fff3b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-22 22:07:28 +01:00
snipe
eb6c51fabd
Fixes #15701 - load avif files properly in lightbox
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-22 22:04:57 +01:00
Marcus Moore
5ecd2b6293
Default checkbox elements to an empty array
2024-10-22 14:04:05 -07:00
spencerrlongg
b59bf495e1
stuff
2024-10-22 15:09:35 -05:00
Godfrey M
1e31592c55
messing with the tests
2024-10-22 11:49:06 -07:00
snipe
dccb788a88
Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user
...
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
2024-10-22 17:44:30 +01:00
Marcus Moore
d10fe77ee7
Merge branch 'develop' into fixes/get-id-for-current-user
2024-10-22 09:38:31 -07:00
snipe
7774dd0b7d
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-10-22 16:53:47 +01:00
snipe
5e1d792bba
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing
...
Fixed #15686 : Corrected capitalization for dashboard section titles by removing strtolower()
2024-10-22 16:52:28 +01:00
snipe
9cf71976f6
Fixed #15706 - Removed purchase order number from asset import
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-22 16:51:42 +01:00
snipe
15745d9737
Merge pull request #15566 from Godmartinz/status-label-error-message
...
Fixed Status Labels Error Message
2024-10-22 16:39:44 +01:00
snipe
bd97955b9e
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-22 16:38:46 +01:00
snipe
252d99421c
Merge pull request #15689 from snipe/better_handle_inline_files
...
Better handle inline files in file listing
2024-10-22 16:26:48 +01:00
snipe
5767a98ad8
Merge pull request #15649 from bryanlopezinc/ImproveImporting
...
Improve import performance
2024-10-22 16:26:23 +01:00
snipe
0c820cbc0d
Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue
...
Custom Field Existence Validation Issue
2024-10-22 15:56:12 +01:00
snipe
db81701621
Merge branch 'develop' into better_handle_inline_files
2024-10-22 15:44:24 +01:00
snipe
a05c33febf
Squashed commit of the following:
...
commit 147fcfb8eb
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 15:12:55 2024 +0100
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
Fix user creation with FullMultipleCompanySupport enabled over API
commit 58a3d09b5f
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 14:55:42 2024 +0100
Merge pull request #15703 from marcusmoore/bug/sc-27188
Linked accessory files in activity report
commit 30a06a5942
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:47:06 2024 +0100
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
Removed brianium/paratest
commit 6c6af78e08
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net >
Date: Tue Oct 22 11:46:04 2024 +0100
Merge pull request #15705 from marcusmoore/tests/icon-component-test
Added test to ensure icon component does not end in newline
commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 17:07:40 2024 -0700
Add test to ensure icon component does not end in newline
commit 9b06bbb6c3
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net >
Date: Mon Oct 21 22:38:26 2024 +0100
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
Removed second icon in accessory file list
commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:57:04 2024 -0700
Remove brianium/paratest dependency
commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 13:48:25 2024 -0700
Remove extra icon in accessory file upload list
commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Oct 21 12:40:24 2024 -0700
Display file in activity report for accessories
commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Oct 17 18:01:48 2024 -0700
Remove --parallel flag
commit 46ad1d072f
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 15:29:47 2024 +0100
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
Bulk checkout to bulk actions
commit bcb4bd9eb4
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net >
Date: Thu Oct 17 10:20:13 2024 +0100
Merge pull request #15683 from Toreg87/fixes/outdated_comment
Fix outdated comment in CompanyableTrait
commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Thu Oct 17 11:07:28 2024 +0200
Fix outdated comment in CompanyableTrait
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Oct 16 23:13:32 2024 +0100
Rework the bulk checkout to not change how all checkouts work
commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Thu Oct 10 13:28:23 2024 +0100
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com >
Date: Wed Oct 16 11:18:24 2024 +0200
Fix user creation with FullMultipleCompanySupport enabled over API
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
Signed-off-by: snipe <snipe@snipe.net >
2024-10-22 15:43:19 +01:00
snipe
03b01689b5
Merge remote-tracking branch 'origin/develop'
2024-10-22 15:39:20 +01:00
snipe
147fcfb8eb
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
...
Fix user creation with FullMultipleCompanySupport enabled over API
2024-10-22 15:12:55 +01:00
snipe
58a3d09b5f
Merge pull request #15703 from marcusmoore/bug/sc-27188
...
Linked accessory files in activity report
2024-10-22 14:55:42 +01:00
snipe
30a06a5942
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing
...
Removed brianium/paratest
2024-10-22 11:47:06 +01:00
snipe
6c6af78e08
Merge pull request #15705 from marcusmoore/tests/icon-component-test
...
Added test to ensure icon component does not end in newline
2024-10-22 11:46:04 +01:00
Marcus Moore
a20e03fce9
Merge branch 'develop' into saving_custom_report_template
2024-10-21 17:13:15 -07:00
Marcus Moore
3f79fd7ea7
Add test to ensure icon component does not end in newline
2024-10-21 17:07:40 -07:00
spencerrlongg
e40849c910
this stuff works
2024-10-21 17:31:26 -05:00
snipe
9b06bbb6c3
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
...
Removed second icon in accessory file list
2024-10-21 22:38:26 +01:00
Marcus Moore
ce30863177
Remove brianium/paratest dependency
2024-10-21 13:57:04 -07:00
Marcus Moore
d7f70146f4
Remove extra icon in accessory file upload list
2024-10-21 13:48:25 -07:00
Marcus Moore
867fa2f36e
Display file in activity report for accessories
2024-10-21 12:40:24 -07:00
Marcus Moore
e1882ee6d2
Add comment
2024-10-21 12:21:45 -07:00
Marcus Moore
7eee239378
use is_numeric instead of is_int
2024-10-21 12:20:28 -07:00
Marcus Moore
4188849ae1
Add failing test case
2024-10-21 12:19:48 -07:00
snipe
787e651778
Fixed todos with log message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-21 16:52:21 +01:00
snipe
ef9b6e3b07
Code cleanup
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-21 16:34:54 +01:00
snipe
06c599cc17
Added method to show or download file
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-21 16:34:03 +01:00
snipe
6105323877
Use plural class name for src
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-21 14:11:20 +01:00
Marcus Moore
0933a2d4ea
Remove --parallel flag
2024-10-17 18:01:48 -07:00
spencerrlongg
95a32864cf
hm, lots to think about 🤔
2024-10-17 18:11:18 -05:00
Marcus Moore
a8d853c44a
Remove focus group tags
2024-10-17 15:26:27 -07:00
Marcus Moore
7e1b47708e
Fix failing test ensuring company id is an integer
2024-10-17 15:18:41 -07:00
Marcus Moore
979e4502ff
Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company
2024-10-17 15:14:39 -07:00
Godfrey M
ff113ef523
typo fix
2024-10-17 14:56:58 -07:00
Marcus Moore
99dd51a965
Improve name
2024-10-17 14:53:18 -07:00
Marcus Moore
15c2169477
Scaffold additional tests
2024-10-17 14:31:05 -07:00
Marcus Moore
50fa6ce335
Scaffold tests
2024-10-17 14:12:22 -07:00
Godfrey M
7ae76e7db9
remove viewdata array from 3 tests
2024-10-17 13:55:03 -07:00
Godfrey M
b98058ca98
fix tests pt 3
2024-10-17 13:48:26 -07:00
Godfrey M
83e8186d9e
fix assertSent to AssertNotSent on some test
2024-10-17 13:39:56 -07:00
Godfrey M
cdd4fef7df
attempt to fix tests p2
2024-10-17 13:34:55 -07:00
Godfrey M
dceb8e305f
attempt to fix tests
2024-10-17 13:11:39 -07:00
Godfrey M
123cdeb858
add email check to listener
2024-10-17 12:39:48 -07:00
Godfrey M
496b44e887
merged composer lock from dev
2024-10-17 12:28:57 -07:00
Godfrey M
a690cc3582
removing my composer stuff again..for the last time
2024-10-17 12:26:55 -07:00
Godfrey M
ceb3f5cea6
added mail-gun and http-client to 8.1
2024-10-17 12:19:50 -07:00
Godfrey M
65735a31f1
removed symfony/mailgun-mailer symfony/http-client
2024-10-17 12:18:34 -07:00
Godfrey M
285d6897cf
added a coulple test adjustments and moved mail send logic to listener
2024-10-17 12:05:36 -07:00
Marcus Moore
159a1d3f43
Be more explicit
2024-10-17 11:48:55 -07:00
spencerrlongg
1fd945c2d8
this works
2024-10-17 12:45:49 -05:00
snipe
d1149730be
Apply blade component to files views
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 16:31:17 +01:00
snipe
46ad1d072f
Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions
...
Bulk checkout to bulk actions
2024-10-17 15:29:47 +01:00
NebelKreis
780ed91a10
Fix: Removed strtolower() from dashboard titles
...
This fix ensures the correct capitalization in different languages.
2024-10-17 16:09:25 +02:00
snipe
bcb4bd9eb4
Merge pull request #15683 from Toreg87/fixes/outdated_comment
...
Fix outdated comment in CompanyableTrait
2024-10-17 10:20:13 +01:00
Tobias Regnery
f50ccbcc49
Fix outdated comment in CompanyableTrait
...
As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment
2024-10-17 11:07:28 +02:00
spencerrlongg
b2ff34260a
hm, lots of thinking to do
2024-10-17 00:02:15 -05:00
Godfrey M
9a79483375
removed namespaces from routing
2024-10-16 16:59:18 -07:00
spencerrlongg
a524c0b418
more work
2024-10-16 18:48:15 -05:00
Godfrey M
ed6034065b
removed test route
2024-10-16 16:47:36 -07:00
Godfrey M
a7754c1a7f
fixed asset checkout markdown, and notifiable variable
2024-10-16 16:46:52 -07:00
snipe
0e9b3c9119
Check for existence before trying to get the icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:27:39 +01:00
snipe
4933aa5784
Add StorageHelper to app config
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:27:04 +01:00
snipe
d67addc69e
Removed filetype column - it’s dumb
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:21:43 +01:00
snipe
02c80ff18a
Added comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:18:40 +01:00
snipe
c01190fac2
Conditionally add content-type
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:18:34 +01:00
snipe
017884f843
Added checks and filetype display
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:09:09 +01:00
snipe
c49921f50f
Removed unused (maybe?) API endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:08:54 +01:00
snipe
c49abb6aea
Refactor the UserFilesController show method for simpler inlining
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:08:38 +01:00
snipe
ccd2019448
Removed unusded use statements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:08:04 +01:00
snipe
96191a5e93
Added method to decide if the file should be inlinable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:07:54 +01:00
snipe
c56affd663
Added SVG icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-17 00:07:37 +01:00
Godfrey M
02bda3cd95
adds Checkout Consumable mailable and slackwebhook channel to notifs
2024-10-16 15:53:05 -07:00
Godfrey M
02ff646da4
adds checkin license mailable
2024-10-16 15:44:45 -07:00
Godfrey M
4becdca8aa
removes toMail from license notificaqtion
2024-10-16 15:39:20 -07:00
Godfrey M
2584d60344
adds Licenses seat checkout Mailable
2024-10-16 15:38:49 -07:00
akemidx
f0d3a6e2d3
removing some comments/merging in develop
2024-10-16 18:35:31 -04:00
akemidx
5cb940c2ee
Merge branch 'refs/heads/upstream/dev' into feature/sc-26415
2024-10-16 18:32:36 -04:00
Godfrey M
f1d83a3f28
forgot to add asset checkout markdown to projet
2024-10-16 15:30:53 -07:00
Godfrey M
c39df34bdf
forgot to add accessory mail to project
2024-10-16 15:29:50 -07:00
Godfrey M
dcdf600b78
adds Checkin and Checkout mailables and listner logic
2024-10-16 15:27:34 -07:00
spencerrlongg
b1d62cc478
initial untested
2024-10-16 17:23:22 -05:00
Brady Wetherington
3cf746d7df
Rework the bulk checkout to not change how all checkouts work
2024-10-16 23:13:32 +01:00
Brady Wetherington
6b7af802af
Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar
2024-10-16 22:02:45 +01:00
Godfrey M
9710436d54
adds Mailables for asset checkin and out
2024-10-16 13:12:07 -07:00
Godfrey M
16cffe9a9d
simplified checkout webhook call
2024-10-16 12:53:35 -07:00
Godfrey M
9e1b86f586
sends checkout notification via webhook
2024-10-16 12:51:19 -07:00
Godfrey M
3ab2521cb0
email comes through, no picture and html markup appear though.
2024-10-16 12:21:33 -07:00
Marcus Moore
604a964462
Improve scenario descriptions
2024-10-16 11:52:24 -07:00
Marcus Moore
2f72c66614
Add additional case
2024-10-16 11:30:06 -07:00
Tobias Regnery
fdcc17ca2c
Fix user creation with FullMultipleCompanySupport enabled over API
...
It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.
Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.
2024-10-16 11:47:18 +02:00
Marcus Moore
cba1a56040
Improve readability?
2024-10-15 17:38:11 -07:00
Marcus Moore
d9afde4610
Write failing test
2024-10-15 17:00:22 -07:00
Godfrey M
9f06a0e441
handle some edge cases, null values clean up variable names
2024-10-15 14:01:28 -07:00
Marcus Moore
42095c0167
Add reference link
2024-10-15 13:02:22 -07:00
Godfrey M
f8476f7133
finished the construct and mail call in the listner
2024-10-15 12:49:52 -07:00
Marcus Moore
5306e1cd15
Merge branch 'develop' into saving_custom_report_template
...
# Conflicts:
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/reports/custom.blade.php
2024-10-15 12:32:01 -07:00
Godfrey M
b29d032bf0
adds checkoutAssetMail class, and content method
2024-10-15 11:28:27 -07:00
snipe
688260c8bb
Merge remote-tracking branch 'origin/develop'
2024-10-15 18:31:16 +01:00
snipe
2500375400
Merge pull request #15672 from uberbrady/ldap_location_fixes
...
Clean up how we use the '$location' in LDAP sync command
2024-10-15 17:34:35 +01:00
Brady Wetherington
e4e1d0d50a
Clean up how we use the '$location' in LDAP sync command
2024-10-15 17:26:31 +01:00
snipe
b38c2d4660
Merge remote-tracking branch 'origin/develop'
2024-10-15 16:43:23 +01:00
snipe
16c8264e76
Merge pull request #15671 from snipe/bug/sc-27147
...
Bug/sc 27147
2024-10-15 16:42:34 +01:00
snipe
0ae9ce0aa9
Cannot sort by updated at on Users [sc-27147]
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-15 16:41:45 +01:00
snipe
50b8f180b3
More logical grouping in allow_columns
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-15 16:41:39 +01:00
snipe
b256bea000
Merge remote-tracking branch 'origin/develop'
2024-10-15 13:10:55 +01:00
snipe
914a647204
Merge pull request #15669 from snipe/remlove_ou_requirenedess
...
Fixed #15663 - remove requiredness for OU
2024-10-15 12:47:15 +01:00
snipe
e9225ff3ea
Switch to regular HTML for input form field
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-15 12:43:10 +01:00
snipe
d0d4159088
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-15 12:42:09 +01:00
snipe
69b6080bd8
Merge pull request #15666 from snipe/updated_readme_llm
...
Added LLM note
2024-10-15 10:31:29 +01:00
snipe
b997d728fb
Added LLM note
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-15 10:30:34 +01:00
snipe
ddead359d0
Merge pull request #15660 from Toreg87/fixes/api_asset_create_fmcs2
...
Refactor asset creation with API
2024-10-14 14:29:34 +01:00
Tobias Regnery
f3c4e55667
Refactor asset creation with API
...
Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport.
But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation()
The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend.
Fix this by removing the check and the now redundant call to getIdForCurrentUser().
Wrong values will get caught by the model-level validation rules.
2024-10-14 15:14:41 +02:00
snipe
0a1716382e
Merge remote-tracking branch 'origin/develop'
2024-10-11 16:07:01 +01:00
snipe
0d35335da7
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-11 16:06:17 +01:00
snipe
6554d0c787
Merge remote-tracking branch 'origin/develop'
2024-10-11 14:24:11 +01:00
snipe
feaa714304
Nicer disabled button
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-11 14:23:57 +01:00
snipe
e1a70023b1
Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs
...
Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport
2024-10-11 11:45:48 +01:00
snipe
41ffd55430
Merge remote-tracking branch 'origin/develop'
2024-10-11 11:30:09 +01:00
snipe
de62359c67
Merge pull request #15533 from marcusmoore/testing/fmcs-accessories
...
Added tests for accessory api controller
2024-10-11 11:29:34 +01:00
snipe
1338eaa4fa
Merge remote-tracking branch 'origin/develop'
2024-10-11 11:28:06 +01:00
snipe
12bda8fc7b
Merge pull request #15653 from snipe/15651_admin_user_on_maintenances
...
Fixed #15651 - admin user now displaying on maintenances page
2024-10-11 11:27:18 +01:00
Tobias Regnery
fb4fe30049
Fix asset creation with API and FullMultipleCompanySupport
...
It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled.
This bug goes back to 75ac7f80b9 which is part of version 6.3.0.
Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().
2024-10-11 12:19:20 +02:00
snipe
b054017c9f
Fixed #15651 - admin user now displaying on maintenances page
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-11 11:16:24 +01:00
bryanlopezinc
524a442724
Improved import performance
2024-10-10 23:32:07 +01:00
snipe
b296afe050
Merge remote-tracking branch 'origin/develop'
2024-10-10 12:32:19 +01:00
snipe
8aa298f6b0
Merge pull request #15644 from snipe/form_requests_for_settings
...
Form requests for settings
2024-10-10 12:30:53 +01:00
snipe
1f34657734
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-10 12:30:35 +01:00
snipe
0856ee648e
Merge pull request #15648 from snipe/update_packages
...
Updated livewire to 3.5.2
2024-10-10 12:23:14 +01:00
snipe
1dafc970df
Updated livewire to 3.5.2
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-10 12:19:57 +01:00
snipe
14b8b3b37c
Merge remote-tracking branch 'origin/develop'
2024-10-10 12:09:29 +01:00
snipe
94a074a193
Merge pull request #15601 from snipe/check_db_on_healthcheck
...
Fixed #15439 - check database on healthcheck
2024-10-10 01:11:10 +01:00
snipe
2d49e1eff2
Merge pull request #15637 from akemidx/bug/sc-26614
...
FIXED: Badge counter showing deleted assets on User page
2024-10-10 01:09:11 +01:00
snipe
705bc6f0c0
Merge pull request #15642 from uberbrady/fix_bulk_checkout
...
Fix bulk checkout to users, assets, and locations
2024-10-10 01:08:25 +01:00
snipe
b5b93fdd3a
Make ldap username required
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-10 00:27:00 +01:00
snipe
d9432baf7a
Mlore ldap style improvements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 23:51:20 +01:00
snipe
90be2a4498
Use newer naming convention for errors
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 22:26:30 +01:00
snipe
3886da8941
Remove form request from get LDAP method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 22:15:49 +01:00
snipe
130e0c6242
More validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 22:15:37 +01:00
snipe
4361a10818
Added string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 22:15:30 +01:00
snipe
aa8048ac15
Blade changes for ldap
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 22:15:25 +01:00
snipe
710e738e8e
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 22:15:16 +01:00
snipe
3705b91439
Added more validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 20:51:34 +01:00
snipe
707bdad192
Updated test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 20:33:56 +01:00
snipe
242fe33f97
Switch to regular HTML input
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 20:33:42 +01:00
snipe
ded79469c1
Remove unused controller method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 20:33:29 +01:00
snipe
d9fbf330e5
Fixed translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 20:33:15 +01:00
snipe
2cb9ac26cd
Renamed test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:57:04 +01:00
snipe
185bc966e6
Cleaned up use statements in tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:46:47 +01:00
snipe
a7f7e4938f
Added form action
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:31:56 +01:00
snipe
2883e79193
Removed unecessary assets creation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:30:55 +01:00
snipe
9c4191ae0a
Basic tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:30:42 +01:00
snipe
3a77b83e9c
Added space
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:30:34 +01:00
snipe
d9be2b5a5e
Trying to use the email_array translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:30:25 +01:00
snipe
69c43c610c
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 19:30:00 +01:00
snipe
4f957bcf71
Required flag
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 18:34:53 +01:00
snipe
5cda7cce48
Only accept a positive number for thresholds
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 18:21:40 +01:00
snipe
41b94e7128
Fixed form input group
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 18:19:26 +01:00
snipe
aa55fa6ff4
Switch to form requests for settings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 18:16:34 +01:00
Brady Wetherington
67a605c9a5
Fix bulk checkout to users, assets, and locations
2024-10-09 17:01:26 +01:00
akemidx
c2663ea1e0
withouttrashed
2024-10-08 16:38:33 -04:00
akemidx
299e743848
weird requesting
2024-10-08 15:51:53 -04:00
snipe
3ee5713740
Merge pull request #15631 from snipe/test/importer-tests
...
Add importer tests
2024-10-07 23:13:15 +01:00
snipe
ab8a22f77e
Merge pull request #15630 from marcusmoore/bug/sc-27028
...
Only show EULA when available on print users page
2024-10-07 22:56:23 +01:00
snipe
56e7ea6677
Merge pull request #15616 from marcusmoore/test/importer-test-updates
...
Improve importer tests
2024-10-07 22:29:35 +01:00
snipe
26d7572bcc
Merge pull request #15603 from marcusmoore/fixes/add-reguard
...
Added `Model::reguard()` to importer
2024-10-07 22:28:53 +01:00
Marcus Moore
8c9132aff9
Hide EULA text and button when nothing will be displayed
2024-10-07 14:22:49 -07:00
snipe
382ebef8ca
Merge pull request #15621 from sniff122/develop
...
Docker Env: Change trusted proxies to RFC1918
2024-10-07 21:26:21 +01:00
snipe
5de608a6d2
Merge remote-tracking branch 'origin/develop'
2024-10-07 11:14:47 +01:00
snipe
2be88cb955
Merge pull request #15624 from snipe/fixed_line_break_on_print_all_for_users
...
Removed duplicate JS and removed line break before user section
2024-10-07 11:14:24 +01:00
snipe
3f36d5f9b3
Removed duplicate CSS and removed line break before user section
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-07 11:08:02 +01:00
Lewis Foster
f76da48448
Docker Env: Change trusted proxies to RFC1918
2024-10-05 18:27:42 +01:00
Marcus Moore
8035326675
Add test
2024-10-03 16:53:19 -07:00
Marcus Moore
dfdd85abb1
Remove unused imports
2024-10-03 15:14:07 -07:00
Marcus Moore
063ea1892b
Add trait to clean up files after test runs
2024-10-03 15:02:03 -07:00
Marcus Moore
e213053775
Swap factory syntax
2024-10-03 13:59:58 -07:00
Marcus Moore
88d549e7c5
Remove unused data provider method
2024-10-03 13:40:37 -07:00
Marcus Moore
983a25aa5f
Simplify permission tests
2024-10-03 13:39:54 -07:00
Marcus Moore
bde05d6ed9
Use new() instead of times()
2024-10-03 13:15:49 -07:00
Marcus Moore
b5ffe54bd0
Swap assertEquals parameter order
2024-10-03 13:15:02 -07:00
Marcus Moore
863c0a8b60
Fix import_type for accessory state
2024-10-03 11:43:02 -07:00
Marcus Moore
32551d55d7
Merge pull request #15579 from bryanlopezinc/ImportTests
...
Add Import data tests
2024-10-03 11:39:21 -07:00
snipe
c56a5edddc
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-10-03 17:41:07 +01:00
snipe
7fc498a597
Merge pull request #15613 from snipe/css_fixes_for_long_values
...
Smarter word-wrapping on long text
2024-10-03 17:39:18 +01:00
snipe
cb281c6408
Tweaked line height
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-03 17:33:46 +01:00
snipe
f483cd448f
Smarter work-wrapping on long text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-03 17:27:37 +01:00
snipe
2de3bc92eb
Merge remote-tracking branch 'origin/develop'
2024-10-03 16:29:14 +01:00
snipe
78ca1026fd
Merge pull request #15612 from snipe/fixes_print_assigned_in_profile
...
Fixes print assigned in profile
2024-10-03 16:24:32 +01:00
snipe
722d5a58e7
Added isset on users
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-03 16:19:38 +01:00
snipe
7461c3e0ca
Change controller to assume a collection. (This is dumb, but whatever)
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-03 16:19:27 +01:00
snipe
3c0f4181ae
Use the newer button style
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-03 16:19:06 +01:00
snipe
f5d7b96503
Merge remote-tracking branch 'origin/develop'
2024-10-03 14:38:34 +01:00
snipe
3699d79363
Merge pull request #15610 from uberbrady/fix_numeric_sort_bug
...
Fix numeric sort 'ambiguous order clause' error
2024-10-03 14:34:00 +01:00
Brady Wetherington
350b627ce1
Fix numeric sort 'ambiguous order clause' error
2024-10-03 14:23:40 +01:00
akemidx
0c84904bf9
un'required'ing the rule. not sure what's breaking here but looking
2024-10-02 18:56:41 -04:00
akemidx
e00a1aec02
note box is now missing when unchecking setting
2024-10-02 18:52:33 -04:00
akemidx
06e3bb7fd1
requested changes
2024-10-02 18:37:11 -04:00
akemidx
492e686b7a
Merge remote-tracking branch 'origin/feature/sc-26415' into feature/sc-26415
...
# Conflicts:
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Assets/AssetCheckoutController.php
# app/Http/Requests/AssetCheckinRequest.php
2024-10-02 18:17:38 -04:00
akemidx
17706f150e
requested changes
2024-10-02 18:15:53 -04:00
akemidx
6fef127cd1
missing closing )
2024-10-02 18:15:53 -04:00
akemidx
f45b836010
backend form validation. +cleanup
2024-10-02 18:15:53 -04:00
akemidx
925aea8531
back to having tests pass. needed to comment out the notes rules() i added
2024-10-02 18:15:53 -04:00
akemidx
bd6698de2a
fixing some formatting
2024-10-02 18:15:53 -04:00
akemidx
515f59fed9
more test work
2024-10-02 18:15:52 -04:00
akemidx
5e74b109d9
front end changes/updates from gh
2024-10-02 18:15:52 -04:00
akemidx
8b643cb3b9
note field optional
2024-10-02 18:15:52 -04:00
akemidx
700647c53f
setting created
2024-10-02 18:15:52 -04:00
akemidx
081c5706c4
required, but not optional
2024-10-02 18:15:52 -04:00
Marcus Moore
ee046a8688
Add matching Model::reguard()
2024-10-02 10:50:40 -07:00
snipe
b34a7c8aad
Removed die()
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-02 15:48:35 +01:00
snipe
f92bf5dc20
Updated language for failure
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-02 15:39:27 +01:00
snipe
4d9e85026a
Fixed #15439 - check database on healthcheck
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-02 15:36:01 +01:00
snipe
1695b8250f
Bumped version for master
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-02 12:41:31 +01:00
snipe
f42eeee666
Merge remote-tracking branch 'origin/develop'
2024-10-02 12:40:59 +01:00
snipe
54fbd0540d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-10-02 12:40:49 +01:00
snipe
b483bb1633
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-02 12:40:45 +01:00
snipe
4db7358086
Merge pull request #15593 from Godmartinz/Fixed-divide-by-zero-bug
...
Fixed divide by zero bug in depreciation transformer
2024-10-02 12:38:46 +01:00
snipe
dc0949da78
Merge remote-tracking branch 'origin/develop'
2024-10-02 11:05:06 +01:00
snipe
0dd6f41f66
Simplified 2fa if/else
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-02 11:04:55 +01:00
snipe
0470a7c946
Merge remote-tracking branch 'origin/develop'
2024-10-02 11:01:05 +01:00
snipe
684c20ae39
Fixed parenthasis
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-02 11:00:49 +01:00
spencerrlongg
3153bbb13f
dumb fix
2024-10-01 17:04:18 -05:00
akemidx
73a059c9ac
missing closing )
2024-10-01 16:37:30 -04:00
Marcus Moore
3dc64cc5e0
Reference accessory checkout and not the accessory
2024-10-01 13:35:39 -07:00
snipe
c32f4e34b4
Minor formatting fix
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 20:35:49 +01:00
snipe
c8981f5031
Merge remote-tracking branch 'origin/develop'
2024-10-01 20:32:41 +01:00
snipe
ca1886cebc
Merge pull request #15594 from snipe/localizations/update-2024-10-01
...
Updated strings
2024-10-01 20:31:38 +01:00
snipe
a79dfea40a
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 20:30:58 +01:00
snipe
45ab49eeab
Merge pull request #15592 from spencerrlongg/bug/catch_request_notify_errors
...
Catch Errors Around Request Notifications
2024-10-01 20:26:42 +01:00
spencerrlongg
8232618a9f
change the other one too
2024-10-01 14:26:32 -05:00
spencerrlongg
9a651b567d
change error to warning
2024-10-01 14:24:03 -05:00
snipe
97d00e5aa8
Fixed erroneous form tag on anchor
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 20:08:54 +01:00
Marcus Moore
5b90d79494
Use created_by
2024-10-01 11:50:48 -07:00
Godfrey M
b9cfdf2e54
reworked monthly depreciation variable value
2024-10-01 11:41:59 -07:00
spencerrlongg
1139acd9f3
catch errors around request notifications
2024-10-01 13:36:47 -05:00
Godfrey M
b7ad80bd31
fix monthly depreciation value
2024-10-01 11:24:24 -07:00
Godfrey M
5ffd1b8daa
fixes if statement in transformer
2024-10-01 11:02:39 -07:00
snipe
9a2117466e
Removed placeholder
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 18:23:40 +01:00
snipe
7e3a062984
Use <th> for table header in bulk interstitial
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 18:23:07 +01:00
snipe
9cf4b03f59
Merge remote-tracking branch 'origin/develop'
2024-10-01 14:33:29 +01:00
snipe
d274fb6963
Merge pull request #15589 from snipe/adds_checkin_action_on_asset_delete
...
Adds checkin action on asset delete via View UI
2024-10-01 14:32:48 +01:00
snipe
27ba641aa5
Added checkin on delete to API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 14:30:34 +01:00
snipe
5823197e6f
Added checkin action on delete for checked out assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 14:29:02 +01:00
snipe
cfc04a1d12
Merge pull request #15588 from snipe/added_more_maxlengths
...
Added maxlengths to additional fields
2024-10-01 14:08:58 +01:00
snipe
cae8aa7840
Added maxlengths to additional fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 14:02:54 +01:00
spencerrlongg
4f9f035c69
added a way to manipulate validator attribute names
2024-09-30 20:09:00 -05:00
snipe
5d5e999384
Merge remote-tracking branch 'origin/develop'
2024-10-01 01:44:24 +01:00
snipe
12da43303f
Fixed #15584 - regression with required css change
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-01 01:44:05 +01:00
Marcus Moore
fdfea390fb
Merge branch 'develop' into testing/fmcs-accessories
2024-09-30 12:59:27 -07:00
spencerrlongg
cd3059f790
rm numbers too. :(
2024-09-30 13:38:52 -05:00
snipe
b04afbbc85
Merge pull request #15564 from uberbrady/improve_autoclose
...
Get us better debugging output for new Github Stale Action
2024-09-30 19:26:08 +01:00
snipe
b964ce1025
Merge pull request #15583 from Godmartinz/remove-sortable-from-depreciations
...
Removed sortablity for current value column in depreciations report
2024-09-30 19:25:05 +01:00
snipe
6217cba201
Merge pull request #15524 from Godmartinz/double-notif-bug
...
Fixed double webhook notifications // Separated email and webhook notifications.
2024-09-30 19:24:19 +01:00
Godfrey M
68e3f375fc
removes sortablity from current value column
2024-09-30 11:15:49 -07:00
snipe
21af36b105
Merge remote-tracking branch 'origin/develop'
2024-09-30 18:24:19 +01:00
snipe
5689e940b8
Fixed #15581 - missing bracker
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-30 18:23:12 +01:00
bryanlopezinc
e807cfab86
Merge branch 'develop' into importTests
2024-09-30 12:47:52 +01:00
bryanlopezinc
0b3f458561
Added tests for Import feature
2024-09-30 12:42:41 +01:00
snipe
d6d5dfb3d2
Merge remote-tracking branch 'origin/develop'
2024-09-29 14:33:50 +01:00
snipe
001348c638
Unset required on checkout select :(
...
Related to the discussion at #15552
Signed-off-by: snipe <snipe@snipe.net >
2024-09-29 14:33:42 +01:00
snipe
9e3997e0a1
Generated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-29 11:25:47 +01:00
snipe
1b041af862
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-09-29 11:25:01 +01:00
snipe
260b153689
Merge pull request #15573 from snipe/fixed_requiredness_indicator
...
Fixes for requiredness indicator in UI
2024-09-28 16:09:51 +01:00
snipe
05d74f7a92
Covered setup pages too
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-28 15:42:03 +01:00
snipe
dc85588d7f
Don’t show password as required if editing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-28 15:31:44 +01:00
snipe
585f998cae
Fixes for requiredness display
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-28 15:28:06 +01:00
snipe
d120585f94
Check for valid eula for license, consumable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-27 14:07:30 +01:00
snipe
166a700342
Merge remote-tracking branch 'origin/develop'
2024-09-27 13:37:28 +01:00
snipe
36b27fcda3
Check for valid category before getting the eula
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-27 13:37:14 +01:00
snipe
a44490e448
Nowrap on files column
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-27 13:07:24 +01:00
Marcus Moore
e974c96eda
Update to created_by
2024-09-26 12:41:16 -07:00
Marcus Moore
2004e58b53
Merge branch 'develop' into updated_ad_hoc_notes
2024-09-26 12:29:28 -07:00
Marcus Moore
eb2d7b1f4f
Move comment location
2024-09-26 12:14:00 -07:00
Marcus Moore
47763d1e1a
Add tests for adding notes to assets
2024-09-26 12:13:36 -07:00
Godfrey M
44447b85c9
Merge branch 'develop' into barcode_settings_hide
2024-09-26 11:27:05 -07:00
snipe
9aada2ec70
Merge pull request #15498 from Godmartinz/Modal_fix
...
Refactoring modals with partials and fixing misalignments
2024-09-26 09:09:35 +01:00
Godfrey M
3f74ff25d2
fixed error message
2024-09-25 16:19:09 -07:00
akemidx
b813dcd9d0
requested changes from github
2024-09-25 18:54:30 -04:00
Godfrey M
ef82f954e5
fixed required css, and user input lengths
2024-09-25 15:47:57 -07:00
spencerrlongg
b69596a261
rm dump
2024-09-25 16:21:33 -05:00
spencerrlongg
d02b9933e5
rm comment
2024-09-25 15:38:40 -05:00
spencerrlongg
852a56fa9b
should be all good now
2024-09-25 15:30:41 -05:00
Brady Wetherington
3f311ba2fb
Get us better debugging output for new Github Stale Action
2024-09-25 21:27:45 +01:00
Godfrey Martinez
96953aa2ed
Merge pull request #23 from Godmartinz/Modal_fix_p3
...
replace duplicate code with partials
2024-09-25 12:50:01 -07:00
Godfrey M
b797c37acb
replace duplicate code with partials
2024-09-25 12:48:05 -07:00
snipe
6c85ba3495
Merge remote-tracking branch 'origin/develop'
2024-09-25 20:45:02 +01:00
snipe
ac6411743b
Merge pull request #15563 from snipe/refined_gates_on_user_bulk
...
Update for #15534 - Refined gates on user bulk
2024-09-25 20:35:58 +01:00
snipe
3f0245f88f
Make controller gate match dropdown gate
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 20:33:00 +01:00
snipe
c02647a0fa
Moved merge into delete gate, since they do technically delete
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 20:32:03 +01:00
snipe
edca3f432c
Removed gate for delete
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 20:30:58 +01:00
snipe
2218c94aa3
Gates the dropdown based on user permissions
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 20:29:23 +01:00
Godfrey Martinez
e609b39760
Merge pull request #22 from Godmartinz/Modal_fix_p2
...
Modal fix p2
2024-09-25 12:09:26 -07:00
Godfrey M
12522a3791
fix spacing issues
2024-09-25 12:07:15 -07:00
spencerrlongg
9df78a9ed0
working! need formatting for error messages etc
2024-09-25 14:00:50 -05:00
snipe
f6d7ea19e4
Set view as base permission, drill down for more intrusive actions
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 19:44:39 +01:00
Godfrey M
18ddffe8f9
fix partial variable intialization, fix width of input fields
2024-09-25 11:42:16 -07:00
snipe
9b03f46490
Merge pull request #15534 from marcusmoore/bulk-print-users
...
Added the ability to bulk print users
2024-09-25 19:32:01 +01:00
Godfrey M
926a319552
Merge branch 'develop' into Modal_fix_p2
2024-09-25 11:10:24 -07:00
spencerrlongg
f3ad89931f
hm ok this kind of works
2024-09-25 13:00:35 -05:00
spencerrlongg
21906d8c27
world set up and idea in place
2024-09-25 12:47:56 -05:00
snipe
9f8473e254
Merge remote-tracking branch 'origin/develop'
2024-09-25 18:36:40 +01:00
snipe
cb6e5042d9
Merge pull request #15547 from snipe/disallow_checkout_with_nondeployable_status
...
Fixed #13396 - do not allow checkout to undeployable status types
2024-09-25 18:32:59 +01:00
snipe
c1a887b48b
Merge pull request #15561 from snipe/fixes/adds_action_date_to_sorting
...
Changed `action_date` to `created_at` in activity report
2024-09-25 18:32:21 +01:00
snipe
658c94ad8b
Changed action_date to created_at
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 17:25:15 +01:00
Maciej Poleszczyk
d1e2f9db34
Fixing #15064 - to not fail ldap sync on single data issue with ldap manager
2024-09-25 17:56:49 +02:00
snipe
0e61d0b195
Merge remote-tracking branch 'origin/develop'
2024-09-25 15:51:38 +01:00
snipe
ba12204842
Merge pull request #15555 from snipe/fixes/user_file_upload
...
Fixed case on `$logAction` for user file upload
2024-09-25 15:51:14 +01:00
snipe
1c3babacaf
Fixed case on logAction for usewr file upload
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 15:46:57 +01:00
snipe
abdddbec44
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-09-25 11:58:25 +01:00
snipe
eeabc8dc9d
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-25 11:33:45 +01:00
snipe
21f8ac8e52
Merge pull request #15552 from Godmartinz/ragged-form-inputs
...
Fixed input field misalignments
2024-09-25 11:31:23 +01:00
snipe
a425c2b765
Merge remote-tracking branch 'origin/develop'
2024-09-25 10:52:19 +01:00
Godfrey M
2a2666be0b
makes required a pseudo field
2024-09-24 13:24:50 -07:00
snipe
c38222e956
Merge pull request #15549 from snipe/fixes/#15548_unify_audit_api_endpoints
...
Fixes #15548 - unify audit api endpoints
2024-09-24 18:10:53 +01:00
snipe
0ce5832b6c
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-24 17:29:40 +01:00
Brady Wetherington
b6340532d7
Improve the error and success messages and linking
2024-09-24 17:15:39 +01:00
snipe
5fb43dd159
Handle audit *and* audits for urls
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-24 16:55:56 +01:00
snipe
de57d71bf1
Fixed #15548 - unify audit due/overdue APIs
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-24 16:30:24 +01:00
snipe
ba69259f2d
Fixed #13396 - do not allow checkout to undeployable status types
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-24 15:35:00 +01:00
Brady Wetherington
c71411465a
First pass at better-handling those annoying Rollbars we keep getting
2024-09-24 15:17:35 +01:00
snipe
8cf1e4dceb
Merge pull request #15544 from snipe/bug/sc-26855
...
Fixed app settings view on mobile
2024-09-24 11:10:20 +01:00
snipe
66249a37ed
Tweaked styles
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-24 11:08:31 +01:00
snipe
96712cb398
Fixed app settings view on mobile
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-24 10:55:26 +01:00
Marcus Moore
fac4833b58
Remove unused import
2024-09-23 17:15:16 -07:00
Marcus Moore
a12c9d053f
Hide label when printing
2024-09-23 16:44:25 -07:00
Marcus Moore
8b3b68b308
Show or hide all eulas at once when printing multiple users
2024-09-23 16:43:14 -07:00
Marcus Moore
4b02db5031
Add authorization check in bulk users controller
2024-09-23 16:26:22 -07:00
Marcus Moore
ab90c0cf05
Add missing eager load in bulk users controller
2024-09-23 16:10:40 -07:00
Marcus Moore
cef7ddc719
Add eager loads to userscontroller
2024-09-23 16:10:21 -07:00
Marcus Moore
3870095a28
Fix Cannot read properties of undefined error by removing snipe-table class from eula table
2024-09-23 15:50:24 -07:00
Marcus Moore
a02e250b22
Add page breaks for each user
2024-09-23 15:26:15 -07:00
Marcus Moore
8ac5c0e471
Re-combine layout and view
2024-09-23 14:05:47 -07:00
Marcus Moore
a2d4dcf6e8
Use bulk actions menu
2024-09-23 12:49:36 -07:00
Marcus Moore
54044bfa5e
Add eager loads
2024-09-23 10:57:57 -07:00
Marcus Moore
e493cc964d
Remove AssetCountForSidebar middleware from print view
2024-09-23 10:48:07 -07:00
Marcus Moore
29af210f4f
Merge branch 'develop' into bulk-print-users
2024-09-23 10:26:20 -07:00
snipe
34eb10ff73
Merge remote-tracking branch 'origin/develop'
2024-09-20 19:45:20 +01:00
snipe
ab0c009c0d
Fixed seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 19:45:10 +01:00
snipe
7d7d58769c
Merge remote-tracking branch 'origin/develop'
2024-09-20 19:13:00 +01:00
snipe
b68805cf83
Small fix for notifications checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 19:11:52 +01:00
snipe
245d5dc469
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-09-20 17:28:15 +01:00
snipe
7d858129d9
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 14:44:19 +01:00
snipe
65ce63bc9b
Merge pull request #15537 from snipe/snyk/updated_jspdf_autotable
...
Updated jspdf autotable
2024-09-20 14:42:07 +01:00
snipe
54fba2f547
Update jspdf autotable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 14:40:41 +01:00
snipe
5eea9d1950
Corrected text warning translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 14:33:56 +01:00
snipe
b84a634ec7
Corrected comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 14:33:35 +01:00
snipe
2fc88a0e08
Eager load adminuser
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 14:33:26 +01:00
snipe
bc540b6564
Requestable status not saving with manual [sc-26848]
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 14:02:28 +01:00
snipe
f53b852dff
Make created_by equal one in the seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-20 13:53:52 +01:00
snipe
b83d1a043f
Merge pull request #15519 from snipe/features/add_created_at_created_by
...
Change `user_id` to `created_by`
2024-09-20 13:47:31 +01:00
snipe
4ab478bb97
Merge remote-tracking branch 'origin/develop'
2024-09-20 13:44:45 +01:00
snipe
b21c303e56
Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by
2024-09-20 13:43:50 +01:00
Marcus Moore
5128fd49e6
Allow printing all users
2024-09-19 17:27:25 -07:00
Marcus Moore
2d2d5bdc7e
Pass user in array
2024-09-19 17:23:47 -07:00
Marcus Moore
8364d26c9b
Extract parent layout
2024-09-19 17:18:26 -07:00
Marcus Moore
efd6d7625f
Remove bad closing tag
2024-09-19 17:16:05 -07:00
Marcus Moore
bdf5708bfc
Remove accidental line
2024-09-19 17:10:43 -07:00
Marcus Moore
e95703cb18
Use eager load
2024-09-19 17:10:07 -07:00
Marcus Moore
7ad4a29970
Add eager loading
2024-09-19 16:54:39 -07:00
snipe
cdb7ccb8f3
Merge pull request #15532 from spencerrlongg/bug/15253
...
Catch Exceptions on Checkout Notification
2024-09-19 21:54:03 +01:00
snipe
8270947ed2
Merge pull request #13291 from akemidx/eol_date_range_for_reports
...
Added date range for EOL in custom reports
2024-09-19 21:49:27 +01:00
snipe
4f7c8e0c3d
Merge pull request #14671 from Robert-Azelis/patch-6
...
[FIX] Update EOL date when used bulk update of purchase date
2024-09-19 21:36:09 +01:00
Marcus Moore
d609ed50a4
Merge branch 'develop' into testing/fmcs-accessories
2024-09-19 13:20:55 -07:00
snipe
b88f2054dd
Refactor isDeletable on companies
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 20:38:34 +01:00
snipe
d7914e238d
Added created by to company on save
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 20:34:54 +01:00
snipe
d7bde37842
Merge pull request #15507 from setpill/setpill/feat/use_explicit_attributes_in_ldap_sync
...
Added #15506 : Explicitly request used LDAP attributes
2024-09-19 20:33:10 +01:00
snipe
454796e52a
Merge pull request #15518 from snipe/sort_by_numeric_custom_fields
...
Fixed #11634 - Sort by numeric columns for numeric custom fields
2024-09-19 20:32:03 +01:00
snipe
eef487d61b
Merge pull request #15531 from Godmartinz/status-doesnt-update-in-email
...
Fixed mail notification field `status label` not updating
2024-09-19 20:31:02 +01:00
Godfrey M
71dbc7abb0
refreshed the assetstatus relationship
2024-09-19 12:23:07 -07:00
Marcus Moore
d639d6fbc1
Add tests for accessory select list endpoint
2024-09-19 12:21:54 -07:00
snipe
74088ea581
Optimize isDeletable counts
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 20:13:38 +01:00
Marcus Moore
fff069824b
Add tests for update accessory endpoint
2024-09-19 12:11:03 -07:00
spencerrlongg
d446773fdd
catch exceptions on notification
2024-09-19 14:05:48 -05:00
snipe
f283b5fbe8
Eager load adminuser
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 19:56:39 +01:00
Marcus Moore
a5be18bb14
Add test for limit and offset
2024-09-19 11:55:15 -07:00
snipe
eb6f05faf7
Eager load adminuser
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 19:41:46 +01:00
snipe
118183ff58
Removed footer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 19:41:39 +01:00
Marcus Moore
2137890496
Remove dead code
2024-09-19 11:33:20 -07:00
snipe
ebf6ce6980
Refactor for fewer queries
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 19:27:10 +01:00
Marcus Moore
9b22d6d493
Add tests for accessory checkouts endpoint
2024-09-19 11:24:01 -07:00
snipe
5ebf0ed2b2
Updated variable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 19:19:14 +01:00
snipe
836893cba5
Added id to report
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 18:35:00 +01:00
snipe
cd98b3817d
Removed duplicate line
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 18:26:08 +01:00
snipe
727806372c
Added created_by to status label
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 18:22:11 +01:00
snipe
5e1c736d49
Added created_by for manufacturers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 18:04:50 +01:00
snipe
6579fa72da
Added scoping for categories and companies
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:56:05 +01:00
snipe
82d6e1510f
Order by created_by for depreciations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:41:05 +01:00
snipe
822ea96dfd
Use auth()->id() instead of Auth::id()
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:31:46 +01:00
snipe
b247fc33b9
Added legacy comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:28:01 +01:00
snipe
2dcae780c0
Reapply deleted code
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:26:21 +01:00
snipe
5c3180ffa0
Removed duplicate code
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:25:09 +01:00
snipe
65eba30038
Fixed markdown in acceptance reminder
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:23:34 +01:00
snipe
bbce7b40ca
Additional consistencies
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:20:56 +01:00
snipe
02a29c71ef
Added created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:01:48 +01:00
snipe
6699995972
Added created_by to components
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:01:36 +01:00
snipe
951f03094a
Added created_by to kits
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 17:01:17 +01:00
snipe
354b00ef15
Made method name consistent
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 16:45:51 +01:00
snipe
c93229179b
Added order by created_by to accessories
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 16:45:39 +01:00
snipe
a77a7065d7
Added order by admin to assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 16:34:10 +01:00
snipe
4363e8b34c
Updated importer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 16:20:42 +01:00
snipe
9adb2c24f3
Squashed commit of the following:
...
commit dddbf27d78
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 14:18:52 2024 +0100
Updated language strings
Signed-off-by: snipe <snipe@snipe.net >
commit fcefcc8184
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:44:44 2024 +0100
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
commit 04bb3eec83
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net >
Date: Wed Sep 18 13:41:37 2024 +0100
Merge pull request #15521 from uberbrady/improve_country_selector
Fix selected-index of Countries drop-down [fd-44144]
commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 18 13:24:26 2024 +0100
Fix selected-index of Countries drop-down
commit 154d5d8d91
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net >
Date: Tue Sep 17 23:40:25 2024 +0100
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 16:55:20 2024 -0700
Fix name: TestsFullMultipleCompaniesSupport
commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:49:08 2024 -0700
Implement interfaces on existing test classes
commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:38:38 2024 -0700
Pluralize
commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:34:55 2024 -0700
More unification
commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:32:38 2024 -0700
Unify assertion method
commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:25:11 2024 -0700
Re-order test methods
commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 14:20:24 2024 -0700
Improve assertions
commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:55:18 2024 -0700
Formatting
commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:52:02 2024 -0700
Add tests for delete supplier endpoint
commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:37:08 2024 -0700
Add tests for delete status label endpoint
commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:29:41 2024 -0700
Add tests for delete predefined kit endpoint
commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 13:13:12 2024 -0700
Add tests for delete manufacturer endpoint
commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:37:18 2024 -0700
Add tests for delete location endpoint
commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 12:33:30 2024 -0700
Add tests for delete license endpoint
commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:38:51 2024 -0700
Add tests for delete group endpoint
commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:35:44 2024 -0700
Add tests for delete depreciation endpoint
commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:33:21 2024 -0700
Add assertion
commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io >
Date: Mon Sep 16 10:29:20 2024 -0700
Add tests for delete departments endpoint
commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:54:29 2024 -0700
Add tests for delete custom fieldsets endpoint
commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:20:32 2024 -0700
Add tests for delete custom fields endpoint
commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 16:00:02 2024 -0700
Add tests for delete consumable endpoint
commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:52:07 2024 -0700
Add tests for delete component endpoint
commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 15:38:30 2024 -0700
Add tests for delete companies endpoint
commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:54:44 2024 -0700
Add tests for delete category endpoint
commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:46:22 2024 -0700
Clean up
commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:39:36 2024 -0700
Add tests for delete asset model endpoint
commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:32:42 2024 -0700
Pluralize test classes
commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:44 2024 -0700
Remove code handled by CompanyableChildTrait
commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:29:10 2024 -0700
Add tests for delete asset maintenance endpoint
commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:16:37 2024 -0700
Add tests for delete asset endpoint
commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 13:02:32 2024 -0700
Introduce interface
commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io >
Date: Thu Sep 12 12:58:47 2024 -0700
Add tests for delete accessory endpoint
commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com >
Date: Wed Sep 11 15:45:01 2024 +0100
Improve multi-asset create when using numeric prefixes to asset_tags
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 16:06:36 +01:00
snipe
634a4afa75
Fixed 1001 query on license
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 16:04:54 +01:00
snipe
7650628d30
Removed free seat count from fillable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 16:00:59 +01:00
snipe
7f690a6238
Fixed variable name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-19 15:58:32 +01:00
Godfrey M
b32ab6a06c
import User model
2024-09-18 16:36:24 -07:00
Godfrey M
4ff5fc1ff9
clean up variables
2024-09-18 16:19:35 -07:00
Marcus Moore
86f13a9735
Add index test
2024-09-18 16:13:34 -07:00
Godfrey M
c40209f500
seperates emails and webhook notifications
2024-09-18 15:23:44 -07:00
akemidx
3964296ae6
no payload
2024-09-18 17:06:21 -04:00
akemidx
da9a61c28a
no payload
2024-09-18 17:01:37 -04:00
Marcus Moore
a071fff954
Implement tests
2024-09-18 12:32:14 -07:00
Marcus Moore
8b50ef077d
Implement test
2024-09-18 11:58:33 -07:00
Marcus Moore
607f29030f
Stub out test
2024-09-18 11:53:27 -07:00
Marcus Moore
a6bcd3c0c2
Add validation test
2024-09-18 11:47:59 -07:00
Marcus Moore
9b293afaac
Remove more dead code
2024-09-18 11:28:29 -07:00
Marcus Moore
636c776620
Remove dead code
2024-09-18 11:27:37 -07:00
Marcus Moore
d5f659024c
Add test for logging
2024-09-18 11:27:09 -07:00
Marcus Moore
832e50a71e
Implement test
2024-09-18 11:19:41 -07:00
Marcus Moore
fa19686248
Implement test
2024-09-18 11:18:21 -07:00
Marcus Moore
c021609c13
Merge branch 'develop' into testing/fmcs-accessories
2024-09-18 10:42:58 -07:00
snipe
655abe8be5
Fixed requestable user_id
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-18 14:32:59 +01:00
snipe
d96c5e1ba4
Merge remote-tracking branch 'origin/develop'
2024-09-18 14:20:55 +01:00
snipe
dddbf27d78
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-18 14:18:52 +01:00
snipe
bae9982833
Updated request methods
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-18 14:18:14 +01:00
snipe
a807646d39
Merge remote-tracking branch 'origin/develop'
2024-09-18 13:48:09 +01:00
snipe
abe79df6dc
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-18 13:47:30 +01:00
snipe
fcefcc8184
Merge pull request #15512 from marcusmoore/testing/fmcs
...
Added tests for delete methods in api
2024-09-18 13:44:44 +01:00
snipe
04bb3eec83
Merge pull request #15521 from uberbrady/improve_country_selector
...
Fix selected-index of Countries drop-down [fd-44144]
2024-09-18 13:41:37 +01:00
Brady Wetherington
f963b9a19f
Fix selected-index of Countries drop-down
2024-09-18 13:24:26 +01:00
Marcus Moore
6e16f589bd
Remove reference to old trait
2024-09-17 17:00:06 -07:00
Marcus Moore
6b70443515
Formatting
2024-09-17 16:58:49 -07:00
Godfrey M
c9854d43a5
fixes selection order
2024-09-17 16:56:02 -07:00
Godfrey M
04708ae2b2
only allows PDF417 for new label engine
2024-09-17 16:54:50 -07:00
Godfrey M
bbb9babf27
one more finger
2024-09-17 16:40:18 -07:00
Godfrey M
e5daf35f65
fat finger fix
2024-09-17 16:39:55 -07:00
Godfrey M
87c72953b2
udpated translation
2024-09-17 16:37:17 -07:00
Marcus Moore
89e2d03a81
Fix the deleted assets radio
2024-09-17 16:24:18 -07:00
Godfrey M
fa5651f335
remove getbarcodes, postbarcodes, barcodes settings blade
2024-09-17 16:21:26 -07:00
akemidx
443447a068
added icon to button
2024-09-17 19:16:44 -04:00
Godfrey M
b33c0fc4dd
updates getbarcode method and labels view
2024-09-17 16:15:56 -07:00
Marcus Moore
8e0b718a4a
Scope Select All checkbox to fields on left side of page
2024-09-17 16:00:32 -07:00
snipe
154d5d8d91
Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets
...
[Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags
2024-09-17 23:40:25 +01:00
Marcus Moore
b51c505d9e
Fix department, manufacturer, and category multi-selects
2024-09-17 15:29:38 -07:00
Marcus Moore
8bba11e1bb
Merge branch 'develop' into saving_custom_report_template
...
# Conflicts:
# app/Http/Controllers/ReportsController.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/status-select.blade.php
# resources/views/reports/custom.blade.php
2024-09-17 15:26:35 -07:00
akemidx
4b54e980e2
added button
2024-09-17 17:56:22 -04:00
snipe
1582d81e5b
Change user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-17 22:16:41 +01:00
Godfrey M
033a56fe6d
change variables in hardware labels edit post methods
2024-09-17 12:22:05 -07:00
snipe
7c85ad54eb
Sort by numeric columns for numeric custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-17 19:44:03 +01:00
Godfrey M
3682d9fa6c
removed duplicate line from post labels
2024-09-17 11:23:59 -07:00
Godfrey M
ce987b4f6d
added front end barcodes to labels
2024-09-17 11:23:38 -07:00
Marcus Moore
7b31df7c14
Begin additional test case
2024-09-17 09:11:58 -07:00
snipe
83b4bf9cf8
Merge remote-tracking branch 'origin/develop'
2024-09-17 15:54:53 +01:00
snipe
6c996b7759
Merge pull request #15516 from snipe/fixes/fmcs_edit_user
...
Fixed check for outside assets on user update validation
2024-09-17 15:54:11 +01:00
snipe
9e957baeb5
Fixed check for outside assets on user update validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-17 15:46:45 +01:00
Marcus Moore
12fd9cd97a
Update interface name
2024-09-16 17:00:08 -07:00
Marcus Moore
9e03c4ba6f
Merge branch 'testing/fmcs' into testing/fmcs-accessories
2024-09-16 16:58:46 -07:00
Marcus Moore
3519a82ddd
Fix name: TestsFullMultipleCompaniesSupport
2024-09-16 16:55:20 -07:00
Marcus Moore
8eb1c487bc
implement FMCS test for accessory index
2024-09-16 16:52:10 -07:00
Marcus Moore
e835637ef0
Add accessory checkin test
2024-09-16 16:40:10 -07:00
Marcus Moore
eb35608bb5
Remove call handled by form request
2024-09-16 16:35:33 -07:00
Marcus Moore
3f07f682de
Migrate existing tests to TestsPermissionsRequirement
2024-09-16 16:35:21 -07:00
akemidx
74efd850af
redoing branch. old branch merge onflicts were waaay too gnarly
2024-09-16 19:30:26 -04:00
Marcus Moore
a629df07bf
Implement interfaces on existing test classes
2024-09-16 14:49:08 -07:00
Marcus Moore
9a13fcab23
Pluralize
2024-09-16 14:38:38 -07:00
Marcus Moore
f5705a1dde
More unification
2024-09-16 14:34:55 -07:00
Marcus Moore
f325c4afdb
Unify assertion method
2024-09-16 14:32:38 -07:00
Marcus Moore
1fddacd7d0
Re-order test methods
2024-09-16 14:25:11 -07:00
Marcus Moore
4af893df61
Improve assertions
2024-09-16 14:20:24 -07:00
Marcus Moore
b8b3f91ce4
Formatting
2024-09-16 13:55:18 -07:00
Marcus Moore
7f40f55343
Add tests for delete supplier endpoint
2024-09-16 13:52:02 -07:00
Marcus Moore
b06e8d442d
Add tests for delete status label endpoint
2024-09-16 13:37:08 -07:00
Marcus Moore
c269184c60
Add tests for delete predefined kit endpoint
2024-09-16 13:29:41 -07:00
Marcus Moore
53c673dee2
Add tests for delete manufacturer endpoint
2024-09-16 13:13:12 -07:00
Marcus Moore
50730fc4fb
Add tests for delete location endpoint
2024-09-16 12:37:18 -07:00
Marcus Moore
60a54cee79
Add tests for delete license endpoint
2024-09-16 12:33:30 -07:00
Marcus Moore
446e962a50
Add tests for delete group endpoint
2024-09-16 10:38:51 -07:00
Marcus Moore
79a4bb7316
Add tests for delete depreciation endpoint
2024-09-16 10:35:44 -07:00
Marcus Moore
2f76c1bc5b
Add assertion
2024-09-16 10:33:21 -07:00
Marcus Moore
38b9f4a438
Add tests for delete departments endpoint
2024-09-16 10:29:20 -07:00
snipe
fe5fc6e0ce
Merge pull request #15471 from Godmartinz/Edit_side-panel
...
Fixes margin for the sidebar menus while using rtl languages
2024-09-16 15:56:31 +01:00
snipe
62747a0090
Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing
...
Fixed misalignment of consumables with smaller media
2024-09-16 15:02:55 +01:00
snipe
9ff2111055
Merge remote-tracking branch 'origin/develop'
2024-09-16 14:52:48 +01:00
snipe
b465cc98d8
Merge pull request #15510 from snipe/bulk_users_locale_fix
...
Fixed #15504 - allow nulling/not changing locale in user bulk edit
2024-09-16 14:45:06 +01:00
snipe
4debaaea39
Fixed #15504 - allow nulling/not changing locale in user bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-16 14:31:10 +01:00
snipe
1328366a48
Merge remote-tracking branch 'origin/develop'
2024-09-16 12:38:56 +01:00
setpill
4facc4007e
feat: Explicitly request LDAP attributes during sync
2024-09-13 17:05:48 +02:00
setpill
31da47e046
refactor: Put LDAP attribute mapping in array
2024-09-13 17:05:28 +02:00
Marcus Moore
3105f53aff
Add tests for delete custom fieldsets endpoint
2024-09-12 16:54:29 -07:00
Marcus Moore
2047cfed09
Add tests for delete custom fields endpoint
2024-09-12 16:20:32 -07:00
Marcus Moore
e3268d32df
Add tests for delete consumable endpoint
2024-09-12 16:00:02 -07:00
Marcus Moore
6df8b0ac0e
Add tests for delete component endpoint
2024-09-12 15:52:07 -07:00
Marcus Moore
910f13c1f7
Add tests for delete companies endpoint
2024-09-12 15:38:30 -07:00
Marcus Moore
8ce2512f55
Add tests for delete category endpoint
2024-09-12 13:54:44 -07:00
Marcus Moore
0ec415d4d0
Clean up
2024-09-12 13:46:22 -07:00
Marcus Moore
2044570e95
Add tests for delete asset model endpoint
2024-09-12 13:39:36 -07:00
Marcus Moore
b336c6273d
Pluralize test classes
2024-09-12 13:32:42 -07:00
Marcus Moore
5299b3e9f0
Remove code handled by CompanyableChildTrait
2024-09-12 13:29:44 -07:00
Marcus Moore
872b76b45f
Add tests for delete asset maintenance endpoint
2024-09-12 13:29:10 -07:00
Marcus Moore
275cf4630e
Add tests for delete asset endpoint
2024-09-12 13:16:37 -07:00
Marcus Moore
5c2660bd34
Introduce interface
2024-09-12 13:02:32 -07:00
Marcus Moore
c7ae9d9dfa
Add tests for delete accessory endpoint
2024-09-12 12:58:47 -07:00
Godfrey M
0bc98e971f
refactoring modals with partials and fixing misalignments
2024-09-12 12:26:19 -07:00
snipe
8774da3921
Merge pull request #15492 from snipe/fixes/edit_to_archived_warning
...
Fix - warn user on changing status to undeployable when editing
2024-09-12 16:08:44 +01:00
Godfrey M
c6c5cb73cf
fixes consumables positioning with smaller media
2024-09-11 10:49:27 -07:00
snipe
a97530367d
Fixed tests again
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-11 17:29:22 +01:00
snipe
43250ae881
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-11 17:04:09 +01:00
snipe
04e96b8f20
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-11 16:43:41 +01:00
snipe
98323185de
Null and warn if editing asset to a non-deployabe state
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-11 16:43:33 +01:00
Brady Wetherington
9e5f6d656a
Improve multi-asset create when using numeric prefixes to asset_tags
2024-09-11 15:45:01 +01:00
snipe
7e14f8c6d6
Merge remote-tracking branch 'origin/develop'
2024-09-11 12:25:28 +01:00
snipe
ab3b655312
Fixed #15483 - show EOL by default
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-11 12:25:09 +01:00
snipe
601d8d7e5f
Merge pull request #15486 from marcusmoore/fixes/custom-field-values
...
Fixed a couple bugs in CustomFieldSetDefaultValuesForModel component
2024-09-11 09:46:58 +01:00
Marcus Moore
ca01261c1f
Merge branch 'develop' into fixes/custom-field-values
2024-09-10 16:05:39 -07:00
Godfrey M
15183c4822
rephrased the ternary <-correctly spelled
2024-09-10 11:05:03 -07:00
snipe
fddbdafb99
Fixed conflict
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-10 19:03:56 +01:00
snipe
a5dbece1a9
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-09-10 19:00:05 +01:00
snipe
4f0f72b29e
Fixed version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-10 18:15:12 +01:00
snipe
4183d1834f
Pre-release assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-10 18:14:03 +01:00
snipe
713bb104ec
Merge remote-tracking branch 'origin/develop'
2024-09-10 14:46:15 +01:00
snipe
4998d60f39
Merge pull request #15481 from snipe/localizations/2024-09-10
...
Updated translations
2024-09-10 14:43:27 +01:00
snipe
7cf30003b6
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-10 14:41:08 +01:00
snipe
f6bf2d03c4
Merge pull request #15445 from Godmartinz/eula_confusion
...
Fixed priority for category eula vs default eula
2024-09-10 11:04:58 +01:00
snipe
6f44441a8b
Merge pull request #15469 from marcusmoore/accessory_tests
...
Added UI tests for creating accessories
2024-09-10 11:04:23 +01:00
snipe
e7e5dfbdfa
Merge pull request #15470 from marcusmoore/company_tests
...
Added UI tests for creating companies
2024-09-10 11:04:08 +01:00
snipe
d62315fbe4
Merge pull request #15472 from marcusmoore/testing/dashboard_counts
...
Added test for dashboard counts
2024-09-10 11:03:55 +01:00
snipe
7f3f77dec8
Merge pull request #15473 from marcusmoore/testing/accessory_api_tests
...
Added some permission tests for accessory api endpoints
2024-09-10 11:03:46 +01:00
snipe
82e56c6832
Merge pull request #15474 from marcusmoore/bug/sc-26730
...
Fixed login success message not being displayed
2024-09-10 09:37:02 +01:00
Marcus Moore
76c9015aa9
Add test case
2024-09-09 16:51:40 -07:00
Marcus Moore
5d5f421294
Add test case
2024-09-09 16:49:43 -07:00
Godfrey M
367f02af86
more partials and includes
2024-09-09 16:34:04 -07:00
Godfrey M
7a1c721eca
making modal partials for reuse
2024-09-09 16:22:56 -07:00
Marcus Moore
6423df2133
Merge branch 'develop' into fixes/custom-field-values
...
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
2024-09-09 16:07:37 -07:00
Marcus Moore
dc6a5bf998
Reflash session so login message is displayed
2024-09-09 14:54:19 -07:00
Marcus Moore
0820dd9da4
Update test names
2024-09-09 14:36:32 -07:00
Marcus Moore
aa6ab2df60
Add permission tests for some accessory api endpoints
2024-09-09 14:35:38 -07:00
Marcus Moore
22a2cc0256
Add test for dashboard counts
2024-09-09 13:21:10 -07:00
Godfrey M
57fab0268b
made it a terenary
2024-09-09 13:02:25 -07:00
Godfrey M
ad5768d8b2
fixes margin for the sidebar using rtl languages
2024-09-09 12:45:11 -07:00
Marcus Moore
35533c39d5
Merge branch 'develop' into company_tests
2024-09-09 12:18:02 -07:00
Marcus Moore
de403f6e07
Merge branch 'develop' into accessory_tests
2024-09-09 12:17:53 -07:00
snipe
549dec9f9e
Merge pull request #15468 from marcusmoore/coverage
...
Added coverage commands for Herd users
2024-09-09 20:13:01 +01:00
Marcus Moore
d4426e4686
Add simple tests for company creation via UI
2024-09-09 11:03:00 -07:00
snipe
b2a6349243
Merge pull request #15465 from snipe/update_city_on_bulk_user_edit
...
Correctly save user’s city on bulk edit
2024-09-09 10:06:42 +01:00
snipe
c5dbc5f6b8
Correctly save user’s city on bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-09 10:01:07 +01:00
snipe
7f2cae4f26
Merge remote-tracking branch 'origin/develop'
2024-09-09 03:56:05 +01:00
snipe
ce97e2a30f
Merge pull request #15463 from snipe/consumables_order_by_remaining
...
Added ability to sort on qty and remaining for consumables
2024-09-09 03:54:28 +01:00
snipe
7d9a0eba04
Added ability to sort on qty and remaining for consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-09 03:49:58 +01:00
Marcus Moore
010f66f4c9
Add validation test
2024-09-04 15:48:11 -07:00
Marcus Moore
9c6718b459
Organize
2024-09-04 15:46:35 -07:00
Marcus Moore
9f832a93c9
Ensure user is stored
2024-09-04 15:44:52 -07:00
Marcus Moore
487d88c012
Add some ui tests for accessories
2024-09-04 15:43:01 -07:00
akemidx
d262638a63
backend form validation. +cleanup
2024-09-04 18:23:36 -04:00
Marcus Moore
0e9f7153c0
Add composer commands for generating coverage reports via Herd
2024-09-04 15:13:45 -07:00
akemidx
bebb72a04f
back to having tests pass. needed to comment out the notes rules() i added
2024-09-04 17:53:19 -04:00
akemidx
77c5035cac
fixing some formatting
2024-09-04 17:50:52 -04:00
Godfrey M
7c8955b126
revert changes to label view
2024-09-04 12:38:35 -07:00
Godfrey M
20fa4c39f9
adds setEula to support\settings
2024-09-04 12:26:44 -07:00
Godfrey M
f04a4a3cf5
adds test
2024-09-04 12:21:49 -07:00
Godfrey M
df8b1c0240
hides barcode settings if new label engine enabled
2024-09-03 12:29:52 -07:00
Godfrey M
cf07186ae8
gives priority to default eula being checked vs catregory eula
2024-09-03 12:23:23 -07:00
Marcus Moore
51d63d57c6
Hide the "Add default values" checkbox if no fieldset selected
2024-09-03 12:22:43 -07:00
akemidx
2901ecbf43
more test work
2024-09-03 15:02:27 -04:00
snipe
e34f549e4c
Merge remote-tracking branch 'origin/develop'
2024-09-02 19:16:23 +01:00
snipe
e1fcfc8dc1
Merge pull request #15440 from snipe/fixes/user_api_put_patch
...
Fixes #15435 - user api put patch API route regression
2024-09-02 19:14:49 +01:00
snipe
9fe8a866e0
Updated test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-02 19:07:21 +01:00
snipe
e8e3060a75
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-02 18:51:22 +01:00
snipe
6aaf2f623f
Removed extra route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-02 18:49:55 +01:00
snipe
dfbccf50e8
Added patch/put back into resource routes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-02 18:48:09 +01:00
snipe
a8813cca94
Merge remote-tracking branch 'origin/develop'
2024-08-31 13:48:59 +01:00
snipe
13dbf9ee74
Added icon for dept
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-31 13:48:42 +01:00
snipe
f8bbb7ad9b
Merge pull request #15431 from snipe/add_employee_num_to_asset_overview
...
Added employee number to asset view
2024-08-31 13:47:25 +01:00
snipe
3c7d455ee3
Added employee number to asset view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-31 13:38:38 +01:00
snipe
5cdb52a249
Corrected flag
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 21:33:08 +01:00
snipe
ea38d6c2f3
Decode as integers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 21:26:38 +01:00
snipe
9fef27a448
Merge remote-tracking branch 'origin/develop'
2024-08-29 21:07:56 +01:00
snipe
12fa505972
Disabmiguate licenses company_id
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 21:07:30 +01:00
snipe
d2b88a5107
Merge remote-tracking branch 'origin/develop'
2024-08-29 21:02:21 +01:00
snipe
4e4930ba62
Check for array
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 21:01:48 +01:00
snipe
4e35f389df
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-08-29 20:07:03 +01:00
snipe
76301bc30d
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 20:05:03 +01:00
snipe
964e105cf9
Merge pull request #15415 from snipe/rules/prevent_company_switch
...
Validation rules to prevent switching user companies if items are assigned to them
2024-08-29 19:20:03 +01:00
snipe
6fd24c7e14
Merge pull request #15418 from snipe/added_multiple_for_custom_report
...
Fixed #15416 - Added multiple selects for custom report
2024-08-29 18:55:11 +01:00
snipe
231bc1e2de
Updated blade selectors
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 18:31:34 +01:00
snipe
37d04b7176
Some CSS tweaks for select2
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 17:52:01 +01:00
snipe
e62a802926
Use whereIn instead of where =
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 17:51:44 +01:00
snipe
69e981364a
Made multiple select
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 17:51:20 +01:00
snipe
e5b9d9a28b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-08-29 15:04:32 +01:00
snipe
abb4221539
Validation rules to prevent switchng user companies if assets are assigned
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 14:55:18 +01:00
snipe
e4ebabdaba
Merge pull request #15414 from uberbrady/fix_create_user
...
Use the null-safe property accessor for new-user creation
2024-08-29 14:19:51 +01:00
Brady Wetherington
da1e383295
Use the null-safe property accessor for new-user creation
2024-08-29 14:09:23 +01:00
snipe
b64ed254e0
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 13:49:09 +01:00
snipe
ba291edc42
Merge pull request #15412 from uberbrady/ImprovePatchPurchasePrice
...
Fix [FD-43836] PATCH of purchase_cost for assets for comma as decimal separator
2024-08-29 13:18:52 +01:00
Brady Wetherington
ec2ea955d8
Fix PATCH of purchase_cost for assets for comma as decimal separator
2024-08-29 12:35:14 +01:00
snipe
c197644ba7
Merge pull request #15284 from spencerrlongg/bug/sc-26584
...
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
2024-08-29 11:38:15 +01:00
snipe
29b30cc5d3
Merge pull request #15411 from snipe/snyk/upgrade-webpack
...
Upgraded webpack
2024-08-29 11:29:44 +01:00
snipe
6af27516dc
Upgraded webpack
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 11:29:00 +01:00
snipe
a89f17a145
Merge pull request #15410 from snipe/snyk/upgrade-jquery-ui
...
Updated jquery UI
2024-08-29 11:25:56 +01:00
snipe
de0565f5b3
Updated jquery UI
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 11:24:06 +01:00
snipe
4111ef0d78
Merge remote-tracking branch 'origin/develop'
2024-08-29 11:20:21 +01:00
snipe
68c708bdef
Merge pull request #15409 from snipe/fixes-string
...
Corrected language string
2024-08-29 11:18:34 +01:00
snipe
5581950fee
Corrected language string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 11:17:17 +01:00
snipe
cfa56e2219
Merge remote-tracking branch 'origin/develop'
2024-08-29 11:08:53 +01:00
snipe
58e366a063
Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid
...
Check that the user exists before trying to print
2024-08-29 11:08:02 +01:00
snipe
b06c527767
Check that the user exists before trying to print
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-29 11:06:30 +01:00
snipe
7f1dfcc935
Merge remote-tracking branch 'origin/develop'
2024-08-28 14:29:06 +01:00
snipe
26f28a862a
Merge pull request #15404 from snipe/bug/sc-26717-model-delete
...
Set image to null if model is deleted
2024-08-28 14:26:03 +01:00
snipe
94c981e22c
Set image to null if model is deleted
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 14:23:49 +01:00
snipe
6f3fb21fef
Merge remote-tracking branch 'origin/develop'
2024-08-28 12:50:19 +01:00
snipe
e8da7e2df2
Merge pull request #15403 from snipe/clean_up_depreciations
...
Fixed #15392 - filter by depreciation when showing models
2024-08-28 12:46:48 +01:00
snipe
d635c86e00
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:46:30 +01:00
snipe
406ff6984b
Added click to select on models table
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:42:23 +01:00
snipe
c6ddc501c5
Filter by depreciation_id
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:40:12 +01:00
snipe
4839181beb
Added counts to API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:40:01 +01:00
snipe
63a05c89a7
Added counts to show method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:39:52 +01:00
snipe
385c4f69f7
Added counts to depreciation transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:39:43 +01:00
snipe
486cd8c8c9
Nicer formatting for searchableAttributes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:39:09 +01:00
snipe
eb5d93b3c2
Added assets relationship
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:38:55 +01:00
snipe
a5ff623484
Added asset, license, model count to API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:38:43 +01:00
snipe
b5a4389815
Added badge count, fixed model bulk edit menu
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 12:38:31 +01:00
snipe
7b5b559baa
Merge pull request #15401 from snipe/fixes-15397-new-window-for-label
...
Opens label new window
2024-08-28 11:57:29 +01:00
snipe
67a9929745
Opens label new window
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-28 11:56:54 +01:00
snipe
a48e79a1fc
Merge remote-tracking branch 'origin/develop'
2024-08-27 07:37:53 +01:00
snipe
64c4433b98
Merge pull request #15396 from snipe/add_start_end_date_to_users_edit
...
Added `start_date` and `end_date` to user bulk edit
2024-08-27 07:36:37 +01:00
snipe
22bc088f6f
Added start_date and end_date to user bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-27 07:21:19 +01:00
snipe
d3e8e06638
Add @swift2512 as a contributor
2024-08-26 14:07:06 +01:00
snipe
c207d48430
Merge remote-tracking branch 'origin/develop'
2024-08-26 14:01:38 +01:00
snipe
1b933f7add
Added s to fa icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-26 13:47:17 +01:00
snipe
991e48696a
Merge remote-tracking branch 'origin/develop'
2024-08-26 10:26:06 +01:00
snipe
3fe891a05b
Removed a few more commas
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-26 10:25:27 +01:00
snipe
7974885041
Merge remote-tracking branch 'origin/develop'
2024-08-26 10:24:19 +01:00
snipe
f4c5b712f4
Removed colons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-26 10:24:07 +01:00
snipe
4ef85bd529
Merge remote-tracking branch 'origin/develop'
2024-08-23 17:58:08 +01:00
snipe
4c8dc7818d
Merge pull request #15389 from snipe/added_generate_label_to_button_stack
...
Fixed #15388 - Moved generate label button
2024-08-23 17:57:00 +01:00
snipe
5c43a1f87c
Use proper style for buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 17:54:49 +01:00
snipe
d3b265de8e
Moved button on hardware
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 17:48:36 +01:00
snipe
263151658f
Moved general label button
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 17:44:09 +01:00
snipe
6eab83a85a
Merge remote-tracking branch 'origin/develop'
2024-08-23 15:22:53 +01:00
snipe
aa86e07cd2
Fixed #15385 - small icon tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 15:22:39 +01:00
snipe
cce1f87da6
Merge remote-tracking branch 'origin/develop'
2024-08-23 15:18:30 +01:00
snipe
d92fa5de65
fa-fw on settings icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 15:17:25 +01:00
snipe
b460e8dc83
Merge remote-tracking branch 'origin/develop'
2024-08-23 08:42:32 +01:00
snipe
c589140ea0
Merge pull request #15383 from snipe/re-adds-checkout-button
...
Fixed #15378 - Corrected gate on checkin button on asset view
2024-08-23 08:42:04 +01:00
snipe
52894615ce
More specific gate for checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 08:40:41 +01:00
snipe
8546bbdd65
Fixed gate for checkout button
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 08:38:47 +01:00
snipe
50cb7e65c9
Merge remote-tracking branch 'origin/develop'
2024-08-23 07:32:39 +01:00
snipe
cc2c8f76d0
Merge pull request #15375 from Godmartinz/fix-acceptance-reminder-command
...
Fixes the `acceptance-reminder` command
2024-08-23 07:31:29 +01:00
snipe
1ffa69c43c
Merge pull request #15380 from snipe/fixed/fixed_nav_bracket
...
Added pull-right to angle bracket
2024-08-23 07:28:20 +01:00
snipe
f85ebd7ffd
Added pull-right to angle bracket
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-23 07:27:39 +01:00
snipe
78d355f136
Merge pull request #15377 from marcusmoore/fixes/custom-field-values-on-validation-error
...
Fixed custom field defaults being prematurely updated
2024-08-23 07:20:23 +01:00
snipe
ec0346e4a8
Add @setpill as a contributor
2024-08-23 07:19:08 +01:00
snipe
fc5eb37776
Merge pull request #15379 from setpill/fix/load-trustproxies-middleware
...
fixed #15374 : load TrustProxies middleware in Kernel.php
2024-08-23 07:18:41 +01:00
Marcus Moore
9a73311a99
Fix nested checkboxes being updated as a group
2024-08-22 17:04:04 -07:00
Marcus Moore
aec781e7df
Be a little more explicit
2024-08-22 16:03:30 -07:00
setpill
1d7853cbfe
fixed #15374 : load TrustProxies middleware in Kernel.php
2024-08-22 23:41:27 +02:00
Marcus Moore
7f3c86165b
Conditionally disable Add default values checkbox
2024-08-22 13:58:31 -07:00
Marcus Moore
10b45812c4
Improve id for checkboxes and radio buttons
2024-08-22 13:38:01 -07:00
Marcus Moore
c3165717ed
Handle old input
2024-08-22 13:20:04 -07:00
Marcus Moore
d0a351a132
Add comment
2024-08-22 12:59:03 -07:00
Marcus Moore
68749e7e87
Simplify logic
2024-08-22 12:58:35 -07:00
Marcus Moore
0abb5637e0
WIP: handle old input
2024-08-22 12:54:54 -07:00
Marcus Moore
af0a95be12
Simplify assertions
2024-08-22 10:18:23 -07:00
Marcus Moore
d67975cb62
Implement fix
2024-08-22 10:18:23 -07:00
Marcus Moore
663b2fd844
Add test case
2024-08-22 10:18:23 -07:00
Marcus Moore
bcace9d019
Point test to correct endpoint
2024-08-22 10:18:23 -07:00
Marcus Moore
b59bf3e7dc
Add failing test
2024-08-22 10:18:23 -07:00
Godfrey M
3957d670d0
fixes send acceptance reminder query
2024-08-22 10:04:46 -07:00
snipe
821dd158d1
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-08-22 15:50:20 +01:00
snipe
833dace2b4
Merge pull request #15373 from snipe/fixes/#15366_custom_fields
...
Fixed #15366 use the non-admin edit encrypted custom fields permissions
2024-08-22 15:00:16 +01:00
snipe
56e31d2303
Fixed #15366 - use permission for encrypted custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 14:58:09 +01:00
snipe
ec365b0804
Merge pull request #15372 from StarlessNights/update-docker-compose-files
...
Fixed #15371 : docker-compose files updated.
2024-08-22 14:49:13 +01:00
Iisakki Jaakkola
aef0ac68c3
Need to use the long format for redis too in docker-compose file.
2024-08-22 16:10:00 +03:00
Iisakki Jaakkola
f12f9a816f
Update the official docker-compose file too while at it.
2024-08-22 15:47:12 +03:00
Iisakki Jaakkola
a000d6454f
Fix non-functional development docker-compose file.
2024-08-22 15:46:40 +03:00
snipe
ca8864c061
Fixed small layout quirks in asset view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 13:28:52 +01:00
snipe
423f4f9126
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset
...
Adds location select to the create new user via asset checkout
2024-08-22 13:25:41 +01:00
snipe
456c7d8d91
Merge pull request #15065 from Godmartinz/explicit_eol_removal_command
...
Adds `snipeit:remove-explicit-eols` command
2024-08-22 13:20:56 +01:00
snipe
54cfe3f6e6
Merge pull request #15156 from uberbrady/re-add-stalebot
...
Re-add stalebot-esque github Action
2024-08-22 13:20:10 +01:00
snipe
5e0b18104d
Merge pull request #15369 from snipe/fixes/checkbox_on_restore
...
Fixed checkbox layout on modal from #15296
2024-08-22 12:59:20 +01:00
snipe
8b5d3f7fbd
Fixed extra closing p tag
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 12:56:32 +01:00
snipe
744f43676d
Fixed checkbox layout on modal from #15296
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 12:53:16 +01:00
snipe
ec0b9b198f
Merge pull request #15296 from uberbrady/expose_restore_sanitize
...
Expose the 'sanitize' system for backup restores to the web GUI
2024-08-22 12:43:07 +01:00
snipe
6c9a402685
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 11:20:52 +01:00
snipe
1b310f3a24
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-08-22 11:20:42 +01:00
snipe
94300d81d6
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 11:19:32 +01:00
snipe
bc9ea5a2ec
Merge pull request #15352 from Godmartinz/mobile_breakpoint
...
Fixed Mobile misalignment of info on Assets and Users view pages
2024-08-22 11:18:06 +01:00
snipe
4635a6efc3
Merge pull request #15360 from snipe/more_print_fixes
...
More print fixes for asset view
2024-08-22 11:17:49 +01:00
snipe
9608414eae
Merge pull request #15367 from snipe/fixes/15344_added_freeform_to_country_select2
...
Fixed #15344 - make select2 for countries freeform-ish
2024-08-22 11:06:13 +01:00
snipe
5efddf6f5b
Allow clear on country dropdown
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 11:01:39 +01:00
snipe
305dc049a4
Added asterisk help text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 11:01:28 +01:00
snipe
3ac0702094
Fixed #15344 - make select2 for countries freeform-ish
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-22 10:13:22 +01:00
snipe
47d8e2f8b9
Add @Scarzy as a contributor
2024-08-22 09:42:05 +01:00
Marcus Moore
a2246b9645
Simplify assertions
2024-08-21 17:00:32 -07:00
Marcus Moore
1d89759706
Implement fix
2024-08-21 16:59:44 -07:00
Marcus Moore
206f8fe605
Add test case
2024-08-21 16:59:38 -07:00
Marcus Moore
21d2217619
Point test to correct endpoint
2024-08-21 16:54:16 -07:00
Marcus Moore
833bcb282f
Add failing test
2024-08-21 16:49:29 -07:00
snipe
83dd9ce20e
Merge pull request #15362 from r-xyz/model-files-api
...
Added #9413 : AssetModel files endpoints to API
2024-08-21 23:15:24 +01:00
r-xyz
a8eb76fd8d
Fixed model files API routes.
2024-08-21 22:25:41 +02:00
r-xyz
cd7db5c4a8
Fix some typos in models file handler.
2024-08-21 22:24:08 +02:00
r-xyz
da7313bc9d
Fix models files API routes.
2024-08-21 20:24:22 +02:00
r-xyz
4ec361c718
Add AssetModel files endpoints to API
2024-08-21 19:49:51 +02:00
Brady Wetherington
738ef442fd
Rename .env var to have DB_ prefix for sanitize-by-default setting
2024-08-21 13:16:51 +01:00
snipe
d29b3bfb9a
Few more hidden-print classes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-21 13:06:16 +01:00
snipe
6fdce3c536
Merge pull request #15358 from r-xyz/rename-docker-startup
...
Renamed docker startup scripts coherently.
2024-08-21 13:02:50 +01:00
snipe
912bbf0e32
More print fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-21 13:02:21 +01:00
snipe
c54bff0f83
Merge remote-tracking branch 'origin/develop'
2024-08-21 12:24:13 +01:00
snipe
01c4fe6113
Merge pull request #15359 from uberbrady/improve_windows_upgrade
...
Fixed #15190 - Improvements to upgrade.php script to improve Windows experience
2024-08-21 12:12:23 +01:00
Brady Wetherington
0fa9f57971
Improvements to upgrade.php script to improve Windows experience
2024-08-21 11:53:38 +01:00
r-xyz
1ab29ec3a4
Rename docker startup scripts coherently.
2024-08-21 11:52:09 +02:00
snipe
7e475a0786
Merge pull request #15357 from snipe/tighten_category_view_translations
...
Fixed #15330 - Cleaned up category title
2024-08-21 10:41:17 +01:00
snipe
26b3c62ab8
Cleaned up category title
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-21 10:29:51 +01:00
snipe
d3f30ced94
Merge remote-tracking branch 'origin/develop'
2024-08-21 10:13:57 +01:00
snipe
d0acf5b8a6
Merge pull request #15356 from snipe/validate_location_parent
...
Fixed #15341 - validate parent ID
2024-08-21 10:12:58 +01:00
snipe
74fbc23823
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-21 10:09:35 +01:00
snipe
a23dee52f2
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-21 09:58:47 +01:00
snipe
4d03f1e110
Fixed #15341 - validate parent ID
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-21 09:46:18 +01:00
Godfrey M
963911f2e1
changed order of info stgack
2024-08-21 00:23:10 -07:00
Marcus Moore
59832126cb
Improve comment
2024-08-20 16:52:51 -07:00
Marcus Moore
680cce3ee2
Align indents
2024-08-20 16:42:29 -07:00
Marcus Moore
6c5ec6a16c
Get datepicker working
2024-08-20 16:41:24 -07:00
akemidx
27c120a55e
front end changes/updates from gh
2024-08-20 19:07:47 -04:00
Marcus Moore
5d1f98bf93
Simplify by directly wire:modeling
2024-08-20 15:38:43 -07:00
Godfrey M
9d484077ae
missed a file
2024-08-20 14:24:37 -07:00
Godfrey M
9858b0f37f
fixes info tab for users and assets
2024-08-20 14:23:55 -07:00
snipe
973e2e5756
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-08-20 19:45:53 +01:00
snipe
09033b19a7
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-20 19:44:13 +01:00
snipe
46ed076428
Merge remote-tracking branch 'origin/develop'
2024-08-20 19:42:56 +01:00
snipe
5fdeb9c413
Merge pull request #15351 from snipe/localizations/new_translations_2024-08-20
...
Updated languages
2024-08-20 19:42:08 +01:00
snipe
22d3734075
Merge pull request #15350 from marcusmoore/icon-component-updates
...
Fixed icon not rotated and simplified component
2024-08-20 19:34:38 +01:00
Marcus Moore
eca6b03f44
Allow id to be rendered
2024-08-20 11:08:53 -07:00
Marcus Moore
bbdbec7197
Rely on $attributes behavior rendering passed attributes
2024-08-20 11:00:39 -07:00
snipe
6c450d1338
Updated languages
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-20 18:18:17 +01:00
spencerrlongg
a8cd1027f3
rm commented code
2024-08-20 11:40:15 -05:00
snipe
d3a555ce91
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-20 11:49:39 +01:00
snipe
0f8e041809
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-08-20 11:49:32 +01:00
snipe
d99b306ae9
Merge pull request #15345 from snipe/add_trim_strings_middleware
...
Added TrimStrings middleware
2024-08-20 11:46:55 +01:00
snipe
74136761df
Added TrimStrings middleware
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-20 11:45:13 +01:00
snipe
f597d64339
Merge pull request #15342 from snipe/snyk/bs-tables
...
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
2024-08-20 10:17:26 +01:00
snipe
0072f1500e
[Snyk] Upgrade bootstrap-table from 1.23.0 to 1.23.2
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-20 10:16:27 +01:00
snipe
64bed01a91
Merge pull request #15327 from snipe/update_button_style
...
Update icons to use blade components, standardize button colors and format
2024-08-20 10:13:43 +01:00
snipe
f6319e11e7
Added fa-fw to sidebar elements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-20 10:11:27 +01:00
snipe
5d9f988df3
Added fw class to topnav icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-20 10:01:49 +01:00
snipe
f8c72fb0ac
Merge pull request #15112 from marcusmoore/livewire-importer-improvements
...
Improved handling attempted access of deleted files in importer
2024-08-20 09:57:03 +01:00
akemidx
4e43fa6b9f
Merge remote-tracking branch 'upstream/develop' into feature/sc-26415
2024-08-19 21:06:18 -04:00
akemidx
8e1111c681
Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports
2024-08-19 19:33:44 -04:00
snipe
886514a25f
Merge pull request #15336 from marcusmoore/fixes/remove-displayed-parentheses
...
Fixed `)` being added to expected asset checkin report email header
2024-08-19 22:46:08 +01:00
Marcus Moore
fa765667f2
Merge branch 'develop' into livewire-importer-improvements
2024-08-19 14:41:58 -07:00
Marcus Moore
434bdcd6d4
Add missing parentheses to conditional
2024-08-19 14:31:47 -07:00
snipe
be5f3f38f8
Settings pages
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 14:48:12 +01:00
snipe
08c3a25b39
Little more padding
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 14:16:57 +01:00
snipe
34cd4b6244
Added links to apple/google maps
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 14:15:36 +01:00
snipe
d89c8682be
Reversed location button ordering
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:46:31 +01:00
snipe
6f024849e9
Few more
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:39:24 +01:00
snipe
e048f0955f
More icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:27:21 +01:00
snipe
479b2b4fd3
More icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:23:08 +01:00
snipe
84f14a05bd
Fixed logging for asset model restore
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:20:19 +01:00
snipe
8d52fa51b1
Fixed suppliers buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:20:06 +01:00
snipe
229d8b9bf5
Added location restore
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:19:59 +01:00
snipe
eb8d43a804
Updated buttons on models
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 12:32:44 +01:00
snipe
f82266fade
Cleaned up presenters
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 11:58:31 +01:00
snipe
b4b6f7a35f
Added css-consumable to overrides for table headers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 11:58:21 +01:00
snipe
0bc995b87f
Updated more icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 11:58:05 +01:00
snipe
59725f2031
Removed extra debugging in test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 11:57:40 +01:00
snipe
00bc9ac806
Fixed spacing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 22:39:14 +01:00
snipe
f200960a57
Aaaand more
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 22:26:57 +01:00
snipe
c700127f1a
Updated user view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 22:09:00 +01:00
snipe
ae2f9571b4
And still more
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 21:57:37 +01:00
snipe
a77dcad336
More links
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 20:30:53 +01:00
snipe
7ace9324b4
Added padlock sound
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 20:30:22 +01:00
snipe
d2e889e927
Still more
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 19:21:59 +01:00
snipe
803bdb457c
Added calendar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 18:48:19 +01:00
snipe
7c9b1f6e38
Added the plus icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 18:39:22 +01:00
snipe
d545537a43
More icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 18:34:13 +01:00
snipe
4d8904938d
Added calendar icon for datepickers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 18:24:26 +01:00
snipe
0c09f2b2c0
Moar icon replacement
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 18:13:49 +01:00
snipe
bffba02511
Updated icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 17:26:44 +01:00
snipe
901f4df7ee
Added more icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 17:03:36 +01:00
snipe
9337cba340
Added download
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 15:53:58 +01:00
snipe
2b0c67c263
Load the icon helper
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 15:51:00 +01:00
snipe
da71f031f5
Use icon in hardware view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 15:48:24 +01:00
snipe
d2e585baa7
Added icon blade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 15:47:45 +01:00
snipe
a102c085df
Added icon helper
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 15:47:37 +01:00
snipe
e8a22f3c5b
Merge remote-tracking branch 'origin/develop'
2024-08-18 04:55:04 +01:00
snipe
cb40a82e79
Merge pull request #15324 from snipe/jerk_prevention
...
Prevent passing an array as login
2024-08-18 04:54:23 +01:00
snipe
4253acad4c
Prevent passing an array as login
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 04:51:36 +01:00
snipe
5066eb58f4
Added asset model import to importer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-17 02:31:03 +01:00
snipe
d843cf8dcc
Merge remote-tracking branch 'origin/develop'
2024-08-17 00:52:10 +01:00
snipe
7e6ff3cbe6
Removed trailing rows
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-17 00:51:19 +01:00
snipe
1013dcae61
Merge remote-tracking branch 'origin/develop'
2024-08-17 00:38:44 +01:00
snipe
e7ef3bf515
Merge pull request #15322 from snipe/importer_model_fixes
...
Importer model fixes
2024-08-17 00:37:37 +01:00
snipe
a25efe53aa
Removed some debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-17 00:35:42 +01:00
snipe
de059a715a
Cleaner test CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-17 00:30:49 +01:00
snipe
318aff1ef0
Fixed behavior for null model numbers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-17 00:27:44 +01:00
snipe
e96b9b2f4f
Added test for models with same name but no model number
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 23:04:11 +01:00
snipe
3ae4a5caf0
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 22:53:27 +01:00
snipe
559f0d2f90
Added string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 22:53:21 +01:00
snipe
9b6a36c8aa
Removed unusued parameter
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 22:45:57 +01:00
snipe
1a4aebf805
Added TwoColumnUniqueUndeletedTrait trait
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 22:45:47 +01:00
snipe
6ad7100aa3
Removed unused use statements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 22:45:17 +01:00
snipe
5529669884
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 22:44:03 +01:00
snipe
b57283d8d1
Removed commented code
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 22:43:56 +01:00
snipe
7658f7c41d
First shot
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 20:29:53 +01:00
spencerrlongg
70e5e0f9df
get rid of dd
2024-08-16 12:52:06 -05:00
spencerrlongg
dec4691c73
should be good to go now
2024-08-16 12:50:09 -05:00
snipe
48903b1402
Added Gate Pass Generator link
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 17:42:42 +01:00
snipe
7376c21f10
Removed dupe link, linked name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 17:01:07 +01:00
snipe
f921400579
Added link to UnifiSnipeSync
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 16:55:16 +01:00
snipe
c30c649aaa
Merge remote-tracking branch 'origin/develop'
2024-08-16 16:44:02 +01:00
snipe
ad6d09b6ad
Removed default label
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 16:43:51 +01:00
snipe
bb1385369c
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-08-16 16:18:00 +01:00
snipe
43b338d612
Fixed translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 16:15:58 +01:00
snipe
c1caf6088e
Prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 13:12:13 +01:00
snipe
67655ad84b
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 13:11:33 +01:00
snipe
12dfe71ea8
Merge remote-tracking branch 'origin/develop'
2024-08-16 12:48:42 +01:00
snipe
ea2b1b0748
Merge pull request #15318 from snipe/localization/fixed_strings
...
Corrected some translations
2024-08-16 12:43:06 +01:00
snipe
856c57cb12
Corrected some translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 12:39:59 +01:00
snipe
90584ab803
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-08-16 11:11:00 +01:00
snipe
184f54a6cd
Removed extra spaces
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 11:10:57 +01:00
snipe
f24031b974
Merge pull request #15206 from Godmartinz/dashboard_box_alignment
...
Fixed dashboard box overflow
2024-08-16 11:10:40 +01:00
snipe
0a7aaa54b6
Merge pull request #15282 from r-xyz/alpine-secrets
...
Added support for Docker secrets in Standard and alpine image.
2024-08-16 11:08:09 +01:00
snipe
ca89268716
Merge remote-tracking branch 'origin/develop'
2024-08-16 11:02:56 +01:00
snipe
3167ee91d1
Added a setting test and validation on settings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 10:51:49 +01:00
snipe
e8f1190628
Added missing migration from #15314
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 10:44:28 +01:00
snipe
44f18d210e
Remove MBP constraint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 10:36:35 +01:00
snipe
e8deecc9b4
Removed MBP constraint on model
...
This was creating a validation error since the name already exists
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 10:35:42 +01:00
snipe
a79fe69bf4
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-08-16 10:22:16 +01:00
snipe
d49c33fbe3
Add @Glukose1 as a contributor
2024-08-16 10:22:05 +01:00
snipe
de29c1d8a0
Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days
...
Added #15312 : Add checkin due in days setting
2024-08-16 10:21:36 +01:00
snipe
f9172594b2
Clearer time example display
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-16 10:14:43 +01:00
Marcus Moore
94d8a547b8
Merge branch 'develop' into livewire-importer-improvements
2024-08-15 13:47:49 -07:00
Marcus Moore
43b109fac0
Use cached values for textarea and radio input
2024-08-15 13:20:22 -07:00
Marcus Moore
75c1e7658f
Improve method name
2024-08-15 10:43:41 -07:00
Marcus Moore
e7c9c799bb
Add wire:keys
2024-08-15 10:40:23 -07:00
Marcus Moore
6ab976f353
Use cached values for text input
2024-08-15 10:32:33 -07:00
snipe
ec5731353a
Merge remote-tracking branch 'origin/develop'
2024-08-15 15:53:52 +01:00
snipe
b39a7c6f0c
String constraint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 15:42:11 +01:00
snipe
a3d847151a
Model name uniqueness
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 15:19:27 +01:00
snipe
3283704fe8
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 12:25:08 +01:00
snipe
540df32046
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-08-15 12:24:59 +01:00
snipe
594f506641
Merge pull request #15305 from snipe/localizations/updated_languages_2024-08-15
...
Updated translation strings
2024-08-15 12:21:59 +01:00
snipe
dd458dfa7f
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 12:21:06 +01:00
snipe
b917489f00
Corrected string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 12:10:41 +01:00
snipe
75dfedcb82
Merge pull request #15304 from snipe/confetti_fun_mode_redux
...
Added confetti option
2024-08-15 11:37:34 +01:00
snipe
6216b4fc0d
Use native browser control for required in addition to the css effect
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 11:35:56 +01:00
snipe
4356cb7b9b
Added confetti option
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 11:32:42 +01:00
Glukose1
d8df52cc8f
Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field.
2024-08-15 12:20:51 +02:00
snipe
85486fa58c
Merge remote-tracking branch 'origin/develop'
2024-08-15 10:53:54 +01:00
snipe
10dc1f1368
Re-pull the accessory checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:51:49 +01:00
snipe
3618df2ec5
Merge remote-tracking branch 'origin/develop'
2024-08-15 10:44:39 +01:00
snipe
8f7bce7aad
Re-added UI for checkout to non-users for accessories
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:44:27 +01:00
snipe
a201f22fdb
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:36:12 +01:00
snipe
6070d530cf
Merge remote-tracking branch 'origin/develop'
2024-08-15 10:35:33 +01:00
snipe
4d66f7c93f
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:35:02 +01:00
snipe
6c0cf94473
Merge remote-tracking branch 'origin/develop'
2024-08-15 10:28:08 +01:00
snipe
381003eeab
Cleaned up asset tag field on quickscan checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:27:31 +01:00
snipe
c3d4c821f3
Merge pull request #15303 from snipe/features/#15301_optional_status_to_quickscan_checkin
...
Fixed #15301 - Added optional status to quickscan checkin
2024-08-15 10:26:04 +01:00
snipe
d8038ac483
Removed status label list
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:17:08 +01:00
snipe
d268f25f16
Make asset tag required
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:16:57 +01:00
snipe
01c69c8f8f
Allow optional status label on quickscan checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 10:08:48 +01:00
spencerrlongg
9622e05cf5
correct api test
2024-08-14 18:41:06 -05:00
spencerrlongg
afaf53cdfc
failing ui test
2024-08-14 18:14:21 -05:00
spencerrlongg
f031309f8f
set up api controller for route/model binding
2024-08-14 16:09:15 -05:00
spencerrlongg
20ec420ba3
not quite done, api side needs some work
2024-08-14 13:53:29 -05:00
Marcus Moore
ab63a19aff
Initialize concept of cached values
2024-08-14 11:01:51 -07:00
spencerrlongg
a70b94e707
Merge branch 'refs/heads/develop' into bug/sc-26584
2024-08-14 11:36:19 -05:00
r-xyz
0d7cf55a3a
Add support for Docker secrets in Standard and alpine image.
2024-08-14 17:40:52 +02:00
Brady Wetherington
008bf036b5
Got rid of weird namespace declaration and commented-out data-toggle line
2024-08-14 16:09:34 +01:00
Brady Wetherington
cc5ad456e6
Expose the 'sanitize' system for backup restores to the web GUI
2024-08-14 15:59:21 +01:00
snipe
3e29457094
Merge pull request #15292 from snipe/features/updated_phpinsights
...
Updated phpinsights
2024-08-14 12:12:40 +01:00
snipe
0b3ac2a9cd
Updated phpinsights
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-14 12:08:49 +01:00
snipe
bf4b915168
Merge remote-tracking branch 'origin/develop'
2024-08-14 10:45:13 +01:00
snipe
0f1e5181a6
Nicer input layout for bulk edit name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-14 10:09:14 +01:00
snipe
0a9c2e354f
Merge remote-tracking branch 'origin/develop'
2024-08-14 10:02:43 +01:00
snipe
e544007185
Merge pull request #15291 from snipe/features/bulk_update_asset_name
...
Added asset name to bulk asset edit
2024-08-14 10:02:09 +01:00
snipe
4b690e8e1f
Updated test to check for nulling
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-14 10:01:56 +01:00
snipe
371afde52d
Bulk edit asset name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-14 09:52:25 +01:00
Marcus Moore
038e86954b
Improve property name
2024-08-13 17:30:53 -07:00
Marcus Moore
f6c1642bf2
Use computed fields in CustomFieldSetDefaultValuesForModel component
2024-08-13 17:01:35 -07:00
snipe
7a6a2e3d92
Merge pull request #15290 from marcusmoore/test-fixes
...
Fixed component check in test
2024-08-14 00:00:55 +01:00
Marcus Moore
3f8ac59f4c
Reference the entry in the components_assets table
2024-08-13 15:31:16 -07:00
snipe
74e7b1cfa5
Merge pull request #15286 from marcusmoore/test-updates
...
Implemented artisan test case
2024-08-13 20:46:46 +01:00
Marcus Moore
ae0a6d66f3
Update tests
...
https://masteringlaravel.io/daily/2024-02-09-watch-out-for-this-when-testing-artisan-commands
2024-08-13 12:16:08 -07:00
Marcus Moore
321839e074
Fix namespace
2024-08-13 12:14:56 -07:00
spencerrlongg
120cfd13c5
translation
2024-08-13 14:07:40 -05:00
spencerrlongg
09f2739298
works, un-reassignable licenses are an issue
2024-08-13 13:45:41 -05:00
snipe
e9fc455a30
Merge pull request #15192 from Godmartinz/status_labels_check_emails
...
Added status labels to confirmation emails
2024-08-13 18:24:15 +01:00
Godfrey M
8af4126de1
removed indent from blades
2024-08-13 10:21:33 -07:00
Godfrey M
5d1c48c071
fixes alignment, and box issue with pie chart
2024-08-13 10:11:49 -07:00
snipe
47f1b3b14e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-08-13 16:48:06 +01:00
snipe
3044af9410
Merge pull request #15280 from snipe/bug/sc-23294
...
Fixed select2 “x” color on multi-select and border color
2024-08-13 16:46:56 +01:00
snipe
4f0f0af83b
Make the border radius match the rest of the site
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-13 16:46:26 +01:00
snipe
198afee946
Fixed select2 “x” color on mult-select and border color
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-13 16:42:23 +01:00
snipe
def0af652d
Merge pull request #15279 from TelecomsSansFrontieres/fix_missing-translate-item-assets
...
Fix: add missing admin/hardware/table.name key
2024-08-13 16:35:25 +01:00
Florent Bervas
20e4ba0590
lang: relocated translation key to existing item in general
2024-08-13 15:07:54 +00:00
snipe
72fd9977e5
Merge pull request #15277 from uberbrady/silence_saml_errors
...
Fixed: [sc-26355] Attempt to de-escalate SAML login and logout errors
2024-08-13 15:51:03 +01:00
Brady Wetherington
10f35c682b
Re-add space
2024-08-13 15:49:51 +01:00
snipe
198b76ebc2
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-08-13 15:47:00 +01:00
snipe
6e84c29ce4
Merge pull request #15278 from snipe/print_view_improvements
...
Fixed #14821 - Hide UI elements from print view on assets
2024-08-13 15:45:30 +01:00
snipe
389a06aac5
Hide UI elements from print view on assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-13 15:40:51 +01:00
Brady Wetherington
4b96721393
Attempt to de-escalate SAML login and logout errors
2024-08-13 14:55:13 +01:00
snipe
e42ee0c0e1
Merge pull request #15276 from snipe/css_updates
...
Bold selected tab for better readability
2024-08-13 14:21:45 +01:00
snipe
277a0fd16a
Make selected tab bold
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-13 14:19:41 +01:00
snipe
c163d6774f
Merge pull request #15198 from spencerrlongg/feature/add_trait_to_request
...
Add MayContainCustomFields Trait to Asset Update Request
2024-08-13 14:12:52 +01:00
snipe
5546f9676a
Merge remote-tracking branch 'origin/develop'
2024-08-13 13:51:33 +01:00
snipe
9e73eaf955
Merge pull request #15275 from snipe/added_tooltips_to_top_bar
...
Added tooltips to top nav shortcuts
2024-08-13 13:50:27 +01:00
snipe
1b2094f4e2
Added tooltips to top nav shortcuts
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-13 13:49:13 +01:00
spencerrlongg
ec863df007
rm conditional that might be unnecessary
2024-08-12 16:58:53 -05:00
spencerrlongg
cc3b8e0681
this should more or less work, but i need to determine if this is the best way
2024-08-12 16:58:21 -05:00
spencerrlongg
ff145abbe7
use array for eager loading, makes ide prettier
2024-08-12 16:13:03 -05:00
snipe
46caa478d2
Merge remote-tracking branch 'origin/develop'
2024-08-12 20:47:45 +01:00
snipe
e6106aa7cf
Merge pull request #15272 from snipe/fixes/added_selectlist_permission_for_reports
...
Added reporting-only access for selectlists
2024-08-12 20:47:17 +01:00
snipe
b45a8f4b5f
Added reporting-only access for selectlists
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-12 20:44:17 +01:00
snipe
4d8569e754
Merge remote-tracking branch 'origin/develop'
2024-08-12 18:01:21 +01:00
snipe
c9f8a84d48
Merge pull request #15270 from snipe/fixes/make_dashboard_pie_respect_show_in_list
...
Fixed #15247 - make pie chart on dashboard respect the “show archived…
2024-08-12 17:59:27 +01:00
snipe
ac1543d568
Fixed #15247 - make pie chart on dashboard respect the “show archived” setting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-12 17:54:42 +01:00
snipe
4dc57f95e2
Merge remote-tracking branch 'origin/develop'
2024-08-12 16:38:23 +01:00
snipe
9d354ca657
Merge pull request #15266 from uberbrady/checkout_to_fixer
...
Checkout-to fixer
2024-08-12 16:34:19 +01:00
snipe
316ee6f810
Merge remote-tracking branch 'origin/develop'
2024-08-12 16:30:53 +01:00
snipe
3f2139349e
Allow better fallthrough on image
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-12 16:30:21 +01:00
snipe
f56dd582f9
Merge pull request #15269 from snipe/fixes/smaller_email_logo
...
Fixes ##15236 - smaller email logo
2024-08-12 16:27:59 +01:00
snipe
225ab47b8e
Simplified logic
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-12 16:23:09 +01:00
snipe
4c350bd5a3
Remove the regular logo fallback, make image capped by height
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-12 16:21:58 +01:00
snipe
509cc812ea
Merge remote-tracking branch 'origin/develop'
2024-08-12 15:58:40 +01:00
snipe
e7fb29fced
Fixed copy area for serial
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-12 15:58:30 +01:00
Brady Wetherington
a2d11b43de
Whoops, these were accidentally committed
2024-08-12 13:50:46 +01:00
Brady Wetherington
f80cf666b1
Mark tests as incomplete for the new artisan assigned_to fixer
2024-08-12 13:46:56 +01:00
snipe
d5f66bc0dd
Merge remote-tracking branch 'origin/develop'
2024-08-12 10:10:59 +01:00
snipe
ce5be8ac24
Merge pull request #15100 from Godmartinz/depreciation_percentage
...
Added Depreciation Percentage as an option
2024-08-12 10:10:25 +01:00
snipe
1e213c31ef
Merge remote-tracking branch 'origin/develop'
2024-08-11 10:26:16 +01:00
snipe
1777bb4b93
Pulled searchable relation on model - needs revisit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-11 10:26:02 +01:00
snipe
91874dfe0b
Merge remote-tracking branch 'origin/develop'
2024-08-10 19:37:37 +01:00
snipe
5c6c655cdc
Added sounds to quickscan checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 19:37:18 +01:00
snipe
0e6eda5e8a
Merge remote-tracking branch 'origin/develop'
2024-08-10 18:29:41 +01:00
snipe
60eb602156
Merge pull request #15264 from snipe/fixes/fixed_admin_ordering_on_report
...
Fixed #15252 - admin ordering on activity report
2024-08-10 18:26:15 +01:00
snipe
24560b9362
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 18:24:49 +01:00
snipe
76b114d820
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 18:21:41 +01:00
snipe
ce33deed86
Remove unused use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 17:14:34 +01:00
snipe
1e6c172f18
Removed unusued use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 17:14:20 +01:00
snipe
a1ce9b9285
Added query scope for ordering by admin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 17:00:50 +01:00
snipe
6ec3693030
Load admin on actionlog
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 17:00:34 +01:00
snipe
71729f0b16
Load admin and model on assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 17:00:20 +01:00
snipe
1c229a8e08
Made notes field sortable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 17:00:11 +01:00
snipe
07b1e3fb90
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 16:55:48 +01:00
snipe
6294516271
Merge pull request #15263 from snipe/really/remove_pound_sign_for_order_number
...
Fixed #15248 Removed pound symbol from order number on asset view
2024-08-10 16:18:40 +01:00
snipe
f3331b5045
Removed pound symbol from order number on asset view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 16:17:07 +01:00
snipe
6a06a91fa2
Merge pull request #15262 from snipe/synk/jquery-validation-from-1.20.1-to-1.21.0
...
Upgrade jquery-validation from 1.20.1 to 1.21.0
2024-08-10 16:07:47 +01:00
snipe
0cba5ba67e
Upgrade jquery-validation from 1.20.1 to 1.21.0
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 16:06:14 +01:00
snipe
b815352a45
Merge pull request #15261 from snipe/security/upgrade_fontawesome
...
[Snyk] Upgrade @fortawesome/fontawesome-free from 6.5.2 to 6.6.0
2024-08-10 15:57:10 +01:00
snipe
2f299dbb20
Upgrade fontawesome, generate dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-10 15:51:24 +01:00
snipe
f76fbe75e0
Merge pull request #15221 from marcusmoore/fixes/bulk-checkin-logging
...
Fixed accessories and consumables not being logged correctly during bulk check-in
2024-08-08 10:43:59 +01:00
snipe
cc1e356c35
Merge pull request #15232 from marcusmoore/shift-126036
...
Updated PHPUnit to v10
2024-08-08 01:23:07 +01:00
snipe
8094f3c0e1
Merge pull request #15245 from spencerrlongg/bug/acceptance_issue
...
Fixed Issue with Acceptances Being Created
2024-08-08 01:22:34 +01:00
snipe
900beaa955
Merge pull request #15244 from snipe/features/play_sound_on_audit
...
Fixes #10560 - optional ability to play sound on audit
2024-08-08 00:58:30 +01:00
Marcus Moore
6521c02526
Merge branch 'develop' into livewire-importer-improvements
...
# Conflicts:
# resources/views/livewire/importer.blade.php
2024-08-07 15:20:39 -07:00
spencerrlongg
2412333152
added conditional to listener
2024-08-07 16:53:06 -05:00
Marcus Moore
4a2d2f7336
Improve variable name
2024-08-07 13:32:30 -07:00
Marcus Moore
d03baa4613
Make diff cleaner
2024-08-07 13:29:45 -07:00
Marcus Moore
41437e4d8f
Merge branch 'develop' into fixes/bulk-checkin-logging
...
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
2024-08-07 13:06:59 -07:00
snipe
7d220dd8c2
set default
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:58:04 +01:00
snipe
a99ec062e6
Added checkbox for preferences
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:49:07 +01:00
snipe
8fe6395287
Added migration
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:41:13 +01:00
snipe
b4d51599ee
Added sound effects
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:38:50 +01:00
snipe
9350a20189
Include accessories count
...
This isn’t exactly right right now
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:19:47 +01:00
snipe
889d5da71e
Check for accessories on bulk items
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:04:32 +01:00
snipe
5546ab08c2
Only delete user records in accessories_checkouts for bulk delete
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 19:53:18 +01:00
snipe
ef183f256c
Merge pull request #15242 from Godmartinz/shortcut_option
...
Fixed shortcuts to be optional now
2024-08-07 18:56:27 +01:00
Godfrey M
3a96e501cc
use old school input
2024-08-07 10:54:06 -07:00
Godfrey M
6b1784f2ee
makes shortcuts optional
2024-08-07 10:47:16 -07:00
snipe
1a872b1643
Merge remote-tracking branch 'origin/develop'
2024-08-07 18:15:44 +01:00
snipe
deef9ad181
Merge pull request #15241 from snipe/partial_revert_for_checkout_accessories_to_non_user
...
Partial revert for checkout accessories to non user
2024-08-07 18:15:08 +01:00
snipe
0dc7e8b8dc
Temp removed other selector
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 18:04:52 +01:00
snipe
a5f075548a
Default to user
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 18:04:39 +01:00
Brady Wetherington
1706ddd511
working fixup script, but failing tests. But I have tests!
2024-08-07 16:06:00 +01:00
Marcus Moore
a220986d16
Switch to snake case
2024-08-06 16:13:51 -07:00
Marcus Moore
2a8ac81eed
Fix namespace
2024-08-06 15:22:13 -07:00
Marcus Moore
d3cb3c03d2
Rerun composer update using php 8.1
2024-08-06 15:01:01 -07:00
Marcus Moore
c60bc5cdbe
Change indents back to 2
2024-08-06 13:51:44 -07:00
Marcus Moore
6cfbf835c7
Migrate phpunit.xml
...
vendor/bin/phpunit --migrate-configuration
2024-08-06 13:37:53 -07:00
Marcus Moore
047b77e038
Composer update for phpunit, collision, and paratest
...
composer update phpunit/phpunit nunomaduro/collision brianium/paratest --with-all-dependencies
2024-08-06 13:34:51 -07:00
snipe
766b370264
Merge pull request #15229 from marcusmoore/bug/sc-26552
...
Disallowed checking out components to different companies and fixed number remaining counts
2024-08-06 21:33:55 +01:00
snipe
da33277234
Merge pull request #15230 from marcusmoore/fixes/test-namespaces
...
Fixed handful of test namespaces
2024-08-06 21:32:11 +01:00
Marcus Moore
3e832e5e94
Revert "Define test classes as final"
...
This reverts commit 95516b0343 .
2024-08-06 13:31:17 -07:00
Marcus Moore
82e795b642
Revert "Add return types to test methods"
...
This reverts commit 83fb6826ee .
2024-08-06 13:30:34 -07:00
Shift
95516b0343
Define test classes as final
2024-08-06 20:25:22 +00:00
Shift
83fb6826ee
Add return types to test methods
2024-08-06 20:25:22 +00:00
Shift
b1e92ab866
Declare data providers as static
2024-08-06 20:25:21 +00:00
Shift
96241cb67c
Adopt PHP attributes in test classes
2024-08-06 20:25:21 +00:00
Shift
b680dab5c9
Ignore PHPUnit cache folder
2024-08-06 20:25:19 +00:00
Shift
984840dc82
Bump PHPUnit dependencies
2024-08-06 20:25:18 +00:00
Marcus Moore
84e447af09
Fix test namespaces
2024-08-06 13:21:36 -07:00
Marcus Moore
c7ddabcc8b
Check for FMCS when checking out component
2024-08-06 12:27:15 -07:00
Marcus Moore
bee80fcf8a
Remove global scope when counting check outs
2024-08-06 12:16:06 -07:00
Marcus Moore
0aff35b622
Scaffold additional failed tests
2024-08-06 12:07:34 -07:00
Godfrey M
46a6a84ecb
adds migration and translations
2024-08-06 11:07:39 -07:00
Marcus Moore
374812f8fe
Add failing test
2024-08-06 10:48:38 -07:00
Marcus Moore
94e00b8a3e
Use new accessory checkout relationship
2024-08-05 17:26:11 -07:00
Marcus Moore
f2b78d18a4
Merge branch 'develop' into fixes/bulk-checkin-logging
...
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
2024-08-05 17:25:54 -07:00
Marcus Moore
17eccfcd8b
Formatting
2024-08-05 16:58:27 -07:00
Marcus Moore
01e4382d20
Formatting
2024-08-05 16:58:17 -07:00
Marcus Moore
1c664af326
Remove todo outside of scope
2024-08-05 16:58:08 -07:00
Marcus Moore
392d34422a
Remove code handled by ConsumableAssignment:: call above
2024-08-05 16:57:40 -07:00
Marcus Moore
35e7a3163c
Implement test case
2024-08-05 16:54:31 -07:00
Marcus Moore
96fafa6952
Improve readability
2024-08-05 16:36:29 -07:00
Marcus Moore
a55693211f
Move test class
2024-08-05 16:27:04 -07:00
Marcus Moore
1acd24fdbe
Re-order helpers
2024-08-05 16:26:25 -07:00
Marcus Moore
59b7d5db4b
Remove comment
2024-08-05 16:25:14 -07:00
Marcus Moore
16aa47509b
Implement test for assets
2024-08-05 16:24:52 -07:00
Marcus Moore
d1bb3ef6bf
Scaffold two tests
2024-08-05 16:19:09 -07:00
Marcus Moore
5cd9dd4a67
Add assertion to ensure user cannot perform bulk actions on self
2024-08-05 16:17:24 -07:00
Marcus Moore
fc405d9d73
Assert redirected to correct place
2024-08-05 16:14:01 -07:00
Marcus Moore
5786ff5035
Add assertion for success message
2024-08-05 16:11:07 -07:00
Marcus Moore
8a206a6d92
Add assertion
2024-08-05 16:10:12 -07:00
Marcus Moore
67b3ab820f
Add todo comments
2024-08-05 16:10:08 -07:00
Marcus Moore
b06501dd02
Add assertions
2024-08-05 16:02:59 -07:00
Marcus Moore
e3049fffd4
Remove comment
2024-08-05 15:50:53 -07:00
Marcus Moore
5ecdb7e07c
Add validation test
2024-08-05 15:50:09 -07:00
Marcus Moore
4ed3347f52
Add permission check
2024-08-05 15:43:38 -07:00
Marcus Moore
364775dcfe
Improve readability
2024-08-05 15:42:03 -07:00
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
akemidx
0f0baa207d
note field optional
2024-08-01 17:02:35 -04:00
akemidx
3ff1745f56
setting created
2024-08-01 16:44:02 -04:00
akemidx
552f90ae2c
required, but not optional
2024-08-01 16:06:47 -04:00
Godfrey M
ae4f278df1
edited terenaries on notifs
2024-08-01 11:13:20 -07:00
Godfrey M
bc0ff706b0
fixes dashboard box overflow
2024-08-01 10:31:39 -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
arne-kroeger
3c3b922eae
Adjusted newly added tests to new checkout form
2024-07-29 19:15:01 +02:00
arne-kroeger
e8d0147075
Adjusted missing down on migration and code smells
2024-07-29 19:04:10 +02:00
snipe
c2bcc2e2d9
Merge remote-tracking branch 'origin/develop'
2024-07-29 14:39:13 +01:00
snipe
55f9886412
Merge pull request #15187 from snipe/feature/sc-26458
...
Use the `pwd_secure_min` value (plus 5) for generated password
2024-07-29 14:38:39 +01:00
snipe
a77ece01a6
Fixed test name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-29 14:34:10 +01:00
snipe
1c1101aeac
Use the pwd_secure_min value (plus 5) for generated password
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-29 14:26:18 +01:00
snipe
de04ead55d
Merge remote-tracking branch 'origin/develop'
2024-07-29 10:11:39 +01:00
snipe
bc18fac97e
Fixed missing div
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-29 10:11:11 +01:00
arne-kroeger
3a0b03348e
added additional tests
2024-07-29 11:06:36 +02:00
arne-kroeger
b18baf74d2
added options to checkout accessoires to locations and assets
...
Added #14979 : add checkout functionality to accessoires
2024-07-29 10:54:53 +02:00
snipe
28c7355697
Fixed missing div
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-29 09:52:38 +01:00
snipe
0dd0baa511
Merge remote-tracking branch 'origin/develop'
2024-07-27 10:12:23 +01:00
snipe
c3a296c19f
Added qr code back
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-27 10:12:13 +01:00
snipe
f6cc923e01
Merge remote-tracking branch 'origin/develop'
2024-07-26 17:29:46 +01:00
snipe
aab29fbb6b
Use translated string for restore
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 16:47:40 +01:00
snipe
d9d3ff27ae
Merge remote-tracking branch 'origin/develop'
2024-07-26 15:31:52 +01:00
snipe
614d05acb5
Merge pull request #15170 from uberbrady/simplify_css_skin_building
...
Dynamically iterate through the skin listing to build skins
2024-07-26 15:14:24 +01:00
snipe
e4a82edd3f
Merge pull request #15172 from snipe/features/blade_component_for_submit
...
Use blade component for submit redirect on asset edit/create
2024-07-26 15:13:30 +01:00
snipe
eceaa72781
And more tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 15:07:43 +01:00
snipe
ddf45c5ee9
Renamed test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 15:00:16 +01:00
snipe
ff100c0b9f
Added more tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 14:58:10 +01:00
snipe
037cc4d098
More tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 14:27:07 +01:00
snipe
ff6e6ef88c
Added more tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 13:43:10 +01:00
snipe
e8ec11652f
Very basic checkin tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 13:16:31 +01:00
snipe
cd7f276c40
Fixed logging for component
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 13:09:21 +01:00
snipe
fc8bb82a02
Made dropdown wider
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 12:48:18 +01:00
snipe
5d7f1f77a3
Added redirect to checkin/checkout controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 12:48:07 +01:00
snipe
5dea3f4495
Added blade component to checkin/checkout pages
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 12:47:33 +01:00
snipe
c6e709cd36
Added parameters
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 12:45:06 +01:00
Brady Wetherington
daf5a80081
Use a similar loop for the minification step for CSS
2024-07-26 12:03:03 +01:00
snipe
759ab78f80
Added more redirects
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 11:27:36 +01:00
snipe
b6d9f736e3
Pulled use session
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 10:41:28 +01:00
snipe
243ab51def
Fixed back button
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 10:40:48 +01:00
snipe
c5603a0e10
Merge remote-tracking branch 'origin/develop'
2024-07-26 10:26:23 +01:00
snipe
57f6ecb1da
Added created_by to license view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-26 10:24:13 +01:00
snipe
64082ada1e
Updated test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-25 22:08:51 +01:00
snipe
068535a80c
Removed logging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-25 22:08:46 +01:00
snipe
08f4fe5f35
Add status messages to redirect
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-25 22:02:34 +01:00
snipe
018b5684fc
Refactor helper method for redirection
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-25 22:02:03 +01:00
snipe
73a80a5fbc
Use blade component for redirect option
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-25 21:35:13 +01:00
Brady Wetherington
4c8bf9ae19
Dynamically iterate through the skin listing to build skins
2024-07-25 21:20:06 +01:00
snipe
f77d300549
Merge pull request #15169 from uberbrady/create_directories_when_needed_on_restore
...
Create intermediate directories on restore if needed - Fixes [SC-25950]
2024-07-25 18:45:54 +01:00
snipe
62655be2d0
Fixed BYOD label
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-25 18:41:37 +01:00
Brady Wetherington
eb938bdba3
Create intermediate directories on restore if needed
2024-07-25 18:40:26 +01:00
snipe
129d3b35fb
Merge pull request #15168 from uberbrady/improve_restore_sanitization
...
Improve restore sanitization - Fixes [sc-24840]
2024-07-25 18:20:05 +01:00
Brady Wetherington
84df23e1f6
Better handle older SQL dumps that got created in Windows format
2024-07-25 18:07:25 +01:00
snipe
a439d8abe8
Use fully qualified use statements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-25 16:08:46 +01:00
snipe
24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113
...
Registered custom anonymous blade component directory
2024-07-25 16:08:01 +01:00
Marcus Moore
44dbbeb608
Add accessory and consumable specific checkin methods
2024-07-24 14:17:49 -07:00
Marcus Moore
7161b6416e
Add failing test for accessories and consumables checkin
2024-07-24 14:16:42 -07:00
snipe
1331bffaca
Merge remote-tracking branch 'origin/develop'
2024-07-24 21:42:41 +01:00
snipe
9b422e5c97
Baremetrics BMPay breaks with CSP turned [sc-25011]
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 21:42:20 +01:00
snipe
0c86855392
Merge remote-tracking branch 'origin/develop'
2024-07-24 21:04:20 +01:00
snipe
962ae5231d
Merge pull request #15162 from snipe/fixes/added_location_assets_endpoint
...
Added assets endpoint for locations
2024-07-24 21:03:43 +01:00
snipe
590d13061a
One more test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 20:57:26 +01:00
snipe
c3a2cdeee9
Added assets endpoint for locations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 20:53:58 +01:00
snipe
ef77fb91c0
Merge remote-tracking branch 'origin/develop'
2024-07-24 20:20:37 +01:00
snipe
02bd8d7ea1
Merge pull request #15161 from snipe/fixes/500_when_depreciation_is_active_but_no_purchase_date
...
Fixes 500 when depreciation is active but no purchase date
2024-07-24 20:20:10 +01:00
snipe
da4ec145d7
Removed test no longer needed due to validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 20:17:30 +01:00
snipe
ef145e47b4
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 20:13:15 +01:00
snipe
adf58a06da
Added check for purchase date
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 20:13:11 +01:00
snipe
63f0b5279d
Added check for purchase_date
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 20:13:01 +01:00
Godfrey Martinez
c96ccbb6cb
Merge branch 'develop' into depreciation_percentage
2024-07-24 12:12:28 -07:00
Godfrey M
950fff31ed
fix conflicts
2024-07-24 12:12:04 -07:00
Godfrey M
f05d8281f3
fixes alignment for error msg
2024-07-24 12:06:56 -07:00
Godfrey M
d5c9fa823e
adds translations
2024-07-24 11:39:33 -07:00
Godfrey M
99741db645
adds status labels to confirmation emails
2024-07-24 11:24:30 -07:00
snipe
90d5a6d8ab
Merge remote-tracking branch 'origin/develop'
2024-07-24 19:16:56 +01:00
snipe
5b8529bc83
Fixed pluralization
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 19:16:08 +01:00
snipe
f76c68f0ed
Merge remote-tracking branch 'origin/develop'
2024-07-24 18:10:23 +01:00
snipe
8368fb5c41
Merge pull request #15160 from snipe/fixes/allow_cloning_of_deleted_assets
...
Allow cloning of deleted assets
2024-07-24 18:09:55 +01:00
snipe
d1c39a737f
Fixed double semicolon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 18:09:32 +01:00
snipe
425bfa4318
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 18:06:21 +01:00
snipe
293abbd1d0
Allow cloning of deleted assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 17:49:38 +01:00
snipe
b64b774bd5
Use route model binding on clone, removed unneeded route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 17:49:21 +01:00
snipe
466ab1e3c0
Removed the banner since we already warn
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 17:40:24 +01:00
snipe
daa9e7810e
Merge pull request #15158 from snipe/fixes/ui_cleanup_for_asset_view
...
Cleaned up UI on asset view
2024-07-24 17:34:17 +01:00
snipe
95a0f3dbe5
Cleaned up UI on asset view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 17:26:55 +01:00
Brady Wetherington
bb465dbfaa
Cut down run number to 100 from 1000
2024-07-24 15:09:23 +01:00
snipe
e5ab12496f
Merge pull request #15151 from snipe/snyk-fix-067da5564c4d29b025cd356b125e6ad9
...
[Snyk] Security upgrade alpine from 3.18.6 to 3.19
2024-07-24 14:22:57 +01:00
snipe
4b906e39be
Merge pull request #15155 from snipe/fix_new_alpine
...
Switch dockerfile to using php8.2 instead of 8.1 due to Alpine changes
2024-07-24 14:00:21 +01:00
Brady Wetherington
0dc8f27240
Switch dockerfile to using php8.2 instead of 8.1 due to Alpine changes
2024-07-24 13:56:27 +01:00
Brady Wetherington
8cbcc237c0
Cleanup of Stale workflow for GH - set to debug-mode to start
2024-07-24 13:27:31 +01:00
snipe
c4135c71d4
Merge remote-tracking branch 'origin/develop'
2024-07-24 13:05:16 +01:00
snipe
172da4d655
Merge pull request #15154 from snipe/fixes/15103_show_eol_to_users
...
Fixes #15103 - Added EOL and audit into to user profile assets
2024-07-24 13:03:50 +01:00
snipe
6f8ccd4e10
Fixes #15103 - Added EOL and audit into to user profile assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 12:54:33 +01:00
snipe
8d36a75342
Merge remote-tracking branch 'origin/develop'
2024-07-24 12:41:20 +01:00
snipe
9457e5b890
Merge pull request #15153 from snipe/fixes/mail_backup_config
...
Fixed env var for backup config - related to #14964
2024-07-24 12:40:46 +01:00
snipe
bce7a278ae
Fixed env var for backup config - related to #14964
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 12:38:58 +01:00
Brady Wetherington
97e3af8fc9
WIP on new GitHub-backed stalebot settings
2024-07-24 12:33:26 +01:00
Brady Wetherington
914e29210a
Initial rough stab at re-implementing stalebot
2024-07-24 12:33:26 +01:00
snipe
a6041ae525
Merge remote-tracking branch 'origin/develop'
2024-07-24 10:41:36 +01:00
snipe
ab1e097b7c
Early return for requiredness
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-24 10:41:14 +01:00
snipe
a781f84aea
Merge remote-tracking branch 'origin/develop'
2024-07-24 10:36:23 +01:00
snipe
90a2a808d6
Merge pull request #15149 from spencerrlongg/bug/check_requiredness
...
Fixed: Requiredness Check Bug
2024-07-24 10:33:45 +01:00
snipe
73e2d8e305
Merge remote-tracking branch 'origin/develop'
2024-07-24 10:32:54 +01:00
snyk-bot
0e1e13f54a
fix: Dockerfile.alpine to reduce vulnerabilities
...
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-6913411
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249236
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249265
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249419
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249419
2024-07-24 09:11:01 +00:00
Marcus Moore
869c06f454
Register anonymous blade component namespace
2024-07-23 15:41:58 -07:00
spencerrlongg
b61ab423ca
ok NOW it should be fine
2024-07-23 17:35:48 -05:00
spencerrlongg
090a595c99
conflict
2024-07-23 17:34:17 -05:00
Spencer Long
bc417308c7
Merge branch 'develop' into bug/check_requiredness
2024-07-23 17:32:43 -05:00
spencerrlongg
e77e16b9aa
this works
2024-07-23 17:22:20 -05:00
spencerrlongg
0ae297634e
ugh
2024-07-23 16:59:58 -05:00
spencerrlongg
0f2f559d7a
test works, helper still needs work. pushing to check something
2024-07-23 16:46:29 -05:00
snipe
57b5b12952
Merge pull request #15148 from marcusmoore/fixes/dates-in-user-import
...
Fixed start_date and end_date in user importer
2024-07-23 22:37:19 +01:00
snipe
9baaaae1a3
Merge remote-tracking branch 'origin/develop'
2024-07-23 22:15:57 +01:00
snipe
1f4118a146
Fixed rule
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-23 22:15:37 +01:00
Marcus Moore
f4a3823d88
Handle empty strings for dates by converting them to null
2024-07-23 13:57:28 -07:00
snipe
b2a69efc9d
Merge remote-tracking branch 'origin/develop'
2024-07-23 21:42:12 +01:00
snipe
00ebc8b64d
Merge pull request #15136 from snipe/fixes/cookie_serialization
...
Remove cookie serialization
2024-07-23 21:41:44 +01:00
snipe
effd273245
Merge pull request #14458 from spencerrlongg/bug/sc-24884
...
Add Form Request and Tests for Update Asset API Method
2024-07-23 20:57:47 +01:00
snipe
7858c72b98
Fixed string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-23 20:45:12 +01:00
snipe
09e2c0beab
Merge pull request #15147 from uberbrady/fix_setup_ssl_check
...
Fix setup ssl check
2024-07-23 20:32:13 +01:00
spencerrlongg
e8864ffb01
test added, permission fixed
2024-07-23 14:29:17 -05:00
Brady Wetherington
d893de2b7e
Merge branch 'develop' into fix_setup_ssl_check
2024-07-23 20:24:38 +01:00
Brady Wetherington
7f7cfef81b
Mark test as Incomplete, and downgrade error back to debug for tests
2024-07-23 20:24:05 +01:00
Godfrey M
d01972bbe5
adds tests for amount and percent
2024-07-23 11:53:59 -07:00
spencerrlongg
b9fdb5880a
quick push
2024-07-23 13:48:43 -05:00
spencerrlongg
1139ed676a
$id to $asset->id (thanks tests)
2024-07-23 13:03:25 -05:00
Spencer Long
64be353156
Merge branch 'develop' into bug/sc-24884
2024-07-23 12:55:19 -05:00
Godfrey M
750015684d
purges user storage files
2024-07-23 10:42:50 -07:00
snipe
992d16664d
Merge remote-tracking branch 'origin/develop'
2024-07-23 18:26:54 +01:00
snipe
900c19b76d
Merge pull request #15143 from snipe/fixes/no-NO-language
...
Switch to nb-NO from no-NO for Norwegian
2024-07-23 18:25:27 +01:00
snipe
effd2bce24
Fixed test to use nb-NO
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-23 18:22:13 +01:00
snipe
de8816d837
Merge pull request #15144 from snipe/localization/updated_strings_2024_07_23
...
Updated translations
2024-07-23 18:17:45 +01:00
snipe
593554daed
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-23 18:14:19 +01:00
snipe
fecd877e8b
Migration
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-23 17:35:06 +01:00
snipe
ba6d8ae8c7
Switch to nb-NO from no-NO
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-23 17:15:44 +01:00
snipe
175862d3c9
Added route param to message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-23 16:37:01 +01:00
Brady Wetherington
5eea08088d
Improve .env file checking to not validate SSL certificates
2024-07-23 16:03:02 +01:00
snipe
c752c2a125
Make the passport cookie name configurable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 14:22:19 +01:00
snipe
4ac4f9b0a9
Customize cookie name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 14:17:16 +01:00
snipe
09abcb44bb
Remove cookie serialization
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 13:49:47 +01:00
snipe
7f566b9152
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-07-22 10:56:37 +01:00
snipe
30835fe9ba
Merge pull request #15134 from snipe/upgrade_bs_table
...
[Snyk] Upgrade bootstrap-table from 1.22.5 to 1.23.0 #15131
2024-07-22 10:50:53 +01:00
snipe
910e98b573
[Snyk] Upgrade bootstrap-table from 1.22.5 to 1.23.0 #15131
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 10:45:35 +01:00
snipe
4623e40077
Merge pull request #15133 from snipe/fixes/load_english_separately_for_table_locale
...
Load the english file again in case BS table doesn’t have a translation
2024-07-22 10:40:01 +01:00
snipe
20868b9ede
Load the english file again in case BS table doesn’t have a translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 10:30:42 +01:00
snipe
efc84efabf
Merge pull request #15132 from snipe/fixes/disable_remote_login_force_via_env
...
Hides the “Disable Other Login Mechanisms” option via env
2024-07-22 10:20:34 +01:00
snipe
7c7fa96334
Pulled from the app.php as well
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 10:19:55 +01:00
snipe
e08acb851c
Removed env part, just check for the remote user login
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 10:18:33 +01:00
snipe
bbad84c6cc
Hides the “Disable Other Login Mechanisms” option via env
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-22 10:13:59 +01:00
snipe
f2acb98afa
Merge pull request #15128 from snipe/fixes/nicer_consumables_layout
...
Nicer consumables layout
2024-07-20 17:01:15 +01:00
snipe
38affea3f3
More updates
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 16:57:10 +01:00
snipe
cea31c5b11
Added more generic buttons with variables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 16:53:01 +01:00
snipe
254e2f120b
Added clone to consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 16:40:32 +01:00
snipe
2bfee0c29a
Few more tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 16:21:11 +01:00
snipe
c08bd8f88b
Nicer consumables layout
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 16:11:45 +01:00
snipe
9818c2f033
Merge remote-tracking branch 'origin/develop'
2024-07-20 08:08:51 +01:00
snipe
f63fd25ce0
Fixed default
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 08:08:29 +01:00
snipe
57ecdd6765
Merge remote-tracking branch 'origin/develop'
2024-07-20 07:43:37 +01:00
snipe
9d890b35c6
Merge pull request #15127 from snipe/fixes/small_default_avatar_tweaks
...
Fixes #15076 - Removes ability to remove the default avatar from disk
2024-07-20 07:42:39 +01:00
snipe
8fc5c0b5be
Use other default avatar, not in the avatars directory
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 07:34:40 +01:00
snipe
c4e7448d31
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 07:25:56 +01:00
snipe
ffd2687734
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 07:25:46 +01:00
snipe
6f3eedf5e6
Removed restoreDefaultAvatar method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 07:25:27 +01:00
snipe
241eb7b031
One more bad sig
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 06:06:27 +01:00
snipe
ca399794c3
Fixed incorrect signature
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 06:05:01 +01:00
snipe
736d4cc59a
Use new deleting method in ImageUploadRequest
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 05:55:34 +01:00
snipe
ad85f8be2f
Cleaned up
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 05:55:12 +01:00
snipe
be17ef4047
Added option to restore from default demo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 05:55:06 +01:00
snipe
c6c006f143
Added restore from demo method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 05:54:40 +01:00
snipe
10856516ac
Split out the image deletion into a separate method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 03:40:16 +01:00
snipe
beac4c8b8a
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 03:39:54 +01:00
snipe
b39b39bc8a
Ignore the test uploads directory
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 03:39:05 +01:00
snipe
e373be7dde
Skip deleting default avatar from disk on delete
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 01:01:27 +01:00
snipe
ca7c0aa47c
Added default avatar to seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 00:59:25 +01:00
snipe
48a8cf6b70
Removed unused default avatar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 00:58:57 +01:00
snipe
7ba1646703
Remove unusued default avatar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 00:58:42 +01:00
snipe
daa550cc82
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-07-20 00:31:08 +01:00
snipe
e9f9d3c259
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 00:30:03 +01:00
snipe
63377853b8
Merge pull request #15125 from snipe/fixes/display_avatar_on_user_edit
...
Show existing images on user edit page
2024-07-20 00:29:28 +01:00
snipe
fc86eefeac
Show existing images on user edit page
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 00:27:28 +01:00
snipe
a98ad76c6a
Merge remote-tracking branch 'origin/develop'
2024-07-19 22:55:09 +01:00
snipe
32c768792a
Merge pull request #15124 from snipe/fixes/path_for_crypt_in_importer
...
Fixed use statement for Crypt in the importer, removed unused statements
2024-07-19 22:54:18 +01:00
snipe
793cf27318
Fixed use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-19 22:50:24 +01:00
snipe
ba568b7975
Merge pull request #15123 from snipe/tests/added_bulk_delete_assets
...
Added tests for bulk asset deletion and restore
2024-07-19 22:36:09 +01:00
snipe
4b5bd76225
Fixed notification use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-19 22:27:03 +01:00
snipe
a54403ef01
Added bulk asset delete test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-19 22:26:52 +01:00
snipe
13262c5125
Merge remote-tracking branch 'origin/develop'
2024-07-19 20:05:47 +01:00
snipe
9ea38fbb3a
Merge pull request #15122 from snipe/fixes/15121_bulk_delete_and_restore
...
Fixed #15121 - bulk delete restore logging
2024-07-19 20:03:32 +01:00
snipe
94619e3284
Fixed #15121 - bulk delete restore logging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-19 19:56:58 +01:00
snipe
8b05ef6db4
Updated url checks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-19 19:48:03 +01:00
snipe
8e03083b83
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-07-19 19:07:53 +01:00
snipe
dc2debcd83
Add @DrekiDegga as a contributor
2024-07-19 19:07:41 +01:00
snipe
b7ab8b9e8f
Merge pull request #14530 from DrekiDegga/develop
...
Added #14426 : Makes all Manufacturer links dynamic, not just warranty lookup
2024-07-19 19:07:25 +01:00
snipe
c50ab1af67
Merge branch 'develop' into develop
2024-07-19 19:00:56 +01:00
snipe
7773d334ba
Merge pull request #15120 from snipe/updated_localizations
...
Updated strings
2024-07-19 17:54:30 +01:00
snipe
2a0697022e
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-19 17:47:22 +01:00
Marcus Moore
8d1cc22c58
Turn on legacy binding since other components still use it
2024-07-18 12:00:01 -07:00
snipe
e1eb963962
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 19:11:51 +01:00
snipe
87c2dc5bb5
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-07-18 19:11:41 +01:00
snipe
06efcd3c46
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-07-18 18:55:18 +01:00
snipe
faa791e94c
Merge pull request #15101 from snipe/localizations/more_strings
...
More localizations
2024-07-18 18:51:35 +01:00
snipe
e328dec9f9
Merge branch 'develop' into localizations/more_strings
2024-07-18 18:51:17 +01:00
snipe
8e60a7b22b
Merge pull request #15110 from marcusmoore/fixes/test-namespace-fixes
...
Fixed a coupled test namespaces
2024-07-18 18:50:27 +01:00
snipe
958b6035e1
Add @r-xyz as a contributor
2024-07-18 18:49:59 +01:00
snipe
94e0739a74
Merge pull request #15115 from r-xyz/alpine-upload-limit
...
Improved Docker environment settings: implement `PHP_UPLOAD_LIMIT` for Alpine images
2024-07-18 18:49:00 +01:00
snipe
4465aef991
Merge pull request #15114 from snipe/checkout_multiple_accessories
...
Checkout multiple of an accessory in one checkout
2024-07-18 17:38:19 +01:00
snipe
822bc6f085
Removed response in form request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 17:37:45 +01:00
snipe
19bd99d159
Updated count
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 17:33:24 +01:00
r-xyz
5c17fefb08
Implement PHP_UPLOAD_LIMIT in Alpine images.
2024-07-18 11:54:58 +02:00
snipe
ee589ca112
Merge pull request #15088 from mauro-miatello/develop
...
Added EULAs in print user's assets
2024-07-18 09:09:34 +01:00
snipe
f984b45de2
Merge branch 'develop' into checkout_multiple_accessories
2024-07-18 05:11:51 +01:00
snipe
d56252c6b3
Added more back :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 05:10:45 +01:00
snipe
44b950cb8e
Added back in missing validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 05:07:50 +01:00
snipe
985714d504
Test passing now - I hope
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 05:04:17 +01:00
snipe
97ead7120e
Use from routes for posting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 04:54:07 +01:00
snipe
670021a482
Apply the optimize fix
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 04:43:46 +01:00
snipe
9858cc5baf
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 04:43:30 +01:00
snipe
fa5b59cf21
Added qty
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 04:29:49 +01:00
snipe
0ef58a9aef
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 03:48:42 +01:00
snipe
0c4e498df3
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 03:48:35 +01:00
snipe
b5b60f22d5
Removed int
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 03:48:21 +01:00
snipe
2f0c74aef0
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 03:48:06 +01:00
snipe
f56006fb6b
More refactoring
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 01:46:53 +01:00
Marcus Moore
7685de45f2
Turn off legacy binding
2024-07-17 17:12:14 -07:00
Marcus Moore
199e68ff29
Simplify computed propery
2024-07-17 17:10:12 -07:00
Marcus Moore
81bffccf01
Use better error message
2024-07-17 16:28:26 -07:00
snipe
79a13e3618
Added numCheckedOut method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:26:58 +01:00
snipe
d9b7df5b85
Added form requests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:26:42 +01:00
snipe
0c933bcc5d
Cleaned up controllers, use form requests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:25:42 +01:00
snipe
4c4b0f722a
Added qty to email notification
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:25:29 +01:00
snipe
6c3cafa72f
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:25:07 +01:00
snipe
16ae23dbeb
Updated validation strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:25:00 +01:00
snipe
4f3064bdb1
Added store accesstory form request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:24:51 +01:00
snipe
2b0627c1f6
Added accessory checkout request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-18 00:24:28 +01:00
Marcus Moore
cfca1514c0
Swap file_id for activeFileId
2024-07-17 16:22:44 -07:00
snipe
345a4306e8
Added SubstituteBindings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-17 23:02:10 +01:00
snipe
beb0836d69
Updated route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-17 23:01:44 +01:00
Marcus Moore
b4ed01243b
Add more details
2024-07-17 13:40:41 -07:00
Marcus Moore
3772a21a51
Move comment up
2024-07-17 13:37:24 -07:00
snipe
1eb16cdb02
Merge pull request #15111 from marcusmoore/fixes/optimize-test
...
Undo `optimize` command in test after it is completed
2024-07-17 21:03:01 +01:00
snipe
05e278d08b
Added qty to email
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-17 20:58:21 +01:00
snipe
c21821a864
Added new form fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-17 20:58:12 +01:00
Marcus Moore
a56f3f85f8
Clear the config and route caching done by optimize command after test
2024-07-17 12:21:46 -07:00
Marcus Moore
ba13b9924b
Fix test namespaces
2024-07-17 11:04:35 -07:00
Marcus Moore
04b6cb763f
Add todo
2024-07-17 10:58:48 -07:00
snipe
239824681d
Merge pull request #15075 from akemidx/checkintranslation
...
FIXED: Missing Translation on a Tooltip
2024-07-17 18:16:02 +01:00
snipe
0ac82fbbe1
Merge pull request #15084 from snipe/fixes_ldap_sync_locale
...
Fixes #15067 - updated ldap sync locale to use `app()->getLocale()`
2024-07-17 18:15:32 +01:00
snipe
8c5a9fa38f
Merge pull request #15089 from snipe/dependabot/github_actions/develop/codacy/codacy-analysis-cli-action-4.4.5
...
Bump codacy/codacy-analysis-cli-action from 4.4.1 to 4.4.5
2024-07-17 16:47:28 +01:00
snipe
2f8306cba8
Merge remote-tracking branch 'origin/develop'
2024-07-17 16:27:16 +01:00
Godfrey M
baa7e7d561
clean up
2024-07-16 20:27:38 -07:00
Godfrey M
ffaacc04ef
cleaned up calculateDepreciation method
2024-07-16 20:24:18 -07:00
Marcus Moore
dd32341502
Display message if attempting to delete non-existent file
2024-07-16 17:21:18 -07:00
Marcus Moore
f58e3114a2
Simplify destroy method and update list
2024-07-16 17:17:45 -07:00
Marcus Moore
eba494ad8c
Make $activeFile a computed property
2024-07-16 17:03:42 -07:00
Marcus Moore
7e89b58746
Move files to computed property
2024-07-16 16:08:42 -07:00
Marcus Moore
b7744105a0
Migrate import type to component
2024-07-16 14:20:41 -07:00
snipe
65dcb2a9bd
Merge pull request #15085 from snipe/small_tweaks_to_oauth_page
...
Small layout tweaks to oauth page
2024-07-16 21:36:17 +01:00
snipe
d5e1dc54c6
Use translated strings for action log meta
...
This is only partially complete and I mostly hate it
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 21:35:45 +01:00
Marcus Moore
69263f0e5b
Migrate header row to component
2024-07-16 13:30:29 -07:00
snipe
a3b2912e89
Updated string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 21:16:23 +01:00
snipe
7f412ec3f5
Missing string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 21:14:41 +01:00
snipe
94e881e5f0
Cleared up language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 21:11:03 +01:00
Godfrey M
5bb47e290f
validates percentage on store and new depreciations
2024-07-16 13:07:12 -07:00
snipe
d53a032402
More consistent UI for indented checkboxes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 21:07:03 +01:00
snipe
70d95877d8
Translations for license checkout errors
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 21:02:58 +01:00
Godfrey M
48821f8391
updates transformer, api controller
2024-07-16 12:58:23 -07:00
snipe
bb00edda4e
Added basic jquery validation translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 20:54:48 +01:00
Godfrey M
aaa2858337
battling with handling depreciation percentage and amount
2024-07-16 12:25:19 -07:00
Marcus Moore
017530ba4b
Make updating hook more specific
2024-07-16 12:02:50 -07:00
snipe
4895023f3b
Translate import button
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 19:56:02 +01:00
snipe
0ed637f0ce
Translate importer header
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 19:41:47 +01:00
snipe
45bf428092
Translated “seat” for license seat view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 19:04:51 +01:00
snipe
e6f2c457a8
Handle localization better, clearer indenting on addresses
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 19:01:50 +01:00
snipe
04f723327e
Fixed translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 19:01:23 +01:00
snipe
4a9bd95ed3
Added language support for select2
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 18:40:10 +01:00
snipe
78bd950daa
Added select2 language files
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 18:39:42 +01:00
snipe
d3070a0be1
Merge remote-tracking branch 'origin/develop'
2024-07-16 17:24:16 +01:00
snipe
a0d461d3e2
Merge pull request #15099 from snipe/fixes/15094_wrong_translation_string
...
Fixed #15094 - wrong translation string for model on checkout
2024-07-16 17:23:46 +01:00
snipe
eb9e276ba7
Fixed #15094 - wrong translation string for model on checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 17:14:13 +01:00
snipe
0a70bcc0a9
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# .all-contributorsrc
# CONTRIBUTORS.md
2024-07-16 16:12:26 +01:00
snipe
35160f88e0
Corrected return type
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-16 16:09:08 +01:00
Marcus Moore
c8dad528a8
Migrate a couple items out of mount
2024-07-15 16:15:58 -07:00
Marcus Moore
256e989ba1
Add test for importer
2024-07-15 15:49:18 -07:00
dependabot[bot]
0ddb447c4c
Bump codacy/codacy-analysis-cli-action from 4.4.1 to 4.4.5
...
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action ) from 4.4.1 to 4.4.5.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases )
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.4.1...v4.4.5 )
---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-07-15 08:39:24 +00:00
MrM
e49c96a35e
Added EULAs in print user's assets
...
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
2024-07-14 19:10:33 +02:00
snipe
2d1aeca949
Re-use existing string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-13 18:24:56 +01:00
snipe
e06e4db4b7
Small layout tweaks to oauth page
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-13 18:16:03 +01:00
snipe
51242fcbb2
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-07-13 16:09:03 +01:00
snipe
99be9ddb47
Add @dbakan as a contributor
2024-07-13 16:08:56 +01:00
snipe
be4317361d
Merge pull request #15082 from dbakan/fix/optimize-command
...
Fixed #10224 : fix route names for optimize command
2024-07-13 16:08:32 +01:00
Daniel Albertsen
a175b6a38b
fix routes and tests
2024-07-13 16:36:14 +02:00
Daniel Albertsen
431da6c903
add test to ensure artisan optimize works
2024-07-13 16:36:14 +02:00
snipe
ab6b8f520e
Fixed field name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-13 15:25:37 +01:00
snipe
24e58d1455
Do not update users who already exist since that locale may have been overirrden manually
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-13 15:20:04 +01:00
snipe
f91ad6b2db
Use app()->getLocale() to determine imported user’s language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-13 15:15:44 +01:00
snipe
eed253bd2f
Use app helped instead of facade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-13 15:15:18 +01:00
snipe
b68fcf1de5
Added unaccepted asset test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-12 12:19:40 +01:00
snipe
39810f9ba5
Merge remote-tracking branch 'origin/develop'
2024-07-12 11:05:10 +01:00
snipe
d21ebc6f0d
Fixed return type
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-12 11:04:56 +01:00
akemidx
ad818cf886
missing translation
2024-07-11 17:13:47 -04:00
Marcus Moore
9793016603
Remove unneeded AuthorizesRequests
2024-07-11 13:32:16 -07:00
Marcus Moore
9e06f2d17f
Remove commented code
2024-07-11 13:22:10 -07:00
snipe
fb7d533ff7
Merge pull request #15073 from marcusmoore/feature/livewire-url-prefix
...
Allow setting a prefix for Livewire's update and asset urls
2024-07-11 21:04:50 +01:00
Marcus Moore
9dd3827222
Allow setting a prefix for Livewire's update and asset urls
2024-07-11 12:43:29 -07:00
snipe
5697370dfe
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command
...
Adds a command to resend acceptance emails
2024-07-11 20:37:04 +01:00
snipe
7464c3622e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-07-11 19:07:54 +01:00
snipe
5132aa0254
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 19:07:30 +01:00
Godfrey M
d4d19569ee
adds execution timer
2024-07-11 10:52:47 -07:00
snipe
1a541ce220
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# .all-contributorsrc
# CONTRIBUTORS.md
2024-07-11 18:38:57 +01:00
Godfrey M
43c7504f89
adds an all option, adds help context for all, seperates logic
2024-07-11 10:03:51 -07:00
snipe
aebe96913a
Add @FlorentDotMe as a contributor
2024-07-11 17:31:20 +01:00
snipe
78d24eb451
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets
...
Fixed inconsistent attributes order in Print All Assigned report
2024-07-11 17:30:41 +01:00
snipe
c5c5ac58e5
Merge pull request #15071 from snipe/fixes/small_consumables_optimizations
...
Small consumables optimizations
2024-07-11 17:27:41 +01:00
snipe
1527679f4b
Handle deletions on the observer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 17:26:43 +01:00
snipe
c2fe3b5459
Use the observer to delete associated files and detach users
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 17:00:38 +01:00
snipe
d4a66f9b6c
Use better icon for deleting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 17:00:12 +01:00
snipe
23f1489b2b
Added history tab
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:46:49 +01:00
snipe
5108b1f3ed
Capture the log meta for what was changed
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:35:16 +01:00
snipe
58bc84436c
Fixed incorrect jquery validation class
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:23:05 +01:00
snipe
2415408a50
Prevent ludicrious amount of min_qty
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:22:41 +01:00
snipe
00d7b36c36
Eager load suppliers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:22:22 +01:00
snipe
67d6f7119d
Prevent a ludicrous amount of consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:22:04 +01:00
snipe
42dbc894e0
Better handle numRemaining for consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:21:45 +01:00
snipe
94bfe7d9c8
Require the user exists
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:18:42 +01:00
snipe
d9a114090b
Added buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:18:33 +01:00
snipe
b10441c928
Detach associated pivot records
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:01:18 +01:00
snipe
e123eeea9e
Added error message if category type is invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:00:20 +01:00
snipe
9676d934d2
Drop the with users on the create checkout screen
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 16:00:08 +01:00
snipe
759bb822ff
Make sure the user exists
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 15:59:18 +01:00
snipe
abd79219dd
Use form request to check for valid category
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 15:26:24 +01:00
snipe
2b5463475c
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 15:25:26 +01:00
snipe
a7a1a377da
Added form request for consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 15:25:07 +01:00
snipe
a6b2f5df1d
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 15:24:56 +01:00
snipe
da2b64c96d
Added string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 15:24:08 +01:00
snipe
9e9b07f10f
Removed duplicate status check
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 15:23:59 +01:00
snipe
82743abadc
Cleans up the consumables index controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 14:15:18 +01:00
snipe
c1937b6ea8
Merge remote-tracking branch 'origin/develop'
2024-07-11 12:01:28 +01:00
snipe
498a443230
Derp
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 12:01:06 +01:00
snipe
7584c30722
Merge remote-tracking branch 'origin/develop'
2024-07-11 12:00:25 +01:00
snipe
34b49ef079
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 11:59:47 +01:00
Florent Bervas
d9a53460ff
Fix design inconsistency between assets and assigned assets in Print All Assigned report
2024-07-11 09:41:58 +00:00
snipe
62f4b75156
Merge remote-tracking branch 'origin/develop'
2024-07-11 10:08:25 +01:00
snipe
5364838fc0
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-07-11 10:08:10 +01:00
snipe
8be44f9cf2
Check for time until depreciated
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-11 10:07:58 +01:00
snipe
68136ea217
Merge pull request #15052 from snipe/jerm/handle-windows-ca-jank-in-upgrade-script
...
upgrade.php: If we're on windows, make sure we can load intermediate certificates
2024-07-11 09:11:37 +01:00
Godfrey M
1fa6a763bc
updated description
2024-07-10 11:09:57 -07:00
Godfrey M
726308bfd5
removed typo
2024-07-10 10:58:45 -07:00
Godfrey M
22ddb695f2
better description
2024-07-10 10:57:47 -07:00
Godfrey M
09b2feac54
updates assets with selected model to inherit asset model eol
2024-07-10 10:56:44 -07:00
Godfrey M
57e1df86c8
finds model and collects assets with such model
2024-07-10 10:21:24 -07:00
snipe
3d5b1b6c6d
Merge remote-tracking branch 'origin/develop'
2024-07-10 17:09:56 +01:00
snipe
ec063b4af5
Updated PHP min version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-10 17:07:44 +01:00
snipe
bfa42ff84a
Merge pull request #15051 from snipe/jerm/add-upgrade-script-debugging
...
upgrade.php: More helpful output when we can't read .upgrade_requirements.json
2024-07-10 16:51:30 +01:00
snipe
5f4ee39f2b
Merge remote-tracking branch 'origin/develop'
2024-07-10 16:13:00 +01:00
snipe
22aca1af53
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-10 16:12:20 +01:00
snipe
45d7e2dc42
Merge remote-tracking branch 'origin/develop'
2024-07-10 08:56:29 +01:00
snipe
71a5d07698
Fixes #15056 - only try to load avatars if one exists or default is set
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-10 08:56:14 +01:00
snipe
fb10c1439a
Merge pull request #15057 from spencerrlongg/bug/sc-23212-2
...
Fixes Potential Exception
2024-07-10 08:27:59 +01:00
snipe
c58c592fb0
Merge pull request #15059 from Godmartinz/export_options
...
Fixed missing print user assigned filter
2024-07-10 08:25:24 +01:00
spencerrlongg
6932a63217
make some naming a little clearer
2024-07-09 16:32:44 -05:00
snipe
18f7ca860d
Merge remote-tracking branch 'origin/develop'
2024-07-09 19:52:20 +01:00
snipe
1a1ccd6bdc
Type constrains one more time - who thought this was a good idea?
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-09 19:50:58 +01:00
Godfrey M
624632d0ca
removed push and endpush
2024-07-09 11:41:31 -07:00
spencerrlongg
66255291da
test working
2024-07-09 11:13:06 -05:00
spencerrlongg
33b2c7b78a
push so i can do something else
2024-07-09 10:35:16 -05:00
snipe
ea881ff95e
Merge remote-tracking branch 'origin/develop'
2024-07-09 13:42:03 +01:00
snipe
34e1ff88db
Added StreamedResponse
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-09 13:41:50 +01:00
snipe
c1916d6fe4
Merge remote-tracking branch 'origin/develop'
2024-07-09 13:39:07 +01:00
snipe
f4ffbcf76e
Fixed wonky layout on accessory files
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-09 13:38:50 +01:00
snipe
da9932d147
Merge remote-tracking branch 'origin/develop'
2024-07-09 13:36:06 +01:00
snipe
8a547dab20
Fixed type constraint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-09 13:35:57 +01:00
snipe
14fa5d778d
Merge pull request #15055 from snipe/more_translations
...
Fixed API key missing translations
2024-07-09 13:19:46 +01:00
snipe
5597992d63
Fixed API key missing translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-09 13:17:46 +01:00
snipe
da42127a7c
Merge remote-tracking branch 'origin/develop'
2024-07-09 11:54:17 +01:00
snipe
595408d21f
On more binaryfile response
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-09 11:54:07 +01:00
snipe
090410edb5
Merge remote-tracking branch 'origin/develop'
2024-07-09 11:48:30 +01:00
snipe
491a0f3959
One more typehint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-09 11:47:53 +01:00
Jeremy Price
c8fe002688
upgrade.php: If we're on windows, make sure we can load intermediate certificates
...
According to https://github.com/curl/curl/issues/12155 and 2d6333101a
Some corporate Windows proxy (mis)configurations don't pass along
intermediate certificates in their TLS handshakes, breaking lots of
things that don't work around it.
This creates a problem in our curl calls when checking for
.upgrade_requirements.json, and seems to be the source of errors for a
few of our users: https://github.com/snipe/snipe-it/issues/14826#issuecomment-2197611342
In this change, we detect when running on windows environments and load
the curl option that works around this.
2024-07-08 22:13:14 -07:00
Jeremy Price
25fabcc1be
More helpful output when we can't read .upgrade_requirements.json
...
Handle json decode errors and display the raw output in such cases, to
better understand what's happening and help debugging
2024-07-08 22:12:09 -07:00
snipe
43d4bc8dc4
Merge remote-tracking branch 'origin/develop'
2024-07-08 22:13:19 +01:00
snipe
09cc9b92d1
Fixed #15050 - erroneous deleted remark
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 22:13:07 +01:00
snipe
ebcc48ec80
Merge remote-tracking branch 'origin/develop'
2024-07-08 22:02:25 +01:00
snipe
bf060d43a7
Fixed typehint on assets controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 22:02:11 +01:00
snipe
9b838cedd1
Fixed typehint on asset model files
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 22:00:45 +01:00
snipe
5ca62f3ef8
Merge remote-tracking branch 'origin/develop'
2024-07-08 21:39:31 +01:00
snipe
abf194fbcf
Added default avatar into repo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 21:38:25 +01:00
snipe
211f98e971
Revert
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 21:38:03 +01:00
snipe
7f1931af9c
Grr
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 21:37:17 +01:00
snipe
7dcb45d7f3
Skip default.png as default
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 21:33:56 +01:00
spencerrlongg
8650923b01
new branch cuz test merge
2024-07-08 12:55:59 -05:00
snipe
9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes
...
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
2024-07-08 17:43:50 +01:00
snipe
202f5077de
Removed return
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 17:41:20 +01:00
snipe
4c19b4d831
Added aria-hidden="true" to error icon for accessibility
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 17:39:38 +01:00
snipe
3ae16ff8ca
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-07-08 15:53:42 +01:00
snipe
f3bf74a540
Updated language files
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 15:51:19 +01:00
snipe
de6a230838
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 15:35:35 +01:00
snipe
2e2f59b290
Updated production assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 15:29:36 +01:00
snipe
cf92dde1ca
Merge pull request #15046 from snipe/localize_bootstrap_table
...
Added localization for bootstrap-tables
2024-07-08 15:20:39 +01:00
snipe
86c0a3ecad
Added localization for bootstrap-tables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 15:12:37 +01:00
snipe
3b3a7e2757
Added more PHP in pgsql tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 14:58:26 +01:00
snipe
c72b36b84a
Upgraded acorn from 8.11.3 to 8.12.0
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 14:40:26 +01:00
snipe
ee1afc63f9
Merge pull request #15045 from snipe/snyk/upgrade-jquery_validation
...
Snyk - Updated jquery validation
2024-07-08 14:38:14 +01:00
snipe
8438652e7d
Updated jquery validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 14:30:06 +01:00
snipe
c16db436d3
Merge remote-tracking branch 'origin/develop'
2024-07-08 13:21:38 +01:00
snipe
ac9df2fc08
Merge pull request #15043 from snipe/fixes/custom_fields_on_audit
...
Fixed #15037 - Removed custom fieldsets on auditing - it’s not used (yet)
2024-07-08 13:20:59 +01:00
snipe
eba24b9242
Removed custom fieldsets on auditing - it’s not used
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-08 13:19:05 +01:00
snipe
8c6ecd35ec
Added more basic tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 11:56:24 +01:00
snipe
e98823f7fa
Added 403 to sad panda page
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 11:54:49 +01:00
snipe
a8ddb2f44a
Added non-circular tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 11:29:30 +01:00
snipe
f32bf35c22
Fixed another rename :-/
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 10:50:03 +01:00
snipe
978a0272a5
Sigh. Renamed again
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 08:37:31 +01:00
snipe
283f24b213
Derp. Renamed file
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 08:34:17 +01:00
snipe
97775fb790
Location test additions
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 08:29:00 +01:00
snipe
7455bf329d
Added more locations tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 08:21:31 +01:00
snipe
24ad74f136
Updated factories
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 08:21:18 +01:00
snipe
16d65631aa
Removed duplicate tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 07:54:22 +01:00
snipe
0a7e053985
Added basic Department UI tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 07:53:02 +01:00
snipe
1d65781d8d
More type-hinting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 07:07:20 +01:00
snipe
0d6fd2643d
More tweaks to the form request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 05:59:39 +01:00
snipe
b3cc7b1578
More tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 05:59:28 +01:00
snipe
2a796fdc09
Format error
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 03:23:48 +01:00
snipe
a0914ccb28
Fleshed out tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 03:22:56 +01:00
snipe
efb9d107cf
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 03:22:03 +01:00
snipe
34bde52f74
Fixed typos
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 03:21:34 +01:00
snipe
75da626c85
Check for category ID
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 03:21:24 +01:00
snipe
1d45e0df79
Added model create test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 03:20:54 +01:00
snipe
5ebcc3b1a0
More type hinting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 02:36:55 +01:00
snipe
6da6411f3b
Added location API index test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 01:46:36 +01:00
snipe
4089b4cd68
Added category tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 01:46:09 +01:00
snipe
96d1aea54a
More cleanup
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 00:54:50 +01:00
snipe
8baef8d7c5
Derp. Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 00:26:28 +01:00
snipe
7215746d7a
Prevent users from editing category types if there are still items
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 00:23:02 +01:00
snipe
6761ff44cc
Removed parens
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 00:22:46 +01:00
snipe
1f28bf14c1
Added category tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-05 00:21:58 +01:00
snipe
d3b62aa918
Few more
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 22:52:49 +01:00
snipe
a1eafc108d
Moar typehinting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 22:37:58 +01:00
snipe
7330bf5832
Check for invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 21:52:47 +01:00
snipe
d834ef5104
Updated string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 21:52:37 +01:00
snipe
ef56f599d2
Use asset model request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 21:52:29 +01:00
snipe
0f43b3f8f9
Added another test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 21:52:16 +01:00
snipe
c570759370
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 21:14:58 +01:00
snipe
066ec8e26e
Added (failing) tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 20:50:18 +01:00
snipe
cc6f1cd585
Added asset model request :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 20:50:11 +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
e98284fff5
Modernized helpers and use statements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 20:48:35 +01:00
snipe
89f01d75d7
Updated test names, added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 19:59:10 +01:00
snipe
8eb68d3901
Merge remote-tracking branch 'origin/develop'
2024-07-04 17:10:43 +01:00
snipe
edd61705dc
Merge pull request #15027 from snipe/feature/sc-26112/allow_default_avatar
...
Added #15015 - ability for admins to select default avatar
2024-07-04 17:10:10 +01:00
snipe
3f20e29901
Moved gthe settings for remote loading to the branding section
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:55:47 +01:00
snipe
36ae162626
Changed my mind :)
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:48:05 +01:00
snipe
00f7cb9dbb
Reverse the order for default gravatar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:46:12 +01:00
snipe
1ca3dc26eb
Removed extra debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:36:48 +01:00
snipe
2f3be267b3
Added some logic around deleting images
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:33:22 +01:00
snipe
5b8f6910fb
Marked tests as incomplete :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:33:08 +01:00
snipe
9fe26ba814
Reverted the validation - might have an impact on quickstart setup
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:25:39 +01:00
snipe
5e97ed1c7e
Added migration
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:24:11 +01:00
snipe
947fb7af7a
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:24:03 +01:00
snipe
44bcc157e5
Updated icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:23:46 +01:00
snipe
278bf3da13
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:23:38 +01:00
snipe
446bc81d3a
Updated presenter to use new avatar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:23:31 +01:00
snipe
9527aac242
Make site name required at the model
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:23:17 +01:00
snipe
c57f1f9d7d
Use null coalescence
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:22:56 +01:00
snipe
e372527d13
Added default_avatar to settings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:22:36 +01:00
snipe
96be1e1275
Removed duplicate locale directive
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 02:14:10 +01:00
snipe
8ce17d0585
Merge pull request #15025 from snipe/security/upgrade_webpack
...
Upgrade webpack from 5.91.0 to 5.92.0 #15008
2024-07-04 01:08:17 +01:00
snipe
6af1eaa4e4
Updated webpack to 5.92
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 01:07:26 +01:00
snipe
da01487301
Merge pull request #15023 from snipe/improvements/optimize_queries_for_user_bulk_actions
...
Added files column to bulk user delete, optimized queries
2024-07-03 23:45:09 +01:00
snipe
708d7b5fc5
Use icons for consistency
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 23:43:44 +01:00
snipe
62b5a159a9
Added files column
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 23:31:09 +01:00
snipe
fc7809192d
Merge remote-tracking branch 'origin/develop'
2024-07-03 23:20:24 +01:00
snipe
a6d04509a5
Merge pull request #15016 from snipe/improved_user_merge
...
Fixed #15005 - Improvements on user merge
2024-07-03 23:19:50 +01:00
snipe
0071596274
Added upload count
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 23:18:43 +01:00
snipe
59f66051f8
More eager loading
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 23:18:37 +01:00
snipe
9f1e59cf78
Marcus’ nitpicks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 23:01:41 +01:00
snipe
f1f68b8ef6
Merge pull request #15022 from spencerrlongg/livewire-delete-button
...
Resolved Potential Issue when Deleting Personal Access Tokens
2024-07-03 22:24:25 +01:00
snipe
f22c3cdda9
Merge pull request #15021 from snipe/fixes/removed_non_counts
...
Removed non-counts from allowed array
2024-07-03 22:21:17 +01:00
snipe
5e15cc3bbe
Added markIncompleteIfSqlite() method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 22:18:31 +01:00
spencerrlongg
a6690493b0
resolved
2024-07-03 16:12:55 -05:00
snipe
17a6335d13
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 22:12:06 +01:00
akemidx
ca57f6de85
adding in item=>asset, missed in first commit
2024-07-03 17:07:50 -04:00
snipe
aefaabdb1a
Removed non-counts from allowed array
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 21:40:43 +01:00
snipe
9211c8d3b1
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:57:21 +01:00
snipe
eff1980df5
Added console test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:52:22 +01:00
snipe
1553ba5630
Added null coalescence for admin id in case via cli
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:52:12 +01:00
snipe
ec24120d2a
Allow admin to be nullable (for cli)
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:50:35 +01:00
snipe
50df750202
Add merge event
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:50:23 +01:00
snipe
dab4aced48
Renamed test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:50:09 +01:00
snipe
1774952312
Added additional assertions
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:19:12 +01:00
snipe
d66d6e70a6
Added checkedOutToUser factory for consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:18:53 +01:00
snipe
4635e9269d
Added user update log factory
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 20:18:34 +01:00
snipe
574867536d
Standardize query for merging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 19:41:34 +01:00
snipe
5488a4d118
One more test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 14:36:27 +01:00
snipe
e34f3c7c2c
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 14:32:41 +01:00
snipe
ceaff7b645
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 14:30:11 +01:00
snipe
d27a025347
Added factories
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 14:30:06 +01:00
snipe
2b2853a183
Added acceptance model
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 14:29:58 +01:00
snipe
a25263f868
Transfer files and acceptances on merge
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 14:29:49 +01:00
snipe
4b9727067b
Merge pull request #15010 from snipe/fixes/translation_strings
...
Added missing translations
2024-07-03 12:43:50 +01:00
snipe
00fc392a12
Added missing traslations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-03 12:41:04 +01:00
spencerrlongg
e79111fed5
fix test :(
2024-07-02 16:01:18 -05:00
spencerrlongg
423b48279b
merge
2024-07-02 15:53:28 -05:00
spencerrlongg
6f29c0a7cf
Merge branch 'refs/heads/develop' into bug/sc-24884
...
# Conflicts:
# routes/api.php
2024-07-02 15:48:39 -05:00
snipe
27bc16604b
Add @Galaxy102 as a contributor
2024-07-02 09:48:32 +01:00
snipe
86ae4a3513
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-07-02 09:37:40 +01:00
snipe
1da90fe1ec
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-02 09:37:05 +01:00
snipe
25ba50d6f7
Merge pull request #14870 from Galaxy102/feature/rotate-labels
...
Add Label Template: Use with endless 62mm Brother printer rolls
2024-07-02 08:45:42 +01:00
snipe
f22e99aec8
Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades
...
Use more modern reference for input text
2024-07-02 08:43:34 +01:00
snipe
f027fd5f21
Merge pull request #14986 from marcusmoore/bug/sc-25926
...
Fixed extension requirement checking in upgrade script
2024-07-02 08:42:45 +01:00
snipe
37a038c24f
Merge pull request #15001 from marcusmoore/features/link-user-table-counts-to-section
...
Added links on user table to tabs on show user page
2024-07-02 08:37:05 +01:00
spencerrlongg
0b60cbc531
remove $rules2
2024-07-01 19:37:49 -05:00
Marcus Moore
3a8f825de5
Link user table counts to section in user show
2024-07-01 14:06:05 -07:00
snipe
d2df83cf2f
Merge pull request #14999 from marcusmoore/fixes/hide-edit-profile-button
...
Removed "Edit Your Profile" button from View Assets page if user is not able to edit their profile
2024-07-01 18:15:47 +01:00
Marcus Moore
d481850d4c
Add @can around Edit Your Profile button on view assets page
2024-07-01 10:11:27 -07:00
snipe
e502968707
Prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-01 10:00:28 +01:00
snipe
12dcac4994
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-07-01 10:00:15 +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
Marcus Moore
0a5e58201a
Correctly account for "or" dependent extensions in upgrade script
2024-06-27 12:38:50 -07:00
snipe
d687b20467
Use more modern reference for input text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-27 15:05:47 +01:00
snipe
7dbcedad40
Merge pull request #14981 from uberbrady/fix_backup_translations
...
Fixed #14976 , #14975 , #14973 - Translation strings aren't always working
2024-06-27 14:36:52 +01:00
snipe
b6e8d28ed3
Merge pull request #14982 from snipe/fixes/check_for_user_on_patch_api
...
Check that the user exists before trying to fill the request
2024-06-27 14:36:21 +01:00
snipe
85ce47f5bb
Updated tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-27 14:21:27 +01:00
snipe
55c98cc27a
Check that the user exists before trying to fill the request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-27 14:05:28 +01:00
snipe
422f3ec81e
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-27 13:53:38 +01:00
snipe
54fb91c03b
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3
...
Updated Livewire to v3
2024-06-27 13:21:52 +01:00
Brady Wetherington
6df9742664
Built a workaround for backup notification translations
2024-06-27 13:17:16 +01:00
snipe
f23a221750
Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms
...
WIP - First start at switching to regular html labels
2024-06-27 13:12:29 +01:00
snipe
1837da4508
Merge branch 'develop'
2024-06-26 13:46:40 +01:00
snipe
4637accb51
Built assets, bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-26 13:35:24 +01:00
snipe
74f067d893
Merge pull request #14974 from uberbrady/improve_saml_behind_proxy
...
Fixed #14895 and #14919 - set SAML baseurl to a sensible default for docker users and users behind a reverse proxy
2024-06-26 13:34:18 +01:00
snipe
43773954cd
Merge pull request #14966 from Godmartinz/css_issue
...
Fixed importer table background color
2024-06-26 13:33:14 +01:00
Brady Wetherington
30cafef9f2
Add a reasonable-looking SAML baseurl, mosty for users behind proxies
2024-06-26 13:25:11 +01:00
snipe
e1a6b441d7
Merge remote-tracking branch 'origin/develop'
2024-06-26 12:53:18 +01:00
snipe
251f2d82b3
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-26 12:53:03 +01:00
snipe
e905550778
Merge pull request #14971 from snipe/fixes/updated_translation_string
...
Fixes #14968 - translate forbidden page
2024-06-26 11:25:51 +01:00
snipe
adee99db34
Fixes #14968 - translate forbidden page
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-26 11:21:56 +01:00
Godfrey M
eda2eb2283
fixes all dark modes
2024-06-25 10:24:35 -07:00
Godfrey M
a7123a04ba
fixes importer background color
2024-06-25 10:19:18 -07:00
Marcus Moore
8a562f1d15
Bump Livewire to 3.5.1
2024-06-25 10:16:44 -07:00
Marcus Moore
d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# composer.lock
2024-06-25 10:15:50 -07:00
snipe
8971cc4b8b
Merge pull request #14963 from snipe/fixes/updated_translation_string
...
Added avif to translation string
2024-06-25 13:45:10 +01:00
snipe
bca6dd41d2
Added avif to translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-25 13:39:36 +01:00
snipe
23c1d664fe
Prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 22:07:01 +01:00
snipe
c891342fdb
Bumoed version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 22:06:52 +01:00
snipe
221c4eeb0c
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 21:59:27 +01:00
snipe
bbb1fbfbe8
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 21:59:09 +01:00
snipe
5a874a90ac
Merge pull request #14951 from snipe/features/disallow_profile_editing
...
Added ability to disallow profile editing
2024-06-24 14:11:48 +01:00
snipe
1c14c2fdef
Added gates to controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:05:21 +01:00
snipe
73a038afd4
Save new setting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:03:01 +01:00
snipe
4d55765e28
Added checkbox to settings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:02:53 +01:00
snipe
2b43f3cb84
Added gate to auth service provider
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:02:40 +01: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
aa5fe52e89
Added gate in blade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:01:56 +01:00
snipe
ce107dd688
New strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:01:39 +01:00
snipe
72affd7a5b
Added migration
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:01:31 +01:00
snipe
ba4c51dd68
Removed duplicate key
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:01:25 +01:00
snipe
294fb1f774
Merge pull request #14925 from snipe/fixes/added_2fa_string
...
Additional translation strings
2024-06-24 12:11:45 +01:00
snipe
a846afe733
Merge pull request #14950 from snipe/localization/updated_strings_20240621
...
Updated translations
2024-06-24 11:44:06 +01:00
snipe
5fb3cea0bb
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 11:41:20 +01:00
snipe
4ae89c23cd
Merge pull request #14947 from snipe/dependabot/github_actions/develop/docker/build-push-action-6
...
Bump docker/build-push-action from 5 to 6
2024-06-24 11:27:04 +01:00
snipe
3d32fe662b
Merge pull request #14949 from snipe/fixes/depreciation_format
...
Check that there is a depreciation date before formatting
2024-06-24 11:11:43 +01:00
snipe
468674a517
Check that there is a depreciation date before formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 11:07:41 +01:00
dependabot[bot]
ebe4354a85
Bump docker/build-push-action from 5 to 6
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-06-24 08:14:34 +00:00
snipe
f47bc5ea7d
Updated hardware checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-23 19:40:52 +01:00
snipe
427615f627
Fiest start at switching to regular html labels
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-23 18:24:23 +01:00
snipe
829b560794
Merge pull request #14941 from snipe/updates/updated_phpunit
...
Updated PHPunit
2024-06-23 17:43:29 +01:00
snipe
f97a15c5c3
Updated PHPunit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-23 17:33:01 +01:00
snipe
25fcf523e3
Merge pull request #14937 from snipe/fixes/user_improvements
...
Fixed #14935 - improvements and more tests around user deletion
2024-06-22 21:41:07 +01:00
snipe
c1be94c4ad
Added another base test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 20:37:49 +01:00
snipe
3a05d72124
Based restore API test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 20:35:40 +01:00
snipe
7ec44e46ce
Added ability check for restoring users at all
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 20:35:28 +01:00
snipe
060b17df01
Pulled duplicated test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 20:34:49 +01:00
snipe
74c78d7577
Added back in commented out test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 20:09:04 +01:00
snipe
1ef0c1adac
Fixed tests! And added more!!
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 20:07:46 +01:00
snipe
c2e649e2bf
Fixed small permissions issue
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 20:07:37 +01:00
snipe
196db9718e
Use class name instead
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:55:58 +01:00
snipe
9f5b264e04
Normalize the tests between UI and API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:51:56 +01:00
snipe
3825f5fb61
Added more permissions tests to user delete UI
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:47:59 +01:00
snipe
e60dbc883c
Removed test code
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:42:34 +01:00
snipe
bbbfa91db9
Fixed wonky rule
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:40:26 +01:00
snipe
5ec8e2da66
Breaking tests :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:33:44 +01:00
snipe
9e59bd5687
Cleaned up controller code a bit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:33:36 +01:00
snipe
1d26ccac4e
Check for the additional auth for that user
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:33:06 +01:00
snipe
0e2526f627
Removed comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 19:32:49 +01:00
snipe
dd9e9c7a6d
Fixed return types
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 18:49:49 +01:00
snipe
e19922abd0
Cleaned up UI controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 18:49:35 +01:00
snipe
d27bde6047
Added deleted factory for tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 18:36:24 +01:00
snipe
61f76dedc6
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 18:36:08 +01:00
snipe
06737f45ad
Added test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 18:36:02 +01:00
snipe
65e8765bdd
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 17:45:42 +01:00
snipe
c6a0212384
Merge remote-tracking branch 'origin/master' into develop
2024-06-22 17:33:12 +01:00
snipe
e03614d91b
Added withtrashed back in
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 16:40:32 +01:00
snipe
b82770d0a8
One more small fix
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 16:38:29 +01:00
snipe
55e1326164
Fixed #14935 - user does not exist
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-22 16:24:18 +01:00
snipe
b0aff68c8b
Merge pull request #14934 from snipe/tests/added_workflow_for_php_8_3
...
Added php 8.3 test
2024-06-21 22:04:05 +01:00
snipe
6a99855c8c
Added php 8.3 test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-21 21:47:40 +01:00
snipe
665aa6eb23
Merge pull request #14924 from snipe/fixes/possible_nicer_handling_for_defaultStatusLabel
...
Possible fix for #14915 - error on import when status label is not provided and no deployable statuses can be found
2024-06-21 21:37:22 +01:00
snipe
42caacbaf9
Merge pull request #14932 from snipe/fixes/small_deprecations
...
Fixed small deprecation warnings for PHP8.2
2024-06-21 21:26:16 +01:00
snipe
3531256c3f
Fixed deprecations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-21 21:06:43 +01:00
snipe
9a0db72eb4
More strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 15:40:38 +01:00
snipe
e11a42cf68
Re-use login string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 15:32:00 +01:00
snipe
114769c2d9
Made requestable items more generic in translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 15:26:45 +01:00
snipe
9594596b8a
Fixed another hard-coded string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 15:22:27 +01:00
snipe
69cf697aa3
Added 2fa translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 15:20:52 +01:00
snipe
45dbe5cb77
Return the id, not the entire status label
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 15:05:38 +01:00
snipe
a1ff35f6ce
Possible fix for #14915
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 14:47:46 +01:00
snipe
077a6949e2
docs: add @Tyree as a contributor
2024-06-20 14:42:19 +01:00
snipe
44022f07ca
docs: update @bryanlopezinc as a contributor
2024-06-20 14:41:22 +01:00
snipe
30c1e1e86a
Merge remote-tracking branch 'origin/develop'
2024-06-20 14:32:46 +01:00
snipe
9a90813877
Merge pull request #14923 from snipe/localizations/updated_strings
...
Updated language strings
2024-06-20 14:29:13 +01:00
snipe
1113218c6c
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 14:23:15 +01:00
snipe
2556c80250
Merge pull request #14922 from snipe/fixes/incorrect_translation_path
...
Fixed incorrect translation path
2024-06-20 14:10:32 +01:00
snipe
8f8a5c639b
Updated profile translation string path
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 14:09:25 +01:00
snipe
9e9c37c1e8
Fixed weird linebreaks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 14:09:11 +01:00
snipe
6cbdbcb1f1
Merge pull request #14791 from Godmartinz/label-option-limit
...
Added some style changes in label field selector for the `DefaultLabel` template
2024-06-20 13:51:49 +01:00
snipe
c8835bf5db
Merge remote-tracking branch 'origin/develop'
2024-06-20 13:40:37 +01:00
snipe
6dfedac7a7
Merge pull request #14912 from bryanlopezinc/addIsWritableTest
...
Add storage path permissions test
2024-06-20 13:38:56 +01:00
snipe
83794eaf33
Merge pull request #14921 from snipe/fixes/14918_added_lastname_dot_firstname
...
Added lastname.firstname as email format
2024-06-20 13:38:30 +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
66ffe21ce2
Merge remote-tracking branch 'origin/develop'
2024-06-20 13:09:54 +01:00
snipe
f2e86b7d30
Merge pull request #14920 from snipe/fixes/backup_notifications
...
Fixed backup notification translations
2024-06-20 13:09:26 +01:00
snipe
5251e6787d
Use two-letter fallback code
...
Ugh, I hate this
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 12:58:00 +01:00
snipe
856aee0a72
Updated laravel-backup
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 12:57:35 +01:00
snipe
6b4c71f966
Updated config
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 12:57:25 +01:00
snipe
dd6d040da5
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 12:56:43 +01:00
bryanlopezinc
203b60383f
Added storage path permissions test for SettingsController@getSetupIndex
2024-06-19 17:46:59 +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
98662c2a77
Merge pull request #14908 from snipe/fixes/importer_audit_date
...
Fixes/importer audit date
2024-06-19 11:12:12 +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
71c9b03779
Fixed incorrect field name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-19 11:05:22 +01:00
snipe
dc7b9315b5
Merge remote-tracking branch 'origin/develop'
2024-06-19 10:35:54 +01:00
snipe
6c17b141db
Removed duplicate locations_id search
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-19 10:35:21 +01:00
snipe
5d2cca855e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-06-19 10:31:04 +01:00
snipe
61e10be04d
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-19 10:29:50 +01:00
snipe
20d5587851
Merge remote-tracking branch 'origin/develop'
2024-06-19 10:23:18 +01:00
snipe
d8eccf03f1
Merge pull request #14896 from snipe/fixes/tls_loading
...
Possible fix for proxy/reverse proxy
2024-06-19 10:22:36 +01:00
snipe
6e40b58dc5
Merge remote-tracking branch 'origin/develop'
2024-06-19 01:21:52 +01:00
Marcus Moore
30dd8bcf2b
Update Livewire
2024-06-18 15:10:59 -07:00
Marcus Moore
f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# composer.lock
2024-06-18 15:10:46 -07:00
snipe
b8882fa00e
Merge pull request #14900 from marcusmoore/fixes/81-install
...
Fixed unable to install on PHP 8.1
2024-06-18 21:53:30 +01:00
Marcus Moore
af337b7018
Move debugbar back to dev dependencies but without updating other packages
2024-06-18 09:46:08 -07:00
Marcus Moore
f60267d208
Revert "Reverted debugbar back into require vs require-dev"
...
This reverts commit ce338c632d .
2024-06-18 09:42:21 -07:00
snipe
a0c844f4f6
Merge remote-tracking branch 'origin/develop'
2024-06-18 16:12:20 +01:00
snipe
7b84b92e72
Merge pull request #14899 from snipe/fixes/revert_debugbar_dev
...
Fixed #14898 - (regression) Reverted debugbar back into require vs require-dev
2024-06-18 16:09:51 +01:00
snipe
ce338c632d
Reverted debugbar back into require vs require-dev
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-18 16:06:38 +01:00
snipe
d9f70c16f7
Possible fix proxy/reverse proxy
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-18 14:44:35 +01:00
snipe
d0299de898
Merge remote-tracking branch 'origin/develop'
2024-06-18 11:25:55 +01:00
snipe
9380c9ec81
Merge pull request #14894 from snipe/fixes/14882_archived_scoping_on_models
...
Fixed #14882 - Properly scope archived based on settings
2024-06-18 11:24:55 +01:00
snipe
941582ac2a
Properly scope archived based on settings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-18 10:27:11 +01:00
snipe
04560b4475
Merge remote-tracking branch 'origin/develop'
2024-06-18 10:13:57 +01:00
snipe
0b30ad0da2
Removed test file - #14890
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-18 10:12:57 +01:00
snipe
cb6ea2c6fb
Merge remote-tracking branch 'origin/develop'
2024-06-18 09:59:43 +01:00
snipe
89a5bbb10e
Merge pull request #14893 from snipe/fixes/rb_3792_ambiguous_query
...
Prefaced fields with “users” for clarity
2024-06-18 09:58:44 +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
6c6a3649ea
Production assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-18 09:33:07 +01:00
snipe
05b97db747
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-06-18 09:32:30 +01:00
snipe
543e4c0666
Bumped version file
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-18 09:31:49 +01:00
snipe
e28619f769
Bumped papaparse library
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-18 09:30:24 +01:00
snipe
4d8c2d3f4e
Merge pull request #14886 from marcusmoore/fixes/debugbar
...
Bumped debugbar from v3.13.0 to v3.13.5 to fix issue with session messages
2024-06-18 09:22:18 +01:00
snipe
f53eeb8b33
Merge pull request #14887 from marcusmoore/fixes/fix-test-namespace
...
Fixed namespace for ViewUserTest
2024-06-18 09:20:58 +01:00
snipe
aba6d9b338
Merge pull request #14885 from marcusmoore/tests/asset-model-test-improvements
...
Added more tests around Asset Model
2024-06-18 09:20:45 +01:00
snipe
cd5bef414c
Merge pull request #14884 from marcusmoore/fix/actionlogcontroller-fix
...
Fixed missing `}`
2024-06-18 09:20:26 +01:00
Marcus Moore
4f2d2ae4b8
Fix namespace for ViewUserTest
2024-06-17 16:37:24 -07:00
Marcus Moore
1bd0ab7389
Move barryvdh/laravel-debugbar from require to require-dev
2024-06-17 16:28:08 -07:00
Marcus Moore
8799276c6e
Bump debugbar from v3.13.0 to v3.13.5
2024-06-17 16:25:39 -07:00
Marcus Moore
672aabf4ac
Add more tests for Asset Model index and store methods
2024-06-17 14:51:59 -07:00
Marcus Moore
796d6909d5
Add missing }
2024-06-17 14:40:06 -07:00
Marcus Moore
a3dea99bbb
Fix category edit form component
2024-06-17 14:24:16 -07:00
Marcus Moore
fc351a1896
Remove .live from oauth clients
2024-06-17 13:03:27 -07:00
Marcus Moore
d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# resources/views/livewire/oauth-clients.blade.php
2024-06-17 12:57:04 -07:00
snipe
cbb5b6e846
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-06-17 15:58:27 +01:00
snipe
08bd39dbba
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 15:57:32 +01:00
snipe
430808e180
Merge remote-tracking branch 'origin/develop'
2024-06-17 15:52:13 +01:00
snipe
6976dc2b26
Merge pull request #14879 from snipe/fixes/better_ui_for_oauth
...
Fixed weird layout in admin oauth [sc-25673]
2024-06-17 15:51:11 +01:00
snipe
27063d5bae
Fix weird layout in admin oauth [sc-25673]
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 15:44:07 +01:00
snipe
5be86b9dbb
Merge remote-tracking branch 'origin/develop'
2024-06-17 13:43:45 +01:00
snipe
afc78524fc
Merge pull request #14877 from snipe/fixes/spatie-backup-config
...
Updated config
2024-06-17 13:42:02 +01:00
snipe
eb33a2451f
Updated config
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 13:36:52 +01:00
snipe
891a0a0965
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-06-17 13:05:31 +01:00
snipe
50f0797850
Added aria hidden to icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 13:05:27 +01:00
snipe
36cdf0e0be
Merge pull request #14876 from snipe/fixes/small_footer_issues
...
Fixed small footer issues
2024-06-17 12:53:52 +01:00
snipe
d9cc3c3ec7
Removed extra divs
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 12:52:23 +01:00
snipe
069a1608de
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-06-17 12:10:13 +01:00
snipe
60accfd601
Bumped version file
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 12:09:30 +01:00
snipe
b1f2051b43
Merge remote-tracking branch 'origin/develop'
2024-06-17 11:58:11 +01:00
snipe
233e4af7f8
Added base asset models test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 11:57:30 +01:00
snipe
dc1b808a28
Fixed static request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 11:47:21 +01:00
snipe
91a423e60e
Bumped php max version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 11:27:55 +01:00
snipe
bd03a6d206
Production assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 11:18:44 +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
f3e82c2c80
Updated languages
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 10:59:17 +01:00
snipe
569f05a99e
Built prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 10:45:04 +01:00
snipe
ece7c22df9
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 10:44:20 +01:00
snipe
4eefd39172
Bumped requirements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 10:42:59 +01:00
snipe
daae5d6859
Merge pull request #14724 from phil-flip/develop
...
Added Proper Docker Compose and .env.docker-setup files
2024-06-16 15:49:15 +01:00
snipe
df76769a29
Merge pull request #14871 from marcusmoore/chore/move-test
...
Moved `AssetFilesTest`
2024-06-13 23:10:36 +01:00
Marcus Moore
fe72639925
Move AssetFilesTest
2024-06-13 14:25:25 -07:00
Marcus Moore
c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3
2024-06-12 15:12:40 -07:00
snipe
cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks
...
Importer tweaks
2024-06-12 12:51:11 +01:00
snipe
a8b47a55bc
Merge pull request #14801 from snipe/fixes/companyable_trait_on_users
...
Allow CompanyableTrait trait on users
2024-06-12 12:42:56 +01:00
snipe
3159fdec9f
FFS
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-12 12:40:43 +01:00
snipe
ea990a5381
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-12 12:31:41 +01:00
snipe
134183ef16
Shuffled tests around again
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-12 12:12:15 +01:00
snipe
67ab2536bc
Updated test names
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-12 12:03:33 +01:00
snipe
756a2ac25c
Added API tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-12 11:58:12 +01:00
snipe
acaceb4103
Moved tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-12 11:57:50 +01:00
snipe
7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users
2024-06-12 11:27:26 +01:00
snipe
1ca9bb5aa8
Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api
...
Added #9413 : Asset file upload from API
2024-06-12 11:18:06 +01:00
snipe
c641b733e1
Merge pull request #14834 from bryanlopezinc/AddAppUrlTest
...
Added test for app url config
2024-06-12 11:14:17 +01:00
snipe
16cf6bc852
Merge pull request #14843 from marcusmoore/chore/sc-25767
...
Added GitHub workflow for tests in Postgres
2024-06-12 09:53:55 +01:00
Marcus Moore
c51b7d7104
Inline variable
2024-06-10 12:22:23 -07:00
Marcus Moore
5c0ca92fd7
Switch to using workflow_dispatch for PostgreSQL tests
2024-06-10 10:24:10 -07:00
snipe
241e9bc253
Merge pull request #14847 from uberbrady/users_index_api_optimization
...
Optimization for listings of large numbers of users
2024-06-10 13:57:49 +01:00
Brady Wetherington
c8820adb56
Add two new 'with()' relationships to Users API index query
2024-06-10 13:29:53 +01:00
snipe
0f4c6dd5b0
Merge pull request #14830 from snipe/chore/sc-25756/better_validation_for_relations_on_delete
...
Better validation for relations on delete
2024-06-07 18:10:41 +01:00
snipe
f8ab9f62f6
Merge pull request #14842 from Godmartinz/adjust-preview-window
...
Fixed label preview window position
2024-06-07 18:09:56 +01:00
Phil
217ed03b8e
add DB_PORT
2024-06-07 12:04:10 +02:00
Godfrey M
77e6058e4c
remembers chosen label
2024-06-06 13:55:15 -07:00
Godfrey M
4a60026162
moves preview down by field definitions
2024-06-06 13:42:06 -07:00
Godfrey M
3621292a0e
removes unnecessary height
2024-06-06 13:28:05 -07:00
Marcus Moore
6c296ccf8e
Use "postgres" instead of "postgres:14"
2024-06-06 13:27:39 -07:00
Godfrey M
6df1c36011
oops
2024-06-06 13:24:02 -07:00
Marcus Moore
924da00f3e
Add Postgres GitHub workflow for tests
2024-06-06 13:21:00 -07:00
Godfrey M
44dae22a3c
adjust label preview window
2024-06-06 13:18:19 -07:00
bryanlopezinc
d35e251d6e
Added test for app url config
2024-06-05 21:46:43 +01:00
snipe
e19d2d6ec9
Merge pull request #14832 from snipe/fixes/added_consumables_to_inventory_email
...
Fixed #14812 - added consumables to individual inventory report
2024-06-05 20:42:35 +01:00
snipe
871255f28c
Fixed #14812 - added consumables to individual inventory report
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 20:40:45 +01:00
Marcus Moore
9044aa4ed9
Import class
2024-06-05 11:48:47 -07:00
Marcus Moore
60c7efae3c
Remove commented code
2024-06-05 11:48:10 -07:00
Marcus Moore
48fc6ca60e
Remove commented code
2024-06-05 11:46:57 -07:00
snipe
7ac315e1eb
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:50:45 +01:00
snipe
374c6845d6
Added test if user has assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:16:28 +01:00
snipe
c5cbe37007
Added view permissions for the redirects
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:13:51 +01:00
snipe
a2346e4666
Changed numbers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:09:57 +01:00
snipe
2479ccc4c6
Fixed accessory assignment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:07:18 +01:00
snipe
64dd8f5d65
Missed a use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:03:33 +01:00
snipe
47420a802a
More (failing) tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:02:04 +01:00
snipe
5cdb2b7163
Check that the user was not aready deleted
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 14:00:35 +01:00
snipe
d4c080c7e4
Use the form request on the UI controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 13:40:32 +01:00
snipe
065a47a446
Use the DeleteUser request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 13:28:44 +01:00
snipe
5bd9ecb8df
Created DeleteUser request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 13:28:37 +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
b0ddb26e73
Fixed variable name, $field
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
181bafd012
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
e054fc1ef1
Removed noisy import debugging, made nicer output
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +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
afe4e5d62e
Added date parser
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
52950f1322
Refactored date parsing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
026c80992e
Pull the log reference
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
0ee2b74ff3
Added date parsers for new date fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
3a0f7eca54
Put asset EOL date back in the Item Importer
...
I have no idea why this is necessary
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
f4d530b4b1
Removed filename column since it’s never worked
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
4ccbfb56a4
Make sure the status label is deployable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
d02904c9a3
Added new fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
c8279c0b99
Moved asset-only date stuff into the asset importer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
f4f184e115
Removed noisy debugging
...
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
9d56617caf
Moved expected checkin date on view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 10:28:35 +01:00
snipe
de7b8940fe
Merge pull request #14828 from fe80/fix/controller-signature-s3
...
fix(ActionlogController): add missin class Illuminate\Support\Facades…
2024-06-05 09:58:03 +01:00
snipe
09e94ec176
Reordered withTrashed() and find()
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 09:57:24 +01:00
snipe
832ceeba56
Fixed missing endpush
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 09:57:10 +01:00
fe80
ea7c3c8485
fix(ActionlogController): add missing class Illuminate\Support\Facades\Storage
2024-06-05 10:55:27 +02:00
snipe
bc36c8074e
Merge pull request #14807 from bryanlopezinc/AddTestToCheckEnvVisibility
...
Added test for .env visibility for setup page
2024-06-05 09:50:54 +01:00
snipe
9fccafa3ac
Merge pull request #14816 from uberbrady/hotfix_autoincrement_workaround
...
Don't save next autoincrement base if it's going to fail, next
2024-06-05 09:47:40 +01:00
snipe
fa083098fc
Merge pull request #14819 from snipe/localization/new_strings_2024_06_03
...
Updated strings
2024-06-05 09:46:41 +01:00
snipe
7688c437c0
Merge pull request #14824 from Godmartinz/select-2-redirect-fix
...
Fixed select 2 Behavior
2024-06-05 09:46:25 +01:00
snipe
697ac83040
Merge pull request #14825 from marcusmoore/chore/test-organization
...
Re-organized test suite
2024-06-05 09:46:08 +01:00
snipe
a742105c21
Merge pull request #14827 from fe80/fix/controller-signature-s3
...
fix(ActionlogController): correct signature image for s3 bucket
2024-06-05 09:40:21 +01:00
fe80
7a76ec9e02
fix(ActionlogController): correct signature image for s3 bucket
2024-06-05 10:08:15 +02:00
Marcus Moore
b2a0e7958b
Inject alpine on label engine page
2024-06-04 17:03:36 -07:00
Marcus Moore
99439f0a5c
Define property
2024-06-04 16:14:07 -07:00
Marcus Moore
ef91c8123e
Remove unneeded re-render of select2
2024-06-04 15:49:57 -07:00
Marcus Moore
5eb5742b3d
Define property
2024-06-04 15:49:39 -07:00
Marcus Moore
296cf3e34b
Update OauthClients component
2024-06-04 15:37:41 -07:00
Marcus Moore
e98c3f92c1
Update domain name
2024-06-04 10:49:29 -07:00
Marcus Moore
d202dfc225
Organize API tests into domains
2024-06-04 10:48:53 -07:00
Godfrey M
6202f6157a
fix select2 behavior
2024-06-04 08:41:00 -07:00
Marcus Moore
b1e8e5389b
Make most test names singular
2024-06-03 16:54:59 -07:00
Marcus Moore
95f6381da4
Update tests names to VerbNounTest
2024-06-03 16:53:15 -07:00
Marcus Moore
b07e3b4a91
Remove API from test class name
2024-06-03 16:50:56 -07:00
Marcus Moore
86bd9a2674
Move test method to existing test
2024-06-03 16:49:44 -07:00
Marcus Moore
29a36839aa
Move existing API checkin and checkout tests under domain directory
2024-06-03 16:29:53 -07:00
snipe
85cb7c92e7
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-03 20:44:40 +01:00
Brady Wetherington
e827bc9a07
Tests on asset tags that are maximum integers and *almost* maximum...
2024-06-03 17:31:56 +01:00
snipe
a6f19a1657
docs: add @U-H-T as a contributor
2024-06-03 17:06:43 +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
bc6c969f21
Merge pull request #14814 from snipe/dependabot/github_actions/develop/crowdin/github-action-2
...
Bump crowdin/github-action from 1 to 2
2024-06-03 16:58:10 +01:00
snipe
8f4ede7785
Merge pull request #14817 from snipe/fixes/hotfix_for_14815
...
Fixes #14815 - Fixed translation string
2024-06-03 16:48:54 +01:00
snipe
877adb082c
Fixed translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-03 16:40:52 +01:00
Brady Wetherington
90818bb147
Don't save next autoincrement base if it's going to fail, next
2024-06-03 15:58:57 +01:00
dependabot[bot]
f767a94c84
Bump crowdin/github-action from 1 to 2
...
Bumps [crowdin/github-action](https://github.com/crowdin/github-action ) from 1 to 2.
- [Release notes](https://github.com/crowdin/github-action/releases )
- [Commits](https://github.com/crowdin/github-action/compare/v1...v2 )
---
updated-dependencies:
- dependency-name: crowdin/github-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-06-03 08:18:51 +00:00
bryanlopezinc
89e50b94d3
Fix Failing sqlite test
2024-06-03 08:09:05 +01:00
snipe
c4d97d095f
Merge pull request #14809 from snipe/features/more_tests
...
Added a few more tests
2024-06-01 04:25:19 +01:00
snipe
67fb3f10d5
Tightened up tests with better checks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 04:24:47 +01:00
snipe
ea8d390596
MOAR TESTS
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 04:01:09 +01:00
snipe
cff382605c
Fixed some missing strings and checks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 04:01:04 +01:00
snipe
52af8afac2
Added company scoping test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 03:10:29 +01:00
snipe
03b0268dc2
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 03:00:45 +01:00
snipe
c09e93e288
Updated delete users API tests, moved non-API tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 02:59:04 +01:00
snipe
694e3b7f3a
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 00:42:16 +01:00
snipe
32c367090b
Updated test names
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 23:13:27 +01:00
snipe
abcfe2b757
Derp. Spelling.
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 23:12:13 +01:00
snipe
f7687008b7
Added more tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 23:10:59 +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
3f9a80942e
Removed manual companyable from non-API views
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 23:10:23 +01:00
snipe
dc62e393c3
Hotfix for user permissions
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 21:22:21 +01:00
snipe
46be0f6610
Merge pull request #14808 from snipe/fixes/small_redirect_tweaks
...
Small UI tweaks and redirects when asset model is invalid
2024-05-31 20:46:07 +01:00
snipe
dd0a16c3d5
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 20:42:32 +01:00
snipe
a15ed6eaee
Wrap disabled <a> links in a span for tooltips
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 19:29:29 +01:00
snipe
3005565bba
Slight tweak to language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 19:29:12 +01:00
snipe
cf45e7536f
Redirect with error if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:51:58 +01:00
snipe
1d97d95c10
UI and styling tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:48:34 +01:00
snipe
4a1b1675cb
Use storage helper
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:48:09 +01:00
snipe
8c5249ba4b
Disable buttons on view page if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:47:53 +01:00
snipe
b936591240
Warn and disable on checkout if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:47:34 +01:00
snipe
76e664d647
Warn and disable the checkout button if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:47:18 +01:00
snipe
0253c2a756
Lauout tweaks, warn and disable button if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:46:57 +01:00
snipe
d27613f55c
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:46:41 +01:00
snipe
ca8d478e87
Redirect if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 18:46:32 +01:00
bryanlopezinc
c63c17d49f
Added test for .env visibility for setup page
2024-05-31 17:33:57 +01:00
snipe
801e58d52e
Removed manual scoping
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 06:58:15 +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
45cfec5b29
Merge pull request #14797 from bryanlopezinc/AddTestsForSettings
...
Added test for setup page
2024-05-31 02:31:35 +01:00
Marcus Moore
5a9a231359
Remove alpinejs
2024-05-30 16:57:20 -07:00
Marcus Moore
1736bf5510
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# app/Livewire/LoginForm.php
# package.json
# resources/views/livewire/login-form.blade.php
2024-05-30 16:56:50 -07:00
snipe
ee8931f886
Merge pull request #14799 from marcusmoore/chore/remove-unused-component
...
Removed unused Livewire component
2024-05-31 00:54:43 +01:00
Marcus Moore
1a1b891309
Remove unused Login Livewire component
2024-05-30 16:49:05 -07:00
Marcus Moore
2eaac3d381
Fix select2 re-renders
2024-05-30 16:20:04 -07:00
Marcus Moore
f03249898a
Update id syntax in custom fields component
2024-05-30 16:12:52 -07:00
snipe
0981cfa902
Built assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-30 20:22:50 +01:00
snipe
37fbcfa22b
Merge pull request #14798 from Godmartinz/redirect_back_to_asset_fix
...
Fixed checkin option from appearing
2024-05-30 19:41:02 +01:00
Godfrey M
0ee441a976
adds hidden as well
2024-05-30 11:19:06 -07:00
Godfrey M
cf8de3baa9
fix checkin option from appearing
2024-05-30 11:11:35 -07:00
bryanlopezinc
404ee238a3
Added test for setup page
2024-05-30 14:37:24 +01:00
snipe
5a5d171ba2
Put session facade back - derp
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-30 14:15:08 +01:00
snipe
aadee068b3
Merge pull request #14740 from Godmartinz/redirect_back_to_asset
...
Added Redirect options to asset check in/out
2024-05-30 14:14:04 +01:00
snipe
a46e2ebfd8
Small tweaks to user export, user view translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-30 13:59:00 +01:00
snipe
f710b1aac3
Merge pull request #14614 from akemidx/feature/sc-19796
...
ADDED: Export User Permissions (Superuser & Admin)
2024-05-30 13:41:26 +01:00
snipe
f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset
2024-05-30 13:38:11 +01:00
snipe
bed8861179
Merge pull request #14796 from snipe/chore/sc-25715/axios
...
Upgraded axios
2024-05-30 13:17:23 +01:00
snipe
180d7b1b5b
Upgraded axios
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-30 13:13:25 +01:00
snipe
386416ee5d
Merge pull request #14795 from snipe/bug/sc-25687/papaparse
...
Upgraded papaparse
2024-05-30 13:04:00 +01:00
snipe
6b5aa91f3d
Upgraded papaparse
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-30 13:00:57 +01:00
Marcus Moore
e80b80f5d1
Remove manual livewire tags
2024-05-29 16:04:05 -07:00
Marcus Moore
9e35441281
Importer fixes
2024-05-29 15:50:42 -07:00
Godfrey M
e28ad50bec
fixes the color change
2024-05-29 15:34:08 -07:00
Scarzy
f48c5ee252
Fix an error message
2024-05-29 22:32:45 +01:00
Scarzy
98a94dec29
Change some errors to be 404
...
The asset or file was not found, so 500 wasn't the best choice of error
code
2024-05-29 22:17:36 +01:00
Marcus Moore
7d95e7765d
Add a few .prevents
2024-05-29 14:13:29 -07:00
Marcus Moore
ee75b30683
Enable legacy_model_binding
2024-05-29 14:06:27 -07:00
Scarzy
ca9d4e3155
Get the tests for download and delete working
2024-05-29 22:01:49 +01:00
Scarzy
633bcbb6c4
Get the file upload test working
...
Added the upload functionality to the get and delete tests, but I
currently don't seem to be able to reference the correct file ID
2024-05-29 22:01:49 +01:00
Scarzy
2d4af61e6c
Begin to add some tests
...
There is currently only really a test for listing, and only for the
empty list response
2024-05-29 22:01:49 +01:00
Scarzy
45329912e6
Give a better response to listing no files on an asset
...
HTTP500 was never a good choice. Now it sends back an empty array
2024-05-29 22:01:49 +01:00
Scarzy
b9d56a8ecc
Fix some routes
...
Names of some of the routes overlapped with others in an incompatible
way. This makes the names more distinct
2024-05-29 22:01:48 +01:00
Scarzy
91c1e53e52
Fix the test file location
2024-05-29 22:01:48 +01:00
Scarzy
73a87a8ea8
Add the framework of a test
2024-05-29 22:01:48 +01:00
Scarzy
bb0a614c39
Update some comments
2024-05-29 22:01:48 +01:00
Scarzy
f11ea79406
Add some sanity checks that the asset actually exists
2024-05-29 22:01:48 +01:00
Scarzy
e817b20840
Fix some responses to be more appropriate
...
Error/success was mixed up
2024-05-29 22:01:48 +01:00
Scarzy
516f766a44
Remove some debug code
2024-05-29 22:01:48 +01:00
Scarzy
f5791c79a5
Change the returns to be API appropriate
2024-05-29 22:01:48 +01:00
Scarzy
f6a1a76095
Add an endpoint for deleting a file
2024-05-29 22:01:48 +01:00
Scarzy
bbb9145744
Add an API endpoint to download files
2024-05-29 22:01:48 +01:00
Scarzy
194853d860
Remove a redundant line
2024-05-29 22:01:48 +01:00
Scarzy
92670d5711
Add the ability to list files for an asset
2024-05-29 22:01:48 +01:00
Scarzy
8a2ea971e1
Add an API assets files controller
...
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
2024-05-29 22:01:48 +01:00
Marcus Moore
8d924b60d7
Replace references to @this in importer
2024-05-29 13:51:57 -07:00
Marcus Moore
34595c266d
Update script tag
2024-05-29 13:16:30 -07:00
Marcus Moore
638ae9bdd5
Use new id method
2024-05-29 13:15:59 -07:00
Godfrey M
713ce7836f
add some css in label field selector
2024-05-29 13:07:33 -07:00
Marcus Moore
093c6652a8
Update select2 snippet for Livewire 3
2024-05-29 12:58:24 -07:00
Marcus Moore
17f0ac1eae
Set view correctly
2024-05-29 12:57:43 -07:00
Marcus Moore
43616d1874
Remove alpine reference from webpack
2024-05-29 12:30:20 -07:00
Marcus Moore
9dc4f2ca80
Migrate config
2024-05-29 12:24:17 -07:00
Marcus Moore
73e3ac7dd8
Migrate to $dispatch
2024-05-29 12:18:31 -07:00
Marcus Moore
8ff639913d
Migrate away from dispatchBrowserEvent()
2024-05-29 12:17:36 -07:00
Marcus Moore
45419586fe
Migrate away from wire:model.prevent
2024-05-29 12:11:33 -07:00
Marcus Moore
d8a480b2a8
Migrate to wire:model.blur
2024-05-29 12:11:02 -07:00
Marcus Moore
29d87246a2
Migrate away from wire:model.defer
2024-05-29 12:10:46 -07:00
Marcus Moore
58e638d3cb
Migrate to wire:model.live
2024-05-29 12:08:25 -07:00
Marcus Moore
b52380f376
Migrate to new namespace
2024-05-29 12:07:48 -07:00
Marcus Moore
4ae74fb7f6
Remove alpinejs from package.json
2024-05-29 12:06:54 -07:00
Marcus Moore
7d1acd3d79
Update Livewire via composer
2024-05-29 12:04:06 -07:00
snipe
12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout
...
Bulk Consumable Checkout
2024-05-29 19:42:25 +01:00
snipe
fba72e1e8d
Merge pull request #14789 from snipe/fixes/14781_broken_wrench_icon
...
Fixed #14781 - Fixed broken wrench icon on some browsers in manufacturer section
2024-05-29 19:23:21 +01:00
snipe
7bbee053c6
Updated fa icon call
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 19:19:45 +01:00
snipe
6ea1a3bacf
Merge pull request #14788 from snipe/security/Snyk-Upgrade-jquery-ui-from-1.13.2-to-1.13.3-#14735
...
Updated jquery-UI
2024-05-29 18:47:39 +01:00
snipe
603afe4466
Updated jquery-UI
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 18:44:39 +01:00
snipe
037ee8c07a
Merge pull request #14787 from snipe/fixes/return_redirect_fixes_for_docblock
...
Fixes path for redirect response
2024-05-29 18:28:00 +01:00
snipe
df1cef59d5
Fixes path for redirect response
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 18:01:40 +01:00
snipe
3fcd196c04
Merge pull request #14786 from snipe/security/upgrade_bs_tables
...
#14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5
2024-05-29 13:12:07 +01:00
snipe
8ee5e7cd0a
#14743 - Upgrade bootstrap-table from 1.22.3 to 1.22.5
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 13:10:46 +01:00
snipe
1ec85063ee
Merge pull request #14785 from snipe/fixes/updates_facade_paths
...
Fixed/updated facade paths
2024-05-29 13:03:13 +01:00
snipe
92ba889cae
Updated/removed facades
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:53:51 +01:00
snipe
f17162c2e2
Use artisan facade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:40:05 +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
369c819a27
Merge pull request #14754 from Godmartinz/footer_user_bug
...
Removed extra div from User Details.
2024-05-29 11:29:02 +01:00
snipe
f1eb4bd3a5
Merge pull request #14349 from snipe/jerm/update-mailer-configs
...
Update mailer configurations for Symfony mailer
2024-05-29 11:25:55 +01:00
snipe
2f828683da
Merge pull request #14783 from snipe/fixes/fixed_category_test_depreciation_warning
...
Fixed deprecation warning on category test
2024-05-29 11:19:31 +01:00
snipe
13db151297
Fixed deprecation warning on category test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 11:06:51 +01:00
snipe
bb95c231e5
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-05-29 10:55:12 +01:00
snipe
dcea14fb99
Merge pull request #14778 from uberbrady/fix_8_3_compat
...
Allows Snipe-ITv7 to install on PHPv8.1-8.3
2024-05-29 10:55:02 +01:00
snipe
282fed27da
Add @bryanlopezinc as a contributor
2024-05-29 10:46:59 +01:00
snipe
cf3ffe9c74
Merge pull request #14782 from bryanlopezinc/ReduceIDeErrors
...
Reduce IDE errors in App\Http\Controllers\SettingsController
2024-05-29 10:46:03 +01:00
bryanlopezinc
5d01a06245
Reduce IDE errors in App\Http\Controllers\SettingsController
2024-05-29 08:07:49 +01:00
snipe
02cdda56e2
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-05-29 02:00:25 +01:00
snipe
ffecd97665
Bumped laravel in readme
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 02:00:21 +01:00
snipe
779cf9418e
Merge pull request #14780 from marcusmoore/fixes/sqlite-tests-in-gh
...
Fixed sqlite tests in GitHub Actions
2024-05-29 01:59:12 +01:00
Marcus Moore
34b4452645
Skip "migrating" and run passport:keys for sqlite testing in GH
2024-05-28 17:41:01 -07:00
snipe
da1c4c23e6
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-05-29 00:26:37 +01:00
snipe
a5d0a21757
Fixed string path
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 00:26:33 +01:00
snipe
29454f7288
Merge pull request #14779 from marcusmoore/fixes/fix-group-create-endpoint
...
Fixed Array to string conversion exception in group create api endpoint
2024-05-28 23:26:34 +01:00
Brady Wetherington
e271711c5b
Added the clock-lts repo which allows use on php8.1-8.3
2024-05-28 22:50:09 +01:00
Marcus Moore
4c78da3bbf
Re-add json encoding of permissions
2024-05-28 13:03:09 -07:00
Marcus Moore
71bab2c315
Improve test case
2024-05-28 13:02:44 -07:00
snipe
fceba13b03
Merge pull request #14777 from snipe/fixes/reportscontroller_optimizations
...
Reports controller query optimizations
2024-05-28 18:08:27 +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
1c1729854e
Use statics for location, supplier, etc
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 18:02:22 +01:00
snipe
14c78d9065
Use static for custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 18:02:09 +01:00
snipe
b1cb9259da
Re-use total to avoid duplicate count
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 18:01:47 +01:00
snipe
7d2af61989
Merge pull request #14775 from snipe/bug/sc-25676/groups_api
...
Fixed #14771 : improvements to groups API
2024-05-28 15:33:36 +01:00
snipe
03b5c2e246
Fixed bad translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 15:21:28 +01:00
snipe
33d5d5e24f
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 15:21:13 +01:00
snipe
3df2a4a70b
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 15:16:44 +01:00
snipe
6b41970e97
Check that selected is an array
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 15:15:31 +01:00
snipe
92eb6eb1b6
Add unique constraint to name
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 15:09:31 +01:00
snipe
206238e83f
Merge pull request #14773 from snipe/bug/sc-25674/location_currency_on_edit
...
Pass accessory's currency if set by location
2024-05-28 10:29:20 +01:00
snipe
df882bbcbc
Pass item’s currency if set by location
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 10:24:10 +01:00
snipe
6c1c3a99dd
Bumped current_snipeit_version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-27 19:22:24 +01:00
snipe
54067ec449
Fixed pre-version in version.php
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-27 18:21:46 +01:00
snipe
4c11e97922
Bumped version to dev, bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-27 18:20:32 +01:00
Brady Wetherington
8df9007a8e
Merge branch 'snipeit_v7_laravel10' into develop
2024-05-27 18:08:27 +01:00
snipe
702b944698
Merge remote-tracking branch 'origin/develop'
2024-05-27 15:46:07 +01:00
snipe
172d24fd3c
Merge pull request #14770 from uberbrady/add_locations_parent_index
...
Add index to 'parent_id' for users with large number of locations
2024-05-27 15:43:49 +01:00
Brady Wetherington
28b450fd3c
Add index to 'parent_id' for users with large number of locations
2024-05-27 15:38:42 +01:00
snipe
485caf1d92
Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout
...
Added tests around asset checkout
2024-05-25 11:33:33 +01:00
snipe
29cd75a6d2
Merge pull request #14766 from snipe/chore/sc-25656/minus_icon_for_fieldsets
...
Changed icon, added translation
2024-05-25 11:19:56 +01:00
snipe
b3fe10baa8
Merge branch 'snipeit_v7_laravel10' into chore/sc-25656/minus_icon_for_fieldsets
2024-05-25 11:19:43 +01:00
snipe
093cc9faf0
Merge pull request #14767 from snipe/chore/sc-25657/improved-translations
...
Improved translations
2024-05-25 11:19:14 +01:00
snipe
be4e809254
Merge pull request #14762 from marcusmoore/chore/update-v7-test
...
Fixed test by removing non-existent trait
2024-05-25 11:18:54 +01:00
snipe
dc5e15f919
Added translation for external link
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-25 11:02:07 +01:00
snipe
ad7b291062
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-25 10:55:48 +01:00
snipe
b54c1caa74
Improved translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-25 10:43:28 +01:00
snipe
c3cf123189
Better translation for custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-25 10:39:47 +01:00
snipe
3a2900621c
Changed icon, added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-25 10:20:52 +01:00
Godfrey M
442903ea5e
trying to get link to work, fixed up markup and url
2024-05-23 16:08:18 -07:00
Marcus Moore
639cbf6d53
Remove passport:install command
2024-05-23 15:56:58 -07:00
Marcus Moore
e03b5754a8
Combine steps
2024-05-23 15:54:32 -07:00
Marcus Moore
4ce86a061f
Set DB_CONNECTION
2024-05-23 15:43:59 -07:00
Marcus Moore
fa6e170feb
Install passport
2024-05-23 14:01:06 -07:00
Marcus Moore
51f72daba1
Debugging step
2024-05-23 13:55:03 -07:00
spencerrlongg
8ce577db37
adds @snipe's rules for undeleted assigned targets
2024-05-23 15:51:26 -05:00
Godfrey M
d3ab152d30
adds reminder notification constructor and updates markdown
2024-05-23 12:47:02 -07:00
Marcus Moore
a130033480
Revert "Add Install Passport step"
...
This reverts commit ef95ede833 .
2024-05-23 12:45:38 -07:00
Marcus Moore
ef95ede833
Add Install Passport step
2024-05-23 12:32:34 -07:00
Spencer Long
cdb1140f10
Merge branch 'develop' into bug/sc-24884
2024-05-23 13:53:00 -05:00
Marcus Moore
d06e5f25b0
Remove old trait from test
2024-05-23 11:51:08 -07:00
U-H-T
2777ac96cc
add logo support for Brother TZe24mm labels
2024-05-23 11:10:23 +02:00
snipe
fd42f1ef24
Merge remote-tracking branch 'origin/develop'
2024-05-23 08:39:31 +01:00
snipe
8b3ff5a82d
Handle potentially deleted admin users in license export
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-23 08:39:15 +01:00
Marcus Moore
482ebfbb68
Implement test
2024-05-22 17:21:29 -07:00
Marcus Moore
67c4fa2966
Improve event assertions
2024-05-22 17:14:10 -07:00
Marcus Moore
a3389a31cd
Update test name and add todo
2024-05-22 17:10:16 -07:00
Marcus Moore
8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
2024-05-22 16:09:27 -07:00
Marcus Moore
6d104251b3
Remove todo
2024-05-22 15:40:54 -07:00
Marcus Moore
f16c79bb9a
Improve event assertions
2024-05-22 15:38:23 -07:00
Marcus Moore
1fe22e4b7b
Re-order scenarios
2024-05-22 13:33:41 -07:00
Marcus Moore
c7fa2c04ad
Add scenario
2024-05-22 13:33:12 -07:00
Marcus Moore
8ca882d1c8
Complete a scenario
2024-05-22 13:23:49 -07:00
Marcus Moore
5d368990dc
Fix assertion
2024-05-22 13:15:51 -07:00
Brady Wetherington
4adbd7af4c
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-22 21:02:11 +01:00
Marcus Moore
1935a4aca3
Improve scenario naming
2024-05-22 12:47:33 -07:00
Godfrey M
c4d96f6ea3
removed extra div
2024-05-22 12:35:32 -07:00
snipe
986d5641f6
Merge remote-tracking branch 'origin/develop'
2024-05-22 18:39:25 +01:00
snipe
e163d5cfc7
Merge pull request #14753 from snipe/chore/sc-24895/add_exif_to_upgrade_php_file
...
Added exif to required extensions
2024-05-22 18:31:47 +01:00
snipe
b1e7c772ae
Added exif to required extensions
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 18:27:52 +01:00
snipe
dce1854ac4
Merge remote-tracking branch 'origin/develop'
2024-05-22 18:04:53 +01:00
snipe
c4b4923ff8
Add @LeePorte as a contributor
2024-05-22 18:04:24 +01:00
snipe
c20d10d4f2
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-05-22 17:50:14 +01:00
snipe
b0479d543d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-05-22 17:49:33 +01:00
snipe
81704c1d40
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:49:29 +01:00
snipe
d3798bf251
Merge pull request #14752 from snipe/fixes/better_handle_data_file_mismatch_in_user_files
...
Nicer handling of erroring when filename+log do not match
2024-05-22 17:47:39 +01:00
snipe
4bb7c1701f
Fiddled with storage facade a little more
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:44:49 +01:00
snipe
5fd0f56258
Use proper storage facade for checking if the file exists
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:38:49 +01:00
snipe
37d7e89e93
Fixed error message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:29:43 +01:00
snipe
3ab197075a
Nicer handling of erroring when filename+log do not match
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 17:20:03 +01:00
Brady Wetherington
12e8ac8b41
Merge pull request #14751 from uberbrady/docker-permissions-fix-rebased
...
Fixed #12299 : permissions on storage dir in Docker (rebased)
2024-05-22 16:57:35 +01:00
Lee Porte
6783dc1312
Fixed #12299 : permissions on storage dir in Docker
...
Fixes #12299 , where currently there is no recursive permissions set on
/var/www/html/storage/ during build time. As a result this requires
users to run an exec into the container and change the permissions
before they are able to initiate the setup. Without this a 500 error is
thrown and little is evident in the docker logs as to what the issue
is.
2024-05-22 16:54:07 +01:00
snipe
b489c71fa2
Removed generated file
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 13:09:02 +01:00
snipe
cf5f6f9b13
Created by OWASP Threat Dragon
2024-05-22 13:06:32 +01:00
snipe
860432acc5
Merge remote-tracking branch 'origin/develop'
2024-05-22 12:45:26 +01:00
snipe
c9f7847fb3
Merge pull request #14745 from snipe/fixes/self_api_endpoint
...
Refactor group syncing on user edit API endpoint
2024-05-22 12:43:22 +01:00
snipe
6fad085a7d
Removed debug in test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 12:37:49 +01:00
snipe
4b23ef4021
Added new test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 12:35:03 +01:00
snipe
bb96a190fd
Moved validator
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 12:34:48 +01:00
snipe
e1eb457f3d
Update tests/Feature/Api/Users/UpdateUserApiTest.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io >
2024-05-22 11:03:46 +01:00
snipe
51025aad57
Update tests/Feature/Api/Users/UpdateUserApiTest.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io >
2024-05-22 11:03:38 +01:00
snipe
14c4765be2
Update tests/Feature/Api/Users/UpdateUserApiTest.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io >
2024-05-22 11:00:52 +01:00
snipe
3afe996755
Update tests/Feature/Api/Users/UpdateUserApiTest.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io >
2024-05-22 11:00:47 +01:00
snipe
0891bd747a
Update tests/Feature/Api/Users/UpdateUserApiTest.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io >
2024-05-22 11:00:31 +01:00
Godfrey M
f2693ee957
conditionally fixed redirect select option
2024-05-21 14:08:35 -07:00
Godfrey M
0327e71f0f
made message the keys, cleaned up array
2024-05-21 13:26:29 -07:00
Godfrey M
69c2cf2c4f
fixed assetcheckin test, created redirect option test
2024-05-21 13:13:25 -07:00
Godfrey M
9f02be0823
removed extra div
2024-05-21 10:15:18 -07:00
Godfrey M
b5553af8ed
rename variable
2024-05-21 10:11:53 -07:00
Godfrey M
4d6f4303f5
fixed partial up
2024-05-21 10:11:01 -07:00
Godfrey M
8a0afae90f
fixed query, fixed no email logic, needs new markdown
2024-05-21 09:42:00 -07:00
snipe
34f1ea1c0e
Re-order gating and refactor group syncing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-21 10:00:49 +01:00
snipe
e3561ad38e
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-21 09:56:57 +01:00
snipe
a7ccf0efff
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-21 09:56:51 +01:00
snipe
f422c2ecad
Merge pull request #14741 from Godmartinz/footer-issue
...
removed extra div tags
2024-05-20 20:44:27 +01:00
Godfrey M
db9c435ae0
removed extra div tags
2024-05-20 10:48:57 -07:00
Godfrey M
a53f89cd2c
remove license checkout changes p2
2024-05-20 10:26:45 -07:00
Godfrey M
280c03dcad
remove license checkout changes
2024-05-20 10:25:59 -07:00
Godfrey M
e70fb42f87
remove license redirects
2024-05-20 10:22:01 -07:00
Brady Wetherington
f633dbba64
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-20 12:55:29 +01:00
snipe
cc0f2d7074
Merge remote-tracking branch 'origin/develop'
2024-05-20 11:22:34 +01:00
snipe
a820f248c8
Merge pull request #14736 from snipe/fixes/small_translation_additions
...
Fixes/small translation additions
2024-05-20 11:21:47 +01:00
snipe
6a6272ace3
Translate no records found message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-20 11:19:47 +01:00
snipe
bcb747f886
Added string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-20 11:19:37 +01:00
snipe
771c85e347
Translated account save message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-20 11:19:31 +01:00
snipe
e5c358a1fe
Merge pull request #14731 from snipe/features/csp_env
...
Fixed #14664 - allow additional urls in env for CSP
2024-05-16 22:25:11 +01:00
snipe
52c906f6b8
Added to env.example
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 22:21:52 +01:00
snipe
ca1555d962
Fixed #14664 - allow additional urls in env for CSP
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 22:19:18 +01:00
snipe
0d4f13219b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-05-16 22:00:07 +01:00
snipe
7fdbbc846e
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 21:59:38 +01:00
snipe
dbbbb103a0
Merge pull request #14730 from snipe/localizations/updated_strings
...
Updated translations
2024-05-16 21:58:24 +01:00
snipe
2182ea1ce8
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 21:57:19 +01:00
snipe
f2cc9ec1dd
Merge remote-tracking branch 'origin/develop'
2024-05-16 19:57:46 +01:00
snipe
54b24434e1
Set file name variable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 19:56:58 +01:00
snipe
653ad562a4
Updated codacy link
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 18:56:44 +01:00
snipe
7743b03129
Merge remote-tracking branch 'origin/develop'
2024-05-16 18:51:27 +01:00
snipe
84a601f364
Merge pull request #14729 from snipe/fixes/attribute_for_purchase_date
...
Sets purchase date as date (versus datetime) in labels
2024-05-16 18:49:49 +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
d691f3b315
Merge remote-tracking branch 'origin/develop'
2024-05-16 16:37:47 +01:00
snipe
00a9d5f33e
Merge pull request #14719 from snipe/fixes/add_next_audit_date_to_assets_form
...
Added next audit date to assets form
2024-05-16 16:33: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
2539c9e697
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 16:01:41 +01:00
snipe
3dfd471fa4
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/dist/all-defer.js
# public/mix-manifest.json
2024-05-16 15:33:50 +01:00
snipe
4119526889
Merge pull request #14728 from snipe/fixes/smarter_decryption_in_activity
...
Only attempt to decrypt custom fields in activity log if the value is not empty
2024-05-16 15:31:18 +01:00
snipe
6b3346d90c
Only attempt to decrypt if there is a value
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:28:25 +01:00
snipe
312ce51de6
Removed more debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:25:57 +01:00
snipe
09914f508f
Removed more debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 15:16:52 +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
2f18430ce4
Merge pull request #14725 from snipe/features/added_security_dot_txt
...
Added security.txt file
2024-05-16 09:59:46 +01:00
snipe
8d67e02d63
Added security.txt file
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-16 09:56:11 +01:00
Phil
1b85eea28e
added new compose and env files
2024-05-16 02:13:31 +02:00
Godfrey M
fb9a5f928f
removed license changes
2024-05-15 16:39:26 -07:00
Phil
4459483862
moved env. to own dev-file
2024-05-16 01:06:47 +02:00
Phil
a0cf7ecc98
moved file to dev-specific naming-scheme
2024-05-16 00:05:59 +02:00
Godfrey M
c658a0fcb4
fixes description
2024-05-15 13:20:05 -07:00
Godfrey M
f40284c413
adds acceptance reminder command
2024-05-15 13:04:58 -07:00
snipe
8e35a56386
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 20:01:04 +01:00
snipe
30f738646e
Merge pull request #14700 from marcusmoore/chore/sc-25471
...
Updated alpine to the latest version (3.13.10)
2024-05-15 19:59:51 +01:00
snipe
55281313d8
Merge pull request #14474 from Godmartinz/asset-location-update-bug
...
Fixed user assets not updating when a user changes location
2024-05-15 19:20:14 +01:00
Godfrey M
786799225c
remove dd
2024-05-15 10:37:07 -07:00
snipe
c137fafa97
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 18:10:43 +01:00
snipe
cb22a3d556
Updated comments again :-/
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:52:50 +01:00
snipe
c7accb4599
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:38:42 +01:00
snipe
72c85f93b6
Fixed test
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:47:45 +01:00
snipe
c1d5b8713b
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +01:00
snipe
8310b91e00
Use UploadFileRequest for audit files
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +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
ab8b40745e
Added next audit date to create/edit asset screen
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +01:00
snipe
16ec47573b
Added help text to bulk edit blade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +01:00
snipe
556d0b44a3
Added asset
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +01:00
snipe
0734d5b0b6
Added help text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:48 +01:00
snipe
f158a369a4
Added/updated string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +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
e5653eaa93
Save new data
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +01:00
snipe
3c4098038d
Fail early if no tag
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +01:00
snipe
8841e21dc9
Removed quickscan header
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +01:00
snipe
f5e03b264f
Show additional help text if help text is given
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +01:00
snipe
eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912
...
Bulk Edit Tests and Tweaks
2024-05-15 11:22:31 +01:00
Godfrey M
dc418a7033
need to make variables names uniform
2024-05-14 14:09:54 -07:00
Godfrey M
15cc4345ab
adds dynamic redirects to Assets
2024-05-14 13:25:52 -07:00
Godfrey Martinez
5272824d85
Merge branch 'develop' into asset-location-update-bug
2024-05-13 10:47:25 -07:00
snipe
9bce0f2ff7
Format fix
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-13 18:19:14 +01:00
snipe
d2e7e11dca
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-13 12:48:28 +01:00
snipe
6823aabf92
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-05-13 10:53:07 +01:00
snipe
f2dddc1226
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-13 10:51:44 +01:00
snipe
957becabb9
Merge pull request #14715 from snipe/dependabot/github_actions/develop/codacy/codacy-analysis-cli-action-4.4.1
...
Bump codacy/codacy-analysis-cli-action from 4.4.0 to 4.4.1
2024-05-13 10:26:33 +01:00
dependabot[bot]
7df03722ee
Bump codacy/codacy-analysis-cli-action from 4.4.0 to 4.4.1
...
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action ) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases )
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.4.0...v4.4.1 )
---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-05-13 08:53:06 +00:00
snipe
4642f50d6b
Merge remote-tracking branch 'origin/develop'
2024-05-11 15:14:57 +01:00
snipe
2decc3d6d3
Merge pull request #14711 from snipe/jerm/fix-all-query-in-sidebar-middleware
...
Fix memory-hog query in AssetCountForSidebar middleware
2024-05-11 01:35:09 +01:00
Jeremy Price
2adc4ffa96
Fix memory-hog query in AssetCountForSidebar middleware
...
https://github.com/snipe/snipe-it/pull/14702/files introduced a bug
where instead of doing a quick `select count(*)` of assets, it did a `select *` of
assets, moving the count from the database to the PHP process.
This caused OOM issues in memory-constrained environments with lots of
assets, and also presented a speed issue even when memory limited were
increased.
Additionally, given this populates the sidebar, this was likely an issue
on every page load that included the sidebar.
The fix is simply removing the `all()->`, ending up with Asset::count(),
which yields the desired `select count(*)` DB query.
2024-05-10 12:54:40 -07:00
snipe
c8fbf7640c
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-05-08 12:16:17 +01:00
snipe
46779ca865
Merge pull request #14697 from snipe/bug/sc-25502/disable_delete_if_not_deletable_user
...
Fixed UI where delete button was not disabled even if the user couldn't be deleted
2024-05-08 12:06:33 +01:00
snipe
86661e79d1
Merge pull request #14702 from Toreg87/fixes/total_asset_count
...
Fixes #14701 - wrong total asset count
2024-05-08 11:52:46 +01:00
Tobias Regnery
b2a5d86e30
Fixes #14701 - wrong total asset count
...
The total asset count in the sidenav shows the ready to deploy count instead of the total count.
Fix this by adjusting the query to all assets. Also respect the setting for archived assets.
Add a default value for total assets, since we are now using the settings-variable, which is not available during the setup process.
While at it, move the block for total assets before the ready to deploy assets to match the ordering of the sidenav.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com >
2024-05-08 09:34:35 +02:00
Marcus Moore
d7f0ee49b7
Update Alpine to 3.13.10
...
Includes fix to new label engine.
2024-05-07 17:08:05 -07:00
spencerrlongg
5b86ee7291
a couple more tests
2024-05-07 17:19:00 -05:00
spencerrlongg
ad2ba252ee
two new test
2024-05-07 15:11:33 -05:00
spencerrlongg
17ef20ea92
alright, in a working place
2024-05-07 14:08:47 -05:00
snipe
8c327e6523
Handle user not found properly
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 19:16:56 +01:00
snipe
386b2839e8
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 18:59:24 +01:00
snipe
934593e0b6
Updated icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 18:09:55 +01:00
snipe
a7aa178f24
Used localized strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:56:07 +01:00
snipe
69122034e7
Fixed icon table headers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:55:33 +01:00
snipe
1117f4289d
Added string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:55:10 +01:00
snipe
97bc4a092f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:40:48 +01:00
snipe
d942b8f1fb
Fixed alias names
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:40:35 +01:00
snipe
49dc9767b6
Added debugging :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 15:54:43 +01:00
snipe
482965197d
Added users, locations to presenter, transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:07:41 +01:00
snipe
410b547f3c
Added users and locatipon count to API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:07: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
snipe
2b4a536f85
Added CSS for users, locations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:06:54 +01:00
snipe
92ae069629
Disable button in UI if user cannot be deleted
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:06:35 +01:00
snipe
6f40b21986
Merge remote-tracking branch 'origin/develop'
2024-05-07 08:38:09 +01:00
snipe
3084521521
Merge pull request #14693 from snipe/fixes/14692_view_share_undefined
...
Fixes #14692 - set default variables for sidebar totals
2024-05-07 08:37:10 +01:00
snipe
4f12c86e74
Fixes #14692 - set default variables for sidebar totals
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 08:34:22 +01:00
snipe
204de99a64
Merge remote-tracking branch 'origin/develop'
2024-05-07 08:12:31 +01:00
snipe
fd929f5dd9
Merge pull request #14690 from marcusmoore/import-settings-properly
...
Load settings in `SendUpcomingAuditReport` command
2024-05-07 07:42:34 +01:00
Marcus Moore
7e9c8ba290
Remove duplicate settings call
2024-05-06 17:08:16 -07:00
Marcus Moore
6f639f7bf0
Load settings properly in SendUpcomingAuditReport command
2024-05-06 16:44:14 -07:00
snipe
3594ed67d1
Removed back buttons on settings index
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-06 20:48:32 +01:00
snipe
d36a06d8e1
Merge remote-tracking branch 'origin/develop'
2024-05-06 20:34:49 +01:00
snipe
c816b960b5
Fixed stray closing paren
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-06 20:34:36 +01:00
Brady Wetherington
5b02a43957
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-06 18:44:03 +01:00
snipe
4913e56086
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-05-06 18:43:48 +01:00
snipe
4d00bb98d1
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-06 18:39:55 +01:00
snipe
db2baae758
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-05-06 18:37:52 +01:00
snipe
fdecdf4b15
Merge pull request #14689 from KorvinSzanto/develop
...
Capitalize `N` instead of `y` since no is default
2024-05-06 17:48:16 +01:00
Korvin Szanto
5c1d4aff23
Capitalize N instead of y since no is default
2024-05-06 09:00:33 -07:00
snipe
bf0edcb92e
docs: add @gitgrimbo as a contributor
2024-05-06 12:59:26 +01:00
snipe
39fa8ef3c0
docs: add @chandanchowdhury as a contributor
2024-05-06 12:55:47 +01:00
snipe
9e8a369bc8
docs: add @PP-JN-RL as a contributor
2024-05-06 12:54:35 +01:00
snipe
3f3fe8935f
docs: add @jeffclay as a contributor
2024-05-06 12:54:20 +01:00
snipe
82387630c7
docs: add @squintfox as a contributor
2024-05-06 12:54:06 +01:00
snipe
16c5033514
docs: add @Q4kK as a contributor
2024-05-06 12:53:34 +01:00
snipe
46ffaee1e4
docs: add @franceslui as a contributor
2024-05-06 12:53:06 +01:00
snipe
d936f92a7d
docs: add @mustafa-online as a contributor
2024-05-06 12:52:46 +01:00
snipe
b424ddf42d
docs: add @koiakoia as a contributor
2024-05-06 12:51:40 +01:00
snipe
b3d5a893fc
Fixed text
...
via (@koiakoia )
Signed-off-by: snipe <snipe@snipe.net >
2024-05-06 12:49:54 +01:00
snipe
69ea6eebae
Merge pull request #14688 from snipe/security/Upgrade-tableexport.jquery.plugin-from-1.28.0-to-1.30.0
...
[Snyk] Upgrade tableexport.jquery.plugin from 1.28.0 to 1.30.0 #14656
2024-05-06 12:47:01 +01:00
snipe
0892c34125
[Snyk] Upgrade tableexport.jquery.plugin from 1.28.0 to 1.30.0 #14656
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-06 12:45:33 +01:00
snipe
52e14d501f
Merge pull request #14687 from snipe/security/upgrade_fontawesome_from-6.5.1-to-6.5.2
...
Upgrade fontawesome from 6.5.1 to 6.5.2
2024-05-06 12:22:50 +01:00
snipe
4d093160fc
Upgrade @fortawesome/fontawesome-free from 6.5.1 to 6.5.2 #14647
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-06 12:21:34 +01:00
snipe
0bcca99573
Merge pull request #14686 from snipe/security/upgrade_alpine_to_3.13.8
...
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.8 #14646
2024-05-06 12:16:00 +01:00
snipe
63516c4a4f
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.8 #14646
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-06 12:12:59 +01:00
snipe
19fb79ffff
Merge pull request #14661 from ubc-cpsc/bugfix/CVE-2024-32489
...
Upgrade tecnickcom/tcpdf from version 6.7.4 to 6.7.5 to address the security vulnerability CVE-2024-22640
2024-05-06 11:58:31 +01:00
snipe
02835de13d
Merge pull request #14679 from mustafa-online/develop
...
Improve RTL support
2024-05-04 15:47:14 +01:00
Mustafa Online
55b004d53d
Improve RTL support
2024-05-04 13:32:42 +02:00
Mustafa Online
c1b72a8ce6
Revert "Improve RTL support"
...
This reverts commit fa0bea87e6 .
2024-05-04 13:31:52 +02:00
Mustafa Online
fa0bea87e6
Improve RTL support
...
I'm starting to make some improvements to RTL support, more PR's to come to address other parts.
2024-05-04 13:17:48 +02:00
Godfrey M
c94a7613ca
dropdown redirect options, helper function and session variable added
2024-05-02 12:16:20 -07:00
snipe
d146426dd8
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 14:02:53 +01:00
snipe
1e1782c232
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-05-02 14:02:36 +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
snipe
4850227c04
Merge pull request #14655 from snipe/feature/sc-25381/simpler_overdue_endpoints
...
Refactored due/overdue for audit, added due/overdue for checkin API endpoint and GUI
2024-05-02 13:11:51 +01:00
snipe
eb9a654cc3
Moved settings call higher
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 12:37:41 +01:00
snipe
4224bc0c43
Removed extra settings param
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 12:36:57 +01:00
snipe
f893b23129
Refactored title blade areas
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 12:35:52 +01:00
snipe
8c65880504
Changed badge to span in default blade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 12:35:41 +01:00
snipe
53cadf80fa
Removed assertions for factories
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 12:24:31 +01:00
Robert-Azelis
3ea5d4ee40
Update BulkAssetsController.php
...
Fix for bulk updarte of purchase date to calculate new EOL
2024-05-02 12:55:17 +02:00
spencerrlongg
e177993bcc
notes and some playing around, push for eod
2024-05-01 16:57:11 -05:00
spencerrlongg
6a7f3ecc2e
new test not quite working, almost there
2024-05-01 16:12:56 -05:00
spencerrlongg
39cc99c89b
all initial attributes set in test
2024-04-30 22:22:59 -05:00
spencerrlongg
25480293dc
change keys to values, add test
2024-04-30 18:03:26 -05:00
Godfrey M
5fa0c87ab0
null debugbar
2024-04-30 12:02:11 -07:00
Godfrey M
75aa01791a
adds location select to the create new user vice asset checkout
2024-04-30 11:54:33 -07:00
Frances Lui
8b3bfc6bc9
Fixes CVE-2024-32489
2024-04-29 16:33:00 -07:00
snipe
19cff25300
Merge pull request #14651 from marcusmoore/bug/sc-25402
...
Fixed `purchase_cost` not being allowed to be a string when creating asset via api
2024-04-27 03:39:10 +01:00
snipe
848e1fe1f6
Refactored audit alerts
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 21:26:00 +01:00
snipe
fe147adec3
Refactor checkin alert
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 21:10:54 +01:00
snipe
103809b65f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 21:01:43 +01:00
snipe
a398496dd4
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 21:01:27 +01:00
snipe
839db8ef44
Refactored due-or-overdue methods
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 20:59:27 +01:00
snipe
bfd0530597
Fixed notification
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 20:59:13 +01:00
snipe
494ec5cd9c
Added tests for due-or-overdue
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 20:59:04 +01:00
snipe
fc61a4b88d
Fixed badge HTML
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:50:58 +01:00
snipe
50d8b02f8b
Removed unused scope
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:23:27 +01:00
snipe
860764a436
Use totals for sidebar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:12:21 +01:00
snipe
52d6a8990a
Check that the asset is not already checked in
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:06:46 +01:00
snipe
87de67e4a9
Fixed test for checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:06:26 +01:00
snipe
8356b57fb4
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:01:34 +01:00
snipe
3f04afee5c
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:01:26 +01:00
snipe
2117f61e8c
More view sharing for sidebar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:01:15 +01:00
snipe
d40604b574
Removed debugging, added date cast
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 19:01:05 +01:00
snipe
76129e9011
Use trans_choice for title
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:59:13 +01:00
snipe
9c8411c7ff
Added checkin due blade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:58:56 +01:00
snipe
c661d732b3
Refactored sidenav links for audit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:58:44 +01:00
snipe
fbe9daace6
Use pattern in API route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:58:29 +01:00
snipe
651001bf6e
Removed duplicate routes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:58:15 +01:00
snipe
9167f8a3ba
Cleaned up tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:57:07 +01:00
snipe
6dc9ccffcd
Refactor api for handling audit/expected checkins
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:56:57 +01:00
snipe
4b4e3badb7
Removed hardware audit overdue blade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:53:36 +01:00
snipe
fe4dd23d39
Removed “all” text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 15:49:12 +01:00
snipe
de6d71cc3b
Use plural api endpoints in blades
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 15:47:19 +01:00
snipe
9e44052709
Switch to plural route name for API endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 15:46:58 +01:00
snipe
2d112f227a
Call the asset factory directly
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 15:44:37 +01:00
snipe
bd8737d986
Changed sidenav badge class
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 15:44:21 +01:00
snipe
4b6d236eb7
Added class for sidebar menu badges
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 15:44:06 +01:00
snipe
bf058bd5c6
Use updated scopes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:02:56 +01:00
snipe
dfaf01e8aa
Updated asset counters
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:02:47 +01:00
snipe
2888dd6fd8
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:02:37 +01:00
snipe
2e92ee8eee
Switch to whereBetween so tests run on sqlite
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:02:23 +01:00
snipe
14b6a75507
Updated routes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:01:38 +01:00
snipe
2484a9db2c
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:01:29 +01:00
snipe
bfc30794c5
Updated badge styling
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:01:22 +01:00
snipe
27bc7a847b
Updated routes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 14:01:11 +01:00
Marcus Moore
2a71877bec
Add additional condition
2024-04-25 17:04:07 -07:00
Marcus Moore
30bd920497
Add conditional
2024-04-25 16:24:12 -07:00
Marcus Moore
1d5b48b88d
Add comment and improve method
2024-04-25 16:22:15 -07:00
spencerrlongg
97a6152ea9
update comment per @uberbrady
2024-04-25 17:47:55 -05:00
spencerrlongg
03f091a77f
ammended note, got real rule in there
2024-04-25 17:17:42 -05:00
Marcus Moore
4295bad12f
Separate test cases
2024-04-25 14:07:56 -07:00
Marcus Moore
3a2eeaea7a
WIP: Future-proof rules being converted to array syntax
2024-04-24 17:40:40 -07:00
Marcus Moore
12418ae91b
WIP: allow EU style purchase cost via api
2024-04-24 17:18:29 -07:00
Marcus Moore
783a24eb68
Add test for ParseCurrencyMethod
2024-04-24 17:17:42 -07:00
Brady Wetherington
3f5c5cbe82
Merge branch 'develop' into snipeit_v7_laravel10
2024-04-24 16:24:43 +01:00
snipe
2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button
...
Added a License Export function and button
2024-04-24 04:42:56 +01:00
spencerrlongg
8696a423b0
another option
2024-04-23 17:38:40 -05:00
spencerrlongg
107f8db9bc
another option
2024-04-23 17:35:33 -05:00
spencerrlongg
b11c900a4c
fix bracket, + overwrite required rulesets
2024-04-23 16:29:07 -05:00
akemidx
ac4aa97103
develop reheading
2024-04-23 17:05:50 -04:00
akemidx
0bc93c6a1e
space
2024-04-23 15:31:37 -04:00
Spencer Long
53ccd196d7
Merge branch 'develop' into bug/sc-24884
2024-04-23 13:57:59 -05:00
snipe
685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels
...
Removed encrypted fields from label options
2024-04-23 13:31:38 +01:00
snipe
e2d1e6b0c5
Merge pull request #14608 from akemidx/bug/sc-25232
...
Left Sidebar Was Not Respecting Theme
2024-04-23 12:32:48 +01:00
snipe
56cb9a0f4e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
2024-04-23 10:28:50 +01:00
snipe
c8c81a360c
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-23 10:26:43 +01:00
snipe
bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields
...
Re-enabled updating encrypted custom fields via API [sc-41465]
2024-04-23 10:20:55 +01:00
snipe
c50d5a678a
Merge pull request #14616 from akemidx/bug/sc-25235
...
REMOVED: Dark Theme Button Text Coloring
2024-04-23 09:20:57 +01:00
Godfrey M
96b3af7cbc
fixed view from sending all custom fields
2024-04-22 18:27:34 -07:00
Godfrey Martinez
9e7bbc968d
Merge pull request #15 from Godmartinz/License-export-button_p2
...
adds licenses available, updated teranslations
2024-04-22 17:59:52 -07:00
Godfrey M
5fc6771543
adds licenses available, updated teranslations
2024-04-22 17:58:49 -07:00
akemidx
0d049a0be7
conflict resolution
2024-04-22 20:09:40 -04:00
akemidx
01c24ab4cd
translating text
2024-04-22 19:16:14 -04:00
Marcus Moore
155f5f35cd
Remove todo
2024-04-22 15:47:05 -07:00
snipe
7ad6caf30a
Merge pull request #14632 from marcusmoore/bug/sc-25384
...
Added "select" option to top of data sources in new label engine
2024-04-22 20:40:31 +01:00
Marcus Moore
ac8aab0043
Add default "select an option" to data source options
2024-04-22 12:22:10 -07:00
Godfrey M
14ddf36d46
removed two duplicate translations
2024-04-22 10:43:11 -07:00
Godfrey M
25f1167c9d
adds company scoping to license export
2024-04-22 10:38:55 -07:00
Godfrey M
420225c2d5
Merge branch 'refs/heads/develop' into License-export-button
2024-04-22 10:33:30 -07:00
Marcus Moore
45f5eaac5b
Extract CanSkipTests trait
2024-04-22 10:32:37 -07:00
snipe
5229dd65ce
Merge remote-tracking branch 'origin/develop'
2024-04-22 15:02:51 +01:00
snipe
cfe39afc11
Merge pull request #14630 from snipe/bug/sc-25377/double_encoding_assets_and_model_notes_on_upload
...
Removed escaping on notes for file uploads
2024-04-22 14:59:55 +01:00
snipe
2aa3ce15bd
Removed escaping on notes for file uploads
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-22 14:55:02 +01:00
snipe
c9873da732
Merge pull request #14628 from snipe/bug/sc-25375/icon_mimetype_validation_fix
...
Added `ico`, `image/x-icon`, `image/vnd.microsoft.icon` to favicon validation
2024-04-22 13:58:08 +01:00
snipe
8dd71f99cc
Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-22 13:54:19 +01:00
Brady Wetherington
ab45975883
Mark custom fields tests as 'incomplete' if the DB is mysql
2024-04-22 13:11:36 +01:00
snipe
7f38ca239e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-04-19 16:24:32 +01:00
snipe
c3b982e759
Merge pull request #14622 from snipe/bug/sc-25363/z-index-bs-table-check-boxes-fix
...
Reeduced z-index of bs table override
2024-04-19 16:11:21 +01:00
snipe
e330e80c46
Reeduced z-index of bs table override
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-19 16:06:43 +01:00
akemidx
f0836d4d3a
changes for button hover, removing text color changes. also added in a border for yellow and black themes
2024-04-18 19:36:35 -04:00
akemidx
1289920217
black button border
2024-04-18 19:29:56 -04:00
snipe
a6a58094c9
Merge remote-tracking branch 'origin/develop'
2024-04-18 14:26:53 +01:00
snipe
424cbd3248
Removed noisy debug
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-18 14:25:54 +01:00
snipe
e59b9627c7
Merge pull request #14511 from jeffclay/features/14508_pdo_ssl_verify
...
Fixed #14508 : Added PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT options to database.php …
2024-04-18 14:23:00 +01:00
snipe
f080c0cdcd
Merge pull request #14578 from Q4kK/features/add_no_interactive
...
Feat: add no-interactive flag for `upgrade.php`
2024-04-18 14:19:38 +01:00
snipe
29bda2ef7d
Merge pull request #14613 from marcusmoore/additional-test-cases
...
Added test cases around modifying user groups via api
2024-04-18 13:53:03 +01:00
akemidx
e8d9701a26
array key existing
2024-04-17 19:16:25 -04:00
Marcus Moore
1d64692fd6
Add two test cases
2024-04-17 15:23:26 -07:00
snipe
6f195cb8ec
Merge pull request #14591 from snipe/bug/sc-25258/naive_fix_for_user_scoping
...
First fix for user FMCS scoping
2024-04-17 21:49:53 +01:00
snipe
4c02a63acc
Removed activated attribute on test users
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 20:29:51 +01:00
snipe
0fc9fc7516
Minor updates to tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 20:29:01 +01:00
snipe
4450351b75
Only sync groups if API user is superadmin
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 11:06:50 +01:00
snipe
9bb15aaf1b
Added individual gates to keep response consistent with other company-ed things
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 10:57:49 +01:00
snipe
65dd729e19
Additional gates
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 10:57:20 +01:00
snipe
c21142605d
Added strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 10:47:56 +01:00
snipe
86e274faa3
Added API tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 10:47:48 +01:00
snipe
5e8c129c7f
Revert accidental commit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 09:26:50 +01:00
snipe
ab3b5ca4ef
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-17 09:26:07 +01:00
Marcus Moore
60a5afd752
Merge branch 'factory-refactors' into fix_saving_encrypted_custom_fields
2024-04-16 17:15:22 -07:00
Marcus Moore
9d0ea857fe
Import facade
2024-04-16 17:14:17 -07:00
Marcus Moore
f763aea4fc
Update tests to send post request
2024-04-16 17:13:18 -07:00
Marcus Moore
e16c04250e
Improve model factories
2024-04-16 16:58:28 -07:00
Marcus Moore
ad99aa460b
Remove unneeded imports
2024-04-16 15:09:49 -07:00
Marcus Moore
e47f64f62d
Separate test methods
2024-04-16 15:03:05 -07:00
Marcus Moore
c6d9da1571
Remove unneeded fields in factory state
2024-04-16 12:36:41 -07:00
Marcus Moore
ab561d1ce8
Simplify factory state
2024-04-16 12:36:13 -07:00
akemidx
f39ba0136c
errant carraige return
2024-04-16 14:26:18 -04:00
akemidx
df60045bfe
sidebar hover fix
2024-04-16 14:21:47 -04:00
akemidx
5e122f780f
sidebar_hover_color
2024-04-16 14:00:20 -04:00
Marcus Moore
eefe377159
Correct order of arguments
2024-04-16 10:51:33 -07:00
q4kK
20920c262d
Feat: add no-interactive flag for upgrade.php
...
Having a no-interactive flag is useful because attempting
to automate snipe-it upgrades is currently extremely janky.
You have to either:
a) read the prompts and pass in the input (the "correct" way)
b) pipe in input, e.g. `yes` and hope no new prompts
are added.
With the `no-interactive` flag, this can be fixed by both
allowing new prompts to be added without conflict
to user prompts, but also allowing automated upgrades (you could
choose to crash, or assign defaults).
2024-04-16 11:54:50 -05:00
Brady Wetherington
870612be1c
Break 'update' API statements into its own test file. Split tests up
2024-04-16 15:34:28 +01:00
Brady Wetherington
266424ff0e
Some simple renames for better readability as suggested by Marcus
2024-04-16 15:17:02 +01:00
snipe
a8d48b758e
Merge pull request #14594 from marcusmoore/bug/sc-25314/multiple-label-fields-on-one-row
...
Fixed label fields only showing first option
2024-04-15 18:53:03 +01:00
Brady Wetherington
67a8e0b5c6
This re-enables the ability to update encrypted custom fields via the API
2024-04-15 18:46:11 +01:00
snipe
7b7d424962
Merge pull request #13880 from Godmartinz/department-validation-bug
...
Fixed department validation to allow updates
2024-04-12 10:50:26 +01:00
Marcus Moore
a4e959818a
Add comment
2024-04-11 17:23:28 -07:00
Marcus Moore
c3a71cc182
Improve variable names and add comment
2024-04-11 16:44:13 -07:00
Marcus Moore
da03cfdbe5
Formatting
2024-04-11 16:39:29 -07:00
Marcus Moore
2b137d76fa
Trim string to avoid leading whitespace if label is empty
2024-04-11 16:38:22 -07:00
Marcus Moore
81b8c111ca
Allow multiple fields to be displayed in one row
2024-04-11 15:00:14 -07:00
snipe
fce98b9ca4
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
2024-04-11 18:58:50 +01:00
snipe
c0dcae16f7
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 18:57:06 +01:00
snipe
c604f08749
Small tweaks for troubleshooting :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 18:47:55 +01:00
snipe
da21424416
Merge pull request #14581 from marcusmoore/bug/sc-25237
...
Fixed assigned to field in new label engine
2024-04-11 15:36:18 +01:00
snipe
b5c83721ad
Merge pull request #14577 from Godmartinz/signature_pad_upgrade
...
Upgraded Signature-pad.js && Fixed Resizing Canvas on mobile
2024-04-11 15:35:47 +01:00
snipe
9b21fca1a0
Merge pull request #14558 from akemidx/bug/sc-25192
...
Fixed: Header Dropdown Menus had no hover coloring in dark themes
2024-04-11 15:35:33 +01:00
snipe
af94b07771
Merge pull request #14582 from akemidx/feature/sc-25288
...
Reduce Extra Space in Header Dropdown
2024-04-11 15:35:11 +01:00
snipe
0d23d28a65
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 15:15:56 +01:00
snipe
710370ac24
Added scoping for destroy
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:58:25 +01:00
snipe
ed0a441e4d
Refactor destroy method
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:52:03 +01:00
snipe
24e87cc0bb
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:51:49 +01:00
snipe
460693c153
Added comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:40:13 +01:00
snipe
f54a94bd4c
Refactorered methods
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:40:00 +01:00
snipe
a19b86add0
Re-ordered scoping for admins, added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:39:37 +01:00
snipe
570944a48b
Updated translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:38:52 +01:00
snipe
5829b02323
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-11 14:38:47 +01:00
Marcus Moore
5567a1e9ac
Formatting
2024-04-10 17:37:11 -07:00
Marcus Moore
fa5016713f
Implement test
2024-04-10 17:29:44 -07:00
Marcus Moore
f28a82de71
Implement some tests, scaffold others
2024-04-10 17:27:07 -07:00
Marcus Moore
7c2fae7b9d
Scaffold api test cases
2024-04-10 17:08:45 -07:00
Marcus Moore
70934e54cf
Remove unneeded comment
2024-04-10 16:34:14 -07:00
Marcus Moore
f6ad275030
Clean ups
2024-04-10 16:28:48 -07:00
Marcus Moore
6666a78936
Organization
2024-04-10 16:19:04 -07:00
Marcus Moore
bbb2cdcceb
Add note
2024-04-10 16:15:43 -07:00
Marcus Moore
6b6e18695f
Account for null asset in factory state
2024-04-10 16:12:47 -07:00
Marcus Moore
b63962e90b
Add additional assertions
2024-04-10 16:01:15 -07:00
Marcus Moore
4434de6241
Add test case
2024-04-10 15:47:26 -07:00
Godfrey M
a2bca0e358
fixed comments
2024-04-10 15:05:21 -07:00
Marcus Moore
6d572424ac
Add validation around dates
2024-04-10 14:02:25 -07:00
Marcus Moore
d371d14c1f
Implement test
2024-04-10 13:49:07 -07:00
Marcus Moore
72eda1e909
Improve naming
2024-04-10 13:29:31 -07:00
Marcus Moore
7dbf8a8a8e
Add tests for asset and location check out
2024-04-10 13:28:52 -07:00
Godfrey M
133fdd7a37
fix conditional
2024-04-10 12:31:04 -07:00
Godfrey M
0849262243
fixed notes
2024-04-10 12:19:34 -07:00
Godfrey M
17095feb33
fix typo
2024-04-10 12:15:48 -07:00
Godfrey M
f42ae46338
exports all licenses
2024-04-10 12:14:44 -07:00
Marcus Moore
37ebf1827f
Organization
2024-04-10 12:12:44 -07:00
Marcus Moore
e65252725a
Add simple test for LogListener
2024-04-10 11:52:59 -07:00
Marcus Moore
6f53f2ac64
Finish implementing test case
2024-04-10 11:43:50 -07:00
Godfrey M
e2679852ce
added export button, half the logic for export method
2024-04-10 11:31:30 -07:00
Marcus Moore
deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
2024-04-10 11:01:35 -07:00
snipe
989dab6259
Moved company scoping methods to group them together
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-10 14:35:13 +01:00
snipe
adacdc038d
Apply company scoping for users
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-10 12:34:32 +01:00
akemidx
f0aefaac42
padding fix
2024-04-09 17:51:42 -04:00
Marcus Moore
1aeaa0094a
Fix assigned to in labels
2024-04-09 13:52:54 -07:00
akemidx
6d3fa12f37
white texty for dropdown lists
2024-04-09 14:52:43 -04:00
Godfrey M
052f1eedd0
fixes signature canvas refresh on mobile
2024-04-09 10:30:33 -07:00
Godfrey M
858da800be
attempting to lock screen orientation
2024-04-09 09:40:39 -07:00
snipe
954cac3af7
Merge remote-tracking branch 'origin/develop'
2024-04-08 10:56:04 +01:00
snipe
d0f171ebc6
Merge pull request #14567 from snipe/bug/sc-25257
...
Remove city as required field on location modal
2024-04-08 10:54:09 +01:00
snipe
90cf612ac7
Remove city as required field on location modal
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-08 10:50:52 +01:00
snipe
802b5863ab
Merge remote-tracking branch 'origin/develop'
2024-04-08 08:49:54 +01:00
snipe
4baa949a99
Merge pull request #14557 from Godmartinz/add-audit-date-to-labels
...
Added audit dates to label options
2024-04-08 04:59:53 +01:00
snipe
3bed04a6d3
Merge pull request #14559 from Godmartinz/ldap_location_bug
...
Fixed ldap location syncing incorrect locations for users.
2024-04-08 04:59:27 +01:00
spencerrlongg
99d7155729
translation strings
2024-04-07 19:50:53 -05:00
spencerrlongg
f30439a544
small refactor, pretty much good to go now though
2024-04-07 17:07:46 -05:00
spencerrlongg
997eddfed1
cleanup + notes for monday
2024-04-04 18:23:03 -05:00
Godfrey M
d548b800d5
nullifies location after ldap user sync
2024-04-04 15:43:33 -07:00
spencerrlongg
52340aca78
just about wrapped up
2024-04-04 17:41:10 -05:00
akemidx
f7f199d929
black hover bg for dark yellow theme
2024-04-04 15:51:46 -04:00
akemidx
5519fddb78
new clean branch for color change
2024-04-04 15:50:30 -04:00
spencerrlongg
e1fb446888
this is a pretty good start, need to know about other PR
2024-04-04 14:20:03 -05:00
Godfrey M
a9ed748fb2
adds audit dates to label options
2024-04-04 11:39:49 -07:00
steve@degga.net
83443ad2b5
Sometimes I should just slow down.
2024-04-04 11:36:21 -04:00
steve@degga.net
3fcc067481
Removes accidental changes on two lines
2024-04-04 10:27:44 -04:00
snipe
dcba2bfd25
Merge pull request #14529 from mauro-miatello/develop
...
Hide/Show encrypted values in hardware list
2024-04-04 15:07:58 +01:00
snipe
72c91ead8b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-04-04 15:06:37 +01:00
snipe
774d0aa90c
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-04 15:05:35 +01:00
snipe
2eea67ce34
Merge pull request #14547 from Godmartinz/user-dropdown-media-change
...
Fixed alignment of dropdown menu for user in nav bar
2024-04-04 15:04:36 +01:00
snipe
db1c44f921
Merge pull request #14552 from snipe/bug/sc-25229/redirect_if_already_checked_in
...
Redirect on checkin if the asset is already checked in
2024-04-04 15:01:43 +01:00
snipe
e11287ec25
Redirect on checkin if the asset is already checked in
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-04 15:00:55 +01:00
snipe
4f10adfb76
Merge remote-tracking branch 'origin/develop'
2024-04-04 14:27:35 +01:00
snipe
f22803c59f
Merge pull request #14551 from snipe/bug/sc-25221/ambiguous_id_in_custom_report
...
Fixed ambiguous id clause in custom report
2024-04-04 14:25:43 +01:00
snipe
a72d4e5dc1
Fixed ambiguous id clause in custom report
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-04 14:23:58 +01:00
steve@degga.net
3e564eaf19
fixed accidentally forgot update a call to the old dynamicWarrantyUrl() method in hardware/view.blade.php
2024-04-03 20:09:37 -04:00
spencerrlongg
0a90df2b14
alright conflicts resolved
2024-04-03 14:40:14 -05:00
Spencer Long
4ab75c1c03
Merge branch 'develop' into bug/sc-24884
2024-04-03 14:08:41 -05:00
Godfrey M
08f9aae8ae
adds note to log listener and checkout accept notif
2024-04-03 11:59:47 -07:00
Godfrey M
43c32fa1bf
fix class name in migration
2024-04-03 11:47:08 -07:00
Godfrey M
5afe024644
changed translation on asset acceptancen blade
2024-04-03 11:40:48 -07:00
Godfrey M
c01bdb42fc
renamed migration
2024-04-03 11:39:17 -07:00
Godfrey M
e3ef8d295f
Merge remote-tracking branch 'origin/add_decline_note_to_acceptance' into add_decline_note_to_acceptance
2024-04-03 11:37:05 -07:00
Godfrey M
ce1d677cdc
adds note to acceptance
2024-04-03 11:36:03 -07:00
Godfrey M
df5cacf8a2
removed front end if statement
2024-04-03 11:06:05 -07:00
Godfrey M
bb2c73348d
only grabs custom Fields that are not encrpyted
2024-04-03 11:03:58 -07:00
Godfrey M
4327653d70
remove db cleaner for encrypted selections
2024-04-03 10:57:41 -07:00
Godfrey M
5f7f4c9b91
aligns dropdown menu for user in nav
2024-04-03 10:41:50 -07:00
snipe
d44202e55b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-04-03 13:09:48 +01:00
snipe
df95447ea4
New dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-03 13:08:08 +01:00
snipe
01852c7188
Merge pull request #14520 from Godmartinz/loading_overlap_bug
...
fixes z-index of table load
2024-04-03 13:07:14 +01:00
snipe
79c5697042
Fixed dev - take 2!
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-03 13:06:49 +01:00
Brady Wetherington
65e21faa3e
Merge branch 'develop' into snipeit_v7_laravel10
...
Hopefully, last merge?
2024-04-02 20:34:04 +01:00
steve@degga.net
bf10fd0cf0
Rename dynamicUrl() method
2024-03-31 22:37:41 -04:00
steve@degga.net
83ce04dc8d
Fixes syntax error.
2024-03-31 22:31:06 -04:00
steve@degga.net
f7bbec6be4
Makes all manufacturer URLs dynamic, not just warranty lookup.
2024-03-31 22:18:44 -04:00
MrM
658ba092e2
Hide encrypted values in hardware list
...
Encrypted values are now hidden also in hardware list, clicking on them show the decrypted value
2024-03-31 18:55:58 +02:00
MrM
b221d99e7b
Encrypted values enhancement
...
Show asterisks instead of the value, respecting the length of the field
2024-03-31 12:27:35 +02:00
snipe
b7af049589
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-03-29 13:20:22 +00:00
snipe
c2d863da99
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-29 13:19:22 +00:00
snipe
6f9ba6ede4
Merge remote-tracking branch 'origin/develop'
2024-03-29 12:49:22 +00:00
snipe
df4e6a0023
Fixed typo in Polish
...
I will fix this in CrowdIn shortly
Signed-off-by: snipe <snipe@snipe.net >
2024-03-29 12:47:43 +00:00
snipe
d60fa65f85
Merge remote-tracking branch 'origin/develop'
2024-03-28 21:59:36 +00:00
snipe
8081a82fe4
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-03-28 21:58:58 +00:00
snipe
f42e5d5292
Reverting the store/update asset API responses for now
...
This currently breaks the Jamf integration - need a better longer term plan.
Signed-off-by: snipe <snipe@snipe.net >
2024-03-28 21:58:49 +00:00
snipe
5a3f5b03d0
Merge pull request #14456 from akemidx/feature/sc-25079/legacy-locations
...
Default Locale value changed to en-US
2024-03-28 21:47:40 +00:00
akemidx
721902c2d4
committed for later
2024-03-28 16:44:44 -04:00
Godfrey M
a450530c74
fixes z-index of table load
2024-03-28 11:44:55 -07:00
snipe
2b4886f37f
Commented out Heroic deploy for now
2024-03-28 17:43:18 +00:00
snipe
b45de3e17f
Update README.md
...
Added alert notations
2024-03-28 17:41:46 +00:00
snipe
b2eea3e5a5
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/dist/all-defer.js
# public/mix-manifest.json
2024-03-28 13:02:51 +00:00
snipe
f411c0fdd8
Merge pull request #14518 from snipe/fixes/downgrade_alpine
...
Downgrade alpine to 3.13.5
2024-03-28 12:59:52 +00:00
snipe
74d8431d01
Downgrade alpine to 3.13.5
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-28 12:58:43 +00:00
snipe
3ea0cd75a5
Merge remote-tracking branch 'origin/develop'
2024-03-28 12:27:24 +00:00
snipe
5f6c746d25
Merge pull request #14517 from snipe/bug/sc-25186/label_index
...
Check that the array key exists in the label engine
2024-03-28 12:26:20 +00:00
snipe
1f2d30ebf4
Check that the array key exists
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-28 12:25:29 +00:00
akemidx
e6b366020a
lots of attempts and syntax, but no go
2024-03-27 19:05:59 -04:00
snipe
6dd6b45829
Merge remote-tracking branch 'origin/develop'
2024-03-27 20:43:34 +00:00
snipe
e5800a2dac
Merge pull request #14516 from snipe/fixes/fixed_sorting_on_last_checkin_assets_api
...
Fixes/fixed sorting on last checkin assets api
2024-03-27 20:39:12 +00:00
snipe
0d3d172108
Make last_checkin searchable and fillable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-27 20:37:40 +00:00
snipe
86677b5f13
Make last_checkin sortable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-27 20:37:25 +00:00
snipe
3f5b94f8ad
Merge remote-tracking branch 'origin/develop'
2024-03-27 19:52:23 +00:00
snipe
cf8cb8521b
Merge pull request #14515 from squintfox/fixes-results-not-limited-by-api-params
...
Fixes #14289 : /reports/activity API endpoint returns too many results due to orwhere
2024-03-27 19:51:58 +00:00
spencerrlongg
cec84b857b
fixed last audit date + test
2024-03-27 14:39:23 -05:00
Robert Spadaro
ccd00caa70
Wrap where logic in additional where statement to protect appended params
2024-03-27 15:36:00 -04:00
spencerrlongg
1d4a7a7b02
added audit dates
2024-03-27 14:05:30 -05:00
snipe
57010b4c23
Merge pull request #14500 from Godmartinz/add-accessory-signature-to-print-all
...
Added signature to user print report for Accessories and Consumables
2024-03-27 19:02:59 +00:00
snipe
545a185614
Merge pull request #14262 from akemidx/bug/sc-24812
...
Last Checkin Date added to Hardware View and Index
2024-03-27 19:02:25 +00:00
snipe
1572e339f9
Merge pull request #14514 from snipe/localizations/new_translations_march_224
...
Updated translations
2024-03-27 19:01:23 +00:00
snipe
7782e5cc93
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-27 18:59:28 +00:00
Godfrey Martinez
bcdda551b3
Merge pull request #12 from Godmartinz/remove_jquery
...
removes jquery and updates translation
2024-03-27 11:58:11 -07:00
Godfrey M
bc66c0f223
removes jquery and updates translation
2024-03-27 11:56:47 -07:00
spencerrlongg
701411c1b9
get rid of a couple unnecessary changes
2024-03-27 13:53:57 -05:00
Spencer Long
013463aafc
Merge branch 'develop' into bug/sc-24884
2024-03-27 12:45:45 -05:00
Jeff Clay
1b8c7ff4ec
Added PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT options to database.php and updated .env files to provide value for the new option.
2024-03-27 11:38:13 -05:00
snipe
3bb81d1e4d
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/dist/all-defer.js
# public/mix-manifest.json
2024-03-27 16:18:28 +00:00
snipe
756c44fcba
Merge pull request #14510 from snipe/snyk/Upgrade-alpinejs-from-3.13.5-to-3.13.6
...
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.6
2024-03-27 16:14:53 +00:00
snipe
befa4428d0
Merge pull request #14509 from snipe/feature/sc-25173/filter_assigned_user_assets_by_category_id
...
Added ability to filter in user's assigned assets by category ID and model ID
2024-03-27 16:13:51 +00:00
snipe
60c678680a
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.6
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-27 16:12:57 +00:00
snipe
8bc9688d71
Added ability to filter on category ID and model ID from user’s asset API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-27 16:04:00 +00:00
spencerrlongg
39c15b2868
reformat array
2024-03-27 10:35:25 -05:00
Godfrey M
aa8af2220c
trying to remove an encrypted field but not all fields
2024-03-26 16:10:08 -07:00
akemidx
b124b9af4d
adding in change to settings table
2024-03-26 16:50:39 -04:00
snipe
ae403da8c1
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation
...
Added validation around `pwd_secure_complexity`
2024-03-26 20:05:04 +00:00
Marcus Moore
b5b8777c94
Extract translation string
2024-03-26 12:23:57 -07:00
snipe
850f85ff59
Merge pull request #14369 from spencerrlongg/bug/sc-24343
...
Add new validator for custom field checkboxes and fix asset model default updates
2024-03-26 19:22:29 +00:00
Godfrey M
84cc88831d
adds signature for components
2024-03-26 12:18:10 -07:00
Godfrey M
f4f9b165a7
moves signature check inside of td
2024-03-26 11:24:34 -07:00
Godfrey M
3222d4c8df
adds signature check
2024-03-26 09:18:34 -07:00
Godfrey M
3173ead2e7
adds accessory signature to user print report
2024-03-26 09:11:54 -07:00
Godfrey M
040f826c52
removes encrypted fields as a selectable option for labels
2024-03-26 08:57:18 -07:00
snipe
89d733d442
Merge remote-tracking branch 'origin/develop'
2024-03-26 14:53:24 +00:00
snipe
df49e8350f
Merge pull request #14498 from snipe/features/limit_report_by_admin
...
Fixed #14495 - Allow user_id to be passed to limit to only specific admins
2024-03-26 14:52:03 +00:00
snipe
3ced85080a
Fixed #14495 - Allow user_id to be passed to limit to only specific admins
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 14:45:20 +00:00
snipe
0611ab9b4c
Merge remote-tracking branch 'origin/develop'
2024-03-26 12:29:39 +00:00
snipe
f450cafe3e
Fixed missing div
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 12:29:25 +00:00
snipe
1f29eb1875
Merge pull request #14494 from snipe/features/add_supplier_address_to_licenses
...
Added supplier details to license view
2024-03-26 12:20:57 +00:00
snipe
a4e5ae0938
Removed duplicates
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 12:20:27 +00:00
snipe
77dacfcc30
Show if deleted supplier
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 12:19:29 +00:00
snipe
0d9b6eaf71
Added supplier details to license view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 12:18:04 +00:00
snipe
7060ffaf34
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-03-26 11:17:07 +00:00
snipe
02a37e2f89
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 10:16:46 +00:00
snipe
9c1b1bc2b5
Removed fre-order columns - it’s not currently used
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 10:15:46 +00:00
snipe
b34156ca25
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-03-26 09:58:35 +00:00
snipe
61bdb57b5d
Merge pull request #14492 from snipe/feature/sc-25142/deeplink_search_urls
...
Fixed #14483 - adds deeplinking to search/sort/pagination
2024-03-26 09:55:50 +00:00
snipe
9df84e235c
Check for config variable
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 09:54:40 +00:00
snipe
566ba4783e
Fixed #14483 - adds deeplinking to search/sort/pagination
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 09:50:01 +00:00
snipe
b41b4b1732
Merge remote-tracking branch 'origin/develop'
2024-03-26 08:48:44 +00:00
snipe
ccf9457c45
Merge pull request #14491 from PP-JN-RL/patch-1
...
Added Dymo Labelwriter 1933081
2024-03-26 08:46:03 +00:00
snipe
53aabdab66
Merge remote-tracking branch 'origin/develop'
2024-03-26 08:33:40 +00:00
snipe
8ff85c952e
Fixed labelwriter 2112283 namespace
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 08:33:30 +00:00
Phil J R
afe1cb8234
Create LabelWriter_1933081.php
...
Added a longer version of the existing label (25 x 54mm vs. 25 x 89mm) due to better availability and to support longer asset names.
2024-03-26 08:29:47 +00:00
snipe
bd42505799
Merge remote-tracking branch 'origin/develop'
2024-03-26 08:23:40 +00:00
snipe
6c735c97c6
Merge pull request #14490 from snipe/bug/sc-25141/bad_method_call_model_restore_from_view
...
Fixed #14482 - bad method call model restore from view
2024-03-26 08:21:27 +00:00
snipe
31a57cdf14
Fixed #14482 - bad method call on restore from view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 08:18:59 +00:00
snipe
7ebbef25e7
Standardize button styling
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-26 08:18:36 +00:00
Phil J R
f836342194
Rename Label_Writer_2112283.php to LabelWriter_2112283.php
...
Fix the name of LabelWWriter_2112283 to be consistent with the existing one.
2024-03-26 08:16:00 +00:00
spencerrlongg
5cf1a6c300
new validator for radio buttons
2024-03-25 21:03:13 -05:00
Marcus Moore
bd506820b7
Display error message
2024-03-25 17:59:39 -07:00
Marcus Moore
5815607924
Add validation for pwd_secure_complexity
2024-03-25 17:45:41 -07:00
spencerrlongg
9b40c9788f
rm commented tests
2024-03-25 18:58:49 -05:00
snipe
67b5e9093e
Merge pull request #14488 from marcusmoore/bug/pass-last-audit-date-through-for-validation
...
Handle badly formatted `last_audit_date` in `StoreAssetRequest`
2024-03-25 20:57:20 +00:00
Marcus Moore
57d1c036ec
Improve method name
2024-03-25 13:53:30 -07:00
Marcus Moore
71722b753d
Little bit of clean up
2024-03-25 13:49:03 -07:00
Marcus Moore
a2625c889a
Improve comment
2024-03-25 13:48:32 -07:00
Marcus Moore
c98b9da612
Pass last_audit_date through for model level validation if not a date
2024-03-25 13:47:24 -07:00
Marcus Moore
675717ff82
Add failing test
2024-03-25 13:46:22 -07:00
snipe
83ef7c6fe8
Merge pull request #14486 from marcusmoore/bug/sc-25139
...
Fixes `last_audit_date` not being stored via API correctly
2024-03-25 19:49:54 +00:00
Marcus Moore
5f4c964309
Account for last_audit_date not being provided
2024-03-25 12:45:11 -07:00
Marcus Moore
66ba96d531
Set last_audit_date to valid format in StoreAssetRequest
2024-03-25 12:38:12 -07:00
snipe
d67b2da064
Merge pull request #14485 from PP-JN-RL/patch-1
...
Created Dymo LabelWriter Label 2112283
2024-03-25 16:50:10 +00:00
Phil J R
e45fd4088f
Created Dymo LabelWriter Label 2112283
...
I have added the layout for the Dymo LabelWriter 2112283 Labels.
They are: DYMO 2112283 DURABLE SMALL MULTI PURPOSE LABELS (160 LABELS) - 25 X 54MM
2024-03-25 16:31:20 +00:00
spencerrlongg
7e4a0eedf0
rm dumb note
2024-03-25 10:46:26 -05:00
snipe
3f812f696d
Merge pull request #14472 from snipe/fixes/last_audit_date_via_api
...
Added validation for last_audit_date and next_audit_date
2024-03-25 14:35:42 +00:00
Godfrey M
633249b08a
user assets get updated when a user changes location
2024-03-21 15:15:40 -07:00
Godfrey M
c62a022252
replaced for loop with eloquent query update
2024-03-21 14:34:47 -07:00
Godfrey M
21c3b1fbd2
rename declined message to note, increased width of textarea
2024-03-21 14:03:25 -07:00
snipe
e9e6f925bf
Updated validation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-21 18:34:39 +00:00
snipe
828b84084d
Added validation for last_audit_date and next_audit_date
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-21 18:29:38 +00:00
snipe
a6a0bfacc2
Merge remote-tracking branch 'origin/develop'
2024-03-21 18:03:19 +00:00
spencerrlongg
60ca634eff
remove interactswithsettings
2024-03-21 12:04:53 -05:00
spencerrlongg
be282dd038
resolve a couple issues
2024-03-21 09:26:45 -05:00
snipe
c4b7e77498
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox
...
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
2024-03-21 12:55:25 +00:00
snipe
91c7180bfd
Merge pull request #14469 from snipe/feature/sc-19515/2fa_reset_log
...
Added 2FA reset log entry
2024-03-21 12:52:22 +00:00
Marcus Moore
b368acf941
Implement test case
2024-03-20 17:46:09 -07:00
snipe
7c39f516b9
Merge pull request #14421 from marcusmoore/fixes/add-minimal-validation-around-asset-tags
...
Adds a minimal amount of validation around asset_tags in AssetsController
2024-03-21 00:04:44 +00:00
snipe
ce1ddcfcee
Merge pull request #14438 from marcusmoore/chore/sc-25071
...
Removed the need to add `InteractsWithSettings` to each test case
2024-03-21 00:03:34 +00:00
snipe
945e8b402f
Only offer the 2FA reset if the user already has 2FA set up
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 23:52:51 +00:00
snipe
5ed2bd0fb7
Skip the normal edit observer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 23:52:22 +00:00
snipe
bc908b854d
Added icon
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 23:44:47 +00:00
snipe
2067b1138a
Added the log item
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 23:43:58 +00:00
snipe
1ffbdee156
Updated 2FA text to not be google authenticator specific
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 23:43:30 +00:00
snipe
bd2812cac1
Added new string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 23:43:12 +00:00
snipe
f2a5eac256
Tightened up 2FA text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 23:43:05 +00:00
snipe
b4e647dbd1
Merge remote-tracking branch 'origin/develop'
2024-03-20 21:31:04 +00:00
Marcus Moore
530291f81c
Implement some tests
2024-03-20 14:28:27 -07:00
snipe
de18e449a6
Merge pull request #14464 from snipe/features/toggle_all_columns
...
Added "toggle all" to column selector
2024-03-20 21:26:23 +00:00
snipe
dce19e0bea
Set names and actions to switchable = false
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 21:25:50 +00:00
snipe
1f586d3102
Removed data-show-columns-toggle-all data attribute
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 21:25:16 +00:00
snipe
e5d01170d2
Fixed locale, added showColumnsToggleAll and minimumCountColumns
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 21:24:59 +00:00
Marcus Moore
393dc51167
Add assertions around the event dispatch
2024-03-20 13:44:26 -07:00
spencerrlongg
8cc1397ace
rm a couple unnecessary
2024-03-20 15:36:53 -05:00
Marcus Moore
984cc7a4f2
Scaffold tests around asset checkout via web
2024-03-20 13:29:25 -07:00
spencerrlongg
e7b9903341
delete some extra lines
2024-03-20 15:29:06 -05:00
spencerrlongg
e3e01e07b1
final cleanup
2024-03-20 15:23:45 -05:00
spencerrlongg
d18aa1db98
some more cleanup + tests
2024-03-20 15:18:15 -05:00
snipe
0f11963127
Merge remote-tracking branch 'origin/develop'
2024-03-20 19:01:03 +00:00
snipe
d8378f2a10
Merge pull request #14468 from snipe/features/added_default_location_to_print_all_assigned
...
Added default location to print all assigned
2024-03-20 18:57:01 +00:00
snipe
a0a5480c97
Added default location to print all assigned
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 18:55:47 +00:00
spencerrlongg
c155e4a7c9
new test for not found assets
2024-03-20 13:52:22 -05:00
spencerrlongg
fdf0be09db
all tests passing
2024-03-20 13:43:01 -05:00
spencerrlongg
e1addc5aef
oops, typo from conflict resolve
2024-03-20 13:16:36 -05:00
Spencer Long
b4b4927370
Merge branch 'develop' into bug/sc-24884
2024-03-20 12:36:39 -05:00
snipe
3391108551
Merge remote-tracking branch 'origin/develop'
2024-03-20 12:57:30 +00:00
snipe
52551dad0f
Merge pull request #14465 from snipe/features/14460_add_avif_format
...
Added #14460 add avif format
2024-03-20 12:39:14 +00:00
snipe
321414f6e3
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:38:48 +00:00
snipe
7787fe42c8
Added avif to helpers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:30:28 +00:00
snipe
3b66912742
Fixed #14460 - added support for avif
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:25:02 +00:00
snipe
278a25c63b
Added toggle all to column selector
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:14:41 +00:00
snipe
0d124bb5a1
Fixed indent
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:08:35 +00:00
snipe
417caae589
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:07:18 +00:00
snipe
3d306aacc5
Fixed mismatched HTML tag
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 11:52:51 +00:00
snipe
ea4ecaea03
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-03-20 11:04:34 +00:00
snipe
6c90f9e395
Merge pull request #14462 from snipe/fixes/small_ui_tweaks_for_country_dropdown
...
Wider country dropdown
2024-03-20 11:01:39 +00:00
snipe
ddf81ba135
Wider country dropdown
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 11:00:06 +00:00
snipe
8ebb41caa6
Merge pull request #14461 from snipe/security/update_bs_tables
...
[Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455
2024-03-20 10:39:05 +00:00
snipe
faf48b1684
[Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 10:37:53 +00:00
snipe
b8232d205b
Merge pull request #14457 from Godmartinz/bulk_delete_locations_bug
...
Fixed Bulk delete locations bug
2024-03-20 10:35:45 +00:00
spencerrlongg
0ffceb9691
some notes and a little progress
2024-03-20 00:07:52 -05:00
spencerrlongg
1e810d2426
most tests now passing, still one broken
2024-03-19 19:47:26 -05:00
spencerrlongg
c0110e7f29
some more tests and refinement
2024-03-19 19:27:35 -05:00
Godfrey M
62745923cf
fixes API location delete
2024-03-19 15:25:28 -07:00
Godfrey M
090466123f
add withCount to query instead
2024-03-19 15:18:18 -07:00
Godfrey M
38a3e36cd6
fixes translation usage
2024-03-19 14:32:21 -07:00
Godfrey M
e8dc634a40
fixes translation usage
2024-03-19 14:30:53 -07:00
Godfrey M
0d0984a400
Bulk Delete Locations does not work [sc-25100]
2024-03-19 14:26:40 -07:00
spencerrlongg
86ab880c90
buncha progress
2024-03-19 15:34:59 -05:00
akemidx
8640cad033
was using lcoations and not locale. fixed
2024-03-19 16:11:32 -04:00
akemidx
dc29717623
fixing default
2024-03-19 15:51:05 -04:00
Godfrey M
866f0a9f56
syncs assets location to users location
2024-03-19 11:58:49 -07:00
snipe
814914924f
Merge remote-tracking branch 'origin/develop'
2024-03-19 15:51:07 +00:00
snipe
c7083488b2
Merge pull request #14447 from snipe/feature/sc-25020_better_print_view
...
Add additional options to print all assigned view
2024-03-19 15:01:50 +00:00
snipe
4b4d383509
Removed - it’s for another PR
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-19 15:00:26 +00:00
Godfrey M
b9986033cc
removed abbr. of variable, changed variable types in migration
2024-03-18 16:03:40 -07:00
akemidx
3680e04817
migration to set legacy locations to an standardized format
2024-03-18 18:29:59 -04:00
snipe
21e23baa37
Fixed ternary
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-18 21:28:46 +00:00
snipe
fcd130ae15
Layout improvements
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-18 21:17:46 +00:00
Godfrey M
8b52d5da85
fixed typos, reordered jquery, fixed migrations
2024-03-18 12:36:54 -07:00
Marcus Moore
d1dffb84dc
Remove InteractsWithSettings trait for remaining tests
2024-03-18 12:33:45 -07:00
Marcus Moore
541350916d
Merge branch 'develop' into chore/sc-25071
...
# Conflicts:
# tests/Feature/Api/Users/UpdateUserApiTest.php
# tests/Feature/Notifications/AccessoryWebhookTest.php
# tests/Feature/Notifications/AssetWebhookTest.php
# tests/Feature/Notifications/ComponentWebhookTest.php
# tests/Feature/Notifications/ConsumableWebhookTest.php
# tests/Feature/Notifications/LicenseWebhookTest.php
2024-03-18 12:33:31 -07:00
Godfrey M
01afa9a749
declined notes are reflected in the action logs
2024-03-18 10:50:15 -07:00
Godfrey M
57f5d4a570
deleted_msg saves to db
2024-03-18 10:45:47 -07:00
Godfrey M
4588393b76
adds declined msg to mail notif, updates lang files and checkout acceptance controller
2024-03-18 10:25:55 -07:00
Godfrey M
0fd99d410e
adds a text field and jquery to show/hide text field
2024-03-18 09:36:09 -07:00
snipe
002fd4ce30
Nicer formatting for signoff
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-18 13:44:51 +00:00
snipe
7b4ecb275f
Use trans choice for language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-18 13:29:01 +00:00
snipe
2df5d3a8ff
Fixed column selector
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-18 13:06:08 +00:00
snipe
7070bad53b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-03-18 12:32:22 +00:00
snipe
da62d6af26
Merge pull request #14445 from snipe/fixes/check_for_valid_license_category_on_view_assets
...
Make sure the category is still valid before displaying on view assets
2024-03-18 12:30:15 +00:00
snipe
d0d4d14787
Make sure the category is still valid before displaying on view assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-18 12:29:00 +00:00
snipe
09d69b214b
Merge pull request #14436 from marcusmoore/chore/sc-24901
...
Organized notification test cases
2024-03-18 12:20:23 +00:00
snipe
0e2aaebda4
Merge pull request #14406 from mauro-miatello/develop
...
Hide/Show ecnrypted values when click on the lock icon
2024-03-18 12:19:54 +00:00
snipe
ec2c58163f
Merge pull request #14437 from marcusmoore/chore/sc-25070
...
Removed dead test code
2024-03-18 12:19:35 +00:00
Godfrey M
05a8d3030b
correct column name
2024-03-16 19:54:48 -07:00
Godfrey M
595dad0f18
updates all assets assigned to user with new location
2024-03-16 19:51:40 -07:00
Marcus Moore
a28bee86ba
Extract method
2024-03-14 16:33:49 -07:00
Marcus Moore
fb64892971
Re-order
2024-03-14 16:26:27 -07:00
Marcus Moore
95ff692b14
Improve InteractsWithSettings name
2024-03-14 15:06:52 -07:00
Marcus Moore
8003615b1f
Move InteractsWithSettings to TestCase
2024-03-14 14:15:11 -07:00
Marcus Moore
948dc3c974
Remove duplicate trait
2024-03-14 13:11:53 -07:00
Marcus Moore
1afb724606
Remove commented (and old) test cases
2024-03-14 13:11:43 -07:00
Marcus Moore
451281d833
Delete test cases with only commented code
2024-03-14 13:11:27 -07:00
Marcus Moore
485f11c945
Move trait usage to parent TestCase
2024-03-14 12:56:49 -07:00
Marcus Moore
dbc79655b0
Cleanup
2024-03-14 12:02:56 -07:00
Marcus Moore
02f6aa6161
Add group tag for new test case
2024-03-14 11:19:36 -07:00
Marcus Moore
07c5264b41
Organize email check in notifications test
2024-03-14 11:17:47 -07:00
Marcus Moore
7c178a6a78
Merge branch 'develop' into chore/sc-24901
...
# Conflicts:
# tests/Feature/Notifications/AssetWebhookTest.php
2024-03-14 11:13:14 -07:00
snipe
f56d53d7c1
Prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-14 17:14:33 +00:00
snipe
4cd4a936d8
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-14 15:43:47 +00:00
snipe
7bae4c39c6
Merge pull request #14401 from uberbrady/fix_locale_warning
...
Fix [sc-25008] - correct and improve legacy language warnings
2024-03-14 15:42:28 +00:00
snipe
d55d95bbea
Merge pull request #14415 from Godmartinz/date_picker_z_order
...
Fixed z-index of date-picker
2024-03-14 15:39:11 +00:00
snipe
5e48d56561
Merge pull request #14427 from marcusmoore/bug/sc-25014
...
Removes the unused `mediconesystems/livewire-datatables` package
2024-03-14 15:35:53 +00:00
snipe
6a5098fb0c
Merge remote-tracking branch 'origin/develop'
2024-03-14 13:26:38 +00:00
snipe
4e835e1772
Merge pull request #14430 from snipe/bug/sc-25066/fixed_requestable_search
...
Move requestable scope below sorting, etc
2024-03-14 13:25:44 +00:00
snipe
cce8cb4f5e
Move requestable scope below sorting, etc
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-14 13:24:22 +00:00
Marcus Moore
8aed26aab1
Remove unneeded test cases
2024-03-13 16:56:54 -07:00
Marcus Moore
01d5d4c2c8
Improve data provider name
2024-03-13 16:37:50 -07:00
spencerrlongg
f6ab0f8f46
lots of cleanup to do, but this DOES work
2024-03-13 15:57:10 -05:00
spencerrlongg
f01b205486
some changes
2024-03-13 15:10:51 -05:00
Marcus Moore
592385cb07
Remove mediconesystems/livewire-datatables package
2024-03-13 11:58:03 -07:00
spencerrlongg
8962ced038
push to switch branches
2024-03-13 10:40:50 -05:00
snipe
85123b3e66
Rework print page
...
Still seeing a weird error tho, not done yet
Signed-off-by: snipe <snipe@snipe.net >
2024-03-13 12:36:17 +00:00
spencerrlongg
04d7884af8
some more testing stuff
2024-03-12 23:17:40 -05:00
spencerrlongg
6732b6601e
some cool progress, but something with unique not working
2024-03-12 18:33:59 -05:00
Marcus Moore
0fcf223960
Add minimal validation for asset_tags
2024-03-12 12:00:10 -07:00
Godfrey M
bf0bd06f20
put important back
2024-03-11 15:56:53 -07:00
Godfrey M
f07b0b6bd7
removed important
2024-03-11 15:54:59 -07:00
Godfrey M
717b26c834
fixes z-index of date-picker
2024-03-11 15:53:59 -07:00
snipe
8bb8eab69b
Merge remote-tracking branch 'origin/develop'
2024-03-11 15:00:38 +00:00
snipe
693d1c9452
Merge pull request #14413 from snipe/fixes/deprecation_on_strtoupper
...
Fixed deprecation warning on `strtoupper()`
2024-03-11 14:59:55 +00:00
snipe
b049bb1d5c
Check for null on select
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-11 14:55:49 +00:00
snipe
c5c6b3bbc6
Starting the revised print page
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-11 14:23:25 +00:00
snipe
1df56a7cab
Merge pull request #14407 from snipe/bug/sc-25019_added_created_at_pivot
...
Added created_at to license pivot
2024-03-10 16:40:56 +00:00
snipe
3f5cc2507d
Used updated_at instead
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-10 16:39:49 +00:00
snipe
5a85424295
Added created_at to license pivot
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-10 16:33:04 +00:00
snipe
a53a8cca74
Merge remote-tracking branch 'origin/develop'
2024-03-10 14:40:41 +00:00
snipe
3fdee881f9
Merge pull request #14404 from snipe/fixes/Uninitialized-string-offset-0-in-labels
...
Fixed uninitialized offset in labels in new label engine
2024-03-10 14:40:12 +00:00
snipe
a289dfaf88
Cleanup
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-10 14:33:53 +00:00
MrM
8abd359b5b
Script to hide / show encrypted values in web ui
...
added a function to show/hide encrypted values with a simple trick because ClipboardJS can't copy display:none element's value
2024-03-10 15:18:54 +01:00
MrM
9359809b4f
Hide / Show encrypted values in web ui
...
added a span element to hide encrypted values
2024-03-10 15:09:46 +01:00
snipe
cde5502f94
Handle blank labels on asset label fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-10 14:03:21 +00:00
spencerrlongg
eb8f1dd553
some cleanup
2024-03-09 12:29:26 -06:00
spencerrlongg
c8341d9dc4
aha, got it working.
2024-03-08 19:48:47 -06:00
spencerrlongg
b239b3a4db
some good progress, lots of testing needs to be done on the new inclusion of SubstituteBindings
2024-03-08 18:24:41 -06:00
spencerrlongg
04e0a9d4a5
commented tests for now
2024-03-08 13:14:59 -06:00
snipe
28ec0b8ebb
Removed debugging console lines
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-08 17:19:31 +00:00
snipe
37dfecf098
Fixed uninitialized offset in labels
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-08 16:46:56 +00:00
snipe
9d8ce872a4
Merge remote-tracking branch 'origin/develop'
2024-03-08 14:56:21 +00:00
snipe
07880dfe50
Merge pull request #14400 from snipe/localizations/updated_strings
...
Updated language strings, added Somali
2024-03-08 14:07:32 +00:00
snipe
7eed9f8542
Added Somali
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-08 14:06:21 +00:00
Brady Wetherington
a2e70dd6b2
Fix [sc-25008] - correct and improve legacy language warnings
...
The legacy language warning was misfiring when a user's language
didn't match the APP_LOCALE from .env.
Additionally, we weren't properly warning when the legacy-language
came from Settings or from the user themselves. Both of which should
be impossible but still probably not a bad idea to warn on it, anyways
2024-03-08 14:04:21 +00:00
snipe
b9aeded957
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-08 14:01:34 +00:00
snipe
027361f079
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-03-08 10:01:21 +00:00
snipe
ff10d1540f
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-08 10:00:00 +00:00
snipe
0f63fa23e0
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# package-lock.json
2024-03-08 09:08:29 +00:00
snipe
22ef569e5e
Merge branch 'security/snyc_Upgrade-webpack-from-5.90.1-to-5.90.2_14395' into develop
2024-03-08 08:50:26 +00:00
snipe
f3663f0983
[Snyk] Upgrade webpack from 5.90.1 to 5.90.2 #14395
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-08 08:45:49 +00:00
snipe
112ddaf55b
Merge pull request #14394 from marcusmoore/fixes/check-endpoint-is-set-for-checkout-in-notifications
...
Ensure Chat and Teams endpoints are not blank before attempting to send webhook on checkout and check in
2024-03-08 08:44:52 +00:00
snipe
bda6fdf09c
Merge pull request #14395 from snipe/snyk-upgrade-9e465161f7c9fd096a214ca3ad2fae7b
...
[Snyk] Upgrade webpack from 5.90.1 to 5.90.2
2024-03-08 08:44:07 +00:00
snyk-bot
a62198f33f
fix: upgrade webpack from 5.90.1 to 5.90.2
...
Snyk has created this PR to upgrade webpack from 5.90.1 to 5.90.2.
See this package in npm:
https://www.npmjs.com/package/webpack
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
2024-03-08 06:20:14 +00:00
Marcus Moore
4b0bfc52b4
Ensure webhook endpoint is set before attempting to send to google or microsoft
2024-03-07 18:10:10 -08:00
snipe
78868813b1
Merge remote-tracking branch 'origin/develop'
2024-03-08 01:05:07 +00:00
snipe
e8be178ac7
Merge pull request #14393 from marcusmoore/bug/sc-24862
...
Guard against checking require acceptance on non-existent relationship in accessory model
2024-03-08 01:04:26 +00:00
Marcus Moore
695428cd44
Guard against unrelated category
2024-03-07 16:59:01 -08:00
snipe
9ae779e442
Merge remote-tracking branch 'origin/develop'
2024-03-07 23:44:30 +00:00
snipe
db92febdc7
Merge pull request #14392 from snipe/fixes/removed_unneeded_starts_with_validation_string
...
Removed unneeded validation message
2024-03-07 23:42:58 +00:00
snipe
5cf10cec34
Remloved unneeded validation message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-07 23:40:30 +00:00
snipe
7939c691f7
Added Brother 18mm label type
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-07 22:04:12 +00:00
snipe
ea2d54b0f7
Merge remote-tracking branch 'origin/develop'
2024-03-07 21:22:01 +00:00
snipe
c66267a0f9
Merge pull request #14389 from Godmartinz/remove-pdf-for-old-labels
...
old engine works as intended
2024-03-07 21:06:57 +00:00
snipe
f1d2f24534
Merge pull request #14388 from marcusmoore/bug/sc-25001
...
Fixed attempting to run bulk actions on an empty asset collection
2024-03-07 21:03:45 +00:00
Godfrey M
d83974e07f
old engine works as intended
2024-03-07 13:03:10 -08:00
Marcus Moore
f270f30728
Redirect if no assets are returned from query
2024-03-07 12:30:08 -08:00
snipe
55c237913c
Merge remote-tracking branch 'origin/develop'
2024-03-07 15:11:33 +00:00
snipe
806671df7c
Merge pull request #14385 from snipe/feature/sc-24971_convert_unencrypted_custom_fields
...
Added console command to encrypt previously unencrypted fields
2024-03-07 15:08:19 +00:00
snipe
d64ee42ec3
Wrapped in a transaction
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-07 15:04:08 +00:00
snipe
fe08f39900
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-07 14:43:06 +00:00
snipe
5123ab57c9
Added console command to encrypt previously unencrypted fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-07 14:40:52 +00:00
snipe
313b327cd7
Bumped hash for master
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-07 11:34:38 +00:00
snipe
855d922a3e
Merge remote-tracking branch 'origin/develop'
2024-03-07 11:31:38 +00:00
snipe
cbe07ad23b
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-07 11:30:54 +00:00
snipe
b3aba4ad99
Merge pull request #14379 from chandanchowdhury/master
...
Fix #13515 : Cannot restore backup
2024-03-07 11:30:06 +00:00
snipe
21ad7f549d
Merge remote-tracking branch 'origin/develop'
2024-03-07 10:34:30 +00:00
snipe
4b13fa45c5
Merge pull request #14320 from Godmartinz/default_label_bug
...
Default label setup with custom fields
2024-03-07 10:33:43 +00:00
snipe
485d40c752
Merge remote-tracking branch 'origin/develop'
2024-03-07 10:30:31 +00:00
snipe
8346ae8235
Merge pull request #14370 from ubc-cpsc/bugfix/CVE-2024-27354
...
Fixes CVE-2024-27354 and CVE-2024-27355 in phpseclib/phpseclib
2024-03-07 10:28:31 +00:00
snipe
109c0f202a
Merge remote-tracking branch 'origin/develop'
2024-03-07 10:19:06 +00:00
snipe
4231058aa1
Merge pull request #14371 from Godmartinz/RB17900_notification_bug
...
Adds User email check when sending Asset acceptance reminder
2024-03-07 10:18:19 +00:00
snipe
6156d67e4a
Merge remote-tracking branch 'origin/develop'
2024-03-07 10:17:05 +00:00
snipe
58bf036f52
Merge pull request #14380 from Godmartinz/1dbarcode_unselected_bug
...
Fixed 1dbarcodes to populate based on settings
2024-03-07 10:16:37 +00:00
Godfrey M
ff7d25c0f2
simplified 1dbarcode logic
2024-03-06 15:30:53 -08:00
Godfrey M
5f0b7f328c
if statement order change
2024-03-06 15:24:03 -08:00
Godfrey M
6559581bad
conditions 1dbarcode to populate based on settings
2024-03-06 15:10:42 -08:00
Godfrey M
d78262f52b
resolved merge conflicts
2024-03-06 14:48:47 -08:00
snipe
bd566324ed
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-06 20:20:23 +00:00
chandanchowdhury
b65bf5082d
Fix #13515 : create directories expected by RestoreFromBackup.php
2024-03-06 15:11:41 -05:00
snipe
939e4cba3e
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-06 20:05:16 +00:00
snipe
015a8763a0
Merge remote-tracking branch 'origin/develop'
2024-03-06 20:04:48 +00:00
snipe
02862d80eb
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-06 20:04:31 +00:00
snipe
7b0a3fc6d3
Merge remote-tracking branch 'origin/develop'
2024-03-06 20:01:23 +00:00
snipe
b40b31b7b1
Merge pull request #14378 from snipe/security/snyk_Upgrade-jspdf-autotable-from-3.8.1-to-3.8.2-14365
...
Upgrade jspdf-autotable from 3.8.1 to 3.8.2 #14365
2024-03-06 19:55:59 +00:00
snipe
149d3d13d1
Upgrade jspdf-autotable from 3.8.1 to 3.8.2 #14365
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-06 19:55:19 +00:00
snipe
0f64d66cd8
Merge remote-tracking branch 'origin/develop'
2024-03-06 19:48:55 +00:00
snipe
a85e2f7aad
Merge pull request #14372 from snipe/bug/sc-24158
...
Added route parameter
2024-03-06 19:45:33 +00:00
snipe
4f883b1264
Merge pull request #14375 from Godmartinz/Label-info_fix
...
Fixed Labels: bulk actions are handled before sorting
2024-03-06 19:44:59 +00:00
Godfrey M
feb78d00cf
conditionally shows label fields if on old label engine only
2024-03-06 11:25:49 -08:00
Godfrey M
c9d54baa10
bulk actions are handled before sorting
2024-03-05 15:47:52 -08:00
Godfrey M
940f54dab1
revert some changes
2024-03-05 15:45:35 -08:00
Godfrey M
d83827a44e
bulk actions are handled before sorting
2024-03-05 15:43:41 -08:00
spencerrlongg
3a0a13d06d
tests written but something not working...
2024-03-05 16:35:06 -06:00
snipe
23f8e35716
Added route parameter
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-05 20:39:56 +00:00
spencerrlongg
a251e61d73
rm commented code and add comment
2024-03-05 13:40:44 -06:00
spencerrlongg
af06b1cd06
hide encryption option for checkbox and radio
2024-03-05 13:37:30 -06:00
Brady Wetherington
5b9120ba6c
Merge branch 'develop' into snipeit_v7_laravel10
2024-03-05 19:22:37 +00:00
snipe
7769a93a10
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-05 19:07:40 +00:00
snipe
95a6c7058f
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-05 19:06:55 +00:00
Godfrey M
6c3a668400
checks to see if a user has an email before sending them a reminder email.
2024-03-05 10:30:24 -08:00
spencerrlongg
ad0f873ece
rm validation stuff
2024-03-05 11:58:00 -06:00
Joël Pittet
3008a4ed7a
Fixes CVE-2024-27354 and CVE-2024-27355
2024-03-05 09:55:56 -08:00
spencerrlongg
eac01868ca
not all working, but pushing to work on something else
2024-03-05 11:02:55 -06:00
Godfrey M
95ef3a336b
Merge branch 'develop' into default_label_bug
2024-03-04 12:03:54 -08:00
snipe
9a5c1b8126
Merge pull request #14362 from Godmartinz/labels-not-generating-properly
...
Fixes inconsistencies with generating labels
2024-03-04 18:49:44 +00:00
Godfrey M
e926db76a0
fixes inconsistencies with generating labels
2024-03-04 10:26:38 -08:00
snipe
9419c7fdeb
Fixed contributing link
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-01 12:42:26 +00:00
snipe
9dbb4abe7e
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-01 12:30:05 +00:00
snipe
19e0fb7955
Reverting CSP change
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-01 12:25:14 +00:00
snipe
5b9b21a7d1
Merge pull request #14357 from snipe/fixes/stricter_csp_rules
...
Removed unsafe-inline and unsafe-eval
2024-03-01 11:48:51 +00:00
snipe
93e69ab0c6
Removed unsafe-inline and unsafe-eval
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-01 11:44:49 +00:00
snipe
bc5c559413
Merge pull request #14356 from snipe/fixes/set_csp_rule_to_true_by_default
...
Set CSP headers to true by default
2024-03-01 11:37:53 +00:00
snipe
9b2fcbff08
Set CSP headers to true by default
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-01 11:36:37 +00:00
snipe
ad2674d20b
Merge pull request #14355 from snipe/localization/new_strings
...
Updated language strings
2024-03-01 11:18:12 +00:00
snipe
10ac2c830f
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-01 11:17:02 +00:00
snipe
df3053eafb
Merge pull request #14354 from snipe/bug/sc-24911
...
Use SVG cleaner on favicons
2024-03-01 10:19:59 +00:00
snipe
aaae952acb
Use SVG cleaner on favicons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-01 10:17:57 +00:00
Jeremy Price
8ace30ee23
Update mailer configurations for Symfony mailer
...
Newer Laravel uses Symfony mailer instead of SwiftMailer, and that means
that some configs and functionality have changed
In this change, we update config/mail.php with the new config layout and
name/functionality changes
of note:
* New configuration layout supporting lots of new/different mailers
* MAIL_DRIVER has become MAIL_MAILER, though we'll support both
* MAIL_ENCRYPTION is mostly useless, and we mark it as such -- symfony
mailer detects which type of encryption to use automagically.
* MAIL_TLS_VERIFY_PEER is now available in case of self-signed
certificates on the mail server, of if you want to access it by a
different name, or by IP
Accordingly, we also update the .env examples, docker configs, and
the .env builder in the snipeit.sh installation script with the above
changes
2024-02-28 23:37:52 -08:00
akemidx
eb0657c953
Merge branch 'develop' into bug/sc-24812
2024-02-28 17:22:16 -05:00
snipe
b1cd44341b
Merge pull request #14347 from snipe/feature/sc-24856_requestable_page
...
Dynamically show models/assets on requestable page
2024-02-28 15:04:48 +00:00
snipe
3da47cdacd
Removed header for consistency
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 15:03:34 +00:00
snipe
658dda916c
Changed operator
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 15:01:00 +00:00
snipe
7c3d8b896b
Updated asset transformers/presenters to display requestable status
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 14:59:55 +00:00
snipe
1ce9df7998
New translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 14:59:27 +00:00
snipe
a0cbf66c81
Only show tabs if there are requestable assets/models
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 14:59:20 +00:00
snipe
a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808
...
Added tests around asset check in and added missing actions to the api controller action
2024-02-28 13:34:12 +00:00
snipe
9fd6aea325
Merge pull request #14281 from Godmartinz/preview-label-fields
...
Added better label previews with the new label engine
2024-02-28 11:48:05 +00:00
snipe
a52181c995
Merge pull request #14283 from akemidx/bug/sc-24788
...
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
2024-02-28 11:47:46 +00:00
snipe
ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728
...
Added `min_amt` functionality to licenses
2024-02-28 11:26:25 +00:00
snipe
92eff653f1
Removed logging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:26:03 +00:00
snipe
1e66985a78
Merge pull request #14344 from snipe/features/added_created_by_to_groups
...
Added created_by to groups table
2024-02-28 11:19:52 +00:00
snipe
a059a42799
Added use Auth to API controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:14:48 +00:00
snipe
b5603fbfe9
Added min amt to license blade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:09:07 +00:00
snipe
a0423a9cc3
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:08:56 +00:00
snipe
4ab7112988
Added validation and fillable attributes for min_amt
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:08:47 +00:00
snipe
767cf96010
Added min_amt to form
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:08:33 +00:00
snipe
4ffb7790df
Added min_amt to API transformer/presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:07:18 +00:00
snipe
3ccc55a78f
Added license min amt formatter for BS table
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:06:50 +00:00
snipe
d0d29e03db
Migration for min_amt on licenses
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:06:01 +00:00
snipe
92b7c4b5ec
Allow sorting on min_amt
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:05:13 +00:00
snipe
dff7c43aed
Added minimum account check for licenses
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:05:02 +00:00
snipe
9efbcbbd5e
Added min_amt to licenses
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:04:42 +00:00
snipe
31fa0a7044
Removed logging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 11:04:32 +00:00
snipe
fcb2bf7fea
Merge pull request #14335 from mauro-miatello/develop
...
Copy encrypted custom fields
2024-02-28 09:04:11 +00:00
snipe
0bd27d61b0
Added created_by to groups table
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-28 08:15:59 +00:00
snipe
369ecfa490
Merge pull request #14341 from marcusmoore/chore/sc-24900
...
Generate unique department names in factory
2024-02-28 07:07:45 +00:00
Marcus Moore
551354b1bb
Add group annotation for tests
2024-02-27 18:05:18 -08:00
Marcus Moore
03b7891edc
Remove unneeded factory states
2024-02-27 18:03:53 -08:00
Marcus Moore
8978dff054
Consolidate helpers into trait
2024-02-27 18:01:08 -08:00
Marcus Moore
d20844fefa
Improve readability by extracting additional helpers
2024-02-27 17:57:12 -08:00
Marcus Moore
cd579a04dd
Improve readability by extracting fireCheckOutEvent method
2024-02-27 17:52:18 -08:00
Marcus Moore
15b8140bff
Fix test helper
2024-02-27 17:48:17 -08:00
Marcus Moore
9a93ad2e06
Remove unneeded factory state
2024-02-27 17:46:27 -08:00
Marcus Moore
bd4d3aa52b
Improve readability by extracting additional helpers
2024-02-27 17:44:19 -08:00
Marcus Moore
bf32ab177f
Improve readability by extracting fireCheckInEvent method
2024-02-27 17:37:07 -08:00
Marcus Moore
2ea883aa15
Move Notification::fake() to setUp method
2024-02-27 17:23:30 -08:00
Marcus Moore
43cc296582
Consolidate additional tests
2024-02-27 17:14:35 -08:00
Marcus Moore
4c1aadd74e
Improve naming and inline helper
2024-02-27 17:09:22 -08:00
Marcus Moore
7d3719bf70
Consolidate some slack notification tests
2024-02-27 17:07:40 -08:00
Marcus Moore
c08164d864
Update test names
2024-02-27 16:48:17 -08:00
Marcus Moore
b156aa74a5
Update helper name
2024-02-27 16:45:49 -08:00
Marcus Moore
87ba2cb407
Generate unique names for departments
2024-02-27 12:47:56 -08:00
Marcus Moore
5084e5d3ef
Improve variable type
2024-02-27 12:23:26 -08:00
Marcus Moore
a5516e3511
Improve trait name
2024-02-27 12:06:29 -08:00
Marcus Moore
0e460baf82
Improve readability
2024-02-27 12:03:36 -08:00
Godfrey M
ef52777ffb
removed conditional
2024-02-27 11:33:00 -08:00
Godfrey M
b67ceab849
fields appear in preview, but not bulk generate labels
2024-02-27 11:29:19 -08:00
Marcus Moore
69022bb8b6
Implement test
2024-02-27 11:12:35 -08:00
akemidx
5ffade663a
unstash
2024-02-26 18:41:58 -05:00
spencerrlongg
c025e25839
just the basics and notes, pushing to keep track
2024-02-26 14:32:50 -06:00
Marcus Moore
29d729171c
Align test with actual values passed from the web
2024-02-26 11:13:39 -08:00
MrM
9475871edb
Fix multiple tooltip issue
...
If there are multiple tooltips, they all report the message "copied" because there is no element selection. This fix resolves the issue.
2024-02-25 14:48:05 +01:00
MrM
b69364d5ff
Add copy of encrypted custom fields
...
Encrypted custom fields may contain sensitive or important information, and it may be useful to have the ability to copy them.
2024-02-25 14:47:06 +01:00
snipe
10dad8e6e6
Merge pull request #14327 from snipe/fixes/better_ui_for_history_importer
...
Nicer UI for history importer
2024-02-23 11:43:15 +00:00
snipe
a184b4e67c
Nicer UI for history importer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-23 11:40:10 +00:00
snipe
8cd0a90ecd
Merge pull request #14325 from snipe/fixes/RB-17890
...
Check for valid supplier in license view
2024-02-23 10:49:56 +00:00
snipe
4a37632ef3
Check for valid supplier in license view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-23 10:48:53 +00:00
snipe
3271d020e9
Merge pull request #14319 from snipe/fixes/RB-17889
...
Check for activeFile before trying to get header on import
2024-02-23 08:19:21 +00:00
snipe
e494a2670f
Merge pull request #14321 from akemidx/accessory_pdf_dl_link
...
Adding in PDF download to Accesories/Asset/License Histories
2024-02-23 08:18:55 +00:00
snipe
d3a0a337b9
Merge pull request #14323 from ubc-cpsc/bugfix/CVE-2024-25117
...
Fixes CVE-2024-25117 php-svg-lib lacks path validation on font through SVG inline styles
2024-02-23 08:05:03 +00:00
Joël Pittet
3951ee746d
Fixes CVE-2024-25117, no other dependencies
2024-02-22 16:49:02 -08:00
Joël Pittet
84e4257e75
Fixes CVE-2024-25117
2024-02-22 16:40:08 -08:00
Marcus Moore
c401c88702
Scope event fake
2024-02-22 16:19:33 -08:00
Godfrey M
550f9e2afa
removes visibility checkmarks for certain fields when in new label engine
2024-02-22 16:19:28 -08:00
Marcus Moore
b55a19cebb
Add assertion event is dispatched with correct timestamp
2024-02-22 13:50:46 -08:00
Marcus Moore
4caadcfa19
Clear pending checkout acceptances when checking in asset via api
2024-02-22 13:33:16 -08:00
Marcus Moore
dba837b1d2
Move location migration logic to trait
2024-02-22 13:21:52 -08:00
Marcus Moore
714fc63050
Have legacy locations updated upon api asset checkin
2024-02-22 13:14:30 -08:00
spencerrlongg
b6fa6cba22
note before switching tasks
2024-02-22 15:01:14 -06:00
Marcus Moore
2df026bcb5
Allow updating asset default location when checking in asset via api
2024-02-22 12:40:14 -08:00
Godfrey M
6ee24a7527
remove unnecessary code reformat
2024-02-22 12:36:27 -08:00
Godfrey M
e2dcee1959
cleans up dead code
2024-02-22 12:26:57 -08:00
Godfrey M
4fbea9512f
puts textY inside of the forloop
2024-02-22 12:08:47 -08:00
Godfrey M
b7850ab839
puts textY outside of the forloop
2024-02-22 12:08:04 -08:00
Godfrey M
c0215baca5
minor changes
2024-02-22 11:41:04 -08:00
Godfrey M
c62758c5b5
adds custom field select to default label view
2024-02-22 11:36:39 -08:00
spencerrlongg
14358651e4
pushing to test other branches
2024-02-22 13:28:23 -06:00
snipe
f04aeb9f2b
Fixed spacing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-22 18:31:02 +00:00
snipe
dc902e7a5a
Fixed return type
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-22 18:30:23 +00:00
snipe
4fc66e19bb
Check for activeFile before trying to get header
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-22 18:28:01 +00:00
snipe
e12d2b2a42
Merge pull request #14317 from snipe/fixes/make_website_searchable_on_users_list
...
Made website searchable on users table
2024-02-22 17:01:58 +00:00
snipe
cb78451d6c
Made website searchable on users table
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-22 16:13:54 +00:00
snipe
7979bc63ae
Merge pull request #14316 from snipe/feature/sc-24871
...
Added email, phone icons
2024-02-22 14:50:46 +00:00
snipe
e8ad8a7448
Added email, phone icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-22 14:48:01 +00:00
snipe
eb61f5aa9e
Merge pull request #14315 from snipe/fixes/rb-3565
...
Only send notification if the item is assigned to a person
2024-02-22 12:05:59 +00:00
snipe
3351998efd
Only send notification if the item is assigned to a person
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-22 12:03:07 +00:00
spencerrlongg
20dbacd22f
store good, update needs work
2024-02-21 21:33:34 -06:00
akemidx
0f3be4fdf8
adding in eula pdf dl link. mimics activity log
2024-02-21 17:45:10 -05:00
Marcus Moore
3ae8adfbf9
Remove incomplete flag on test case
2024-02-21 12:33:32 -08:00
Marcus Moore
aa2632fe46
Merge branch 'develop' into chore/sc-24808
2024-02-21 12:33:06 -08:00
Brady Wetherington
8f2843bfcf
Merge branch 'develop' into snipeit_v7_laravel10
...
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
2024-02-21 20:22:28 +00:00
Godfrey M
14c86d447b
added filter to collectifunction
2024-02-21 11:38:03 -08:00
Godfrey M
bee016e0be
keeps example values in the example preview, fixes indent
2024-02-21 09:31:01 -08:00
snipe
54552fc95c
Merge pull request #14192 from inietov/fixes/api_issue_checkin_licenses
...
Fixed #14183 API /hardware/:id/checkin doesn't return Licenses
2024-02-21 11:35:06 +00:00
akemidx
9397372f87
permissions, but they are now all in their own column because reasons???
2024-02-20 18:48:17 -05:00
akemidx
8bbf6da052
user block, trying to pick out ONLY permissions we wanna see
2024-02-20 18:25:41 -05:00
snipe
ffa7d25fc0
Merge pull request #14308 from snipe/fixes/eager_load_relations_on_locations
...
Eager load relations to determine deletability on locations
2024-02-20 22:28:39 +00:00
snipe
a37d3b00d0
Merge pull request #14307 from marcusmoore/bug/sc-24867
...
Fixed title not appearing in new label engine
2024-02-20 22:25:45 +00:00
snipe
04891c7c61
Eager load relations to determine
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 22:25:00 +00:00
spencerrlongg
d67ff54f4b
temporary decrypt, almost there
2024-02-20 16:20:03 -06:00
Marcus Moore
ccec190985
Set label title properly
2024-02-20 13:59:50 -08:00
spencerrlongg
26728a85ad
this seems to work for patches
2024-02-20 13:18:40 -06:00
spencerrlongg
c6d85a1b0b
allows arrays on checkbox values
2024-02-20 12:23:24 -06:00
snipe
71610fb20f
Merge pull request #14304 from snipe/feature/sc-24018
...
Added ability to bulk delete locations
2024-02-20 18:14:51 +00:00
snipe
cb0f9024b1
Fixed gate
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 17:56:40 +00:00
snipe
1797480128
Few more translations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 17:27:56 +00:00
snipe
972b198248
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 17:27:16 +00:00
snipe
9010b7acd0
Use isDeletable instead of asset count
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 17:27:10 +00:00
snipe
b57b68571e
Added blade views
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:44:45 +00:00
snipe
1ca9420baa
Fixed incorrect gate
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:44:29 +00:00
snipe
0383938536
API-ify the managed locations tab in user view
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:44:20 +00:00
snipe
50b841d54d
Added table data-dash attributes to make the checkbox stuff work
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:43:57 +00:00
snipe
8f71460fa1
Formatting changes only
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:43:27 +00:00
snipe
d5324bce6a
Added more generic bulk translations for trans_choice
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:43:07 +00:00
snipe
660f3ccba1
Removed duplicate key
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:42:28 +00:00
snipe
bc8db3deab
Added bulk delete routes
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:42:14 +00:00
snipe
b2c8fbf349
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:42:04 +00:00
snipe
c3f21d9292
Removed new checkbox selectability on users and assets - more complicated work to be done
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:41:58 +00:00
snipe
9b146ae1d2
Formatting for API response
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:40:51 +00:00
snipe
a32c679519
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:40:31 +00:00
snipe
1e602793b2
Added manager ID to filter
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:40:23 +00:00
snipe
a6a65b7523
Fixed locations isDeletable check
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-20 16:40:09 +00:00
snipe
04c1d9cbff
Merge pull request #14302 from uberbrady/fix_uploaded_file_extensions
...
Clean up the file extension on image file uploads
2024-02-19 16:53:47 +00:00
Brady Wetherington
a6dfd67cd7
Clean up the file extension on image file uploads
2024-02-19 16:51:23 +00:00
snipe
7d178da61c
Merge pull request #14301 from snipe/bug/sc-24375
...
Disallow branding uploads in demo mode
2024-02-19 16:27:20 +00:00
snipe
30f9acfcf3
Disallow uploads in demo mode
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-19 16:11:17 +00:00
snipe
1e351b4d63
Merge pull request #14299 from snipe/fixes/fix_crash_on_purged_models_in_activity_report
...
Check that the model exists before trying to access properties
2024-02-19 15:36:44 +00:00
snipe
cb5b691ec1
Check that the model exists before trying to access properties
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-19 15:34:57 +00:00
snipe
b47b401245
Merge pull request #14298 from uberbrady/docker_fix_alpine_exif
...
Add missing EXIF PHP library for Alpine Docker image
2024-02-19 15:09:02 +00:00
Brady Wetherington
119e79e248
Add missing EXIF PHP library for Alpine Docker image
2024-02-19 15:00:13 +00:00
snipe
d7254053b6
Merge pull request #14297 from snipe/feature/sc-24855
...
Added `/backups/latest` to API endpoint
2024-02-19 14:40:13 +00:00
snipe
8f8edd4126
Added /backups/latest endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-19 14:35:09 +00:00
snipe
10bb844087
Added comment
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-19 14:34:51 +00:00
snipe
ba3baabb50
Fixed @return
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-19 14:34:36 +00:00
snipe
c76fbe4edb
Return 404 if download file isn’t found
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-19 13:05:44 +00:00
snipe
cae2de4fc9
Merge remote-tracking branch 'origin/develop'
2024-02-19 12:25:26 +00:00
snipe
7c346d977a
Merge pull request #14296 from snipe/fixes/return_download_for_backup_api
...
Better handle large downloads on backup API
2024-02-19 12:22:49 +00:00
snipe
9847934de9
Better handle large downloads on backup API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-19 12:20:37 +00:00
snipe
db73f80058
Starting off
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-16 18:57:50 +00:00
akemidx
4dd479dad7
formatting
2024-02-15 19:59:26 -05:00
akemidx
d01e1e8eeb
query works, but still only shows the asset once even if it's been checked out multiple times
2024-02-15 19:56:08 -05:00
akemidx
e3ef737ac4
query first go
2024-02-15 19:15:27 -05:00
Godfrey M
69317fb403
Marcus is a beast and condensed everything into 4 lines
2024-02-15 13:26:47 -08:00
Godfrey M
1b80c8938a
removed unnecessary if statement
2024-02-15 13:04:00 -08:00
Godfrey M
dc77c01fd3
removes spacing
2024-02-15 13:00:38 -08:00
Godfrey M
83474d6e59
moves the array manipulation up the page where it should be
2024-02-15 12:59:47 -08:00
Godfrey M
529310c93a
fixed typo in comment
2024-02-15 12:41:31 -08:00
Godfrey M
70f26f33a5
does a collect and map instead of a for loop for the array solution
2024-02-15 12:34:09 -08:00
Godfrey M
414bc10c40
removes the double for loop with a better solution
2024-02-15 12:02:08 -08:00
Godfrey M
250b0a7afb
gives a better example with custom fields in label preview
2024-02-15 11:50:41 -08:00
snipe
e5355db672
Merge remote-tracking branch 'origin/develop'
2024-02-15 18:39:57 +00:00
snipe
aef45a90b2
Merge pull request #14278 from uberbrady/allowlist_and_db_prefix_for_restore
...
Allowlist and db prefix for restore
2024-02-15 14:50:44 +00:00
snipe
9221641bba
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-02-15 14:50:37 +00:00
snipe
6bca1e3b22
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 14:48:07 +00:00
snipe
00cea3eb3c
Merge remote-tracking branch 'origin/develop'
2024-02-15 14:45:30 +00:00
snipe
19b52a2f24
Merge pull request #14279 from snipe/fixes/clearer_ui_for_fieldsets
...
Improved UI for fieldsets
2024-02-15 14:19:34 +00:00
snipe
6237f6192c
Added fieldset button
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 14:14:18 +00:00
snipe
cc58d4c3ad
Nicer form UI
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 14:08:06 +00:00
Brady Wetherington
6a78706a3e
New 'sanitize' version of backup-restore tool. Optional.
2024-02-15 13:27:18 +00:00
snipe
060c59bf9d
Merge remote-tracking branch 'origin/develop'
2024-02-15 12:30:22 +00:00
snipe
6fd3c494be
Merge pull request #14277 from snipe/fixes/change_log_level_to_info
...
Lower log level to warning on webhook failure
2024-02-15 12:28:57 +00:00
snipe
8adfa8dd83
Change exceptions to warnings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 12:28:12 +00:00
snipe
6c9001df09
Changed log level in checkoutable listener to info
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 12:20:14 +00:00
snipe
d6159d8cb5
Merge remote-tracking branch 'origin/develop'
2024-02-15 09:59:23 +00:00
snipe
81b9753b79
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/dist/all-defer.js
# public/mix-manifest.json
2024-02-15 09:58:09 +00:00
snipe
d8b1eec91b
Merge pull request #14197 from inietov/fixes/component_licenses_checkouts_not_displayed_in_asset_history
...
Fixes #14010 Adds Components and Licenses logs to Assets history view
2024-02-15 09:57:46 +00:00
snipe
b871813cfd
Merge pull request #14172 from spencerrlongg/bug/sc-23514
...
Resolve Duplicate Activity Logs for Imports
2024-02-15 09:54:43 +00:00
snipe
6f7dce53cc
Merge pull request #14276 from snipe/bug/sc-24828
...
Fixed ambiguous query on supplier_id in maintenances
2024-02-15 09:52:23 +00:00
snipe
13d2af2155
Fixed ambiguous query on supplier_id in maintenances
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 09:51:14 +00:00
snipe
bf3794822c
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 09:47:45 +00:00
snipe
1fa8fba5fe
Merge pull request #14268 from Godmartinz/checked-out-notif-fix
...
Fixed the notification listener
2024-02-15 08:29:15 +00:00
snipe
3d7697da6f
Merge pull request #14275 from snipe/snyk/14270
...
Upgrade webpack from 5.89.0 to 5.90.0
2024-02-15 08:28:26 +00:00
snipe
42cf17d3bf
Upgrade webpack from 5.89.0 to 5.90.0
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 08:27:52 +00:00
snipe
783e37f06d
Merge pull request #14274 from snipe/snyk/14269
...
Upgrade alpinejs from 3.13.3 to 3.13.5
2024-02-15 08:21:58 +00:00
snipe
9a4cda0bf6
Upgrade alpinejs from 3.13.3 to 3.13.5
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-15 08:21:19 +00:00
snipe
b6279af1d8
Merge pull request #14272 from marcusmoore/testing/update-state-helper-name
...
Updated testing helper name
2024-02-15 08:19:40 +00:00
Marcus Moore
bc0a7542ac
Change enableWebhook to enableSlackWebhook
2024-02-14 18:17:34 -08:00
akemidx
232fad0145
query and progress notes
2024-02-14 20:00:23 -05:00
Godfrey M
5cbcac28b1
adds custom fields as an example in label settings
2024-02-14 16:53:38 -08:00
Marcus Moore
aec59f2da6
Update assertion to be more correct
2024-02-14 12:27:42 -08:00
Marcus Moore
905df5ec25
Consolidate test cases
2024-02-14 12:14:27 -08:00
Marcus Moore
bacfdc5049
Scaffold additional tests
2024-02-14 11:33:03 -08:00
Marcus Moore
3cc72021b6
Move notification test to notifications test suite
2024-02-14 11:16:31 -08:00
spencerrlongg
115e0fc119
implode submitted arrays to save
2024-02-14 13:15:23 -06:00
Marcus Moore
4354e126b1
Scaffold tests
2024-02-14 11:11:08 -08:00
Marcus Moore
02f39472f9
Remove duplicate test
2024-02-14 11:10:59 -08:00
Marcus Moore
d7aed2edc9
Remove unneeded code
2024-02-14 11:10:45 -08:00
Marcus Moore
af513946a2
Implement test
2024-02-14 10:48:49 -08:00
Marcus Moore
7bfd02054b
Remove duplicate authorization check
2024-02-14 10:48:41 -08:00
spencerrlongg
1ceb703129
rm var
2024-02-14 12:44:09 -06:00
spencerrlongg
fb28882f65
trim potential spaces
2024-02-14 11:59:14 -06:00
spencerrlongg
d9c61fdb02
validation msg
2024-02-14 11:52:25 -06:00
spencerrlongg
72c118a70f
cleanup
2024-02-14 11:41:46 -06:00
Godfrey M
b136e9e29d
fix the listener to fire when checking in
2024-02-14 09:16:20 -08:00
snipe
50c910461a
Merge remote-tracking branch 'origin/develop'
2024-02-14 11:36:28 +00:00
snipe
88a84e9350
Merge pull request #14264 from snipe/feature/sc-24816
...
Added serial and status label to asset maintenances page and API
2024-02-14 10:37:01 +00:00
snipe
43bb8ae0a8
Added string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 10:14:44 +00:00
snipe
638071dadd
Check the asset is not deleted when creating the permissions array
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 10:14:38 +00:00
snipe
8a4c90ade8
Check that the asset is not deleted
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 10:14:25 +00:00
snipe
1dfa1da0ee
Disable the edit button if permission is not allowed
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 10:14:10 +00:00
snipe
71ebade641
Added serial and status to searchable relations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:59:10 +00:00
snipe
b86b05c4fc
Added serial and status fields to presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:58:55 +00:00
snipe
35a70988cb
Added sorting by status label
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:58:39 +00:00
snipe
56ba26eb45
Disallow editing of deleted assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:58:07 +00:00
snipe
adb8be9345
Added bootstrap formatting to show deleted assets more clearly
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:57:57 +00:00
snipe
abc9ee22c6
Added serial and status to transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:48:02 +00:00
snipe
e5ee9760c0
I don’t think we use these anyore because of the modifiers on date
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:47:33 +00:00
snipe
7868a8c174
Added serial for API controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:47:13 +00:00
snipe
03df4cec45
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:46:43 +00:00
spencerrlongg
25241542d2
progress, going to sleep
2024-02-14 02:12:31 -06:00
spencerrlongg
57a75e68b9
maybe i do the inverse here?
2024-02-14 00:52:50 -06:00
Marcus Moore
ad1846fed6
Implement tests
2024-02-13 17:50:26 -08:00
spencerrlongg
dcf2168454
initial stuff, need to switch branches
2024-02-13 19:35:37 -06:00
Marcus Moore
9ab56fe9ca
Implement tests
2024-02-13 17:04:53 -08:00
Marcus Moore
f708b8b299
Implement test
2024-02-13 14:30:26 -08:00
akemidx
c5e8d1c276
custom report tinker
2024-02-13 17:09:51 -05:00
akemidx
4093327b7f
adding in Last Checkin Date to Hardware view and index
2024-02-13 16:52:12 -05:00
Marcus Moore
391b832613
Implement test
2024-02-13 13:34:55 -08:00
Marcus Moore
b653d19579
Implement test
2024-02-13 13:29:54 -08:00
akemidx
4a57cfaf3e
commenting out the nulling of last checkout date on checkin page and API
2024-02-13 16:21:18 -05:00
Marcus Moore
31a75bd252
Add some assertions
2024-02-13 13:17:02 -08:00
snipe
e2c3386c33
Merge remote-tracking branch 'origin/develop'
2024-02-13 20:37:17 +00:00
Marcus Moore
0506f3bef9
Scaffold additional tests
2024-02-13 12:35:31 -08:00
snipe
a866d6b16e
Merge pull request #14261 from snipe/fixed/missing_location_string
...
Fixed incorrect string for location not existing
2024-02-13 20:29:32 +00:00
snipe
a76a69d085
Fixed incorrect string for location not existing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-13 20:23:32 +00:00
Marcus Moore
852b0b3f11
Scaffold additional tests
2024-02-13 12:15:59 -08:00
Marcus Moore
307b39bd38
Implement tests around asset check in
2024-02-13 12:03:27 -08:00
spencerrlongg
d55358652b
cleanup for pr
2024-02-13 13:45:56 -06:00
Brady Wetherington
955f75f733
Fixes for the prefix-guessing and sanitizing.
2024-02-13 16:45:24 +00:00
snipe
280e778749
Merge remote-tracking branch 'origin/develop'
2024-02-13 13:46:52 +00:00
snipe
60ba898167
Merge pull request #14255 from marcusmoore/chore/sc-24805
...
Added LDAP group tag to LDAP tests
2024-02-13 13:42:51 +00:00
snipe
2c9d5b9ea3
Merge pull request #14247 from ubc-cpsc/bugfix/CVE-2023-37260
...
Fixes CVE-2023-37260 upgrading league/oauth2-server
2024-02-13 13:40:53 +00:00
snipe
eb6e2636b5
Merge pull request #14246 from ubc-cpsc/bugfix/CVE-2022-24894
...
Fixes CVE-2022-24894 by upgrading symfony/http-kernel
2024-02-13 13:40:33 +00:00
snipe
4c1964d509
Merge pull request #14245 from ubc-cpsc/bugfix/CVE-2024-24821
...
Fixes CVE-2024-24821 by upgrading composer/composer
2024-02-13 13:39:16 +00:00
snipe
7547277352
Merge pull request #14236 from snipe/jerm/upgrade-script-enhancements
...
Change how we check forward-looking upgrade requirements
2024-02-13 13:38:35 +00:00
snipe
3e00bc49fd
Merge pull request #14250 from mauro-miatello/develop
...
Cleaned up navbar-custom-menu
2024-02-13 13:33:03 +00:00
snipe
99e0b65de7
Merge pull request #14256 from marcusmoore/bug/sc-24790
...
Fixed accessory check in emails being sent when setting disabled
2024-02-13 13:32:42 +00:00
Brady Wetherington
70ef904951
Actually got this pretty close to being able to do a restore
2024-02-13 12:16:15 +00:00
Brady Wetherington
fcf023e3d2
WIP: trying to get prefixing and sanitization working
2024-02-13 12:16:15 +00:00
Brady Wetherington
8c882ddead
Starting to abstract out the SQL Streaming logic into its own class
2024-02-13 12:16:15 +00:00
Brady Wetherington
7d136f9970
Initial rough stabs at prefix removal and SQL sanitization
2024-02-13 12:16:15 +00:00
Jeremy Price
f4c1460c2b
remove help text options until i put together the help text
2024-02-12 19:18:26 -08:00
Jeremy Price
bb2e1de0a8
Change how we check forward-looking upgrade requirements
...
In https://github.com/snipe/snipe-it/pull/14128 we added the capability
for the upgrade.php script to check version requirements _before_
downloading the new source, to help keep from breaking installations.
Turns out, `file_get_contents()` isn't a reliable way to grab a url, because
some systems have `allow_url_fopen` turned off in their PHP
configurations.
In this iteration, we swap that out for a curl function, while also
adding more error handling, the ability to entirely skip the
PHP version checks if for some reason you Just Can't query the upgrade
json correctly, as well as adding a lot of helpful text around the whole
issue.
Additionally, I've added some error checking around DB backups and
initial artisan down-ing, since shell_exec would happily march right
past any errors.
2024-02-12 19:18:26 -08:00
Marcus Moore
c81bc1d2ee
Scaffold tests around asset check in
2024-02-12 17:54:22 -08:00
Marcus Moore
7154d23759
Pass the correct variable to the route helper
2024-02-12 16:45:18 -08:00
Marcus Moore
df23fd0dee
Remove usused import
2024-02-12 16:35:54 -08:00
Marcus Moore
adfb8895df
Improve factory state name
2024-02-12 16:31:32 -08:00
Marcus Moore
c8e12ddb5c
Remove bug in factory state
2024-02-12 16:30:09 -08:00
Marcus Moore
5b181ecea7
Remove old comment
2024-02-12 16:29:34 -08:00
Marcus Moore
728aaaab20
Ensure accessory check in emails are not sent when the setting is disabled
2024-02-12 16:22:59 -08:00
akemidx
f7d0cecdac
permissions query starto
2024-02-12 19:01:06 -05:00
Marcus Moore
095a7d9b34
Scaffold tests around accessory check in
2024-02-12 12:54:48 -08:00
Marcus Moore
cf53f2778f
Add LDAP test cases to group
2024-02-12 12:28:27 -08:00
snipe
65e20282b6
Merge pull request #14251 from snipe/dependabot/github_actions/develop/codacy/codacy-analysis-cli-action-4.4.0
...
Bump codacy/codacy-analysis-cli-action from 4.3.0 to 4.4.0
2024-02-12 08:35:30 +00:00
dependabot[bot]
405c5b5ad0
Bump codacy/codacy-analysis-cli-action from 4.3.0 to 4.4.0
...
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action ) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases )
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.3.0...v4.4.0 )
---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-02-12 08:33:17 +00:00
MrM
6f0fe16b87
Update default.blade.php
...
removed some repeated attributes
2024-02-11 18:45:37 +01:00
snipe
111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146
...
Fixes Default Location Being Set During Asset Creation and Checkout
2024-02-10 11:47:46 +00:00
Joël Pittet
b8a478f558
Fixes by CVE-2023-37260 upgrading league/oauth2-server
2024-02-09 17:24:07 -08:00
Joël Pittet
9f7084d077
Revert "Fixes by CVE-2022-24894 upgrading league/oauth2-server"
...
This reverts commit 0840cd3df3 .
2024-02-09 17:22:36 -08:00
Joël Pittet
0840cd3df3
Fixes by CVE-2022-24894 upgrading league/oauth2-server
2024-02-09 17:21:24 -08:00
Joël Pittet
cefdaf9a9b
Fixes CVE-2022-24894
2024-02-09 17:17:44 -08:00
Joël Pittet
13335b19e9
Fixes CVE-2024-24821
2024-02-09 17:04:34 -08:00
snipe
6e471a27e7
Merge remote-tracking branch 'origin/develop'
2024-02-09 21:10:27 +00:00
snipe
513ea67e7d
Merge pull request #14244 from snipe/fixes/null_barcode_if_hard_deleted
...
Return null if asset was hard-deleted/purged
2024-02-09 21:09:17 +00:00
snipe
3868e711f4
Return null if asset was hard-deleted/purged
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 21:08:07 +00:00
snipe
f33f712de7
Merge remote-tracking branch 'origin/develop'
2024-02-09 21:00:16 +00:00
snipe
c12e1f6d6c
Merge pull request #14243 from snipe/fixes/reports_controller_when_item_is_deleted
...
Fixed ReportsController to not try to return a serial if the item doesn’t exist
2024-02-09 20:54:37 +00:00
snipe
479abd5231
Do not try to return a serial if the item doesn’t exist
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:53:33 +00:00
snipe
a60a24a4a8
Merge remote-tracking branch 'origin/develop'
2024-02-09 20:42:48 +00:00
snipe
55b3050ca8
Re-applied previous withTrashed PR
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:37:18 +00:00
snipe
2c996a8508
Merge pull request #14241 from snipe/revert-14240-feature/sc-24786
...
Revert "Fixed barcodes crashing if asset was deleted"
2024-02-09 20:36:02 +00:00
snipe
84f8eee869
Revert "Fixed barcodes crashing if asset was deleted"
2024-02-09 20:35:45 +00:00
snipe
590c19dbd7
Merge pull request #14240 from snipe/feature/sc-24786
...
Feature/sc 24786
2024-02-09 20:28:31 +00:00
snipe
fa47707974
Use withTrashed() to get the barcode on deleted assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:26:49 +00:00
snipe
ca62481083
Added button and route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:23:13 +00:00
snipe
1c3306046c
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-02-08 23:14:54 +00:00
snipe
f4fc845375
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-08 23:06:47 +00:00
snipe
a7af987322
Merge pull request #14229 from Godmartinz/select2-target-fix
...
Fixed select inputs un-select2-ifying on mobile
2024-02-08 23:04:55 +00:00
Godfrey M
c4eaae923a
removed vue comments since they do not apply anymore
2024-02-08 15:02:47 -08:00
snipe
849ba02516
Merge pull request #14187 from Godmartinz/general-hook_fix
...
Fixed the general webhook not notifying anymore
2024-02-08 23:01:36 +00:00
Godfrey Martinez
9dcd14a712
Merge branch 'develop' into general-hook_fix
2024-02-08 14:59:25 -08:00
snipe
3412b4dc5a
Merge remote-tracking branch 'origin/develop'
2024-02-08 14:58:24 +00:00
snipe
a3b96aff1f
Merge pull request #14233 from uberbrady/prevent_svg_injection_with_fake_extensions_rebased
...
Fixes file upload XSS vulnerability [sc-24156]
2024-02-08 14:56:59 +00:00
Brady Wetherington
9bb191f29f
Fixes file upload XSS vulnerability [sc-24156]
2024-02-08 14:30:40 +00:00
snipe
4a43ccfa92
Merge pull request #14228 from akemidx/bug/sc-23516
...
Fixed: 404 Error on Importer When Uploading a .csv Under Certain Circumstance
2024-02-08 13:43:07 +00:00
spencerrlongg
bcfa913450
condition makes this work, needs more testing
2024-02-07 20:03:37 -06:00
spencerrlongg
43d8474caa
a note to remember this tomorrow
2024-02-06 17:45:46 -06:00
Godfrey M
b73e8642d3
removed unnecessary changes
2024-02-06 13:06:21 -08:00
Godfrey M
cfe2277a64
forgot to remove comment line
2024-02-06 13:05:04 -08:00
akemidx
e776c2cffa
formatting the button tag
2024-02-06 15:51:04 -05:00
Godfrey M
ca59bc3c9c
removes if statement that prevents select2-ifying inputs
2024-02-06 12:46:17 -08:00
akemidx
575362f4dc
adding in line to null out the active file on click of button
2024-02-06 15:38:07 -05:00
snipe
f0139c5e41
Merge remote-tracking branch 'origin/develop'
2024-02-06 18:25:19 +00:00
snipe
5f8ac66036
Merge pull request #14223 from Godmartinz/user-bulk-edit
...
Fixed Select2 functionality in User bulk check-in Delete User
2024-02-06 18:22:46 +00:00
snipe
a49e66c689
Merge remote-tracking branch 'origin/develop'
2024-02-06 16:42:16 +00:00
snipe
1630e4bc2f
Merge pull request #14227 from snipe/fixes/bulk_update_by_audit_interval
...
Switch to bulk updating to handle audit interval updates
2024-02-06 16:06:08 +00:00
snipe
bf674a0f4d
Removed backticks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-06 15:58:36 +00:00
snipe
b170755c3d
Switch to bulk updating to handle audit interval updates
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-06 15:52:46 +00:00
snipe
b25612bbac
Merge remote-tracking branch 'origin/develop'
2024-02-06 09:09:39 +00:00
snipe
a43183ff96
Increased chunk
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-06 09:09:27 +00:00
Godfrey M
5aa34695a1
z
2024-02-05 16:41:29 -08:00
snipe
3b36372a66
Merge pull request #14222 from marcusmoore/tests/company-get-id-for-current-user
...
Added tests around getIdForCurrentUser method
2024-02-05 22:04:08 +00:00
snipe
e763693829
Merge remote-tracking branch 'origin/develop'
2024-02-05 20:51:37 +00:00
snipe
e08d60ed18
Merge pull request #14221 from snipe/bug/sc-24749
...
Chunk data to reduce memory on large datasets when updating `next_audit_date`
2024-02-05 20:50:41 +00:00
Marcus Moore
9e6e2de71e
Add docblock
2024-02-05 12:49:29 -08:00
snipe
b49935701b
Chunk data to reduce memory on large datasets when updating next_audit_date
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 20:48:24 +00:00
Marcus Moore
76cc5995d9
Write tests around getIdForCurrentUser method [sc-24748]
2024-02-05 12:38:33 -08:00
snipe
c0fbf106ed
Merge remote-tracking branch 'origin/develop'
2024-02-05 19:13:17 +00:00
snipe
7b4020c5e9
Updated string paths for URL
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 19:09:16 +00:00
snipe
383e3829e5
Merge remote-tracking branch 'origin/develop'
2024-02-05 19:04:40 +00:00
snipe
91356af838
Merge pull request #14220 from snipe/bug/sc-24740
...
Removed loading of assets for label count
2024-02-05 19:02:10 +00:00
snipe
4c967a43a7
Removed loading of assets for label count
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 18:56:51 +00:00
snipe
deca842eb0
Merge remote-tracking branch 'origin/develop'
2024-02-05 18:35:56 +00:00
snipe
44366746dd
Merge pull request #14219 from snipe/fixes/resurface_load_remote
...
Fixed #14185 - Resurfaced `load_remote` in admin
2024-02-05 18:33:11 +00:00
snipe
3806cec10e
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 18:28:05 +00:00
snipe
a800fa07f9
Removed duplicate string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 18:27:58 +00:00
snipe
32c360f032
Re-added UI for load_remote
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 18:23:52 +00:00
snipe
25f1445afc
Merge branch 'master' of https://github.com/snipe/snipe-it
2024-02-05 17:26:54 +00:00
snipe
0042359e5f
Prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 17:23:30 +00:00
snipe
cf2e2bfbc1
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 17:23:21 +00:00
snipe
60f9a8be9a
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-02-05 17:22:58 +00:00
snipe
8316db9702
Merge pull request #13805 from gitgrimbo/more_line_based_markdown
...
Use parseEscapedMarkedownInline for more views
2024-02-05 17:19:41 +00:00
snipe
1a480435de
Merge pull request #14190 from marcusmoore/bug/sc-24685
...
Fixed consumable checkout via API not sending notification
2024-02-05 17:16:57 +00:00
snipe
ebc373744a
Merge pull request #14218 from snipe/security/alpine_3_18_6
...
Security upgrade alpine from 3.18.5 to 3.18.6 #14178
2024-02-05 17:16:18 +00:00
snipe
650aa25659
Merge pull request #14191 from Godmartinz/googlechat_webhook
...
Added support for Google Chat notifications
2024-02-05 17:10:54 +00:00
snipe
212dd06948
Security upgrade alpine from 3.18.5 to 3.18.6 #14178
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 17:07:31 +00:00
snipe
b6eea2e170
Merge pull request #14217 from snipe/security/snyk_bs_table_14199
...
Upgrade bootstrap-table from 1.22.1 to 1.22.2 #14199
2024-02-05 16:59:51 +00:00
snipe
688017bd8a
Upgrade bootstrap-table from 1.22.1 to 1.22.2
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 16:59:01 +00:00
snipe
58a9c27342
Merge remote-tracking branch 'origin/develop'
2024-02-05 16:31:32 +00:00
snipe
f52b00256d
Merge pull request #14213 from snipe/fixes/orientate_on_exif
...
Fixed FD-40296 - mobile uploads sometimes uploading with incorrect orientation
2024-02-05 16:22:03 +00:00
snipe
2d48d96b3c
Merge remote-tracking branch 'origin/develop'
2024-02-05 16:10:54 +00:00
snipe
abd13a1140
Merge pull request #14216 from snipe/bug/sc-24727
...
Fixed company asset counts for dashboard widget
2024-02-05 16:07:40 +00:00
snipe
5882d71f9b
Fix company asset counts for dashboard widget
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 15:55:53 +00:00
snipe
dc92bbf61e
Merge pull request #14215 from snipe/bug/sc-24726
...
Removed initial check for assets, licenses, etc
2024-02-05 15:54:45 +00:00
snipe
e6fdeb0e8a
Removed initial check for assets, licenses, etc
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 15:30:18 +00:00
snipe
3b948c7b7e
Add orientate to image upload
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 14:29:43 +00:00
snipe
d965fe759a
Fixed #14211 - duplicate array key ldap_emp_num
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 12:28:24 +00:00
Ivan Nieto Vivanco
5e4a3379a9
Adds Components and Licenses logs to Assets history view
2024-02-01 01:35:25 -06:00
Godfrey M
9dc428b720
ran composer update on the package since the version was explicitized
2024-01-31 17:30:56 -08:00
Godfrey M
8a5b469ff8
adds # to webhook channel trigger
2024-01-31 12:54:30 -08:00
Godfrey M
ed06f32a7a
adds # to webhook channel trigger
2024-01-31 12:53:56 -08:00
Godfrey M
a876703f8f
spacing
2024-01-31 10:48:48 -08:00
Godfrey M
01bb8d8c9a
spacing
2024-01-31 10:48:23 -08:00
Godfrey M
f452204d62
applies a conditional to have the the integration test button function properly
2024-01-31 10:47:25 -08:00
Ivan Nieto Vivanco
51ae485f20
When asset is checked-in the assigned licenses also are taken from the user
2024-01-30 19:44:38 -06:00
Godfrey M
0eabb147b2
adds google notif to consumable check out
2024-01-30 13:19:28 -08:00
Marcus Moore
2e0e39ccc8
Ensure notification is sent when consumable is checked out via api
2024-01-30 13:19:20 -08:00
spencerrlongg
63e733f0d6
changes from a note to a source
2024-01-30 15:14:59 -06:00
Godfrey M
2406d2cfdb
adds google notifs to license seats check in and out
2024-01-30 13:14:24 -08:00
Godfrey M
e074ca0bf9
adds google notifs to accessories check in and out
2024-01-30 12:57:45 -08:00
Marcus Moore
13c37e708f
Implement tests around consumable checkout
2024-01-30 12:43:20 -08:00
Marcus Moore
3f76d65b95
Improve test method name
2024-01-30 12:43:07 -08:00
Godfrey M
87bce0c097
adds google notifs for asset check in and out
2024-01-30 12:38:17 -08:00
Marcus Moore
6d41c8cf67
Merge branch 'develop' into bug/sc-24685
2024-01-30 11:44:36 -08:00
Godfrey M
22385a8e35
fix for general webhook not notifiying anymore
2024-01-30 10:47:18 -08:00
snipe
77fa213ccd
Merge pull request #14181 from marcusmoore/bug/sc-24671
...
Fixed accessory checkout via API not sending notification and not adhering to qty limit
2024-01-30 14:24:42 +00:00
spencerrlongg
d0a82adc3f
changed condition
2024-01-29 20:44:26 -06:00
Marcus Moore
de2aa903c5
Scaffold tests
2024-01-29 17:56:55 -08:00
Marcus Moore
42ec2548c9
Fire event when accessory checked out via API
...
Brings behavior in line with GUI controller
2024-01-29 17:03:19 -08:00
Marcus Moore
a2cba67f4e
Improve assertion
2024-01-29 16:59:57 -08:00
Marcus Moore
7d45cfff2c
Ensure accessory available when checking out via api
2024-01-29 16:49:09 -08:00
Marcus Moore
f1ab8253f0
Implement tests included two currently failing tests
2024-01-29 16:48:40 -08:00
Marcus Moore
e5d3df7d24
Scaffold accessory checkout tests for api
2024-01-29 15:59:23 -08:00
Marcus Moore
987676df08
Implement additional tests
2024-01-29 15:56:18 -08:00
Marcus Moore
f16f62f76c
Scaffold and implement some tests around accessory checkout
2024-01-29 14:21:30 -08:00
Brady Wetherington
8a2f3405d5
Merge branch 'develop' into snipeit_v7_laravel10
...
A lot of changes here, but hopefully this works?
2024-01-29 22:12:58 +00:00
Godfrey M
dfa33f651a
webhook test works
2024-01-29 12:58:09 -08:00
Godfrey M
30c2927987
merged develope
2024-01-29 11:21:00 -08:00
Godfrey M
e8159d97fa
changes
2024-01-29 11:12:25 -08:00
snipe
86c625ed8f
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2024-01-27 15:12:03 +00:00
snipe
3da7876631
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-27 15:08:52 +00:00
spencerrlongg
1248260df3
i don't think the output needs to separately escaped, the entire statement is already wrapped in {{}}
2024-01-26 12:33:35 -06:00
spencerrlongg
4cb804cf03
get rid of e() on store and update
2024-01-26 11:56:02 -06:00
spencerrlongg
2b0dd8851c
probably needs more testing... but should work
2024-01-26 11:47:09 -06:00
snipe
9136415bb2
Merge remote-tracking branch 'origin/develop'
2024-01-26 15:58:21 +00:00
snipe
c0241a8421
Merge pull request #14175 from uberbrady/rebased_snipe_translator
...
Fixed #14173 : Use new SnipeTranslator to handle pluralized localizations
2024-01-26 15:54:11 +00:00
Brady Wetherington
401e1842ee
Fixed pluralization bug due to dashed-locale names instead of underscored
...
Our locale directories are named things like 'en-US'. But the pluralization
code used by Laravel (through Symfony) requires locale names to be
in the format en_US. This change introduces a new Translator,
SnipeTranslator, which is a tiny set of changes against the built-in
one. It additionally adds a SnipeTranslationServiceProvider, which
loads up the new Translator.
2024-01-26 15:40:55 +00:00
snipe
ad2e0cc7f3
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-26 15:17:59 +00:00
spencerrlongg
2deba17d91
that's all of 'em
2024-01-25 20:04:02 -06:00
spencerrlongg
3574ef5bb9
a few more imports, component sample
2024-01-25 19:54:53 -06:00
spencerrlongg
abf13f1619
revert spacing
2024-01-25 19:37:59 -06:00
spencerrlongg
4a7df470f0
this works
2024-01-25 19:34:41 -06:00
spencerrlongg
c9101f4d97
initial work, not working yet
2024-01-25 18:18:24 -06:00
snipe
14db425725
Merge remote-tracking branch 'origin/develop'
2024-01-25 21:45:49 +00:00
snipe
b39d11cc06
Merge pull request #14171 from snipe/fixes/fd-39934
...
Removed attribute assigning blank EOL as 0
2024-01-25 21:41:18 +00:00
snipe
d6c61e1429
Removed attribute assigning blank EOL as 0
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-25 21:34:20 +00:00
snipe
aa14d5e6b6
Merge remote-tracking branch 'origin/develop'
2024-01-25 20:18:36 +00:00
snipe
85a158eaef
Merge pull request #14170 from uberbrady/saml_nonce_storage
...
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
2024-01-25 20:14:40 +00:00
Brady Wetherington
d3815ddce7
Remove commented-out timestamps on the saml_nonces table
2024-01-25 20:13:49 +00:00
Brady Wetherington
b39b575fec
Add table-check; add command-description for Artisan command
2024-01-25 20:07:18 +00:00
Brady Wetherington
81b8243e1d
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute
2024-01-25 19:53:24 +00:00
Jeremy Price
43c8e98ec7
Set v6 upgrade requirements in .upgrade_requirements.json -- REVERT FOR v7
...
This was originally created on the v7 branch, and had v7 requirements,
but we're backporting it so that people have it in-hand before v7 launches.
Since v7 hasn't launched yet, and people can use it for upgrading to new
v6's potentially, we'll make it v6 happy for now.
2024-01-25 10:12:08 -08:00
snipe
9d1abb0aa7
Merge pull request #14127 from snipe/jerm/upgrade-deps-file
...
Add php version requirements file for future-proofing upgrades
2024-01-25 10:09:35 -08:00
snipe
4e59b83885
Merge pull request #14128 from snipe/jerm/upgrade-dot-php
...
Add remote requirements checking to upgrade.php
2024-01-25 10:09:03 -08:00
snipe
d8a9d93b1d
Merge remote-tracking branch 'origin/develop'
2024-01-25 08:30:56 +00:00
snipe
ab926f2e33
Merge pull request #14153 from Godmartinz/ms_teams_webhook
...
Added support for Microsoft Teams Notifications
2024-01-25 08:27:17 +00:00
snipe
b76500e32d
Merge remote-tracking branch 'origin/develop'
2024-01-25 00:22:18 +00:00
snipe
45b253a57d
Merge pull request #14164 from marcusmoore/bug/sc-20686
...
Avoid unnecessarily hydrating models on asset show page
2024-01-25 00:20:30 +00:00
Marcus Moore
f5dafc477a
Avoid unnecessary model hydration on asset model show page
2024-01-24 16:14:51 -08:00
Godfrey M
6e9a46e582
working on Chat integration test
2024-01-24 15:50:36 -08:00
Godfrey M
c65b32bcdb
removed translation fixed via method
2024-01-24 14:49:42 -08:00
Godfrey M
1d3124f89f
adding a test variable for test methods
2024-01-24 14:38:45 -08:00
snipe
57a8630e99
Merge pull request #14162 from snipe/bug/sc-24511
...
Fixed #14114 - correctly sort related fields for labels
2024-01-24 21:37:20 +00:00
snipe
105d4899f5
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 20:33:13 +00:00
snipe
0715f68c0e
Merge remote-tracking branch 'origin/develop'
2024-01-24 20:18:43 +00:00
snipe
5909654fd4
Merge pull request #14163 from Godmartinz/ldap_test_table_fix
...
Added overflow scroll to ldap test table
2024-01-24 20:18:08 +00:00
Godfrey M
e175cdbfd7
adds table overflow scroll
2024-01-24 12:13:40 -08:00
snipe
896b16d4d5
Merge remote-tracking branch 'origin/develop'
2024-01-24 19:49:50 +00:00
snipe
5f8e63717d
Merge pull request #14058 from Godmartinz/ldap_test_table_fix
...
Fixed Ldap sync test table and table data from overflowing
2024-01-24 19:31:04 +00:00
Godfrey M
ada1a593a4
add google placeholder
2024-01-24 11:29:32 -08:00
snipe
2c7bbfa637
Added additional sort/order hidden fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 19:09:20 +00:00
snipe
ba680126bc
Properly sort the results based on non-asset fields
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 19:09:06 +00:00
snipe
dd3b2da670
Updated variable names for clarity, remove the concat of order and sort
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 19:08:47 +00:00
Godfrey M
00f07ac2ce
add translations, brush up code
2024-01-24 10:38:06 -08:00
snipe
165f9545ac
Merge pull request #13924 from snipe/bug/sc-20167
...
Set qty mutators
2024-01-24 18:21:06 +00:00
snipe
fff21416be
Merge pull request #14051 from akemidx/email_in_license_table
...
Email in License Seat Table
2024-01-24 15:37:43 +00:00
snipe
f760397837
Merge remote-tracking branch 'origin/develop'
2024-01-24 15:36:45 +00:00
snipe
dc84e0f3ae
Merge pull request #14161 from snipe/localizations/updated_with_new_strings
...
Updated language strings
2024-01-24 15:31:09 +00:00
snipe
8ca4c51186
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 15:29:39 +00:00
snipe
f247661f07
Merge pull request #14159 from snipe/fixes/not_array_typo
...
Fixed english and attribute placeholder
2024-01-24 14:59:57 +00:00
snipe
f73a55f9ab
Fixed english and attribute placeholder
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 14:58:06 +00:00
snipe
7668a6767d
Merge pull request #14102 from Godmartinz/seat-id-is-zero
...
Fixed license seats id turning to zero when sorting by department
2024-01-24 14:49:33 +00:00
snipe
684264dac7
Merge pull request #14158 from snipe/fixes/moved_url_string_again
...
Moved URL string to general
2024-01-24 14:48:26 +00:00
snipe
e6f94cfebf
Missed one
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 14:47:54 +00:00
snipe
c54eb22754
Moved URL string to general
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-24 14:46:52 +00:00
snipe
661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations
...
Adds translations for Label example
2024-01-24 13:36:40 +00:00
snipe
36f8311204
Merge remote-tracking branch 'origin/develop'
2024-01-24 13:35:04 +00:00
snipe
25db35e41e
Merge pull request #14128 from snipe/jerm/upgrade-dot-php
...
Add remote requirements checking to upgrade.php
2024-01-24 13:23:10 +00:00
snipe
49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501
...
Improved radio button values in custom report form
2024-01-24 13:22:48 +00:00
snipe
bfc9be6b97
Merge pull request #14149 from snipe/dependabot/github_actions/develop/actions/cache-4
...
Bump actions/cache from 3 to 4
2024-01-24 13:22:08 +00:00
snipe
1b7885677a
Merge pull request #14155 from uberbrady/ldap_location_fixes
...
Fix for LDAP syncing with base_dn and location_id and location [FD-39651]
2024-01-24 13:21:46 +00:00
Brady Wetherington
3bc1b9038d
Fix for LDAP syncing with base_dn and location_id and location
2024-01-24 11:54:29 +00:00
Marcus Moore
d65c0c8bea
Remove comma
2024-01-23 15:22:00 -08:00
Marcus Moore
2d5631284b
Indent
2024-01-23 15:19:36 -08:00
Marcus Moore
3952fc10a6
Re-render order number properly
2024-01-23 15:18:02 -08:00
Marcus Moore
0881301b6d
Fix language strings
2024-01-23 13:55:20 -08:00
Marcus Moore
530ea474d1
Merge branch 'develop' into saving_custom_report_template
...
# Conflicts:
# resources/lang/en/admin/reports/general.php
# resources/views/reports/custom.blade.php
2024-01-23 13:55:07 -08:00
Godfrey M
49021d277c
if not location add default location
2024-01-23 13:33:57 -08:00
Godfrey M
f270672a3d
added a location check, to prevent notif blowing up
2024-01-23 13:05:39 -08:00
Godfrey Martinez
b797795d37
Merge pull request #11 from Godmartinz/license_checkable
...
adds consumable checkout ms notification
2024-01-23 11:22:02 -08:00
Godfrey M
7c529df49b
adds consumable checkout ms notification
2024-01-23 11:21:20 -08:00
Godfrey Martinez
81e92228f3
Merge pull request #10 from Godmartinz/license_checkable
...
adds licenses ms notifications
2024-01-23 11:12:02 -08:00
Godfrey M
e969f8808c
adds licenses ms notifications
2024-01-23 11:10:04 -08:00
Godfrey M
5a46ef5d5b
adds Accessory Check in out Notifcations,
2024-01-22 15:30:15 -08:00
Marcus Moore
219540281f
Add trailing commas
2024-01-22 12:42:01 -08:00
Godfrey M
f049cf5b06
adds Asset Check Out Notification
2024-01-22 10:57:22 -08:00
dependabot[bot]
a1ccea4e34
Bump actions/cache from 3 to 4
...
Bumps [actions/cache](https://github.com/actions/cache ) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases )
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md )
- [Commits](https://github.com/actions/cache/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-01-22 08:50:37 +00:00
Marcus Moore
b74115b604
Add docblocks
2024-01-18 15:42:52 -08:00
Marcus Moore
1630392953
Uncheck a couple boxes by default to match existing behavior
2024-01-18 13:30:51 -08:00
Marcus Moore
861ef6312e
Use is_iterable for checks instead of is_array
2024-01-18 13:04:41 -08:00
Marcus Moore
f64aa4dfd4
Improve variable name
2024-01-18 11:58:34 -08:00
snipe
2fa5eb4365
Merge pull request #14144 from snipe/fixes/updated_apple_url
...
Updated URL for apple manufacturer
2024-01-18 11:53:28 +00:00
snipe
aceb072a1b
Updated URL for apple manufacturer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-18 11:49:30 +00:00
snipe
0fbf154187
Merge remote-tracking branch 'origin/develop'
2024-01-18 10:50:12 +00:00
snipe
2a7be4dfd5
Merge pull request #14143 from fe80/feat/redis-database
...
feat(config): add REDIS_DATABASE support
2024-01-18 10:49:32 +00:00
fe80
f52b17cca6
feat(config): add REDIS_DATABASE support
...
Add the possibility to set the redis database to use.
The default value is still 0
2024-01-18 11:32:51 +01:00
Godfrey M
befab608f2
cha cha cha changes
2024-01-17 17:59:20 -08:00
Marcus Moore
786c41ad79
Add some type hints
2024-01-17 17:41:03 -08:00
Marcus Moore
b24d80680e
Add clarifying comments
2024-01-17 17:32:35 -08:00
Godfrey M
cdcd868162
formats check in message for MS Teams
2024-01-17 17:31:23 -08:00
Marcus Moore
1a1f417633
Change variable name to keep foreach scoped
2024-01-17 17:00:03 -08:00
Marcus Moore
bbfee27fd3
Implement test
2024-01-17 16:40:05 -08:00
Godfrey M
ce02e43ab2
fixed integration link, added some conditionals
2024-01-17 16:30:27 -08:00
Marcus Moore
691e81d827
Implement some tests
2024-01-17 16:25:28 -08:00
Godfrey M
9f2af40ef2
adds MS teams integration test
2024-01-17 13:41:45 -08:00
Marcus Moore
0ac1dd314a
Organize tests
2024-01-17 13:19:54 -08:00
Marcus Moore
82f4cc799b
Improve variable name
2024-01-17 11:54:37 -08:00
Godfrey M
93ef8317e8
added payload, new MS webhook test method
2024-01-17 11:49:31 -08:00
Marcus Moore
4d8d069bbc
Update placeholder
2024-01-17 11:43:34 -08:00
Marcus Moore
5a396cc997
Add assertion
2024-01-17 11:24:50 -08:00
Marcus Moore
0883321d9e
Only limit template creator scope when authenticated
2024-01-17 11:24:38 -08:00
snipe
99000fada1
Merge pull request #14127 from snipe/jerm/upgrade-deps-file
...
Add php version requirements file for future-proofing upgrades
2024-01-17 13:15:56 +00:00
akemidx
2768f19b7c
code cleanup
2024-01-16 18:56:29 -05:00
Marcus Moore
8aa5cf530b
Improve radio button values in custom report form
2024-01-16 12:33:16 -08:00
Godfrey M
6be8c063a9
added moar translations
2024-01-16 12:05:09 -08:00
Godfrey M
74dc17b4b9
adds translations for Label example
2024-01-16 10:47:45 -08:00
snipe
2ae5029bc4
Merge remote-tracking branch 'origin/develop'
2024-01-15 16:11:59 +00:00
snipe
adba2d5b6c
Remove 7 day padding for expected assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-15 16:11:31 +00:00
Jeremy Price
58b2f8ca17
typo
2024-01-11 19:12:24 -08:00
Jeremy Price
8be3c1aaf2
Quit the script when we hit hard errors
...
a found a few other points where we talk about exiting and re-running
the script once fixed, but never actually exit. So i'm adding-in the
missing exits, and updating any existing exits to make sure we return a
failing return code to the shell
2024-01-11 18:20:09 -08:00
Jeremy Price
2ee8639eaf
Check to make sure there's a .env file
...
While i was testing this, i noticed that it ran right by the .env check,
even though i don't have a .env file at all. The script checks for a
_bad_ .env, but not a missing one.
Now it does
2024-01-11 18:18:41 -08:00
Jeremy Price
32605578dd
Add remote requirements checking to upgrade.php
...
quoted from https://github.com/snipe/snipe-it/pull/14127
There is a race condition in the upgrade.php file where it can't
currently know the hard requirements for the version it's upgrading to
until it does a git pull. By that time, it will have pulled new source
code that possibly relies on an incompatible version of php, leaving you
with a broken installation.
Example: You're running v6.2.x on PHP 7.4, which is fine. v7 requires
PHP 8.1 or 8.2, but we couldn't know that when we released v6. or v5 for
that matter. We could change the requirements in the most-recent v6
version of upgrade.php, but that doesn't help anyone who doesn't upgrade
first to the most recent v6.
With this change, we implement fetching and incorporating the
requirements data from the remote file.
It's just fetching/decoding a couple of json values that replace the
hard-coded version requirements.
We move the branch checking higher than the php version checking so that
we can use the defined/overridden $branch to decide what branch to pull
the requirements from.
2024-01-11 18:13:59 -08:00
Jeremy Price
fe0bba6df6
rename upgrade requirements file and add snipeit version differentiation
...
the latter mostly for testing and san checking.. but it doesn't really
matter because it's just json.. if we don't use it we don't use it
2024-01-11 16:52:39 -08:00
Jeremy Price
5fdcd6298f
rename php_max_major, because it's not.. it's major_minor, even if it sounds ridiculous
2024-01-11 16:50:16 -08:00
Jeremy Price
55943dbff6
add comments and php_max_wontwork because that's what we use rigth now and MVP, dammit
2024-01-11 16:47:47 -08:00
akemidx
20bd83232e
standardizing naming to use Template
2024-01-11 19:41:19 -05:00
Jeremy Price
d12e571b20
undoing versioning.. doesn't make sense
2024-01-11 16:32:17 -08:00
Jeremy Price
0c15f05316
Initial upgrade_requirements.json file
...
for fetching before upgrades, to check major prereqs -- mainly php -- before
pulling down new, possibly breaking, code.
2024-01-11 16:27:03 -08:00
Marcus Moore
d72970b5b6
Add global scope to limit template to current user
2024-01-11 13:59:51 -08:00
Marcus Moore
9c1bea00ad
Add failing test
2024-01-11 13:51:18 -08:00
Marcus Moore
8d8bf73c1b
Scaffold additional tests
2024-01-11 13:51:10 -08:00
snipe
73ddc0f669
Merge remote-tracking branch 'origin/develop'
2024-01-11 21:46:20 +00:00
snipe
66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation
...
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-11 21:46:01 +00:00
Marcus Moore
e5fb888d67
Implement test
2024-01-11 13:34:20 -08:00
Marcus Moore
82df7a66ec
Add form label and remove info box from show and edit pages
2024-01-11 13:19:36 -08:00
Marcus Moore
0202a97e97
Add missing tag
2024-01-11 13:08:08 -08:00
Marcus Moore
b34886ead6
Move box header into box
2024-01-11 13:04:46 -08:00
snipe
f610afb1b8
Merge pull request #14121 from Godmartinz/checkout_bug_fix
...
Fixed multiple click checkouts for consumables, accessories and components
2024-01-11 11:15:48 +00:00
akemidx
6f6341bc09
about saved reports box
2024-01-10 16:33:35 -05:00
akemidx
5f8e91455f
clarifying name box
2024-01-10 15:39:32 -05:00
akemidx
a5099b5163
translations/messages on report template controller
2024-01-10 15:23:42 -05:00
Godfrey M
1f7f9717c5
fixes checkout bug
2024-01-10 11:35:32 -08:00
snipe
5beeaa237b
Merge remote-tracking branch 'origin/develop'
2024-01-10 13:20:36 +00:00
snipe
f151de2adc
Merge pull request #14118 from snipe/fixes/_supplier_searchable_on_maintenances
...
Search on supplier name attached to maintenance
2024-01-10 13:18:47 +00:00
snipe
b94aaad9b5
Search on supplier name attached to maintenance
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-10 13:16:07 +00:00
snipe
9c9af12e83
Merge remote-tracking branch 'origin/develop'
2024-01-10 13:06:38 +00:00
akemidx
27103124bf
messages/translations
2024-01-09 16:49:56 -05:00
snipe
1a48790dfe
Merge pull request #14116 from marcusmoore/bug/sc-24475
...
Guard against passing non-integer for company_id when creating asset
2024-01-09 19:08:14 +00:00
Marcus Moore
423b636db9
Guard against non-integers being passed for company_id
2024-01-09 10:57:43 -08:00
snipe
be32152394
Merge remote-tracking branch 'origin/develop'
2024-01-09 17:44:19 +00:00
snipe
824c3e6ecf
Merge pull request #14087 from ubc-cpsc/bugfix/CVE-2023-51651
...
Fixes CVE-2023-51651 Potential URI resolution path traversal in the AWS SDK for PHP
2024-01-09 17:44:04 +00:00
snipe
4053b75f49
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2024-01-09 17:43:11 +00:00
snipe
ea4a0c2293
docs: add @mauro-miatello as a contributor
2024-01-09 17:43:03 +00:00
snipe
10ee6ee5c4
Merge pull request #14115 from mauro-miatello/develop
...
Added license expiration date in "view asset"
2024-01-09 17:38:51 +00:00
MrM
9d16eacad5
Added license expiration date in "view asset"
...
I've added the expiration date of the license associated with an asset in hardware/ID#software, it is useful to see all of them on the asset page instead of having to open the license details page. I've also fixed a space formatting issue.
2024-01-09 18:30:51 +01:00
Brady Wetherington
4b90f85372
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-09 16:37:33 +00:00
snipe
8001ed8436
Merge remote-tracking branch 'origin/develop'
2024-01-08 22:30:05 +00:00
snipe
eaf6d56253
Merge pull request #14109 from marcusmoore/chore/sc-24397
...
Moved contributors to dedicated file
2024-01-08 22:28:52 +00:00
snipe
8541a342cb
Merge pull request #14108 from Godmartinz/asset_maintenance_scope
...
Added supplier name as a searchable relation on the asset maintenance report
2024-01-08 22:25:55 +00:00
Godfrey M
4184b271f7
adds Supplier as a searchable relation on the asset maintenance report
2024-01-08 14:22:35 -08:00
Marcus Moore
6b105ba8f0
Move link
2024-01-08 14:17:42 -08:00
Marcus Moore
348ed1e555
Add link to contributors file
2024-01-08 14:16:15 -08:00
Marcus Moore
8314047bfb
Add newline to start of contributors file
2024-01-08 14:02:09 -08:00
Marcus Moore
1bd4b3827d
Add missing comma
2024-01-08 13:47:43 -08:00
Marcus Moore
a2463c2a71
Reference correct file
2024-01-08 13:43:26 -08:00
Marcus Moore
f4d568bf89
Add missing config key
2024-01-08 13:40:57 -08:00
Marcus Moore
eb862c27b8
Add config keys
2024-01-08 13:31:30 -08:00
Marcus Moore
18f79ad924
Move contributors from readme to dedicated files
2024-01-08 13:29:18 -08:00
Marcus Moore
afb396ed65
Add contributor commands to package.json
2024-01-08 13:26:58 -08:00
Marcus Moore
8ea15fc6aa
Run generate command to migrate to new style
...
(from markdown style tables and images to html style)
./node_modules/.bin/all-contributors generate
2024-01-08 12:42:45 -08:00
Marcus Moore
064ec1c22d
Add missing markers
2024-01-08 12:39:40 -08:00
Marcus Moore
2f47217003
Add all-contributors-cli as dev dependency
2024-01-08 12:26:52 -08:00
Jermops
25c9f8e038
Merge pull request #14105 from snipe/jerm/snipeit-sh
...
Update snipeit.sh for v7 Requirements
2024-01-08 11:48:21 -08:00
Jeremy Price
a3811371cc
remove removal of installation scripts
2024-01-08 11:41:30 -08:00
Brady Wetherington
f734e196e5
Merge branch 'develop' into snipeit_v7_laravel10
2024-01-08 18:57:55 +00:00
Jeremy Price
6129f4722f
Oops! Don't checkout my custom branch
...
using master until we make the switch to main. As master will keep
working after we switch branches, main will _not_ work _until_ we switch, and if
for some reason we have to delay the branch migration, this will remain
broken until we fix it.
2024-01-08 10:08:52 -08:00
snipe
d71a04e489
Merge remote-tracking branch 'origin/develop'
2024-01-08 17:24:47 +00:00
snipe
4f8defb67d
Merge pull request #14107 from snipe/bug/sc-24471
...
Check that the asset exists before trying to get properties
2024-01-08 12:43:13 +00:00
snipe
2707c399ea
Check that the asset exists before trying to get properties
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-08 12:42:05 +00:00
Jeremy Price
585d7d0b87
replace some tabs with spaces. don't @ me
2024-01-05 12:09:03 -08:00
snipe
012fe57ca1
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-05 15:16:14 +00:00
snipe
f5960388f1
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-01-05 15:05:22 +00:00
snipe
6ebbd2dc30
Merge pull request #14104 from snipe/feature/google_login_more_prominent
...
Move Google Login prompt higher, made it bigger
2024-01-05 15:03:12 +00:00
snipe
7c5d29ccd9
Move Google Login prompt higher, made it bigger
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-05 14:56:34 +00:00
snipe
93712ec417
Merge pull request #14103 from snipe/bug/user_api_limit_offset_order
...
Moved limit and offset in user API to after additional qualifiers
2024-01-05 12:02:18 +00:00
snipe
f8a21bdb2d
Moved limit and offset to after additional qualifiers
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-05 11:59:31 +00:00
Jeremy Price
cdfc198f28
update changelog
2024-01-05 00:09:06 -08:00
Jeremy Price
6fcb3d3d5e
re-add missing progress bar to ensure correct command ordering
2024-01-05 00:09:06 -08:00
Jeremy Price
358d9ec06d
fix enterprise linux version in remi repo for v9 distros
2024-01-05 00:09:06 -08:00
Jeremy Price
322c8c1cf3
install php-sodium on al2. fix snipeit database name
2024-01-05 00:09:06 -08:00
Jeremy Price
47eb0c34a2
remove fedora surpport, add amazon and alma
2024-01-05 00:09:06 -08:00
Jeremy Price
4a290a85e6
awsl2 support, php8.2 support in centos/alma, new mysql user creation code
2024-01-05 00:09:06 -08:00
Jeremy Price
5489c50cc0
remove remaining 8.2 references in Ubuntu 23* block
...
different vim config confusion made my regex misbehave :-/
2024-01-05 00:09:06 -08:00
Jeremy Price
066e40dada
update Ubuntu versions comment in code block
2024-01-05 00:09:06 -08:00
Jeremy Price
123d04ff7b
split-out ubuntu 23* versions
...
since 2023 didn't produce and LTS ubuntu versions
the Ondrej repo we use for installing arbitrary PHP versions doesn't
(easily) support non-LTS versions of ubuntu, which means that 23.04 and
23.10 are problematic using the repo
However, these versions ship with php8.1 and php8.2 (respectively), so
we don't even need the Ondrej repo for these, so we'll remove it
In general, we'll only support LTS Ubuntu repos because of this, but if
they happen to ship with our preferred PHP versions and otherwise work
w/o heroics, we'll include nominal support in the script
2024-01-05 00:09:06 -08:00
Jeremy Price
d5881736cf
stop quoting run_as_app_user args
...
because "$@" splits positional parameters, but quoting the args makes
them one arg, which doesn't work
2024-01-05 00:09:06 -08:00
Jeremy Price
5e539da3da
Debian 12
2024-01-05 00:09:06 -08:00
Jeremy Price
ba58ca9d5c
fix up ondrej repo
2024-01-05 00:09:06 -08:00
Jeremy Price
117007dfa1
add new ubuntu/debian versions, change php to 8.2
2024-01-05 00:09:06 -08:00
snipe
10ef47fe87
Merge remote-tracking branch 'origin/develop'
2024-01-04 23:37:36 +00:00
snipe
d29b3633d1
Merge pull request #14063 from marcusmoore/chore/sc-24353
...
Removed unused files in assets directory
2024-01-04 22:41:49 +00:00
snipe
98ef687e9c
Merge pull request #14090 from marcusmoore/chore/sc-24386
...
Run sqlite tests in GitHub action
2024-01-04 22:41:37 +00:00
snipe
432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link
...
fixed `departmentNameLinkFormatter` url
2024-01-04 22:40:24 +00:00
snipe
dbcf7e3fd1
Merge pull request #14101 from marcusmoore/bug/sc-24398
...
Fixes creating invalid query with null values
2024-01-04 22:36:46 +00:00
Godfrey M
43737263d4
removed that clause
2024-01-04 14:32:03 -08:00
Godfrey M
07eeaea3bf
adds an additional clause
2024-01-04 14:30:59 -08:00
Godfrey M
249ff868e5
removes empty seats when sorting by department
2024-01-04 14:26:07 -08:00
Marcus Moore
742e183b02
Add guard against adding null values to query
...
Since $request->filled(null) returns true
2024-01-04 14:04:00 -08:00
Godfrey M
a110b5fcca
ugh
2024-01-04 12:37:53 -08:00
Godfrey M
1f1e58eb1e
remove unintentional change
2024-01-04 12:36:57 -08:00
Godfrey M
32b34ca9b9
departmentNameLinkFormatter had a bad url
2024-01-04 12:33:33 -08:00
snipe
3a6d626aa1
Merge remote-tracking branch 'origin/develop'
2024-01-04 00:36:50 +00:00
snipe
0c6611d6bd
Merge pull request #14097 from spencerrlongg/hotfix/migration_model_issue
...
Use Query Builder instead of Model for Update to Skip Observer
2024-01-04 00:36:30 +00:00
spencerrlongg
0d853f931d
use query builder instead of model for update to skip observer
2024-01-03 18:32:13 -06:00
snipe
c8816354ae
Updated assets for master
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-03 23:28:54 +00:00
snipe
42d35174b2
Updated hash
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-03 23:25:56 +00:00
snipe
00718d7a4b
Merge pull request #14096 from snipe/security/snyk_14075
...
Upgrade jspdf-autotable from 3.5.31 to 3.8.0
2024-01-03 23:23:10 +00:00
snipe
ab32c42ac8
Upgrade jspdf-autotable from 3.5.31 to 3.8.0
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-03 23:21:27 +00:00
snipe
bbdc8383e1
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-03 23:17:44 +00:00
snipe
e711d68de1
Merge pull request #14095 from snipe/security/snyk_14066_Upgrade_fortawesome/fontawesome-free
...
Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0
2024-01-03 23:16:39 +00:00
snipe
b29df4a610
Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-03 23:15:49 +00:00
snipe
93273d301a
Merge pull request #14094 from snipe/localizations/updated_strings
...
Updated language strings
2024-01-03 23:13:15 +00:00
snipe
50eb257cec
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-01-03 23:12:29 +00:00
snipe
b23ce6cfc6
Merge pull request #14093 from marcusmoore/bug/sc-24389
...
Fixes language source directory for crowdin
2024-01-03 22:11:20 +00:00
Marcus Moore
08c16b4435
Fix language source directory
2024-01-03 14:02:36 -08:00
snipe
0d697629aa
Merge pull request #14092 from marcusmoore/chore/sc-24383
...
Syncs readme to DockerHub description
2024-01-03 21:36:34 +00:00
Marcus Moore
1f7e7b20e9
Sync readme to dockerhub
2024-01-03 13:26:49 -08:00
Marcus Moore
4894f524a0
Update action name
2024-01-03 12:30:10 -08:00
Marcus Moore
f819e1469a
Run sqlite tests in GitHub action
2024-01-03 12:27:13 -08:00
snipe
cce9540316
Merge pull request #13964 from spencerrlongg/refactor/store_asset_form_request
...
Tests For API Asset Store + Refactor For Auto Increment & Form Requests
2024-01-03 19:26:11 +00:00
spencerrlongg
41e0275c95
htmlentities()
2024-01-03 12:42:36 -06:00
Marcus Moore
f2d34b2c03
Remove inline javascript
2024-01-02 18:23:57 -08:00
Marcus Moore
25cba65c6e
Remove marker test case
2024-01-02 18:14:50 -08:00
Marcus Moore
a756d2b765
Implement test
2024-01-02 18:14:17 -08:00
Marcus Moore
740d46a50e
Repopulate report after validation error
2024-01-02 17:59:30 -08:00
Marcus Moore
d8d92a6d2c
Scaffold test case
2024-01-02 17:47:52 -08:00
Marcus Moore
137193ab12
Remove duplicate test
2024-01-02 17:44:22 -08:00
Joël Pittet
771e3ad0ad
Fixes CVE-2023-51651 aws/aws-sdk-php with depdendencies
2024-01-02 17:31:10 -08:00
Joël Pittet
7ce37d0ffb
Fixes CVE-2023-51651 aws/aws-sdk-php
2024-01-02 17:22:22 -08:00
spencerrlongg
901b1b83d0
rm code, was probably fixed through rules at some point
2024-01-02 18:27:17 -06:00
spencerrlongg
9e84521098
fix auto-increment settings for test settings
2024-01-02 18:10:59 -06:00
Spencer Long
8546407083
Merge branch 'develop' into refactor/store_asset_form_request
2024-01-02 18:05:15 -06:00
spencerrlongg
7c30261ec8
add marcus' migration changes to branch
2024-01-02 17:28:41 -06:00
snipe
8bc5f08da5
Fixed a few more small localization issues
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-24 20:14:49 +00:00
snipe
38bd530fae
Update en defaults for controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-24 19:44:20 +00:00
snipe
02d35449d2
Updated seeder with en to en-US
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-24 19:41:48 +00:00
snipe
eead7b49e3
Fixed language code
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-24 19:07:11 +00:00
snipe
a31bef7b9e
Merge pull request #14072 from snipe/fixes/also_update_settings_console_command
...
Update ResetSettings command to en-US vs en
2023-12-24 18:33:23 +00:00
snipe
ed9473c8ff
Update ResetSettings command to en-US vs en
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-24 18:32:21 +00:00
Marcus Moore
fcef60445c
Implement radioValue properly
2023-12-21 18:07:46 -08:00
Marcus Moore
9e0897b2cb
Remove old comments
2023-12-21 17:40:26 -08:00
Marcus Moore
a23a3b95d6
Partially implement test
2023-12-21 17:15:36 -08:00
Marcus Moore
1ac0be50a7
Remove test case
2023-12-21 17:06:40 -08:00
Marcus Moore
618bbc4bda
Mark test as incomplete
2023-12-21 17:03:10 -08:00
Marcus Moore
8c434c7862
Implement and scaffold tests
2023-12-21 17:02:44 -08:00
Marcus Moore
7f153b32e4
Always return an array from selectValues method
2023-12-21 16:38:51 -08:00
Marcus Moore
4fc8e8dd61
Add todo
2023-12-21 14:27:31 -08:00
Marcus Moore
48e5ee2310
Add filtering to remaining selects
2023-12-21 14:19:16 -08:00
Marcus Moore
92e3a1e69e
Update variable names
2023-12-21 13:46:27 -08:00
Marcus Moore
7f0e3e288e
Scaffold additional test
2023-12-21 13:43:44 -08:00
Marcus Moore
dc27e67b19
Remove edit and delete buttons from edit template view
2023-12-21 13:13:28 -08:00
Marcus Moore
4c62e8ade9
Add guard against attempting to access property on unsaved template
2023-12-21 13:11:44 -08:00
Marcus Moore
87853921c3
Formatting
2023-12-21 13:07:11 -08:00
Marcus Moore
8a496ccebc
Formatting
2023-12-21 13:05:56 -08:00
Marcus Moore
3e5f804791
Display "Save" on the update template page button
2023-12-21 13:05:49 -08:00
Marcus Moore
62f8353bd7
Implement model filtering for selectValue method
2023-12-21 13:03:43 -08:00
Marcus Moore
1dd9273f70
Improve readability
2023-12-21 12:50:21 -08:00
Marcus Moore
2eeaef00e1
Improve readability
2023-12-21 12:15:00 -08:00
Marcus Moore
5c0c60a5b9
Formatting
2023-12-21 12:02:54 -08:00
Marcus Moore
6fcbb108c6
Implement test for filtering out invalid models from selectValues
2023-12-21 12:02:48 -08:00
Marcus Moore
71761a48ad
A few more small clean ups
2023-12-20 17:50:55 -08:00
Marcus Moore
495d74f7c9
Formatting
2023-12-20 17:11:03 -08:00
Marcus Moore
fda77179a3
Simplify url
2023-12-20 16:48:25 -08:00
Marcus Moore
578495bab6
Update tests
2023-12-20 16:37:27 -08:00
Marcus Moore
9a5c8c4ce6
Formatting and clean ups
2023-12-20 16:24:48 -08:00
Marcus Moore
0504c09a9a
Implement ability to delete templates
2023-12-20 16:19:04 -08:00
Marcus Moore
9d062f9849
Make control statements more explicit
2023-12-20 16:08:25 -08:00
Marcus Moore
0527201ae5
Allow templates to be updated
2023-12-20 14:41:23 -08:00
Marcus Moore
cf5c78029c
Only show template name input on default screen
2023-12-20 14:12:42 -08:00
Marcus Moore
26cc4497eb
Use dedicated show route for report templates
2023-12-20 14:01:46 -08:00
Marcus Moore
c35179b098
Use existing class in place of inline styling
2023-12-20 13:48:31 -08:00
Marcus Moore
b2d0cbb264
Display validation error for report name
2023-12-20 13:44:47 -08:00
snipe
780269850a
Merge pull request #14064 from snipe/bug/set_fallback_locale_to_new_locale_code
...
Bug/set fallback locale to new locale code
2023-12-20 01:04:43 +00:00
snipe
2a4eff2e90
Remove env var option for config on fallback
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-20 01:03:11 +00:00
snipe
a0553f4c33
Update fallback locale to new locale code
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-20 01:01:59 +00:00
snipe
4ee5ba4496
Merge pull request #14059 from snipe/localizations/new_strings_pre-6.3.0
...
Normalize language codes, updated strings
2023-12-20 00:02:47 +00:00
akemidx
ebf760a477
translations, UI fixes
2023-12-19 18:01:19 -05:00
snipe
97ba023152
Moved return
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 20:47:06 +00:00
snipe
a5947b8109
Added warning in middleware
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 20:34:45 +00:00
snipe
4a0d4f5862
Moved static var up above
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 20:27:11 +00:00
snipe
5e0128c9dc
Include trashed per @marcusmoore
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 20:23:19 +00:00
snipe
1a0e1b5f6c
Added default to helper per @marcusmoore
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 20:23:11 +00:00
snipe
493ffc10c1
Defaulted to en-US on quickstart
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 20:16:00 +00:00
snipe
de62e2775e
Merge pull request #14062 from uberbrady/add_down_migration_for_new_localization_refactor
...
Added back-migration for Big Locale Refactoring
2023-12-19 20:08:27 +00:00
Brady Wetherington
12ed8800d1
Changed some spacing and added a comment as per Snipe
2023-12-19 20:06:48 +00:00
Brady Wetherington
82dd601661
Added back-migration for Big Locale Refactoring
2023-12-19 19:54:04 +00:00
snipe
70b8b7e4be
Check for a value for settings (this mostly matters in tests)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 19:00:11 +00:00
snipe
1b3a4617b7
Merge pull request #14060 from snipe/bug/fix_bad_migration_namespace
...
Fixed bad migration namespace
2023-12-19 18:49:24 +00:00
snipe
9dbc38e2ca
Drop the down()
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 18:25:21 +00:00
snipe
ab2c85778a
Fixed migration namespace :(
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 18:22:06 +00:00
snipe
98e6f7e14c
Updated form marco with new locale codes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 18:12:02 +00:00
snipe
02f24d3332
WTF
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:57:17 +00:00
Godfrey M
4b071745fa
prevents tables and table data from overflowing
2023-12-19 09:49:40 -08:00
snipe
6801caaa0d
Added backl vendors directory
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:49:10 +00:00
snipe
db138479aa
Updated locale middleware for mapping
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:43:22 +00:00
snipe
081bd69d5a
Added helper method to map values
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:43:05 +00:00
snipe
c306ba550c
Migration to update what we can for locales
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:42:56 +00:00
snipe
b9a877d92d
Fixed donked dir tree
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:42:39 +00:00
snipe
3a6f26f241
Update example envs to use correct code for language
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:36:21 +00:00
Godfrey M
c0dba95426
testing ldap test table fix
2023-12-19 09:32:26 -08:00
snipe
026ea41dee
Use correct language codes, updated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 17:23:16 +00:00
snipe
b07133a008
Add @coach1988 as a contributor
2023-12-19 14:05:54 +00:00
snipe
f07ae45fc0
Merge pull request #14056 from snipe/bug/retarget_of_13987_dymo_fix
...
Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987
2023-12-19 14:05:22 +00:00
snipe
2226bd2cd7
Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 14:03:55 +00:00
snipe
aca51d992b
Merge pull request #14038 from ubc-cpsc/bugfix/CVE-2023-50251
...
Fixes CVE-2023-50251 and CVE-2023-50262 DoS on parsing SVG
2023-12-19 14:00:13 +00:00
snipe
fee0956832
Merge pull request #14039 from ubc-cpsc/bugfix/CVE-2023-43655
...
Fixes CVE-2023-43655 Composer Remote Code Execution vulnerability public composer.phar
2023-12-19 13:59:48 +00:00
snipe
36a76084da
Merge remote-tracking branch 'origin/master' into develop
2023-12-19 13:31:10 +00:00
snipe
fe51d0ef79
Merge pull request #14055 from snipe/bug/disallow_arrays_for_model_id_in_api_hardware_update
...
Make sure we're getting an object instead of a collection on Asset API for model_id
2023-12-19 13:30:54 +00:00
snipe
f9139e0f10
Changed to use instanceof
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 13:25:32 +00:00
snipe
1063dcfb7b
Merge pull request #13994 from Godmartinz/add_license_to_info_for_activation
...
Added licensed to name and email in user profile license view
2023-12-19 13:16:34 +00:00
snipe
79ad598673
Merge pull request #14050 from marcusmoore/add-logging-to-checking-alerts-command
...
Added log message for who is being sent expected checkin notifications
2023-12-19 13:14:04 +00:00
snipe
f13c1a53ef
Get an object instead of a collection
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 12:51:35 +00:00
snipe
aef95e2218
Merge remote-tracking branch 'origin/develop'
2023-12-19 12:32:19 +00:00
snipe
f08ce34036
Fixed translation string in JSON
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-19 12:31:55 +00:00
Marcus Moore
7cf4baa92a
Remove unused vendor less from resources directory
2023-12-18 17:58:47 -08:00
Marcus Moore
6c3dfdfe6d
Remove unused vendor css files
2023-12-18 17:48:52 -08:00
akemidx
85bfbf8bc4
email in table, shows in export
2023-12-18 20:15:06 -05:00
Marcus Moore
1708897726
Add log message for who is being sent expected checkin notifications
2023-12-18 17:14:03 -08:00
akemidx
3fe3697a29
adding column, needs table join
2023-12-18 18:26:47 -05:00
snipe
ac8926abc2
Merge pull request #14047 from snipe/dependabot/github_actions/develop/github/codeql-action-3
...
Bump github/codeql-action from 2 to 3
2023-12-18 22:57:10 +00:00
snipe
e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577
...
Added Status Label names to Asset history/ Action log
2023-12-18 22:41:02 +00:00
Marcus Moore
9fcb1a2d0e
Rename SavedReport to ReportTemplate
2023-12-18 12:55:48 -08:00
Marcus Moore
149d159c05
Remove unused bootstrap resources
2023-12-18 11:49:52 -08:00
Marcus Moore
c0ad16f497
Remove unused vendor js files
2023-12-18 11:48:28 -08:00
dependabot[bot]
2305224221
Bump github/codeql-action from 2 to 3
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/github/codeql-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-12-18 08:13:48 +00:00
snipe
ea8181d3ec
Merge remote-tracking branch 'origin/develop'
2023-12-15 16:41:55 +00:00
snipe
05bc9f117c
Merge pull request #14042 from snipe/bug/sc-24356
...
Fixed #14037 - record current time on accessory checkin
2023-12-15 16:41:42 +00:00
snipe
444c41bedb
Fixed #14037 - record current time on accessory checkin
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-15 16:39:18 +00:00
snipe
ec3c4674de
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-15 13:58:45 +00:00
snipe
61a1fed0a2
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2023-12-15 13:58:25 +00:00
snipe
2427cb787b
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-15 13:57:37 +00:00
snipe
e3d6d48e04
Merge pull request #13966 from marcusmoore/feature/sc-24120
...
Removed jquery-ui-bundle
2023-12-15 13:55:56 +00:00
snipe
0bb5abd24d
Merge remote-tracking branch 'origin/develop'
2023-12-15 13:45:02 +00:00
snipe
130be26820
Merge pull request #14031 from snipe/bug/ldap_undefined_search_base
...
Fixed undefined $search_base
2023-12-15 13:33:34 +00:00
snipe
2d85eeface
Added indexes for reports
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-15 13:24:01 +00:00
snipe
56f9c7f2f5
Merge pull request #14036 from snipe/feature/sc-24355
...
Added user agent, remote_ip, action_source to action_logs
2023-12-15 11:18:46 +00:00
snipe
421802893e
Added new fields to action report
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-15 10:45:22 +00:00
Joël Pittet
32aedabfe5
Force update with PHP 7.4.3 platform requirement and update lock
2023-12-14 09:59:11 -08:00
Joël Pittet
b746c7d371
Fixes CVE-2023-43655 Composer Remote Code Execution vulnerability via web-accessible composer.phar
2023-12-14 09:34:25 -08:00
Joël Pittet
0a5eca53db
Fixes CVE-2023-50251 and CVE-2023-50262 DoS on parsing SVG
2023-12-14 09:28:21 -08:00
snipe
7aabf94a35
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:43:38 +00:00
snipe
e71080ef37
Make action date sortable on asset history view
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:41:15 +00:00
snipe
14c70ee6c4
Removed BS th classes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:37:47 +00:00
snipe
8fc470c978
Added fields to activity report
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:34:44 +00:00
snipe
f5f136b9b5
Added fields to history views
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:34:31 +00:00
snipe
a90b04c905
Allowed sorting on user_agent, etc
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:34:08 +00:00
snipe
93c7108eda
Added action source to translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:33:49 +00:00
snipe
40052e99a7
Added user agent to log method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:33:39 +00:00
snipe
70303c2b2d
Added searchable fields, improved formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:33:25 +00:00
snipe
4dac3712a6
Added DB migration for remote_ip, action_source, user_agent in logs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 14:32:26 +00:00
Brady Wetherington
430f1b0212
Merge branch 'develop' into feature/sc-24120
2023-12-14 13:28:17 +00:00
Marcus Moore
27bb938d9e
WIP: add dedicated edit report page
2023-12-13 18:09:42 -08:00
snipe
5df6575c37
Fixed undefinted $search_base
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-14 00:11:02 +00:00
Marcus Moore
75bd056bbe
Display saved template name in header
2023-12-13 14:49:38 -08:00
akemidx
ad202be374
update method (WIP ver)
2023-12-13 17:31:58 -05:00
snipe
cb18606b2e
Merge remote-tracking branch 'origin/develop'
2023-12-13 17:55:57 +00:00
snipe
6b4bc9723c
Added logo to readme
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-13 17:55:46 +00:00
spencerrlongg
e028145ad9
Add new asset tests for archive, depreciate, and physical fields
2023-12-13 09:16:08 -06:00
snipe
547d58cf14
Merge remote-tracking branch 'origin/develop'
2023-12-13 14:15:36 +00:00
snipe
b92906b071
Merge pull request #14028 from snipe/security/snyk_14013
...
[Snyk] Upgrade alpinejs from 3.12.3 to 3.13.3 #14013
2023-12-13 14:15:07 +00:00
snipe
b1d4d89b19
[Snyk] Upgrade alpinejs from 3.12.3 to 3.13.3 #14013
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-13 14:14:04 +00:00
snipe
4f56c2e9d6
Added radio to seeder for custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-13 14:03:13 +00:00
snipe
70250191ed
Merge pull request #14026 from snipe/bug/sc-23599
...
Fixed checkbox/radio button display on models edit for default fields
2023-12-13 14:00:27 +00:00
snipe
337d863330
Missed closing label on radio buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-13 13:52:31 +00:00
snipe
7b85a30b64
Fixed checkbox seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-13 13:16:45 +00:00
snipe
ac96bad4a1
Merge pull request #14014 from Godmartinz/requested_assets_table_missing_header
...
added a missing table header on requested table for checkout
2023-12-13 12:57:20 +00:00
snipe
3834221589
Fixed radio button display
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-13 06:30:08 +00:00
snipe
016ca1adc1
Fixed HTML for checkboxes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-13 06:27:50 +00:00
snipe
9edb631d52
Merge pull request #14024 from spencerrlongg/chore/last_vue_component
...
Last Vue Components
2023-12-13 04:35:35 +00:00
akemidx
ca35b66597
frontys
2023-12-12 19:03:09 -05:00
akemidx
e9e68171bb
frontend stuff
2023-12-12 18:56:21 -05:00
spencerrlongg
58d2f0a41e
quick note
2023-12-12 15:49:57 -06:00
spencerrlongg
255d9427b6
make edit a button
2023-12-12 15:41:29 -06:00
spencerrlongg
d29f4489de
fix
2023-12-12 14:09:12 -06:00
spencerrlongg
4367fc54bf
remove vue from webpack steps
2023-12-12 13:43:05 -06:00
spencerrlongg
b89116eb55
submit on enter for edit
2023-12-12 13:33:51 -06:00
spencerrlongg
9430e9c8e2
autofocus, package-lock.json
2023-12-12 13:28:04 -06:00
snipe
7743b3a0fa
Merge remote-tracking branch 'origin/develop'
2023-12-12 14:02:18 +00:00
snipe
8d4a4ccdab
Merge pull request #14022 from snipe/chore/sc-24329
...
Added GH test action status badge
2023-12-12 14:01:56 +00:00
snipe
c5c3000a38
Added GH test action status badge
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 13:59:45 +00:00
snipe
46c0d38c6d
Removed huntr.dev badge
...
They refocused their company to only AI now :(
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 13:44:11 +00:00
snipe
f9697887e8
Removed extraneous test
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 13:41:35 +00:00
snipe
c2896c034d
Merge remote-tracking branch 'origin/develop'
2023-12-12 13:33:50 +00:00
snipe
0241e66f2d
Merge pull request #14021 from snipe/bug/sc-24328
...
Fixed HTML double-encoded on checkout emails.
2023-12-12 13:31:41 +00:00
snipe
b53a4c366e
Removed escaping on notes on checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 13:26:41 +00:00
snipe
1572d5c3cc
Merge remote-tracking branch 'origin/develop'
2023-12-12 12:27:15 +00:00
snipe
6bb842f52c
Merge pull request #14020 from snipe/bug/sc-24326
...
Added $user->created_at to API user create method
2023-12-12 12:26:58 +00:00
snipe
e894138fd4
Added $user->created_at to API user create method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 12:26:02 +00:00
snipe
f8a56f6dc2
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2023-12-12 04:33:04 +00:00
snipe
068f64a78e
Merge pull request #14018 from snipe/features/more_info_in_quickscan
...
Added model name and number to quickscan
2023-12-12 04:30:11 +00:00
snipe
631dd58de1
Added model name and number to quickscan
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 04:23:04 +00:00
snipe
bbe5c7c6e8
Merge pull request #14017 from snipe/bug/sc-24323
...
Smaller icon size for activity reports, other action icons
2023-12-12 01:02:45 +00:00
snipe
41f1c5c1e3
Smaller icon size for activity reports, other action icons
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 00:58:20 +00:00
spencerrlongg
b01d53a247
one more
2023-12-11 18:43:46 -06:00
Marcus Moore
e791ebbe76
Display report name in input
2023-12-11 16:36:32 -08:00
snipe
8100f11a36
Merge pull request #14016 from snipe/feature/sc-24184
...
Set default sorting on backups to latest first
2023-12-12 00:36:28 +00:00
snipe
65dae836c6
Set default sorting on backups to latest first
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 00:35:08 +00:00
Marcus Moore
d92893b2c7
Remove old javascript
2023-12-11 16:30:44 -08:00
Marcus Moore
c68a2a36fa
Add test case for saving custom reports
2023-12-11 16:25:36 -08:00
Marcus Moore
89c47c1879
Add validation for saving reports
2023-12-11 16:20:36 -08:00
Marcus Moore
b9cda88363
Alphabetize saved reports list
2023-12-11 16:20:17 -08:00
snipe
1689c7f9b6
Merge remote-tracking branch 'origin/develop'
2023-12-12 00:15:35 +00:00
snipe
1084382654
Merge pull request #14015 from snipe/bug/sc-24322
...
Updated importer icons
2023-12-12 00:15:15 +00:00
snipe
456e6979f0
Updated import icons
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-12 00:12:06 +00:00
spencerrlongg
65cbba3c2e
completely kill vue
2023-12-11 18:09:22 -06:00
Marcus Moore
52028ddef2
Add authorization to saving saved reports route
2023-12-11 15:34:17 -08:00
Marcus Moore
c3845f4393
Add tests around loading saved reports
2023-12-11 14:29:33 -08:00
Marcus Moore
c9157dc55d
Update docblock
2023-12-11 14:20:33 -08:00
Marcus Moore
c3b53b28e3
Allow saving custom reports
2023-12-11 14:19:03 -08:00
akemidx
e636d7b9d5
multiple saved reports, beginning of dynamic dropdown listing/queried url
2023-12-11 15:28:34 -05:00
Marcus Moore
bd86c5430c
Add a few typehints
2023-12-11 11:27:56 -08:00
Godfrey M
5eb08d9568
added a missing table header for checkout
2023-12-11 11:14:55 -08:00
snipe
e7a9c7ec99
Merge pull request #14008 from akemidx/sc20532_change_log_level
...
Change log level on status label colors above 256
2023-12-08 09:01:28 +00:00
snipe
cf242d8b86
Merge remote-tracking branch 'origin/develop'
2023-12-08 08:59:17 +00:00
snipe
aa4aaf69b0
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-08 08:58:45 +00:00
akemidx
f112e31b46
changing log level from ERROR to LOG
2023-12-07 17:56:10 -05:00
akemidx
dc83689553
changing log level from ERROR to LOG
2023-12-07 17:50:25 -05:00
snipe
16ea459eca
Merge remote-tracking branch 'origin/develop'
2023-12-07 19:49:25 +00:00
snipe
e483e910fe
Merge pull request #14007 from snipe/bug/sc-24315
...
Fixed maintenances patch endpoint
2023-12-07 19:48:43 +00:00
snipe
778e45c9fd
Fixed maintenances patch endpoint
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-07 19:36:12 +00:00
Marcus Moore
4a0bb31866
Scaffold two more test cases
2023-12-07 11:00:26 -08:00
snipe
4e96c8d05d
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# Dockerfile.alpine
2023-12-07 14:12:56 +00:00
snipe
2c5c97fd7e
Merge pull request #14005 from uberbrady/restore_more_directories
...
Improve backup directory array
2023-12-07 14:12:04 +00:00
Brady Wetherington
6bd351c5d8
Whoops, didn't even add changes - duh
2023-12-07 14:08:15 +00:00
akemidx
b7f6c7df06
html work, code comments for tomorrow's tasks
2023-12-06 18:05:58 -05:00
spencerrlongg
f93e7b91ff
that's all folks
2023-12-06 16:20:30 -06:00
spencerrlongg
04069bab82
remove comment
2023-12-05 20:50:07 -06:00
spencerrlongg
3106035ef9
delete, comment
2023-12-05 20:41:34 -06:00
spencerrlongg
18720b3302
safety stuff
2023-12-05 20:36:59 -06:00
spencerrlongg
12e546e63a
everything working, cleanup
2023-12-05 20:22:20 -06:00
spencerrlongg
c28936fefb
almost there... problem with update button
2023-12-05 17:39:35 -06:00
spencerrlongg
080d196138
buttons work now after style tags removed
2023-12-05 16:41:25 -06:00
spencerrlongg
d3967b37cd
this is a start, buttons not working?
2023-12-05 14:52:14 -06:00
Godfrey M
b90cfba796
adds status label id to line change
2023-12-05 11:56:54 -08:00
Godfrey M
49342a4542
added status names to asset history
2023-12-05 11:50:43 -08:00
Godfrey M
a95f0b8862
remove column sizes
2023-12-05 11:07:52 -08:00
Godfrey M
7a1d5e11cc
Merge remote-tracking branch 'origin/add_license_to_info_for_activation' into add_license_to_info_for_activation
2023-12-05 11:07:34 -08:00
Godfrey M
15af64a355
fixed the bootstrap column sizes
2023-12-05 10:07:58 -08:00
snipe
0089ea2321
Merge pull request #13882 from marcusmoore/fixes/jquery-validation
...
Fix client side validation in the v7 branch
2023-12-05 17:26:48 +00:00
snipe
3f35124838
Merge pull request #13888 from spencerrlongg/chore/sc-16907
...
Convert Vue Personal Access Tokens to Livewire
2023-12-05 16:45:16 +00:00
spencerrlongg
6ca5fb6b20
remove token scope html
2023-12-05 09:44:03 -06:00
snipe
34bf6818ca
Merge pull request #13999 from snipe/security/alpine
...
Updated to alpine 3.18.5 (PR to #13989 )
2023-12-05 15:01:07 +00:00
snipe
a0de9eb343
Updated to alpine 3.18.5
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-05 15:00:04 +00:00
snipe
b4d747550c
Merge pull request #13998 from snipe/feature/add_help_text_for_rtd
...
Added help text to RTD location field
2023-12-05 14:42:07 +00:00
snipe
7258af20fc
Added help text to RTD location field
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-05 14:40:49 +00:00
Marcus Moore
a3b0273445
Remove comment
2023-12-04 15:21:04 -08:00
Godfrey Martinez
dd68182d08
Merge branch 'develop' into add_license_to_info_for_activation
2023-12-04 11:17:07 -08:00
Godfrey M
0e9e31f68b
adds info needed for license self activation
2023-12-04 11:12:30 -08:00
snipe
174a3398d1
Merge pull request #13993 from Godmartinz/license_product_key_serial_swap
...
Fixed the Column header Serial to Product Key on a User View
2023-12-04 19:09:03 +00:00
Godfrey M
4fd43799b4
missed one view
2023-12-04 10:56:03 -08:00
spencerrlongg
cef1c5d4d2
cleanup test
2023-12-04 12:47:46 -06:00
snipe
09ec8d1d5c
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/mix-manifest.json
2023-12-04 15:42:58 +00:00
snipe
5d60be97af
Merge pull request #13992 from snipe/bug/sc-24182
...
Added eula-pdfs to allow-list on restore
2023-12-04 15:35:34 +00:00
snipe
1e46ecc2ee
Added eula-pdfs to allow-list
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-04 15:33:56 +00:00
Marcus Moore
327d27591f
Merge branch 'saved-custom-reports' into saving_custom_report_template
2023-11-30 18:15:35 -08:00
Marcus Moore
5041c07c7e
WIP: implement restoring checkbox inputs
2023-11-30 18:15:04 -08:00
Marcus Moore
505d601488
Implement restoring date ranges
2023-11-30 17:07:39 -08:00
Marcus Moore
bca7f208a6
Implement restoring select values
2023-11-30 16:57:21 -08:00
spencerrlongg
2d57b9399c
more cleanup
2023-11-30 16:20:48 -06:00
spencerrlongg
ca8765e1d7
cleaned up
2023-11-30 16:18:50 -06:00
spencerrlongg
6e5f296a13
gets rid of depreciate
2023-11-30 16:08:49 -06:00
spencerrlongg
68d85385a2
get rid of physical
2023-11-30 16:03:30 -06:00
spencerrlongg
88b6a541ee
removed references to archived
2023-11-30 15:59:03 -06:00
spencerrlongg
133c469e36
organization
2023-11-30 14:25:58 -06:00
Marcus Moore
4f031149e8
Scaffold a couple test cases
2023-11-30 12:12:57 -08:00
snipe
5730518fc6
Merge pull request #13978 from uberbrady/test_ldap
...
Test ldap
2023-11-30 19:23:29 +00:00
snipe
fb1965331c
Merge pull request #13981 from Godmartinz/license-table-header-fix
...
Fixed the Column header Serial to Product Key for Licenses
2023-11-30 18:51:42 +00:00
Godfrey M
fdaa44654d
changes the table header Serial to Product Key
2023-11-30 10:46:18 -08:00
snipe
1455331a90
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-30 18:25:38 +00:00
spencerrlongg
7e780c1187
cleanup rules formatting
2023-11-30 12:20:02 -06:00
spencerrlongg
df954a3af2
return types
2023-11-30 12:06:58 -06:00
spencerrlongg
135b7bde7d
added some more check out assertions
2023-11-30 11:53:26 -06:00
snipe
42109dc1eb
Merge pull request #13976 from Godmartinz/sc-24144_final
...
Fixed black dark theme, contrast issues etc
2023-11-30 16:23:13 +00:00
snipe
47c8ae000a
Merge pull request #13975 from ubc-cpsc/bugfix/CVE-2023-49316
...
Fixes CVE-2023-49316 by upgrading phpseclib/phpseclib
2023-11-30 16:22:08 +00:00
Brady Wetherington
5a60df55d1
Add more LDAP tests - including pagination(!)
2023-11-30 16:09:37 +00:00
Brady Wetherington
16da994e28
Add LDAP as 'recommended' requirement; flesh out LDAP tests
2023-11-30 14:00:20 +00:00
Brady Wetherington
2a00dc2d28
Merge branch 'develop' into test_ldap
2023-11-30 12:04:43 +00:00
spencerrlongg
151ceb5fbe
get rid of firsts and find by responses id
2023-11-29 17:14:46 -06:00
spencerrlongg
d794608a09
note
2023-11-29 15:04:52 -06:00
spencerrlongg
c3492f1699
fixed eol, add calculated eol/eol explicit tests
2023-11-29 14:57:31 -06:00
Godfrey M
4a19f23e7c
fixes for black dark theme
2023-11-29 11:30:02 -08:00
spencerrlongg
9d8433bd6d
a couple quick things
2023-11-29 13:15:41 -06:00
Joël Pittet
5b4d6b346b
Update for CVE-2023-49316 by upgrading phpseclib/phpseclib (3.0.14 => 3.0.34)
2023-11-29 11:03:12 -08:00
spencerrlongg
65ca24f6ae
asset assigned to asset works now
2023-11-29 11:37:52 -06:00
snipe
f004007c47
Merge remote-tracking branch 'origin/develop'
2023-11-29 10:09:27 +00:00
snipe
96210e9498
Merge pull request #13970 from snipe/bug/sc-24149
...
Created mutator for requestable attribute
2023-11-29 10:08:41 +00:00
snipe
3152df2c48
Created mutator for requestable attribute
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-29 10:07:47 +00:00
snipe
df2b52c537
Merge remote-tracking branch 'origin/develop'
2023-11-29 09:41:05 +00:00
snipe
189c90e9e5
Merge pull request #13954 from Godmartinz/feature/sc-23756
...
Fixed user total asset cost to appear conditionally
2023-11-29 09:40:39 +00:00
snipe
c35d234cde
Merge pull request #13959 from snipe/fixes/rebased_bulk_edit_fix
...
Fixed status and model in bulk edit
2023-11-29 09:40:03 +00:00
snipe
80fafeaebe
Merge pull request #13965 from akemidx/no_group_notice_trans
...
Translation of No Group notice on User edit page
2023-11-29 09:39:28 +00:00
spencerrlongg
b17078fffd
a couple notes
2023-11-28 22:15:13 -06:00
spencerrlongg
c886fb555b
checkout on store tests almost done
2023-11-28 22:11:20 -06:00
spencerrlongg
15d11f7f4e
test checkout to user on store
2023-11-28 21:46:03 -06:00
spencerrlongg
cba5f869c0
standardize some of the validation rules, fix int/string issue
2023-11-28 21:19:19 -06:00
spencerrlongg
4aae82fa38
cleanup validation rules a little
2023-11-28 17:28:17 -06:00
spencerrlongg
5b77e66d28
get rid of deleted_at as it doesn't do anything
2023-11-28 17:16:17 -06:00
Marcus Moore
4a975ebe29
Remove jquery-ui-dist
2023-11-28 15:01:41 -08:00
akemidx
2a54797dce
permission level proof of formatting
2023-11-28 17:58:37 -05:00
akemidx
63065bab5d
adding in icons for clarity, since there are two places called settings
2023-11-28 17:51:43 -05:00
akemidx
9770016eec
beginning of permission groups export
2023-11-28 17:47:36 -05:00
Marcus Moore
810abb5c30
Replace jquery-ui-bundle with jquery-ui-dist
2023-11-28 14:24:21 -08:00
akemidx
108658520d
translating no group message on user edit page
2023-11-28 17:15:51 -05:00
spencerrlongg
75ac7f80b9
some refactor + tests
2023-11-28 15:17:46 -06:00
Godfrey M
9e59550b79
removes the row instead of just the optional values
2023-11-28 10:08:32 -08:00
snipe
899890b224
Use update array nomenclature
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 16:25:35 +00:00
snipe
7ac3341b4f
Merge pull request #13955 from marcusmoore/bug/sc-24137
...
Fixed sqlite exception in migration
2023-11-28 16:13:10 +00:00
snipe
d4fb7ac403
Merge remote-tracking branch 'origin/develop'
2023-11-28 16:11:01 +00:00
snipe
9d5ceb685d
Merge pull request #13958 from uberbrady/encryption_key_rotator
...
Modified re-crypter to also work when given a CLI old-key
2023-11-28 16:10:45 +00:00
snipe
601ebcc1e6
Removed table header contraint
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 16:00:42 +00:00
snipe
2247be77d8
Fixed translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:56:20 +00:00
snipe
2d4a14d4bb
Fixed from rebase :(
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:55:41 +00:00
snipe
3b9f069627
Switched back to old version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:54:42 +00:00
snipe
2c6b957fbe
Removed unused query
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:28:37 +00:00
snipe
6ae03a204b
Added the model info back in
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:21:14 +00:00
snipe
187d3abeb4
Use translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:15:07 +00:00
snipe
c91713e20a
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:14:55 +00:00
snipe
fa1176ce14
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 15:14:12 +00:00
Brady Wetherington
c71726c83e
Whoops, left in some debug lines
2023-11-28 13:52:07 +00:00
Brady Wetherington
ca430ec9b3
Modified re-crypter to also work when given a CLI old-key
2023-11-28 13:49:58 +00:00
snipe
9d786d9386
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 13:43:33 +00:00
snipe
4723cfd4ba
More refactoring
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 13:33:32 +00:00
snipe
f9d5c451bc
Committing this for now - not done
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 13:33:32 +00:00
snipe
5574218966
More FAFO - cleanup needed, but model_id works now
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 13:33:32 +00:00
snipe
c997ae44c2
FAFO troubleshooting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-28 13:33:32 +00:00
Marcus Moore
77ceac5747
Update docblock
2023-11-27 16:36:51 -08:00
Marcus Moore
990358750b
Add migration for postgres
2023-11-27 16:33:57 -08:00
Marcus Moore
72dbe95168
Add table prefix
2023-11-27 15:55:33 -08:00
Marcus Moore
37bd297094
Fix typo
2023-11-27 14:05:38 -08:00
Marcus Moore
5d32956070
Allow for migrating data when using sqlite
2023-11-27 12:35:13 -08:00
Godfrey M
45e9d0597a
makes user total asset cost appear conditionally
2023-11-27 11:36:47 -08:00
snipe
121b86b3e8
Merge remote-tracking branch 'origin/develop'
2023-11-27 15:49:26 +00:00
Brady Wetherington
8e8b1068ff
Beginnings of LDAP test suite
2023-11-27 14:50:43 +00:00
snipe
c72950166f
Merge remote-tracking branch 'origin/develop'
2023-11-27 14:46:37 +00:00
snipe
8c7edcb357
Merge pull request #13953 from snipe/localizations/new_strings
...
Updated language strings
2023-11-27 14:44:01 +00:00
snipe
dbb6002f9f
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-27 14:43:16 +00:00
snipe
776c91934b
Updated dir name for Khmer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-27 14:39:13 +00:00
Brady Wetherington
6210716199
Merge branch 'develop' into snipeit_v7_laravel10
2023-11-27 13:04:39 +00:00
snipe
77ab5eb875
Merge pull request #13909 from akemidx/bug/sc-23999
...
Hiding Order Column in Custom Fieldsets
2023-11-24 19:10:42 +00:00
snipe
d80c8ff25b
Merge remote-tracking branch 'origin/develop'
2023-11-24 10:10:45 +00:00
snipe
eca13d0593
Merge pull request #13950 from snipe/fixes/array_key_in_import
...
Check for the array key in $activeFile->first_row
2023-11-24 10:10:08 +00:00
snipe
9607567b75
Check for the array key in $activeFile->first_row
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-24 10:08:35 +00:00
snipe
6cec1bd3b9
Merge remote-tracking branch 'origin/develop'
2023-11-23 17:00:32 +00:00
snipe
1217bff4b6
Merge pull request #13947 from snipe/fixes/refactor_checkout_with_bad_category
...
Refactored checkout for items with bad or missing category
2023-11-23 16:59:51 +00:00
snipe
84d26fe7fa
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# package-lock.json
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/js/dist/all-defer.js
# public/mix-manifest.json
2023-11-23 16:53:13 +00:00
snipe
ea55daf913
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 16:51:39 +00:00
snipe
0ff99f0479
Merge pull request #13948 from uberbrady/scim_active_flag
...
SCIM active flag must be a boolean
2023-11-23 16:44:22 +00:00
Brady Wetherington
8916c976e1
Merge branch 'develop' into scim_active_flag
2023-11-23 16:36:17 +00:00
Brady Wetherington
7b12d511f8
Force active flag to be returned as true or false
2023-11-23 16:34:03 +00:00
snipe
81b2273c37
Refactored checkout screen to redirect if invalid category
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 16:18:28 +00:00
snipe
978bbeccc5
Added strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 16:18:09 +00:00
snipe
accfbc1b99
Show number of remaining seats and category in form
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 16:18:03 +00:00
snipe
cf3608ae10
Add @bilias as a contributor
2023-11-23 15:33:08 +00:00
snipe
aaa6a31eb3
Merge pull request #13945 from snipe/fixes/green_skin_fix_13915_to_develop
...
Higher contrast on green dark skin (#13915 for develop)
2023-11-23 15:30:00 +00:00
snipe
88cc234cbd
Higher contrast for green dark skin
...
Applies #13915 to develop
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 15:28:43 +00:00
snipe
94eeca7429
Merge pull request #13944 from snipe/security/snyk_13937
...
Upgrade jspdf-autotable from 3.5.31 to 3.7.1 #13937
2023-11-23 15:24:33 +00:00
snipe
e0e11845bb
Upgrade jspdf-autotable from 3.5.31 to 3.7.1 #13937
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 15:23:13 +00:00
snipe
a7f98ea2a5
Merge pull request #13943 from snipe/security/snyk_13936
...
Upgrade alpinejs from 3.12.3 to 3.13.2 #13936
2023-11-23 15:20:47 +00:00
snipe
8e3657d62e
Upgrade alpinejs from 3.12.3 to 3.13.2 #13936
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 15:19:59 +00:00
snipe
ddd7f206d3
Merge pull request #13942 from snipe/security/snyk_13935
...
Updated acorn to 8.11.2
2023-11-23 15:17:34 +00:00
snipe
81cf08adf5
Updated acorn to 8.11.2
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 15:16:40 +00:00
snipe
1b77632ecb
Merge pull request #13941 from snipe/security/snyk_13938
...
Upgraded webpack to 5.89.0
2023-11-23 15:15:08 +00:00
snipe
d4bdaf16e7
Upgraded webpack to 5.89.0
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 15:13:13 +00:00
snipe
e3a8952f4b
Merge pull request #13940 from snipe/features/add_location_to_user_view_assets
...
Added location to user view assets
2023-11-23 15:02:23 +00:00
snipe
ad6b286e10
Added default location to view-assets view
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 15:01:39 +00:00
snipe
7f94b7df32
Removed refresh from asset view table
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-23 15:01:24 +00:00
snipe
776b16d379
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-11-22 23:41:31 +00:00
snipe
6409018b08
Bumped hash and moved to pre version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 23:41:03 +00:00
snipe
780279a620
Merge remote-tracking branch 'origin/develop'
2023-11-22 23:22:46 +00:00
snipe
31f429e1c4
Merge pull request #13934 from snipe/fixes/escaped_asset_tag_in_return_msg
...
Escape the asset tag before passing it to the view
2023-11-22 23:21:54 +00:00
snipe
3a0b994443
Merge pull request #13933 from snipe/fixes/removed_extra_return
...
Removed extra return statement in consumables API checkout method
2023-11-22 23:21:06 +00:00
snipe
1307ef19cf
Escape the asset tag before passing it to the view
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 23:20:47 +00:00
snipe
aed6b531cb
Derp. Extra return statement
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 23:05:38 +00:00
snipe
43db3b13ef
Merge remote-tracking branch 'origin/develop'
2023-11-22 23:02:20 +00:00
snipe
bb0ba0bebe
Merge pull request #13932 from snipe/features/use_allowlist_for_user_logging
...
Use allowlist for user observer logging
2023-11-22 23:01:52 +00:00
snipe
ba127be344
Use saveQuietly to prevent double entries
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 23:00:30 +00:00
snipe
c6178bd619
Added translation for success password save
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 22:59:59 +00:00
snipe
3929c8f260
Nicer alert layout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 22:57:54 +00:00
snipe
f922d0518e
Added allow list - quiet the observer down for magical laravel things
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 22:35:34 +00:00
snipe
45d9119733
Removed debugging/comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 22:32:34 +00:00
snipe
e269415fec
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:55:44 +00:00
snipe
996caafa80
Merge remote-tracking branch 'origin/develop'
2023-11-22 21:42:32 +00:00
snipe
8481768c3d
Save quietly for login methods
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:42:21 +00:00
snipe
91c36730e7
Merge remote-tracking branch 'origin/develop'
2023-11-22 21:39:47 +00:00
snipe
d3175b2ca4
Removed remember token from changed
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:39:06 +00:00
snipe
dfabf9082b
Merge remote-tracking branch 'origin/develop'
2023-11-22 21:37:35 +00:00
snipe
a8123db4fb
Fixed comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:35:12 +00:00
snipe
b1e782d2f0
Small nits picked to make Brady happy
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:34:39 +00:00
snipe
60517f811e
Merge pull request #13931 from snipe/features/nicer_icons_for_activity_report
...
Use updated icons for activity report
2023-11-22 21:10:22 +00:00
snipe
58679a13eb
Use updated icons for activity report
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 21:07:07 +00:00
snipe
3d9a9c7fe8
Merge pull request #13930 from snipe/features/added_user_observer
...
Added user observer
2023-11-22 20:51:27 +00:00
snipe
22246dd099
Unset the specific arrays we don’t want to keep
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:50:46 +00:00
snipe
a7f76f9860
Hide certain fields from changelog
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:28:58 +00:00
snipe
8b79a8afdf
Added user observer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:22:05 +00:00
snipe
299db76009
Merge pull request #13928 from snipe/fixes/double_logging_on_asset_restore
...
Fixes double logging on asset restore
2023-11-22 20:10:45 +00:00
snipe
20c0f687e9
Added restored to asset observer, removed manual logging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:09:10 +00:00
snipe
d06cfe6502
Changed verb to “restore” from “restored”
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:08:41 +00:00
snipe
534ac5ac53
Merge pull request #13926 from snipe/bug/sc-24106
...
Fixed issue where delete then restore could result in duplicate asset tags
2023-11-22 18:33:17 +00:00
snipe
e2d0136336
Fixed goofy translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 18:14:44 +00:00
snipe
6a3ab526de
Refactorer API controller restore methods
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 18:04:24 +00:00
snipe
19877244cd
Added/refactorerd isDeletable()
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 18:03:26 +00:00
snipe
f7ccef16e7
Refactorer controller restore methods
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 18:02:47 +00:00
snipe
0e51a0935d
Added language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 17:41:12 +00:00
snipe
ffc1266d0e
UI fix - don’t show the trash can icon on things that can be restored
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 17:41:06 +00:00
snipe
2972c31a11
Added restore endpoints for manufacturers and asset models API
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 17:40:47 +00:00
snipe
2353c8199c
Set qty mutators
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 15:25:22 +00:00
snipe
e10258804d
Merge remote-tracking branch 'origin/develop'
2023-11-22 13:48:35 +00:00
snipe
0d29ac9856
Fixded gate return
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 13:48:20 +00:00
snipe
10d867ccc9
Merge remote-tracking branch 'origin/develop'
2023-11-22 12:28:42 +00:00
snipe
eae98d3f35
Merge pull request #13923 from snipe/bug/sc-24098
...
Quick revert for #13830
2023-11-22 12:28:25 +00:00
snipe
a08dcbdfdb
Quick revert for #13830
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 12:25:42 +00:00
snipe
9c4fbbe915
Merge pull request #13922 from snipe/bug/sc-24097
...
Created mutator on category checkin_email
2023-11-22 12:16:07 +00:00
snipe
d6a337a584
English hard
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 11:23:17 +00:00
snipe
83ee07cca1
Created mutator on category checkin_email
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 11:14:04 +00:00
akemidx
697595d963
Merge branch 'develop' into eol_date_range_for_reports
2023-11-21 16:07:26 -05:00
snipe
f12efcf5b2
Merge remote-tracking branch 'origin/develop'
2023-11-21 15:45:13 +00:00
snipe
9502525a41
Merge pull request #13914 from snipe/bug/sc-24073
...
Fixed missing translation string for `validation.two_column_unique_undeleted`
2023-11-21 15:44:56 +00:00
snipe
68ac1aaae0
Additional comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 15:36:11 +00:00
snipe
6a2ab2cfb2
Removed line break
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 15:10:19 +00:00
snipe
fb125af0df
Tweaked language
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 15:09:50 +00:00
snipe
590cd0c71f
Added Validator::replace() for friendlier interpretation of validation string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 15:03:59 +00:00
snipe
0ae91d305d
Add the two_column_unique_undeleted translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 15:03:03 +00:00
snipe
0a1eef2e5b
Merge remote-tracking branch 'origin/develop'
2023-11-21 14:12:50 +00:00
snipe
9347af0970
Merge pull request #13913 from snipe/bug/sc-24071
...
Fixed #13905 - Use `unique_undeleted` instead of `unique_serial`
2023-11-21 14:12:15 +00:00
snipe
766eee78b2
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 13:47:49 +00:00
snipe
2b9e4110bc
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 13:37:56 +00:00
snipe
4eb435e148
Use unique_undeleted instead of unique_serial
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-21 12:36:11 +00:00
akemidx
e5a4214b8b
hiding all order stuff
2023-11-20 20:32:14 -05:00
snipe
6573ea6da6
Merge remote-tracking branch 'origin/develop'
2023-11-20 15:41:55 +00:00
snipe
a203189724
Add @Azooz2014 as a contributor
2023-11-20 15:41:36 +00:00
snipe
b02c60c2ce
Merge pull request #13898 from Azooz2014/develop
...
Fixed #13850 : Too few arguments to function in App\Importer\UserImporter::fetchManager()
2023-11-20 15:41:04 +00:00
snipe
c14b3d9780
Merge pull request #13904 from snipe/fixes/redirect_to_consumable_on_invalid_category
...
Redirect back to the specific consumable for correction
2023-11-20 15:40:40 +00:00
snipe
01fec1d6bb
Redirect back to the specific consumable for correction
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-20 15:39:39 +00:00
snipe
9907da0aae
Merge remote-tracking branch 'origin/develop'
2023-11-20 15:32:21 +00:00
snipe
01740b7969
Merge pull request #13903 from snipe/fixes/redirect_if_category_invalid
...
Redirect if category is missing or invalid
2023-11-20 15:31:58 +00:00
snipe
7c88601066
Grab the API
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-20 15:31:39 +00:00
snipe
fe2cfa0d38
Redirect if category is missing or invalid
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-20 15:28:44 +00:00
Abdelaziz Faki
2c62a7e78d
Fixing #13850 UserImporter bug
2023-11-19 19:59:01 +03:00
snipe
7baf8e36c0
Merge remote-tracking branch 'origin/develop'
2023-11-19 07:16:34 +00:00
snipe
e41a16dbf3
Merge pull request #13879 from Godmartinz/location_search_bug
...
added user location scope
2023-11-19 07:01:59 +00:00
snipe
ad6822875d
Merge pull request #13892 from Godmartinz/ldap_sync_bug
...
added a `empty()` around location_id to fix ldap sync bug
2023-11-19 06:58:38 +00:00
Godfrey M
01f4aa018f
fixed query
2023-11-16 11:20:14 -08:00
Godfrey M
f9baeefbaf
allows to search full name
2023-11-16 11:14:42 -08:00
Godfrey Martinez
5569c2ba4a
Merge branch 'develop' into ldap_sync_bug
2023-11-16 10:02:56 -08:00
Godfrey M
2f12a9cfe2
add a conditional around location_id to fix bug
2023-11-16 09:52:44 -08:00
spencerrlongg
af3417d6cc
add return type
2023-11-16 11:42:37 -06:00
spencerrlongg
17bf8d0124
fix string
2023-11-16 11:31:00 -06:00
spencerrlongg
c3e02286d3
i can't blame this on livewire - animations or something?
2023-11-16 11:24:54 -06:00
spencerrlongg
a9d82bf157
enter working
2023-11-16 10:54:32 -06:00
snipe
617f58e046
Merge remote-tracking branch 'origin/develop'
2023-11-16 15:28:13 +00:00
snipe
81583207a9
Merge pull request #13887 from spencerrlongg/bug/sc-24024
...
Fix for Unique Serial
2023-11-16 15:27:55 +00:00
spencerrlongg
e097df912e
a little cleanup
2023-11-15 22:35:20 -06:00
spencerrlongg
477bb6165f
rm log
2023-11-15 20:45:04 -06:00
Spencer Long
19850e8c5a
Merge branch 'snipeit_v7_laravel10' into chore/sc-16907
2023-11-15 20:37:15 -06:00
spencerrlongg
12dcf76da9
more cleanup
2023-11-15 20:33:44 -06:00
spencerrlongg
36aac328e4
delete vue component
2023-11-15 20:32:22 -06:00
spencerrlongg
9cf81c7ad4
cleanup, validation
2023-11-15 20:29:14 -06:00
spencerrlongg
6c6417e595
ok, maybe i do like livewire
2023-11-15 20:19:03 -06:00
spencerrlongg
efa8ba5965
nice, just need frontend work now
2023-11-15 17:24:54 -06:00
spencerrlongg
fd02385c22
deleted components i've already rebuilt in livewire
2023-11-15 17:14:09 -06:00
spencerrlongg
713b21de14
note
2023-11-15 16:56:08 -06:00
spencerrlongg
af144a5184
cleanup
2023-11-15 16:55:21 -06:00
spencerrlongg
9b31ae3146
create mostly working
2023-11-15 16:51:09 -06:00
spencerrlongg
4cb0012872
cleanup
2023-11-15 16:33:16 -06:00
spencerrlongg
eaa68327f7
SINGLE QUOTES
2023-11-15 16:27:01 -06:00
spencerrlongg
b1f75a3bb3
remove unused import
2023-11-15 13:20:17 -06:00
spencerrlongg
c7f90ad86d
tested, working
2023-11-15 12:50:40 -06:00
spencerrlongg
0924a53789
quick fix
2023-11-15 12:28:30 -06:00
Marcus Moore
68ef618028
Run validation on blur
2023-11-14 16:30:29 -08:00
Marcus Moore
3ecdafa685
Add class to error placement check
2023-11-14 16:12:47 -08:00
Marcus Moore
20ae9dea19
Fix placement of error message
2023-11-14 15:55:15 -08:00
Godfrey M
c9d46856a3
added name back
2023-11-14 15:00:11 -08:00
Godfrey M
6d65f6646f
allows validation to ignore self and update
2023-11-14 14:55:51 -08:00
Marcus Moore
34cd106357
Apply validation
2023-11-14 12:25:18 -08:00
Marcus Moore
714fce7e59
Add site name validation test
2023-11-14 12:23:58 -08:00
Marcus Moore
08e4ea384e
Update additional partials for validation
2023-11-14 12:23:46 -08:00
Marcus Moore
fe0f9743d3
Update additional partials for validation
2023-11-14 12:07:37 -08:00
Godfrey M
57019e170f
adds user location scope, still needs fine tuning
2023-11-14 11:49:00 -08:00
spencerrlongg
9f303cc116
playing around with livewire
2023-11-14 11:50:27 -06:00
spencerrlongg
e504b20235
couple small changes
2023-11-14 11:01:38 -06:00
snipe
0da3ef70d9
Merge remote-tracking branch 'origin/develop'
2023-11-14 16:16:30 +00:00
snipe
eb87720661
Merge pull request #13878 from snipe/fixes/clearer_error_text_on_import
...
Clarified upload error text
2023-11-14 16:16:16 +00:00
snipe
9316ecb8d6
CLarified upload error text
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-14 16:14:39 +00:00
Brady Wetherington
f64b0d3818
Merge branch 'develop' into snipeit_v7_laravel10
2023-11-14 16:00:29 +00:00
snipe
ec83b733f1
Merge remote-tracking branch 'origin/develop'
2023-11-14 14:40:21 +00:00
snipe
a81e2be6da
Merge pull request #13876 from snipe/fixes/added_fieldmap_back_for_cli_import
...
Added default map back to the importer
2023-11-14 14:40:08 +00:00
snipe
73ebd9017f
Added default map back to the importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-14 14:37:48 +00:00
Marcus Moore
1a26ea0911
Update a couple more fields for new validation
2023-11-13 19:18:04 -08:00
Marcus Moore
7098ab6509
Match styling of existing error messages
2023-11-13 18:54:51 -08:00
Marcus Moore
0d3589ca24
Update create asset page to use new validation library
2023-11-13 18:17:39 -08:00
Marcus Moore
f02ff62a08
Install jquery-validation package
2023-11-13 18:15:18 -08:00
spencerrlongg
fbfc817c5f
just some cleanup
2023-11-13 19:47:03 -06:00
snipe
a48eb60f87
Merge remote-tracking branch 'origin/develop'
2023-11-13 20:40:05 +00:00
snipe
13601031cb
Merge pull request #13764 from Godmartinz/expiring-alerts-fix
...
Fixed the `getExpiringLicenses` query
2023-11-13 20:39:29 +00:00
snipe
4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769
...
Changed data source input to select in new label engine
2023-11-13 20:38:42 +00:00
snipe
9dc9834bcb
Merge pull request #13859 from inietov/fixes/attempt_to_read_id_on_boolean
...
Fixed ErrorExemption: Attempt to read property "id" on bool [sc-23945]
2023-11-13 20:22:52 +00:00
snipe
4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations
...
Added multi location sync for ldap
2023-11-13 20:20:45 +00:00
snipe
000a28d648
Merge pull request #13830 from spencerrlongg/bug/sc-23921
...
Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation
2023-11-13 20:19:44 +00:00
snipe
f3d6de316b
Merge branch 'master' of https://github.com/snipe/snipe-it
2023-11-13 16:41:18 +00:00
snipe
1f17c6e4f4
Merge remote-tracking branch 'origin/develop'
2023-11-13 16:41:07 +00:00
snipe
495df737fc
Unfixed indenting :(
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-13 16:39:35 +00:00
snipe
0bae1a1f5e
Merge pull request #13853 from snipe/features/link_back_to_asset_on_create
...
Link back to asset on create
2023-11-13 16:37:35 +00:00
snipe
442cad69a7
Merge pull request #13864 from marcusmoore/chore/sc-24012
...
Fixed GitHub Action tests for v7
2023-11-13 16:34:35 +00:00
snipe
5dde7cb439
Merge pull request #13871 from snipe/snyk-fix-bdea9ba7648f6c20aef5ce312ee450cd
...
[Snyk] Security upgrade alpine from 3.17.3 to 3.17.5
2023-11-13 16:34:08 +00:00
snyk-bot
6acff575e6
fix: Dockerfile.alpine to reduce vulnerabilities
...
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5438697
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5788365
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5821141
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-6032385
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-6032385
2023-11-13 04:03:04 +00:00
Marcus Moore
be6545a366
Merge Laravel setup steps
2023-11-09 15:55:04 -08:00
Marcus Moore
32fdd36802
Run migrations
2023-11-09 15:51:30 -08:00
Marcus Moore
fbc54526ed
Set variables for Passport install step
2023-11-09 15:47:52 -08:00
Marcus Moore
a3306e4a81
Install Passport during test setup process specifying the environment
2023-11-09 15:41:22 -08:00
Marcus Moore
3d858b21fa
Revert "Install Passport during test setup process"
...
This reverts commit 690a5119f4 .
2023-11-09 15:29:31 -08:00
Marcus Moore
62b557f82c
Revert "Add database migration step"
...
This reverts commit 65e3696029 .
2023-11-09 15:29:19 -08:00
Marcus Moore
158c82ff5f
Revert "Be explicit about database host"
...
This reverts commit fd410c0281 .
2023-11-09 15:26:50 -08:00
Marcus Moore
fd410c0281
Be explicit about database host
2023-11-09 15:20:41 -08:00
Marcus Moore
65e3696029
Add database migration step
2023-11-09 14:56:32 -08:00
Marcus Moore
690a5119f4
Install Passport during test setup process
2023-11-09 14:49:56 -08:00
Marcus Moore
cc0653c68a
Update GitHub test action to run on PHP 8.1 and 8.2
2023-11-09 14:42:47 -08:00
Marcus Moore
042a15d294
Set minimum PHP version to 8.1
2023-11-09 14:41:13 -08:00
snipe
9bff2d0bbf
Fixed indenting?
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-09 21:47:29 +00:00
snipe
9e1cfac995
Merge pull request #13857 from akemidx/bug/sc-20532
...
Bug Fix: Undefined array key 266
2023-11-09 09:39:04 +00:00
spencerrlongg
8e4c0f60a1
return format
2023-11-08 17:36:54 -06:00
spencerrlongg
5615fc09e6
add view modal
2023-11-08 16:55:29 -06:00
spencerrlongg
d68f1e4cfa
initial display work done
2023-11-08 16:48:20 -06:00
spencerrlongg
0c4901487d
delete component class (for now)
2023-11-08 16:12:01 -06:00
spencerrlongg
7f4b2d6e42
modal and initial stuff working
2023-11-08 16:10:09 -06:00
Ivan Nieto Vivanco
7d30001ff8
Ignore the importer checkout if user is not found
2023-11-08 15:32:33 -06:00
Marcus Moore
49136a4d67
Add tests for color helper
2023-11-08 12:35:42 -08:00
akemidx
4382adce85
typo in error log message
2023-11-08 15:29:29 -05:00
spencerrlongg
715a49d9fe
update php in composer.json
2023-11-08 14:29:06 -06:00
akemidx
2051ac785d
adding in error logging and code comments
2023-11-08 13:44:46 -05:00
akemidx
9cc89911f7
possibilitieeeeeeeeessss
2023-11-08 13:29:32 -05:00
akemidx
495521b70e
adjusting for less than 0 possibility
2023-11-08 12:51:51 -05:00
snipe
6da0671143
Added comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-08 14:44:09 +00:00
snipe
a24d21e683
Added new unescaped alert box
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-08 14:41:05 +00:00
snipe
d2bf71327b
Redirect /asset_tag/view to /asset_tag
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-08 14:40:56 +00:00
snipe
ef10f2e50e
Use more correct route in redirect
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-08 14:40:38 +00:00
snipe
08153d418f
Use new alert box and linked string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-08 14:40:18 +00:00
snipe
3f8b63e053
Add linked text
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-08 14:40:02 +00:00
snipe
8a61803963
Merge remote-tracking branch 'origin/develop'
2023-11-08 11:39:46 +00:00
snipe
d2bfa9a3b6
Merge pull request #13852 from snipe/bug/sc-23959
...
Fixed URL to favicon on default blade (used in 404 messages)
2023-11-08 11:39:24 +00:00
snipe
26311e46b8
Fixed URL to favicon on default blade (used in 404 messages)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-08 11:38:48 +00:00
snipe
b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication
...
clarifies an address column under locations
2023-11-08 08:59:07 +00:00
snipe
749b87cbbd
Merge remote-tracking branch 'origin/develop'
2023-11-08 08:58:12 +00:00
snipe
bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922
...
New Translation Strings for Custom Asset Export
2023-11-08 08:57:20 +00:00
snipe
cf42eca198
Merge pull request #13814 from ntbutler-nbcs/feature-location-history
...
Added #13754 - asset history tab to locations view
2023-11-08 08:55:07 +00:00
snipe
44d064f094
Merge pull request #13842 from marcusmoore/bug/sc-23932
...
Fixed notes not saving to action log when licenses are checked in/out
2023-11-08 08:53:00 +00:00
snipe
3fb913669b
Merge pull request #13847 from spencerrlongg/bug/sc-23914
...
Removed Refresh Button on Client Tables
2023-11-08 08:52:40 +00:00
snipe
1171141904
Merge pull request #13848 from marcusmoore/bug/sc-23949
...
Fixed missing import
2023-11-08 08:50:31 +00:00
Marcus Moore
eceb69122c
Add missing import
2023-11-07 16:03:28 -08:00
akemidx
154e71de74
shifting wrap around logic back into 0-265
2023-11-07 17:43:51 -05:00
spencerrlongg
93101d36b8
removed refresh button on client tables
2023-11-07 15:07:24 -06:00
Marcus Moore
4fb349e326
Remove extra assertions
2023-11-06 14:04:52 -08:00
Marcus Moore
4d2790c3f4
Add tests for license checkout notes
2023-11-06 13:54:36 -08:00
Marcus Moore
a08e0bd547
Ensure notes are saved to the action log when licenses are checked in and out
2023-11-06 12:20:13 -08:00
snipe
9143b7a1b7
Merge remote-tracking branch 'origin/develop'
2023-11-03 20:10:38 +00:00
snipe
92c7de3fb5
Merge pull request #13837 from snipe/features/add_employee_number_to_user_merge
...
Added employee number to user merge screen
2023-11-03 20:10:05 +00:00
snipe
d0cc42a068
Added employee number to user merge screeb
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-03 20:09:11 +00:00
snipe
39c06802aa
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-11-03 14:07:46 +00:00
snipe
8c316e0bd3
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-03 14:07:15 +00:00
snipe
7a638e4a65
RB-17457 - Object of class Illuminate\Database\Eloquent\Collection could not be converted to int
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-03 14:06:27 +00:00
Marcus Moore
b7011d853a
WIP: add methods to restore settings from saved report
2023-11-02 17:10:50 -07:00
Godfrey M
3b6a0d6525
allows multi location sync for ldap
2023-11-02 16:50:19 -07:00
snipe
b47e734b37
Merge remote-tracking branch 'origin/develop'
2023-11-02 14:50:55 +00:00
snipe
4d65d09306
Removed trim on manager ID
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-02 14:50:40 +00:00
snipe
c5e1cdbcee
Merge pull request #13828 from Godmartinz/ldap_location_sync
...
fixed ldap location sync
2023-11-02 12:20:01 +00:00
spencerrlongg
75532d9662
adds permission test
2023-11-01 16:49:59 -05:00
Godfrey M
13d3f85c62
fixes ldap location sync
2023-11-01 12:26:58 -07:00
spencerrlongg
938ec75aa7
clarifying note
2023-11-01 14:09:03 -05:00
spencerrlongg
c9604b896a
nevermind
2023-11-01 13:46:32 -05:00
spencerrlongg
d167ec6dc0
unique undeleted recreated with laravel rule
2023-11-01 13:36:35 -05:00
spencerrlongg
e05af5216e
formatting
2023-11-01 12:14:46 -05:00
spencerrlongg
3f834cb88f
authorization tested in request
2023-11-01 11:43:53 -05:00
spencerrlongg
d971172cf3
rm unnecessary import
2023-11-01 11:34:15 -05:00
spencerrlongg
53bd5626c9
this works, need to write up pr
2023-11-01 11:33:29 -05:00
spencerrlongg
8f75bb8706
fix translation strings
2023-10-31 21:38:52 -05:00
spencerrlongg
b67b00dd82
this is a start, something up with asset_tag unique rule
2023-10-31 21:06:44 -05:00
spencerrlongg
d4b9f6a2a4
add not_array (not ready, doesn't catch for specific exception)
2023-10-31 21:00:22 -05:00
snipe
e43051a1f7
Merge remote-tracking branch 'origin/develop'
2023-10-31 17:11:38 +00:00
snipe
5073c3389f
Merge pull request #13821 from snipe/bug/rb-17462
...
More graceful failure if ldap_results JSON decode isn’t set
2023-10-31 17:11:14 +00:00
snipe
f822f8b186
More graceful failure if ldap_results JSON decode isn’t set
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 17:09:18 +00:00
snipe
e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900
...
Fixed datetime displayed on license edit for fields that should be date
2023-10-31 16:59:12 +00:00
snipe
db8a7c5ad9
Merge remote-tracking branch 'origin/develop'
2023-10-31 16:30:22 +00:00
snipe
95e9002cd0
Merge pull request #13820 from inietov/fixes/attempt_to_read_property_fields
...
Fixed Attempt to read property fields on null [sc-23903]
2023-10-31 16:30:07 +00:00
snipe
60088403b9
Merge remote-tracking branch 'origin/develop'
2023-10-31 16:04:29 +00:00
snipe
22996895d8
Check for valid model
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 16:04:19 +00:00
Ivan Nieto Vivanco
9f9f8c173b
Add condition to only run trough custom fields if a custom fieldset exist
2023-10-31 10:00:36 -06:00
snipe
96be0c25c4
Merge remote-tracking branch 'origin/develop'
2023-10-31 16:00:27 +00:00
snipe
e6810e8db9
Merge pull request #13819 from snipe/bug/check_for_valid_category_on_print
...
Check that the category exists on user print page
2023-10-31 15:59:54 +00:00
snipe
28641493ca
Check that the category exists
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 15:58:59 +00:00
snipe
e703bfaa21
Merge remote-tracking branch 'origin/develop'
2023-10-31 15:33:50 +00:00
snipe
9a7e7bddcc
Merge pull request #13818 from snipe/bug/sc-23902
...
Fixed validation handling on backup uploads
2023-10-31 15:33:26 +00:00
snipe
aa2a25dc19
Display the form errors correctly
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 15:30:49 +00:00
snipe
57372fc82a
Correctly call the validator in the response if it fails
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 15:30:38 +00:00
snipe
e862fe1056
Merge remote-tracking branch 'origin/develop'
2023-10-31 12:55:04 +00:00
snipe
ae90f9defa
Merge pull request #13817 from snipe/feature/sc-23901
...
Added checkboxes to intentionally remove field values in bulk user edit
2023-10-31 12:54:07 +00:00
snipe
3495652827
Added checkboxes to intentionally remove field values in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 12:52:53 +00:00
snipe
5779a63221
Undoing that thing I just did :(
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 12:28:57 +00:00
snipe
209627e2cc
Force format if dates are given
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 12:25:00 +00:00
snipe
9fc1cbd7ae
Change cast to include format
...
https://laravel.com/docs/8.x/eloquent-mutators#date-casting - this doesn’t seem to work tho?
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 12:24:48 +00:00
snipe
e3e887f02e
Merge remote-tracking branch 'origin/develop'
2023-10-31 09:46:30 +00:00
snipe
e405e27643
Merge pull request #13815 from snipe/feature/sc-23898
...
Add additional fields to Download All in Activity Report
2023-10-31 09:45:12 +00:00
snipe
96211cf73c
Add additional fields to Download All in Activity Report
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-31 09:43:47 +00:00
Marcus Moore
06186c9b12
WIP: Simply post the form to a different controller
2023-10-30 16:30:53 -07:00
Nathan Butler
79f380cbe7
Added asset history tab to locations view
2023-10-31 10:28:54 +11:00
snipe
5236ca3332
Merge remote-tracking branch 'origin/develop'
2023-10-30 21:05:33 +00:00
snipe
518c43680d
Merge pull request #13812 from snipe/bug/sc-23897
...
Handle redirect from after POST request from backup restore
2023-10-30 20:21:29 +00:00
snipe
e554a80589
Handle redirect from after POST request from backup restore
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-30 20:01:01 +00:00
snipe
f47a8664f9
Merge pull request #13811 from Godmartinz/missing_translation_string
...
add missing translation string
2023-10-30 19:40:51 +00:00
Godfrey M
97953ae082
add missing translation string
2023-10-30 12:17:55 -07:00
Marcus Moore
7a5faa9619
Adjust margin on custom report page
2023-10-30 12:03:50 -07:00
snipe
8e20071254
Merge pull request #13731 from snipe/improvements/trim_on_import
...
Added trim to import values
2023-10-30 14:17:37 +00:00
snipe
316c90c144
Update app/Importer/ItemImporter.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io >
2023-10-30 14:17:27 +00:00
snipe
a8e8fe7447
Merge remote-tracking branch 'origin/develop'
2023-10-30 14:12:54 +00:00
snipe
462d2d329a
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2023-10-30 14:12:38 +00:00
snipe
a6b713ae21
Add @mmanjos as a contributor
2023-10-30 14:12:23 +00:00
snipe
0d67ae27c2
Merge pull request #13810 from mmanjos/develop
...
Fixed #11179 : APP_FORCE_TLS is missing from the example .env.docker
2023-10-30 14:11:54 +00:00
Matthew Manjos
bd894677ef
add missing variable APP_FORCE_TLS to .env.docker
2023-10-30 10:09:44 -04:00
snipe
2fd2d9431e
Merge remote-tracking branch 'origin/develop'
2023-10-30 13:21:19 +00:00
snipe
d404452f5a
Merge pull request #13809 from snipe/bug/sc-23893
...
Added min_amt value to model detail page
2023-10-30 13:21:00 +00:00
snipe
8c46f4ef69
Added min_amt value to model detaul page
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-30 13:19:59 +00:00
snipe
1da6b6a4d5
Merge remote-tracking branch 'origin/develop'
2023-10-30 13:06:50 +00:00
snipe
740569791f
Merge pull request #13803 from spencerrlongg/feature/13789-feature-request-add-user-phone-and-address-to-custom-asset-report
...
Added User Phone & Address Fields to Custom Asset Report
2023-10-30 12:43:20 +00:00
gitgrimbo
d556f0d275
Use parseEscapedMarkedownInline for more views
2023-10-27 15:37:56 +01:00
spencerrlongg
90eb3b86cf
added user phone & address fields
2023-10-26 19:10:53 -05:00
snipe
b58dea07a7
Merge remote-tracking branch 'origin/develop'
2023-10-26 21:46:45 +01:00
snipe
10abecc5a6
Merge pull request #13802 from spencerrlongg/bug/13531-custom-asset-report-does-not-correct-report-eol-date
...
Fixes EOL on Custom Report
2023-10-26 21:43:13 +01:00
spencerrlongg
f12d44509e
asset_eol_date should always be filled now
2023-10-26 14:39:02 -05:00
spencerrlongg
91b53bffa1
resolved
2023-10-26 14:23:31 -05:00
snipe
98423e4dd9
Merge remote-tracking branch 'origin/develop'
2023-10-26 17:57:17 +01:00
snipe
a2ba39c837
Removed required custom field from seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 17:57:05 +01:00
snipe
38f10e0b21
Merge remote-tracking branch 'origin/develop'
2023-10-26 16:00:22 +01:00
snipe
aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets
...
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
2023-10-26 15:56:47 +01:00
snipe
7b2f49644e
Use nothing instead of null to make it consistent
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 14:44:17 +01:00
snipe
305cd9b0b8
Use null instead of blank
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 14:42:49 +01:00
snipe
9bba0b764a
Added clearer comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 14:38:39 +01:00
snipe
1ce95b6eac
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 14:34:27 +01:00
snipe
9c90f03142
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 14:34:18 +01:00
snipe
b4d3f51414
Merge pull request #13776 from Robert-Azelis/Robert-Azelis-EOL_fix_improvements
...
[FIX and improvements] EOL rate and EOL date
2023-10-26 13:36:25 +01:00
snipe
64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements
2023-10-26 13:36:18 +01:00
snipe
7b9259274c
Merge pull request #13799 from inietov/fixes/unlogged_checkin_from_importer
...
Fixed #13795 Unlogged checkin action post updating the username of an asset through the CSV import
2023-10-26 13:33:51 +01:00
snipe
d40a03b4c5
Merge remote-tracking branch 'origin/develop'
2023-10-26 13:09:38 +01:00
snipe
c1213e0abc
Nicer handling for empty custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 09:41:44 +01:00
snipe
05de8a5731
Re-added missing break
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 09:21:27 +01:00
snipe
ff72c4fbaa
Added nicer formatting for fields in log meta
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 09:17:28 +01:00
snipe
9d887484c8
Added encrypted custom field to seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 07:41:25 +01:00
snipe
c4c47f2e8d
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 06:51:14 +01:00
snipe
0cebccac95
Removed extra logging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 06:51:07 +01:00
snipe
c3b3aa4de6
Set one field to encrypted in the seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 06:25:51 +01:00
snipe
3717d60170
Added two more custom fields/fieldsets to seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 05:04:30 +01:00
snipe
6c996ac8fa
Changed the seeder order to accomodate actionlog factory
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 05:03:59 +01:00
snipe
7042260871
More style polishing on custom fields in bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 04:23:11 +01:00
snipe
2695576968
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 04:21:20 +01:00
snipe
f25ddee857
Removed debugging, use new model rules if model has changed
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 04:21:14 +01:00
snipe
541ba0c0ba
Removed conditional add for model_id
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 04:20:52 +01:00
snipe
77d141d19c
Don’t check the delete expected checkin by detault
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 03:56:02 +01:00
snipe
436192b836
Fixed seeder
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 02:56:34 +01:00
snipe
522aa96fcc
Changed error variable name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 02:36:18 +01:00
snipe
b87879f8e7
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 02:35:53 +01:00
snipe
60e0e899bc
Added show_in_requestable_list to factory
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 02:35:33 +01:00
snipe
6ebc01ca50
Bulk edit refactor
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 01:49:23 +01:00
snipe
4b6b36c639
Removed semicolon
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 01:49:14 +01:00
snipe
4a759f0a20
Added fingerprint icon for unique
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-26 01:49:01 +01:00
Ivan Nieto Vivanco
ca1845efd7
Only log checkin event if the assigned_to property is not empty
2023-10-25 16:41:31 -06:00
Ivan Nieto Vivanco
7ed58a177b
Evaluate if the asset was assigned to a different user than current target to log a checkin event
2023-10-25 16:31:23 -06:00
snipe
d8a3081128
Merge remote-tracking branch 'origin/develop'
2023-10-25 21:05:28 +01:00
snipe
d93e399295
Merge pull request #13797 from Godmartinz/employeeid_search_add
...
adds employee number as a searchable field to the asset table
2023-10-25 21:04:54 +01:00
Godfrey M
1b614c13fb
ugh
2023-10-25 13:03:42 -07:00
Godfrey M
56fd41eee4
removed erroneous code
2023-10-25 13:03:12 -07:00
Godfrey M
33b45898b1
adds to advancedsearch
2023-10-25 12:59:58 -07:00
snipe
eabc7479e3
Merge remote-tracking branch 'origin/develop'
2023-10-25 20:58:13 +01:00
snipe
7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880
...
Added optional custom fields to requestable assets page
2023-10-25 20:57:54 +01:00
snipe
da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572
...
added an option to bulk edit location & fixed location bug
2023-10-25 20:57:18 +01:00
snipe
0feb56d931
Removed period
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 20:39:15 +01:00
snipe
a0cae77278
Fixed weird layout quirk on smaller screens
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 20:21:07 +01:00
snipe
0f97c0601b
Nicer show/hide if encrypted, warn if already encrypted
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 20:11:06 +01:00
snipe
3916bac95f
Added warning translation for encrypted fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 20:10:46 +01:00
snipe
6264d90459
Removed ending period for consistency
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:45:11 +01:00
snipe
57d3b2d2ef
Check for encryption
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:44:10 +01:00
snipe
a202bf81fa
Removed column widths, check for encryption and showable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:44:02 +01:00
snipe
43da292d60
Used short translation for sr-only text
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:43:34 +01:00
snipe
ab3edae0b6
Reverted buttons (this re-introduces the n+1 problem.)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:43:09 +01:00
snipe
887d013a39
Added listable fields in profile -> requested assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:42:33 +01:00
akemidx
e5792fd415
api/savereports controller
2023-10-25 14:42:23 -04:00
snipe
eb82bc290d
Clarified translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:42:07 +01:00
snipe
8b9b46c562
Removed comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:41:59 +01:00
snipe
307f84dff8
Removed extraneous method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 19:41:53 +01:00
snipe
3c6b79e807
Added new fields to blades
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:28:55 +01:00
snipe
e5bd78a722
Added show_in_requestable_list validation, casting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:28:35 +01:00
snipe
23a6547ada
Added custom fields, fixed n+1
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:28:14 +01:00
snipe
63a86c5622
Added field to controller
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:27:36 +01:00
snipe
933ce61efd
Removed eager loading for defaultLoc, added requests loading, sorting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:26:51 +01:00
snipe
88661a58a7
Make field nullable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:26:31 +01:00
snipe
08693f09b0
Added requests() method on Assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:22:12 +01:00
snipe
3a37b80251
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:21:58 +01:00
snipe
e7ef7f04f0
Removed periods for consistency
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:21:48 +01:00
snipe
c4adc3ccc8
Migration to add show_in_requestable_list boolean
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 17:18:37 +01:00
snipe
96f7f49b68
Fixed response docblock
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-25 16:40:49 +01:00
snipe
8c93e79397
Merge pull request #13787 from inietov/fixes/errorexception_undefined_array_key
...
Fixed ErrorException: Undefined array key in importer blade [sc-23864]
2023-10-25 07:47:48 +01:00
snipe
4d345168d6
Merge pull request #13786 from svpernova09/map-docker-logs-to-storage
...
Map Snipe-IT logs to storage logs folder
2023-10-25 07:20:22 +01:00
Ivan Nieto Vivanco
f2f3931fa9
Formatting correctly
2023-10-24 11:26:37 -06:00
Joe Ferguson
c919cd31fa
Map Snipe-IT logs to storage logs folder
...
For docker-compose.yml usage to prevent error messages.
2023-10-24 11:31:02 -05:00
snipe
4f136920a9
Merge remote-tracking branch 'origin/develop'
2023-10-24 17:03:50 +01:00
snipe
9d2d13bb59
Merge pull request #13784 from snipe/fixes/fixed_accessory_not_found_string
...
Fixed accessory not found string
2023-10-24 17:03:13 +01:00
snipe
944520bc5d
Fixed notification formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-24 17:02:16 +01:00
snipe
aae289e150
Added missing string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-24 17:02:07 +01:00
snipe
c756849497
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-24 17:01:51 +01:00
snipe
ec878202f7
Merge remote-tracking branch 'origin/develop'
2023-10-24 11:53:00 +01:00
snipe
29f438123e
Merge pull request #13777 from Robert-Azelis/Robert-Azelis-Cutom_Report_FIX
...
[FIX] Custom report - date fields error
2023-10-24 10:27:58 +01:00
Ivan Nieto Vivanco
0c5d54dfde
Create the language string to show in the importer GUI indicating the file is empty
2023-10-23 22:09:17 -06:00
Ivan Nieto Vivanco
49f6eef9df
Places a text indicating that the file is empty and display it as an info text
2023-10-23 21:57:35 -06:00
Ivan Nieto Vivanco
8f8e5cb723
Adds condition to only process CSV if is not empty
2023-10-23 21:47:10 -06:00
snipe
d5598b3322
Merge pull request #13778 from Robert-Azelis/Robert-Azelis-Dashboard_impr
...
[Improvement] Dashboard
2023-10-23 18:00:00 +01:00
Robert-Azelis
309f30f630
Update view.blade.php
...
display marker if date of EOL is expired and show real EOL rate as diff between purchase date and eol date
2023-10-22 18:38:59 +02:00
Robert-Azelis
04a867d12b
Update eol_date.blade.php
...
read EOL date from database instead calculate on the base model EOL rate
2023-10-22 18:32:20 +02:00
Robert-Azelis
e62636b3a5
Update AssetModelPresenter.php
...
display name 'EOL rate' instead of 'EOL'
2023-10-22 18:27:53 +02:00
Robert-Azelis
4e20a241ce
Update AssetPresenter.php
...
display name 'EOL rate' instead of 'EOL'
2023-10-22 18:26:19 +02:00
Robert-Azelis
30cc498a16
Update AssetObserver.php
...
update exlicit marker depends if model EOL > 0 , EOL = 0
2023-10-22 18:23:30 +02:00
Robert-Azelis
5ae09b791f
Update AssetsTransformer.php
...
on list of assets display EOL rate in months if purchase date and eol date are set, otherwise null (not display anything)
2023-10-22 18:16:49 +02:00
Robert-Azelis
bd195a6911
Update AssetsController.php
...
when asset is updated control EOL date change sand set explicit marker depends to setup of model EOL rate
2023-10-22 18:11:19 +02:00
Robert-Azelis
58062ff9f5
Update AssetModelsController.php
...
if EOL of model has been changed and value is >0 assets will be updates with new EOL rate, date
if EOL of model has been changes and value is null or 0 then assets will be updates by null EOL rate, date
*asset with set expilicity market will not be updated
2023-10-22 17:56:38 +02:00
Robert-Azelis
7571d45d44
[Improvement[ Dashboard
...
If multicompany option is enabled much more important for admin is to see on dashboard list of companies instead of locations.
In other way if multicompanies option is disabled then locations are displayed.
2023-10-22 17:41:33 +02:00
Robert-Azelis
47186b0abe
[FIX] Custom report - date fields error
...
Custom report in v6.2.3 give Error if selected are fields:
Purchase Date, Checkout Date, Last Checkin Date, Expected Checkin Date
Reason is: date field format
2023-10-22 16:28:44 +02:00
Godfrey M
e0a4387b10
clarifies an address column under locations
2023-10-19 10:01:08 -07:00
Godfrey M
b98c1a0627
fixes getExpiringLicenses query
2023-10-18 13:25:34 -07:00
snipe
bcce282ef9
Merge remote-tracking branch 'origin/develop'
2023-10-18 19:16:55 +01:00
snipe
38066bf162
Merge pull request #13758 from inietov/fixes/array_to_string_conversion_rb17355
...
Fixed ErrorException: Array to String Conversion rb17355
2023-10-18 19:09:13 +01:00
spencerrlongg
6b745930b5
what typo?
2023-10-18 13:00:13 -05:00
snipe
da30292d84
Merge pull request #13763 from Godmartinz/snipeit_v7_laravel10
...
fixed the bulk edit button on Asset tab
2023-10-18 18:51:41 +01:00
Godfrey M
7bda5c06de
fixes the bulk edit button on Asset tab
2023-10-18 10:46:47 -07:00
spencerrlongg
38de69b3da
new validation rule
2023-10-18 12:41:24 -05:00
snipe
41e96ad0ab
Merge remote-tracking branch 'origin/develop'
2023-10-18 14:37:37 +01:00
snipe
bc6f014fff
Merge pull request #13762 from snipe/fixes/make_sure_order_number_is_not_array
...
Make sure order number is not an array
2023-10-18 14:37:18 +01:00
snipe
1be503b21a
Make sure order number is not an array
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-18 14:36:16 +01:00
snipe
997664f489
Merge remote-tracking branch 'origin/develop'
2023-10-18 14:18:49 +01:00
snipe
825c800d32
Merge pull request #13761 from snipe/fixes/check_for_valid_date_in_custom_report
...
Check for valid date in custom report
2023-10-18 14:18:27 +01:00
snipe
0c86b67ed6
Added error reporting to UI
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-18 14:13:35 +01:00
snipe
4d841dbc79
Use custom report validator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-18 14:13:25 +01:00
snipe
f2fb5b43e3
Added custom report validator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-18 14:12:52 +01:00
snipe
14a0c9b5db
Merge remote-tracking branch 'origin/develop'
2023-10-18 13:06:21 +01:00
snipe
3747165f25
Merge pull request #13759 from snipe/fixes/better_handle_deleted_variables_in_api_call
...
Check for true/false explicitly on api table view
2023-10-18 13:05:57 +01:00
snipe
787a64d313
Check for true/false explicitly on api table view
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-18 13:05:06 +01:00
spencerrlongg
f7bb911b99
clean up
2023-10-17 19:06:53 -05:00
spencerrlongg
388e4c10c4
catch custom fields that are arrays
2023-10-17 19:03:58 -05:00
Ivan Nieto Vivanco
74ed32903f
Adds condition to check if parameter is of the proper type
2023-10-17 15:48:51 -06:00
snipe
a6d3886aaf
Merge remote-tracking branch 'origin/develop'
2023-10-17 22:37:50 +01:00
snipe
f2bc7d6173
Merge pull request #13757 from snipe/fixes/RB-17334_user_formatted_array
...
Fixed RB-17334 - ErrorException: Undefined variable $user_formatted_array
2023-10-17 22:34:52 +01:00
snipe
72fe94edb3
Fixed RB-17334 - ErrorException: Undefined variable $user_formatted_array
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-17 22:33:56 +01:00
snipe
3e54a9d561
Merge pull request #13756 from spencerrlongg/bug/label_logo_fix
...
Fixed #13652 - Labels Using Wrong Logo
2023-10-17 19:45:20 +01:00
spencerrlongg
4bdd070f7b
formatting
2023-10-17 13:41:31 -05:00
spencerrlongg
277608d962
this seems to work
2023-10-17 13:30:51 -05:00
Brady Wetherington
3d5847f4b3
Merge branch 'develop' into snipeit_v7_laravel10
2023-10-16 23:37:13 +01:00
snipe
82c2a46ada
Commented out noisy debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-16 23:24:03 +01:00
snipe
3f6554ee34
Use singleton for offset
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-16 23:23:43 +01:00
snipe
73ec84903e
Merge remote-tracking branch 'origin/develop'
2023-10-16 23:15:05 +01:00
snipe
1e0512ad44
Merge pull request #13753 from snipe/fixes/check_for_valid_location
...
Check that the location is valid before debugging
2023-10-16 23:14:41 +01:00
snipe
23fa92f4ce
Check that the location is valid before debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-16 23:13:38 +01:00
snipe
55d0c4021d
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-10-16 20:19:03 +01:00
snipe
2218cff7bc
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-16 20:18:33 +01:00
Brady Wetherington
db400dffb5
Merge branch 'develop' into snipeit_v7_laravel10
...
Rebuild assets and re-install from npm
2023-10-16 20:13:59 +01:00
snipe
199cdf6899
Commented out noisy debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-16 20:05:11 +01:00
snipe
752171d5b8
Use singleton for offset
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-16 20:05:11 +01:00
snipe
8c4bf74f93
Commented out noisy debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-14 20:43:18 +01:00
snipe
4e3d5707ce
Use singleton for offset
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-14 20:39:52 +01:00
snipe
37858d870a
Merge remote-tracking branch 'origin/develop'
2023-10-13 19:58:37 +01:00
snipe
b1f158ba5a
Merge pull request #13749 from snipe/bug/sc-23473
...
Handle case where value is deleted in history
2023-10-13 19:58:19 +01:00
snipe
a92a9d7616
Removed duplicated deleted
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 19:53:11 +01:00
snipe
8f23a45cb3
Removed dummy text
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 19:49:03 +01:00
snipe
93cccf4f5f
Handle case where value is deleted in history
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 19:32:09 +01:00
snipe
dcdc294135
Merge remote-tracking branch 'origin/develop'
2023-10-13 12:40:30 +01:00
snipe
04f6f39588
Merge pull request #13748 from snipe/bug/sc-23830
...
Fixed #13723 - race condition on asset observer for older migration
2023-10-13 12:40:14 +01:00
snipe
ca1420c9bd
Added the temp column back in
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:39:28 +01:00
snipe
2537d0fdaf
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:34:46 +01:00
snipe
b2aed7feea
Removed temp column
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:30:26 +01:00
snipe
ea960c39bb
Check if the eol_explicit column exists yet, add it if not
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:19:32 +01:00
snipe
0b39591d88
Add the eol_explicit column earlier to accomodate the observer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:18:58 +01:00
snipe
c14a01eb8b
Added comments to explain the potential race condition
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-13 12:18:19 +01:00
snipe
2a9ed09f77
Merge remote-tracking branch 'origin/develop'
2023-10-13 10:03:18 +01:00
snipe
b96e77268a
Merge pull request #13745 from spencerrlongg/bug/table_prefix_migration_fix
...
Resolves issue with migrations with table prefixes
2023-10-13 08:49:28 +01:00
spencerrlongg
f3bd23da3d
rm whitespace
2023-10-12 14:53:17 -05:00
spencerrlongg
9b53b0fedc
resolve issue with migrations with table prefixes
2023-10-12 14:50:12 -05:00
snipe
0d2f43c04f
Merge remote-tracking branch 'origin/develop'
2023-10-11 12:00:54 +01:00
snipe
138ec33555
Merge pull request #13733 from marcusmoore/bug/sc-23453
...
Fixed notification logic to ensure check in and out emails are delivered
2023-10-11 12:00:37 +01:00
snipe
e99d307350
Merge pull request #13734 from marcusmoore/bug/sc-23661
...
Fixed the storing of group permissions when creating via API
2023-10-11 03:46:49 +01:00
Marcus Moore
417f9c21e4
Fix the storing of group permissions when creating via API
2023-10-10 17:51:29 -07:00
Marcus Moore
43b9e6401c
Formatting
2023-10-10 15:18:55 -07:00
Marcus Moore
dae9e6d096
Improve try catch blocks
2023-10-10 15:18:37 -07:00
Marcus Moore
9ef598d07b
Apply changes to exception handling for check outs to check ins
2023-10-10 15:16:12 -07:00
Marcus Moore
2a29566458
Catch all ClientExceptions on check out
2023-10-10 15:15:02 -07:00
Marcus Moore
ab3a3de59b
Fire webhook notification after sending emails
2023-10-10 15:13:46 -07:00
Marcus Moore
47a77eabf2
Avoid logging error messages for webhook request failures
2023-10-10 15:06:08 -07:00
snipe
758d3aadb4
Added trim to import values
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-10 11:52:35 +01:00
snipe
1f0dadb58d
Merge remote-tracking branch 'origin/develop'
2023-10-09 16:43:24 +01:00
snipe
f685ba01b6
Reversed order of find
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-09 16:43:14 +01:00
snipe
e3591dc756
Merge pull request #13728 from snipe/fixes/13725_for_dev
...
Fixes qty remaining requirements for component checkout via API
2023-10-09 16:34:40 +01:00
snipe
0fbe63d0cf
Add @Singrity as a contributor
2023-10-09 16:33:00 +01:00
snipe
b9dc7f88d0
Fix qty requirements for Components API checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-09 16:32:30 +01:00
snipe
f6527e0b42
Merge pull request #13727 from snipe/security/huntr_43206801-9862-48da-b379-e55e341d78bf
...
Set resend acceptance to POST
2023-10-09 16:15:27 +01:00
snipe
866bbe5e11
Removed extra debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-09 16:15:14 +01:00
snipe
6d55d78280
Set resend acceptance to POST
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-09 16:13:41 +01:00
snipe
2789f67bb4
Merge remote-tracking branch 'origin/develop'
2023-10-09 15:19:29 +01:00
snipe
7a0d3f788f
Merge pull request #13726 from snipe/fixes/tighter_checkin_on_log_match
...
Added tighter controls for matching log ID and item_id
2023-10-09 15:19:10 +01:00
snipe
e5f5802235
Added tighter controls for matching log ID and item_id
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-09 15:17:03 +01:00
snipe
a1f3a5c624
Merge remote-tracking branch 'origin/develop'
2023-10-07 11:34:49 +01:00
snipe
d2dc3253ab
Cast the request limit to intval before we try to abs()
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-07 11:34:37 +01:00
snipe
d9a1dab827
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2023-10-06 20:17:59 +01:00
snipe
5277f7cc5c
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-06 20:14:44 +01:00
snipe
25a5507d9d
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-06 20:07:35 +01:00
snipe
a95fae0e94
Merge remote-tracking branch 'origin/develop'
2023-10-06 20:00:12 +01:00
snipe
890efb18d8
Merge pull request #13720 from snipe/security/huntr_dev_d6ed5ac1-2ad6-45fd-9492-979820bf60c8
...
Fixed missing escaping asset history old/new values
2023-10-06 19:59:42 +01:00
snipe
eea2eabaee
Escaping asset history old/new values
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-06 19:45:23 +01:00
snipe
9596826259
Merge branch 'master' of https://github.com/snipe/snipe-it
2023-10-06 19:04:44 +01:00
snipe
cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2
...
Added a check-in button on components tab of Asset view
2023-10-05 14:28:37 +01:00
snipe
1dab4b59e9
Merge pull request #13693 from Godmartinz/bug/sc-9955
...
added proper margin-top to sidebar menu on bigger resolutions
2023-10-05 14:27:25 +01:00
snipe
05dd2b4008
Merge pull request #13709 from spencerrlongg/eol-migration
...
Speed up EOL Migration
2023-10-05 14:26:47 +01:00
snipe
b809625856
Merge pull request #13713 from snipe/security/13685
...
[Snyk] Security upgrade css-loader from 4.3.0 to 5.0.0 #13685
2023-10-05 14:13:35 +01:00
snipe
8d921359ca
[Snyk] Security upgrade css-loader from 4.3.0 to 5.0.0 #13685
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-05 14:12:36 +01:00
spencerrlongg
c07c0c0f74
cleanup
2023-10-04 16:55:35 -05:00
spencerrlongg
cc82e86eeb
one more check
2023-10-04 16:54:56 -05:00
spencerrlongg
8c9961aba8
refactor
2023-10-04 15:40:42 -05:00
spencerrlongg
46af40bd02
?????
2023-10-04 15:20:16 -05:00
spencerrlongg
6cda9056b8
oops
2023-10-04 14:56:18 -05:00
spencerrlongg
101bd9c404
kill transaction, try update array
2023-10-04 14:47:14 -05:00
spencerrlongg
ad6b502005
comments
2023-10-04 14:37:18 -05:00
spencerrlongg
cb10c7af27
oops
2023-10-04 14:33:35 -05:00
spencerrlongg
99d409c0a5
transaction
2023-10-04 14:32:28 -05:00
Godfrey M
37c1d6fc04
removed unnecessary changes
2023-10-03 12:45:13 -07:00
Brady Wetherington
7a5714cc85
Merge branch 'develop' into snipeit_v7_laravel10
2023-10-03 20:37:17 +01:00
Godfrey M
c69958d95d
removed dead space
2023-10-03 12:32:24 -07:00
Godfrey M
92776adb93
remove unnecessary changes
2023-10-03 12:31:58 -07:00
Godfrey M
dee36fc294
adds component checkin to asset tab
2023-10-03 12:30:08 -07:00
snipe
a2773aa895
Merge pull request #13696 from marcusmoore/bug/sc-23796
...
Fixed potential call to a member function toArray() on null
2023-10-03 11:01:40 +01:00
Marcus Moore
e82fec2a5f
Grammar fix
2023-10-02 16:19:20 -07:00
Marcus Moore
db4c86a4f4
Filter null field options before attempting to process them
2023-10-02 16:14:20 -07:00
snipe
8384786e8b
Merge pull request #13695 from marcusmoore/bug/sc-23795-to-master
...
Log non-compliant barcode error as debug message
2023-10-02 22:22:26 +01:00
Marcus Moore
a5fd218c23
Log non-compliant barcode error as debug message
2023-10-02 14:19:52 -07:00
snipe
d2435c6f86
Merge remote-tracking branch 'origin/develop'
2023-10-02 22:14:08 +01:00
snipe
1abcc8b802
Merge pull request #13694 from marcusmoore/bug/sc-23795
...
Logs non-compliant barcode error as debug message
2023-10-02 22:13:19 +01:00
Marcus Moore
724c054838
Log non-compliant barcode error as debug message
2023-10-02 12:06:24 -07:00
Godfrey M
1e8f90bcf0
gives proper margin-top to sidebar menu on bigger resolutions
2023-10-02 11:46:08 -07:00
snipe
129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2
...
Standardize Asset EOL Date
2023-10-02 16:09:22 +01:00
snipe
4e6764428e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-10-02 14:29:59 +01:00
snipe
c7b8880d69
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-02 14:28:59 +01:00
snipe
228f21ed91
Merge pull request #13690 from snipe/localization/all
...
Updated language strings
2023-10-02 14:24:52 +01:00
snipe
b7c390a257
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-10-02 14:23:22 +01:00
snipe
c45ede2d17
Merge remote-tracking branch 'origin/develop'
2023-09-29 19:00:27 +01:00
snipe
758d808772
Merge pull request #13683 from snipe/bug/sc-17602
...
Fixed consumable user view route name
2023-09-29 15:17:23 +01:00
snipe
754ec7563a
Fixed consumable user view route name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-29 15:15:03 +01:00
snipe
352e53a036
Merge remote-tracking branch 'origin/develop'
2023-09-29 01:51:40 +01:00
snipe
0184d25a95
Merge pull request #13681 from marcusmoore/bug/sc-23778
...
Fixed uncaught type error when attempting to render barcodes with invalid characters
2023-09-29 01:50:07 +01:00
Marcus Moore
bed1055c4e
Catch TypeError when rendering 1d barcode
2023-09-28 17:32:16 -07:00
Marcus Moore
41eccaeae0
Set dummy asset tag to value that is valid for EAN13
2023-09-28 17:31:45 -07:00
Marcus Moore
eb2edb7475
Add more default values for label preview
2023-09-28 13:40:51 -07:00
Marcus Moore
ed77e8768c
Re-order options
2023-09-28 12:33:27 -07:00
Marcus Moore
3aa256ec02
Ensure non-checked out items can be displayed
2023-09-28 12:33:20 -07:00
snipe
c1f545a523
Merge pull request #13679 from Godmartinz/bug/sc-23688
...
Fixed General Webhooks error messaging and validation
2023-09-28 20:24:09 +01:00
Godfrey M
8792d654b6
added translations for messages
2023-09-28 12:15:17 -07:00
Godfrey M
f8730adb11
removed unnecessary changes
2023-09-28 11:41:43 -07:00
Marcus Moore
36638feac4
Add assigned to as option
2023-09-28 11:37:02 -07:00
Marcus Moore
4675f02349
Format assigned to field
2023-09-28 11:35:20 -07:00
Godfrey M
c21586dee5
adds better error messaging
2023-09-28 11:29:46 -07:00
snipe
581e56198c
Merge remote-tracking branch 'origin/develop'
2023-09-28 19:24:48 +01:00
snipe
f16e81e0e8
Merge pull request #13678 from spencerrlongg/bug/sc-23596
...
Fieldset Properly Sortable in Asset Models Table
2023-09-28 19:24:04 +01:00
snipe
3de656f5c6
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2023-09-28 19:20:27 +01:00
snipe
3b4004ac18
Merge pull request #13677 from snipe/feature/sc-14880
...
Set modal focus to modal-name field
2023-09-28 19:18:16 +01:00
snipe
0bf423cda9
Set modal focus to modal-name field
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-28 19:16:40 +01:00
spencerrlongg
a54fab5c33
add fieldset to allowed_columns
2023-09-28 13:02:12 -05:00
snipe
96c6c93197
Merge pull request #13674 from snipe/bug/sc-23774
...
Fixed bug where license checkout/checkin notes were not being saved
2023-09-28 18:37:47 +01:00
spencerrlongg
4d67c72eea
scope and switch case in api
2023-09-28 12:26:23 -05:00
snipe
6fa0d42bc2
Fixed bug where license checkout/checkin notes were not being saved
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-28 15:40:18 +01:00
snipe
cfe6b07b3a
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2023-09-28 15:15:50 +01:00
snipe
7512400b56
Merge pull request #13672 from snipe/feature/sc-23772
...
Fixed #13662 - added clipboard.js
2023-09-28 15:13:42 +01:00
snipe
1acb14a39f
Moved dragtable css
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-28 15:12:44 +01:00
snipe
bb7a41628a
Fixed #13662 - added clipboard.js
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-28 15:06:55 +01:00
snipe
68c9fac971
Merge remote-tracking branch 'origin/develop'
2023-09-28 14:25:31 +01:00
snipe
402ff58628
Merge pull request #13671 from snipe/bug/sc-23773
...
Fixed #13670 - order number missing from license import
2023-09-28 14:24:49 +01:00
snipe
492fb15036
Fixed #13670 - order number missing from license import
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-28 14:24:07 +01:00
snipe
ac7f85fea9
Merge remote-tracking branch 'origin/develop'
2023-09-28 03:32:57 +01:00
snipe
cc4cb14e9d
Merge pull request #13667 from snipe/bug/sc-23771
...
Fixed #13658 for asset history with encrypted fields
2023-09-28 03:29:06 +01:00
snipe
ee72c92d4f
Fix for asset history with enfrypted fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-28 03:00:49 +01:00
Marcus Moore
a47e36c1e5
Add custom fields as options
2023-09-27 16:51:53 -07:00
Marcus Moore
a4a25ab9d0
Remove a couple fields
2023-09-27 16:35:44 -07:00
Marcus Moore
518ae28a37
Improve option display values
2023-09-27 16:20:26 -07:00
Marcus Moore
74a891afbb
WIP: Render select box for field options in label engine
2023-09-27 15:58:01 -07:00
snipe
3aeea007b2
Merge remote-tracking branch 'origin/develop'
2023-09-26 15:26:21 +01:00
snipe
048ad57418
Merge pull request #13657 from snipe/fixes/revert_column_sorting_temp
...
Commented out sortable columns
2023-09-26 15:25:58 +01:00
snipe
7bcb28d8fd
Commented out sortable columns
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-26 15:24:20 +01:00
snipe
660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704
...
Fixed exception being thrown when selected import was deleted
2023-09-26 15:00:35 +01:00
snipe
0c31d5749c
Merge remote-tracking branch 'origin/develop'
2023-09-26 14:47:25 +01:00
snipe
1509339b68
Merge pull request #13655 from snipe/bug/sc-23759
...
Fixed bug where checkout to location would throw an error if FMCS was enabled
2023-09-26 14:37:36 +01:00
snipe
81ae32d3f9
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-26 14:33:51 +01:00
snipe
279e6c7e4f
Check for null company ID
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-26 14:33:42 +01:00
snipe
16498fdcf8
Merge remote-tracking branch 'origin/develop'
2023-09-25 13:46:33 +01:00
snipe
81a982fd77
Merge pull request #13650 from snipe/features/more_info_in_settings
...
Features/more info in settings
2023-09-25 13:46:00 +01:00
snipe
619712b927
Fixed table
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-25 13:45:46 +01:00
snipe
359cd2a267
A few more config options
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-25 13:28:13 +01:00
snipe
13bee63fe9
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-09-25 10:59:09 +01:00
snipe
f6317695f9
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-25 10:58:14 +01:00
snipe
e4696138ba
Merge pull request #13647 from snipe/localization/new_translations
...
Localization/new translations
2023-09-25 10:57:02 +01:00
snipe
bd0863d9c7
Added new translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-25 10:54:46 +01:00
snipe
28cd0085b7
Added Khmer as an available language
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-25 10:54:32 +01:00
snipe
456d55c3bd
Added some mail settings to /settings for easier reference
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-21 16:14:47 +01:00
Marcus Moore
5a88a64ebd
Remove unnecessary redirect
2023-09-20 17:35:34 -07:00
Marcus Moore
b1199100a0
Display error message if import file deleted before it can be selected
2023-09-20 17:22:12 -07:00
Godfrey M
b7901ae2d8
dont allow redirects, messaging applied, general webhook validation applied
2023-09-20 12:54:34 -07:00
spencerrlongg
4660a2e5b7
rm more duplicate
2023-09-20 14:37:32 -05:00
spencerrlongg
a9123754f5
remove unnecessary code
2023-09-20 14:34:42 -05:00
spencerrlongg
cbef531811
parse purchase date even though it's cast
2023-09-20 14:26:49 -05:00
spencerrlongg
7dab59c98d
fix for no eol, fix for optional in view
2023-09-20 14:17:30 -05:00
spencerrlongg
c48a47936c
add validation back in
2023-09-20 14:00:59 -05:00
snipe
7c908fecd9
Merge pull request #12992 from spencerrlongg/features/12853
...
Adds tag for docker builds
2023-09-20 19:36:22 +01:00
snipe
cdd0de15b5
Merge pull request #13634 from marcusmoore/chore/add-factories-to-autolabeler
...
Added factories to autolabeler action
2023-09-20 17:51:34 +01:00
snipe
46981da400
Merge pull request #13635 from marcusmoore/bug/sc-23715
...
Added unique() to some factory properties
2023-09-20 17:51:22 +01:00
Godfrey M
66abf8d5c0
redoing logic
2023-09-19 17:46:29 -07:00
spencerrlongg
2ace24b176
csv header
2023-09-19 19:38:59 -05:00
spencerrlongg
d65d1930e4
asset models
2023-09-19 19:24:53 -05:00
Marcus Moore
90e75a3e2c
Add unique() to some factory properties
2023-09-19 17:02:18 -07:00
spencerrlongg
2d59517c35
rm !empty
2023-09-19 18:40:23 -05:00
spencerrlongg
3cb906a05f
pushing to switch branches and test
2023-09-19 18:23:06 -05:00
Marcus Moore
cd538a4ad8
Add factories to autolabeler action
2023-09-19 16:07:26 -07:00
spencerrlongg
6b4f8f1813
rm duplicate fillable
2023-09-19 18:07:15 -05:00
spencerrlongg
929e107a20
rm byod from casts
2023-09-19 18:04:16 -05:00
snipe
5a5b07f5a5
Merge remote-tracking branch 'origin/develop'
2023-09-19 10:22:59 +01:00
snipe
439c2e095d
Merge pull request #13629 from snipe/bug/sc-23745
...
Fixed #13628 - removed duplicate favicon tag
2023-09-19 10:22:36 +01:00
snipe
14c0517927
Fixed #13628 - removed duplicate favicon tag
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-19 10:21:38 +01:00
snipe
d84d26febf
Merge remote-tracking branch 'origin/develop'
2023-09-18 22:31:41 +01:00
snipe
753a5f789e
Merge pull request #13623 from snipe/fixes/dependabot_target
...
Made develop the target branch for dependabot
2023-09-18 22:31:11 +01:00
snipe
d7790cd16b
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-18 22:24:15 +01:00
snipe
8ecc0651ed
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2023-09-18 22:23:58 +01:00
snipe
a8b2089275
Merge pull request #13627 from snipe/fixes/dependabot_13616
...
Replaces #13616 - Bump docker/metadata-action from 4 to 5
2023-09-18 22:20:06 +01:00
snipe
a46a11d554
Replaces #13616 - Bump docker/metadata-action from 4 to 5
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-18 22:19:31 +01:00
snipe
d444b620c5
Merge pull request #13626 from snipe/fixes/dependabot_13617
...
Replaces #13617 - Bump docker/setup-buildx-action from 2 to 3
2023-09-18 22:18:04 +01:00
snipe
10dcd8166b
Replaces #13617 - Bump docker/setup-buildx-action from 2 to 3
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-18 22:17:24 +01:00
snipe
00df449e0b
Merge pull request #13625 from snipe/fixes/dependabot_13618
...
Replaces #13618 - Bump docker/build-push-action from 4 to 5
2023-09-18 22:16:08 +01:00
snipe
0cb4427a19
Bump docker/build-push-action from 4 to 5
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-18 22:15:18 +01:00
snipe
17fe915d2f
Merge pull request #13624 from snipe/fixes/dependabot_13619
...
Bump docker/login-action from 2 to 3 (#13619 )
2023-09-18 22:14:01 +01:00
snipe
9ad73ed09a
Bump docker/login-action from 2 to 3 ( #13619 )
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-18 22:13:09 +01:00
snipe
68fa6d57ca
Merge pull request #13613 from snipe/features/reorder_columns
...
Added column re-ordering
2023-09-18 22:10:09 +01:00
snipe
f14e3422b4
Made develop the target branch
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-18 22:09:43 +01:00
snipe
2a638e66f0
Added column re-ordering
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-15 21:53:34 +01:00
snipe
8bdecb1da9
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2023-09-15 20:32:05 +01:00
snipe
52f9c786be
Merge pull request #13612 from snipe/fixes/re_add_sticky_header
...
Fixed regression that disabled sticky headers
2023-09-15 20:29:24 +01:00
snipe
3ba8b60f54
Fixed regression that disabled sticky headers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-15 20:28:28 +01:00
snipe
341f711385
Merge remote-tracking branch 'origin/develop'
2023-09-15 15:43:48 +01:00
snipe
eb406547c4
Merge pull request #13610 from snipe/fixes/disallow_sorting_on_age
...
Fixes #13609 - disallow sorting on age
2023-09-15 15:26:55 +01:00
snipe
0b562d2f55
Fixes #13609 - disallow sorting on age
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-15 15:25:52 +01:00
snipe
131ccaa5b9
Merge pull request #12869 from Godmartinz/bug/sc-23134
...
Fixed footer sizing issue
2023-09-15 14:31:07 +01:00
snipe
9bd357e2d4
Merge remote-tracking branch 'origin/develop'
2023-09-15 12:52:59 +01:00
snipe
054d8763fb
Merge pull request #13608 from snipe/bug/sc-15287
...
Use relative path in backups for cleaner directory structure
2023-09-15 12:51:49 +01:00
snipe
52a77f4c31
Use relative path in backups for cleaner directory structure
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-15 12:50:00 +01:00
snipe
cce90c6ce0
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-09-15 09:43:25 +01:00
snipe
4e0e1a2c85
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-15 09:42:27 +01:00
snipe
8a8afef81b
Merge pull request #13606 from snipe/feature/sc-23705
...
Fixed #13592 - unable to delete model from view page
2023-09-15 01:11:49 +01:00
snipe
860e7791ff
Fixed #13592 - unable to delete model from view page
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 23:35:44 +01:00
snipe
20da6cccbc
Merge remote-tracking branch 'origin/develop'
2023-09-14 22:57:04 +01:00
snipe
a013ddf541
Merge pull request #13605 from snipe/bug/sc-23183
...
Simplify upload messaging, handle -1% error
2023-09-14 22:52:31 +01:00
spencerrlongg
1cfd7673e0
change Importer.php back
2023-09-14 16:11:24 -05:00
snipe
bbe7d9dde2
Removed stray space
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 22:08:53 +01:00
snipe
932c02cc54
Typo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 22:08:30 +01:00
snipe
84b0ff76ed
Revert large warning size
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 22:06:19 +01:00
snipe
273740b8f5
Fixed import error warning
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 22:04:23 +01:00
spencerrlongg
afe9d43139
chunk by id?
2023-09-14 16:00:35 -05:00
snipe
34c3174531
Merge pull request #13604 from marcusmoore/feature/sc-23714
...
Removed ChipperCI integration
2023-09-14 21:48:49 +01:00
spencerrlongg
aac627592b
move logic inside of try
2023-09-14 15:43:00 -05:00
spencerrlongg
f35f9f922e
safety & catch & log
2023-09-14 15:32:17 -05:00
snipe
8f4ca9da57
Simplify upload messaging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 21:20:21 +01:00
Marcus Moore
b113411891
Remove ChipperCI
2023-09-14 13:00:38 -07:00
spencerrlongg
44441ec703
up chunk size
2023-09-14 14:25:02 -05:00
snipe
15c71439b6
Merge pull request #13602 from snipe/bug/sc-23685
...
Fixed checkbox formatting on quickstart
2023-09-14 18:48:50 +01:00
snipe
8e41fb7b36
Removed stray text
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 18:48:20 +01:00
snipe
d0c4910a51
Fixed checkbox formatting on quickstart
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 18:44:02 +01:00
snipe
467609e561
Merge remote-tracking branch 'origin/develop'
2023-09-14 14:32:06 +01:00
snipe
2166d6649d
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled
...
Fixed #13336 - Save unhashed password if no password provided
2023-09-14 14:15:53 +01:00
snipe
dcae5503c8
Use $attributes array
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-14 13:52:57 +01:00
snipe
d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping
...
Added `CompanyableTrait` to `Department` model
2023-09-14 12:52:53 +01:00
snipe
b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature
...
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
2023-09-14 12:52:13 +01:00
snipe
c7b24821b3
Merge pull request #13549 from inietov/fixes/attempt_to_read_property_id_on_null
...
Fixed ErrorException: Attempt to read property "id" on null (rollbar #3541 )
2023-09-14 12:50:54 +01:00
snipe
a37df8ce9d
Merge pull request #13581 from snipe/updates/upgrade_checkout_actions
...
Upgraded actions/checkout to v4 (via #13580 )
2023-09-14 12:40:34 +01:00
snipe
104219ed76
Merge pull request #13597 from marcusmoore/bug/sc-23681
...
Reset checkout to value when navigating away from type
2023-09-14 12:39:04 +01:00
snipe
56c7da7b06
Merge pull request #13595 from Godmartinz/correct-nullable_on_asset_model_min_qty
...
Fixed nullability on asset model `min qty` column
2023-09-14 08:52:33 +01:00
spencerrlongg
7c9a4ac161
immutable
2023-09-13 18:15:13 -05:00
spencerrlongg
64a9859efd
cleanup
2023-09-13 17:58:33 -05:00
spencerrlongg
ef64843d2f
chunk migration, needs to be tested
2023-09-13 17:41:45 -05:00
Ivan Nieto Vivanco
439e031911
Evaluate if the event properties exists before run the CheckoutAcceptance query
2023-09-13 16:35:10 -06:00
spencerrlongg
0368b9df43
viola
2023-09-13 17:16:17 -05:00
Marcus Moore
74c7f106ce
Reset assigned_x values when changing check out to type
2023-09-13 13:43:35 -07:00
Godfrey M
f283a5f755
changed the down method change
2023-09-13 13:24:26 -07:00
spencerrlongg
951521dc81
push
2023-09-13 15:20:55 -05:00
Godfrey M
0c504fed49
fixed nullability of on Asset Models
2023-09-13 13:13:41 -07:00
Marcus Moore
11208ee064
Guard against attempting to send notification to model that isn't notifiable
2023-09-13 12:56:27 -07:00
spencerrlongg
70a251de55
fix up gui edit
2023-09-13 13:51:14 -05:00
spencerrlongg
e21a8b6717
fix up this file
2023-09-12 18:11:36 -05:00
spencerrlongg
7047869367
cleanup
2023-09-12 18:03:13 -05:00
spencerrlongg
53d4fd1d0b
purchase_date
2023-09-12 18:01:33 -05:00
Brady Wetherington
c77f5eee8c
Merge branch 'develop' into snipeit_v7_laravel10
2023-09-12 12:04:42 +01:00
snipe
f6a11ac0ed
Merge pull request #13586 from inietov/fixes/call_to_member_function_checkedOutToUser
...
Fixed Call to a member function checkedOutToUser() on null [rollbar-3598]
2023-09-12 08:35:30 +01:00
Ivan Nieto Vivanco
9cbd2d032c
Add a boolean variable and condition to handle the call to checkedOutToUser() method
2023-09-11 17:40:59 -06:00
spencerrlongg
ccf3fe40ec
rm additional row
2023-09-11 17:35:13 -05:00
spencerrlongg
3a63bcab73
temporarily show on its own line
2023-09-11 17:35:13 -05:00
spencerrlongg
30dade1fba
cleanup
2023-09-11 17:35:12 -05:00
spencerrlongg
97d6a34b8c
some changes to sample csv
2023-09-11 17:34:05 -05:00
spencerrlongg
431af5f530
this works!!!!
2023-09-11 17:34:05 -05:00
spencerrlongg
3e3bb594ea
some import stuff
2023-09-11 17:34:04 -05:00
spencerrlongg
fb001caee4
fix conflicts
2023-09-11 17:33:31 -05:00
spencerrlongg
b73f20cadf
immutable when things are looping, just in case
2023-09-11 17:22:46 -05:00
spencerrlongg
3fb62874f0
quick push to check something else
2023-09-11 17:22:46 -05:00
spencerrlongg
c66804bcee
a little cleanup
2023-09-11 17:22:46 -05:00
spencerrlongg
e1af69f6ae
typo
2023-09-11 17:22:46 -05:00
slong753
27bea2abb9
just some more wip on the importer
2023-09-11 17:21:51 -05:00
slong753
1b18cd7fe6
added asset_eol_date and explicit to factory
2023-09-11 17:21:51 -05:00
slong753
78c400e948
fix conflicts
2023-09-11 17:21:50 -05:00
slong753
75d7e3e1a0
fix conflicts
2023-09-11 17:20:21 -05:00
slong753
5948679a4a
fix purchase date update
2023-09-11 17:17:59 -05:00
slong753
774f21bb7f
some more cleanup
2023-09-11 17:17:59 -05:00
slong753
20367eecc9
fix conflicts
2023-09-11 17:17:59 -05:00
slong753
cda9dd57dd
asset update logic
2023-09-11 17:15:25 -05:00
slong753
41b65bd9a2
small changes
2023-09-11 17:15:25 -05:00
slong753
17a83129b9
this all needs to be tested tediously
2023-09-11 17:15:25 -05:00
slong753
0e60184e95
i think this migration makes sense
2023-09-11 17:15:25 -05:00
slong753
1ea0de8bca
prevent injection, fix asset update
2023-09-11 17:15:25 -05:00
slong753
17ccfa9ada
resolve some conflicts
2023-09-11 17:15:24 -05:00
slong753
c1daabef08
progress
2023-09-11 17:10:41 -05:00
slong753
dc39d2c567
notes
2023-09-11 17:10:41 -05:00
slong753
321e7c93ec
carbon thing
2023-09-11 16:51:40 -05:00
slong753
8456b3ec0c
wip stuff
2023-09-11 16:51:40 -05:00
Godfrey M
e73b16846e
adds an option to bulk edit actual location for bulk edit and fixes update issue
2023-09-11 11:21:56 -07:00
snipe
a49d3fe131
Merge pull request #13526 from Godmartinz/asset-model-notifs
...
Added threshold notifications and min qty for Asset models
2023-09-11 17:55:34 +01:00
Godfrey Martinez
a26b96185b
Merge branch 'develop' into asset-model-notifs
2023-09-11 09:37:22 -07:00
Godfrey M
0eb50ceb3d
removes commented code
2023-09-11 09:36:38 -07:00
snipe
c2fe9d490b
Upgraded actions/checkout to v4 (via #13580 )
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-11 13:25:44 +01:00
snipe
dc74fb133f
Merge pull request #13577 from marcusmoore/fixes/improve-testcase
...
Fixed failing test
2023-09-08 07:08:21 +01:00
Marcus Moore
093bf57448
Update assertion and add failure messages
2023-09-07 16:42:49 -07:00
snipe
9c608dd6ff
Merge remote-tracking branch 'origin/develop'
2023-09-07 21:36:39 +01:00
snipe
06836663c8
Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging
...
Added validation around department_id in API patch request
2023-09-07 21:36:20 +01:00
Marcus Moore
c6c1c64c1e
Remove todo
2023-09-07 13:30:05 -07:00
Marcus Moore
4caa501996
Relax property type check
2023-09-07 13:28:32 -07:00
Marcus Moore
a7a70f6981
Test permissions update
2023-09-07 13:21:27 -07:00
Marcus Moore
39ff575ac1
Remove unused test cases
2023-09-07 13:16:08 -07:00
snipe
5b88089ffc
Merge remote-tracking branch 'origin/develop'
2023-09-07 20:50:35 +01:00
snipe
02c187b0a0
Merge pull request #13566 from snipe/features/13562_add_inline_file_link
...
Fixed #13562 - Added inline file link
2023-09-07 20:50:13 +01:00
snipe
7f892bf5ef
Merge pull request #13574 from inietov/fixes/unaccepted_assets_report_incorrect
...
Fixed Unaccepted Assets report has incorrect people [freshdesk-37808]
2023-09-07 20:49:40 +01:00
Marcus Moore
56e6205667
Formatting
2023-09-07 12:45:03 -07:00
Ivan Nieto Vivanco
abd2ed3b81
Filter unaccepted assets that are not assigned to users
2023-09-07 13:39:16 -06:00
Marcus Moore
899c2eb19b
Implement test case
2023-09-07 12:34:50 -07:00
snipe
cf36c31eac
Merge remote-tracking branch 'origin/develop'
2023-09-07 20:22:33 +01:00
snipe
894c34ff4f
Update to only use relative paths
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-07 20:22:14 +01:00
Brady Wetherington
aacfed40f8
Switch back to our fork of laravel-scim-server
2023-09-07 20:16:03 +01:00
Brady Wetherington
ec1059e74c
Merge branch 'develop' into snipeit_v7_laravel10
2023-09-07 20:11:41 +01:00
snipe
b7c2b9374c
Merge pull request #13573 from snipe/upgrade_scim_server
...
Upgrade to new branch for our fork of laravel-scim-server
2023-09-07 20:07:59 +01:00
Brady Wetherington
3184f795c2
Upgrade to new branch for our fork of laravel-scim-server
2023-09-07 18:29:23 +01:00
snipe
67cad9c751
Merge pull request #13571 from inietov/fixes/require_acceptance_on_null
...
Fixed Attempt to read property require_acceptance on null [rollbar-3557]
2023-09-07 18:11:42 +01:00
snipe
ec5238ff06
Merge pull request #13548 from marcusmoore/update-testing-documentation
...
Updated testing documentation
2023-09-07 11:25:53 +01:00
Marcus Moore
1c3c36f2a0
Begin to implement patch test
2023-09-06 16:14:14 -07:00
Ivan Nieto Vivanco
1509c512a5
Add guard clauses around some License and LicenseSeat models functions
2023-09-06 11:54:11 -06:00
snipe
2a94fd17ee
Merge remote-tracking branch 'origin/develop'
2023-09-06 09:37:35 +01:00
snipe
e920199626
Merge pull request #13567 from johnson-yi/fixes/add_default_location_to_checkin_actionlog
...
Add default location to tracked changes on checkin actionlog
2023-09-06 09:37:04 +01:00
johnson-yi
5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog
2023-09-06 00:36:48 +00:00
snipe
a67888f3d3
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag
...
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541 )
2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco
91b1cc7121
Move the early return to the controller instead of the Label model
2023-09-05 13:23:51 -06:00
akemidx
45dbc02868
save commit
2023-09-05 15:01:20 -04:00
snipe
d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog
...
Added/Fixed: track changes on asset checkin/out
2023-09-05 19:08:49 +01:00
snipe
65a76c599c
Added inline=true to image preview modal
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-05 18:35:07 +01:00
snipe
f53db8ba75
Fixed #13562 - allow inline view for uploaded files
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-05 18:28:01 +01:00
snipe
32407b531b
Merge remote-tracking branch 'origin/develop'
2023-09-05 16:10:30 +01:00
snipe
e486fe2794
Removed soft-delete query
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-05 16:10:20 +01:00
snipe
521fcd45b0
Merge remote-tracking branch 'origin/develop'
2023-09-05 16:08:17 +01:00
snipe
26452a8a29
Merge pull request #13565 from snipe/fixes/asset_history_500_on_hard_deleted_models
...
Account for hard-deleted models, suppliers
2023-09-05 16:06:40 +01:00
snipe
f85df6bb8c
Use same method of accessing companies as others
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-05 16:02:28 +01:00
snipe
2acf2b880e
Account for hard-deleted models, suppliers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-09-05 15:58:21 +01:00
snipe
b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost
...
Added users total cost of assets to user profile
2023-09-05 13:52:34 +01:00
snipe
a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report
...
Added last check in column and filter to custom asset report
2023-09-05 13:22:15 +01:00
Johnson Yi
09f7b3debe
Track changes on asset checkin/out
2023-09-01 13:12:07 +10:00
Marcus Moore
da7d6f6f77
Merge branch 'develop' into update-testing-documentation
2023-08-31 10:36:06 -07:00
snipe
faa865fd48
Merge remote-tracking branch 'origin/develop'
2023-08-31 18:24:29 +01:00
snipe
f08cef8664
Merge pull request #13556 from snipe/feature/sc-23684
...
Added model name and number to dynamic url
2023-08-31 18:23:33 +01:00
snipe
e192cbbbe1
Merge pull request #13550 from marcusmoore/remove-dusk
...
Removed Dusk
2023-08-31 18:06:04 +01:00
snipe
83b178f5b2
Added model name and number to dynamic url
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-31 18:03:32 +01:00
Brady Wetherington
3500217f94
Merge branch 'develop' into snipeit_v7_laravel10
2023-08-31 13:07:06 +01:00
snipe
2a1aa53ba6
Merge remote-tracking branch 'origin/develop'
2023-08-31 13:04:56 +01:00
snipe
c51574099f
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes
...
Added eager loading for `changedinfo` and removed encrypted values from Asset history
2023-08-31 13:04:39 +01:00
snipe
821c3085f0
Merge remote-tracking branch 'origin/develop'
2023-08-31 12:01:58 +01:00
snipe
9a0f691f05
Merge pull request #13546 from snipe/fixes/make_boolean_user_fields_more_consistant
...
Don’t cast as boolean, do validate as boolean for User validation
2023-08-31 12:01:20 +01:00
Marcus Moore
a799659610
Scaffold tests and add context
2023-08-30 17:33:23 -07:00
Marcus Moore
999605f832
Add failing test
2023-08-30 17:10:50 -07:00
Marcus Moore
5828d29952
Remove Dusk
2023-08-30 16:43:18 -07:00
Marcus Moore
417b2c8331
Update testing documentation
2023-08-30 11:27:26 -07:00
snipe
663faffcc1
Un-cast byod, validate as boolean
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 19:13:55 +01:00
snipe
fb455be406
Added tests
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 19:13:38 +01:00
Ivan Nieto Vivanco
3cf9c1fea5
Adds a null coalescing operator to the license seat checkin notification
2023-08-30 11:57:29 -06:00
Ivan Nieto Vivanco
085a993340
Early return if no asset is found
2023-08-30 11:05:58 -06:00
Marcus Moore
07c3fe1fce
Update assertions to account for type change
2023-08-30 09:42:53 -07:00
snipe
2a93c38830
Don’t cast as boolean, validate as boolean
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 16:40:28 +01:00
snipe
587a787b5d
Fixed bug introduced in #13528
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 15:50:28 +01:00
snipe
305804f260
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# package-lock.json
# public/css/dist/all.css
# public/js/dist/all-defer.js
# public/mix-manifest.json
2023-08-30 15:50:09 +01:00
snipe
c0cbdb1fc4
Fixed bug introduced in #13528
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 15:48:35 +01:00
snipe
5cf8c36698
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 15:43:06 +01:00
snipe
1bcc74f156
Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.4.2 #13527
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 15:41:11 +01:00
snipe
9ebcde4472
Upgrade less from 4.1.2 to 4.2.0 #13534
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 15:40:56 +01:00
snipe
fbc04cfd47
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-30 15:07:38 +01:00
snipe
319cb2305d
Merge remote-tracking branch 'origin/develop'
2023-08-30 15:05:46 +01:00
snipe
b109ee281a
Merge pull request #13544 from marcusmoore/bug/sc-23675
...
Fixed user search not adhering to company scoping
2023-08-30 08:54:41 +01:00
Marcus Moore
806ab2cb9d
Ensure users are scoped by company in index method
2023-08-29 16:17:29 -07:00
Marcus Moore
aafa1ab70e
Add failing test
2023-08-29 16:15:13 -07:00
akemidx
f1cc2c8d8b
submitting form after capturing/formatting fixes
2023-08-29 16:55:21 -04:00
snipe
22d136df46
Merge pull request #13528 from inietov/fixes/cloning_model_blanks_fieldset
...
Fixed #12548 Cloning a model blanks fieldset of new one
2023-08-29 19:14:38 +01:00
Godfrey Martinez
0ac5d4d582
Merge pull request #8 from Godmartinz/fix-companyable
...
Fix companyable
2023-08-28 19:38:27 -07:00
Godfrey Martinez
d86c63cf23
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable
2023-08-28 19:38:16 -07:00
Godfrey M
74f45a4473
reworks company queries for asset history
2023-08-28 19:35:46 -07:00
akemidx
734af87f2f
template structuring
2023-08-28 19:26:31 -04:00
Ivan Nieto Vivanco
4e4ba38038
Pass the model_id variable in the controller and get it only if we are cloning the asset model
2023-08-28 16:23:26 -06:00
snipe
18ff810d7e
Reverse orderof parent
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-28 20:51:52 +01:00
snipe
baffcbad71
Set password property properly
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-28 20:47:56 +01:00
snipe
611db4c0d2
Removed stray line
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-28 20:46:45 +01:00
snipe
367484a766
Merge pull request #13537 from snipe/fixes/13500_prevent_autocomplete_on_ldap_password
...
Fixed #13500 - Try to prevent the browser from pre-filling the LDAP password
2023-08-28 20:42:58 +01:00
snipe
0f43388a2b
Merge remote-tracking branch 'origin/develop'
2023-08-28 20:40:12 +01:00
snipe
81365ef911
Merge pull request #13518 from marcusmoore/chore/tests-via-github-actions
...
Run tests for PHP 7.4, 8.0, and 8.1.1 via GitHub Actions
2023-08-28 20:28:42 +01:00
snipe
6020927e24
Merge pull request #13538 from snipe/fixes/13516_use_int_not_string_for_port_default
...
Fixed #13516 - Use int not string if no DB_PORT specified
2023-08-28 19:38:41 +01:00
snipe
82981290d4
Use int not string if no DB_PORT specified
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-28 19:34:08 +01:00
snipe
7787ca328c
Try to prevent the browser from pre-filling the LDAP password
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-28 18:36:06 +01:00
Godfrey Martinez
92e88a0ae2
Merge branch 'develop' into ignore_encrypt_and_other_changes
2023-08-28 10:14:41 -07:00
Brady Wetherington
427f8b1522
Merge branch 'develop' into snipeit_v7_laravel10
...
Upgraded composer due to lockfile conflicts
2023-08-28 16:04:21 +01:00
snipe
b93adf44c8
Merge remote-tracking branch 'origin/develop'
2023-08-28 12:41:45 +01:00
snipe
535ca0e3c0
Merge pull request #13535 from snipe/fixes/13521_make_modal_upload_button_wider
...
Fixed #13521 - make modal “select files” button wider
2023-08-28 12:41:27 +01:00
snipe
582cad2dc5
Fixed #13521 - make modal “select files” button wider
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-28 12:37:42 +01:00
snipe
a1897298dc
Merge remote-tracking branch 'origin/develop'
2023-08-27 13:56:54 +01:00
snipe
e3a9c34818
Merge pull request #13533 from snipe/improvements/labels_clearer_barcode_text
...
Clearer labels barcode text
2023-08-26 18:08:10 +01:00
snipe
20e9f05a64
Tighter layout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-26 17:43:02 +01:00
snipe
844fe0938c
Added link to the help docs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-26 17:42:56 +01:00
snipe
0a47706e46
Merge remote-tracking branch 'origin/develop'
2023-08-25 15:47:47 +01:00
Ivan Nieto Vivanco
a12a68e4e9
Add a variable so I dont ended rewriting the original model
2023-08-24 15:28:12 -06:00
Ivan Nieto Vivanco
950536f59f
Added a condition to send correct model id when cloning one
2023-08-24 15:18:51 -06:00
Godfrey M
e56628499c
fixed lost changes
2023-08-24 11:45:23 -07:00
Godfrey M
2b7a899ef8
removed unnecessary code
2023-08-24 11:43:44 -07:00
akemidx
78d589fe78
beginning of migrations
2023-08-24 14:32:37 -04:00
Godfrey M
0b956b2a46
revert changes of composer.lock
2023-08-24 10:45:59 -07:00
Godfrey M
18cb514a53
revert unwanted changes
2023-08-24 10:40:44 -07:00
Godfrey M
a3b6e0fbe6
adds some spacing
2023-08-24 10:36:09 -07:00
Godfrey M
34ba0c4440
adds id to history info
2023-08-24 10:36:08 -07:00
Godfrey M
739fc152c2
Adds readable asset history in the action log transformer
2023-08-24 10:36:08 -07:00
Godfrey M
011c09a3dd
working on getting notifications
2023-08-24 10:35:40 -07:00
Godfrey M
38d5691b88
fix conflicts
2023-08-24 10:35:40 -07:00
Godfrey M
c26ef224f4
fixing my mess
2023-08-24 10:31:01 -07:00
Godfrey M
8ebb9afedd
adds min_amt to asset model edit, index, and table
2023-08-24 10:30:07 -07:00
snipe
26dd992d3c
Merge pull request #13525 from marcusmoore/bug/sc-23660
...
Fixed undeclared variable in ActionlogsTransformer
2023-08-24 17:09:30 +01:00
Marcus Moore
e32c07be02
Clear commented log statements
2023-08-24 08:15:40 -07:00
Marcus Moore
5a0b0522b0
Explicitly declare $clean_meta variable
2023-08-24 08:15:07 -07:00
akemidx
c9fcc906fb
create saved reports migration
2023-08-23 19:32:19 -04:00
Marcus Moore
20457bd89e
Run tests for PHP 7.4, 8.0, and 8.1.1
2023-08-23 15:53:34 -07:00
Ivan Nieto Vivanco
7bfb5a0667
Disable the Checkin All Seats button if License is not reassignable
2023-08-23 16:36:06 -06:00
Ivan Nieto Vivanco
6161a0d76d
Add condition in LicenseCheckinController:bulkCheckin method to evaluate if the license is reassignable
2023-08-23 16:22:40 -06:00
Godfrey Martinez
28cf533d19
Merge branch 'develop' into ignore_encrypt_and_other_changes
2023-08-23 00:42:59 -07:00
Godfrey M
0fc79ec936
fixes conflicts
2023-08-23 00:40:59 -07:00
Godfrey M
ffe1b11419
merged develop
2023-08-23 00:38:58 -07:00
Godfrey M
27488c1009
adds soft deletes to eager loading
2023-08-23 00:34:09 -07:00
Godfrey M
ce60db009c
adds soft deletes to eager loading
2023-08-23 00:32:43 -07:00
snipe
9f291d7e4b
Merge remote-tracking branch 'origin/develop'
2023-08-23 08:21:53 +01:00
snipe
d393bd5c97
Merge pull request #13511 from snipe/fixes/13510_no_translations_in_migrations
...
Fixed #13510 - do not use translations in migrations
2023-08-23 08:21:18 +01:00
snipe
ea37325806
Remove trans() from default values
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-23 08:19:05 +01:00
snipe
31a7758ab1
Merge pull request #13509 from marcusmoore/bug/sc-23636
...
Fixed asset model query in action log transformer
2023-08-23 06:58:41 +01:00
Marcus Moore
bee680683d
Add withTrashed to asset model query
2023-08-22 17:05:06 -07:00
Godfrey M
92ddf8fc67
removed dead space
2023-08-22 12:38:50 -07:00
Godfrey M
1019287c76
retarget key
2023-08-22 12:36:43 -07:00
Godfrey M
9e438c3ed0
eager loaded changedInfo queries, reworked encrypted data change log changes
2023-08-22 12:34:45 -07:00
akemidx
f9fc2a44cd
alphatyping for layout
2023-08-22 15:19:12 -04:00
Godfrey M
c7f2acf2c6
removes encrypted info from change log, renames asset_eol_date in the change log
2023-08-22 11:39:38 -07:00
snipe
79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error
...
Fixed Asset acceptance error when user company and asset company don't match
2023-08-22 15:49:56 +01:00
snipe
3da21e73e2
Merge pull request #13501 from snipe/fixes/checkbox_layout_in_settings
...
Small fixes to checkbox layout in general settings blade
2023-08-22 14:12:15 +01:00
snipe
da38945a53
Small fixes to checkbox layout in general settings blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-22 14:10:39 +01:00
snipe
a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order
...
Fixed #13495 added setting for name order
2023-08-22 12:50:58 +01:00
snipe
23237e5cd3
Removed unused translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-22 12:50:32 +01:00
snipe
aafb7668f5
Merge pull request #13453 from inietov/fixes/accessories_declined_issue
...
Fixed #13317 Accessories declined by user remain assigned
2023-08-22 12:42:55 +01:00
snipe
bb61134dd5
Merge remote-tracking branch 'origin/develop'
2023-08-22 12:41:27 +01:00
snipe
fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields
...
Bulk Editing Custom Fields
2023-08-22 12:40:18 +01:00
snipe
303b45c9e9
Merge pull request #13485 from Godmartinz/history_info_clean_up
...
Added better handling of information of asset history
2023-08-22 12:25:17 +01:00
snipe
8c7925e703
Merge pull request #13436 from marcusmoore/chore/dependency-updates
...
Bumped dependencies
2023-08-21 22:58:52 +01:00
Marcus Moore
191c4f959f
Bump guzzlehttp/psr7 to 2.4.5
2023-08-21 14:46:08 -07:00
Marcus Moore
1e10a7ee23
Bump nyholm/psr7 to 1.6.1
2023-08-21 14:45:21 -07:00
Marcus Moore
4e8537a1c7
Merge branch 'develop' into chore/dependency-updates
...
# Conflicts:
# composer.lock
2023-08-21 14:44:15 -07:00
snipe
24a9deb735
Merge remote-tracking branch 'origin/develop'
2023-08-21 22:35:45 +01:00
Marcus Moore
4e2ef4f056
Default to using the current date if last check in end date is not provided
2023-08-21 14:35:15 -07:00
snipe
79a4d915db
Merge pull request #13456 from marcusmoore/fixes/auto-incrementing-on-74
...
Fixed passing invalid argument to `strpos()`
2023-08-21 22:25:52 +01:00
Marcus Moore
c332b98456
Add last checkin options to report front end
2023-08-21 13:44:49 -07:00
Godfrey M
b54aaefefb
adds some spacing
2023-08-21 13:43:06 -07:00
Godfrey M
5076b45a0d
adds id to history info
2023-08-21 13:40:39 -07:00
Marcus Moore
6fc06f2ee1
Add simple tests around asset check in
2023-08-21 12:31:51 -07:00
snipe
36a343365e
Switched from fullName() to getFullNameAttribute()
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:14:07 +01:00
snipe
c617bf89b6
Tweak layout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:13:45 +01:00
snipe
ba0643f6a4
Added name display format, tweaked some
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:13:28 +01:00
snipe
bfd674b622
Switched to getFullNameAttribute() from fullName() in User Presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:12:25 +01:00
snipe
d73d15b8a2
Added form macro for name format
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:11:59 +01:00
snipe
8660d41aa3
Changed width of locale field
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:11:45 +01:00
snipe
c39579b170
New strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:11:25 +01:00
snipe
354550b52e
Removed getCompleteNameAttribute(), modified getFullNameAttribute()
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:11:17 +01:00
snipe
f3460b5a4f
Switch to getFullNameAttribute() in user transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:10:48 +01:00
snipe
474c03e3fc
Added name order to settings save controller method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:10:03 +01:00
snipe
749002b768
Added migration to add name order to settings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:09:48 +01:00
Marcus Moore
489d30c685
Set last_checkin in ui and api controllers
2023-08-21 11:57:33 -07:00
snipe
2346bab8ed
Merge pull request #13492 from snipe/features/add_dymo_labelwriter
...
Added Dymo labelwriter
2023-08-18 23:27:37 +01:00
snipe
45898deb1a
Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 22:18:38 +01:00
snipe
ffc7c4e99a
use number format to constrain large number displays
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 22:18:09 +01:00
snipe
1e82c2bfad
Changed example asset name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 22:17:54 +01:00
snipe
d12f4564e1
Added Dymo Labelwriter template
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 21:44:12 +01:00
snipe
1dcca14c37
Values are not sortable, so don’t show them as sortable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 21:21:54 +01:00
snipe
cb3db51fe0
Merge remote-tracking branch 'origin/develop'
2023-08-18 18:42:11 +01:00
snipe
63f847f125
Merge pull request #13491 from snipe/fixes/remove_border_from_default_label
...
Removed the black label from around the default labels
2023-08-18 18:40:45 +01:00
snipe
d56c671410
Removed the black label from around the default labels
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 18:39:00 +01:00
snipe
8e9fa613e3
Merge remote-tracking branch 'origin/develop'
2023-08-18 18:14:40 +01:00
snipe
802651a1b4
Merge pull request #13489 from snipe/fixes/override_0_cols_rows_in_default_for_new_engine
...
Make sure the columns and rows can never be 0
2023-08-18 18:14:01 +01:00
snipe
0cb76a049a
Make sure the columns and rows can never be 0
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 18:13:16 +01:00
snipe
384428148b
Merge remote-tracking branch 'origin/develop'
2023-08-18 15:32:33 +01:00
snipe
5645141f93
Merge pull request #13488 from snipe/fixes/13487_supplier_url_in_listing
...
Fixed #13487 - include supplier url in listing
2023-08-18 15:32:14 +01:00
snipe
da2f22d504
Fixed #13487 - include supplier url in listing
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-18 15:31:15 +01:00
Marcus Moore
8b2716d2b7
Fix update statement
2023-08-17 18:33:01 -07:00
Marcus Moore
56fb45f1ea
WIP: Add last_checkin to assets table
2023-08-17 18:01:26 -07:00
Godfrey M
a62876d4bc
Adds readable asset history in the action log transformer
2023-08-17 16:14:01 -07:00
snipe
0ee032a10d
Merge pull request #13391 from Godmartinz/ldap_sync_field_clear_bug
...
Fixed Ldap sync field clear bug
2023-08-17 17:45:03 +01:00
snipe
03a01c02c4
Merge pull request #13483 from inietov/fixes/default_locations_advanced_search
...
Fixed #13359 Advanced search by Default Location does not work
2023-08-17 15:15:21 +01:00
Ivan Nieto Vivanco
b607a59875
Add query to search default locations in advanced search
2023-08-16 15:04:17 -06:00
snipe
34f2221b02
Merge pull request #13471 from inietov/fixes/components_search
...
Fixed #13409 Search in component detail view not working
2023-08-16 21:59:40 +01:00
snipe
b81c6825cf
Merge pull request #13476 from uberbrady/accessry_checkin_fix_develop
...
Accessory checkin via API reported wrong target user
2023-08-16 13:05:54 +01:00
Brady Wetherington
852e9ff311
Accessory checkin via API reported wrong target user
2023-08-16 13:03:37 +01:00
Ivan Nieto Vivanco
92df32dfaa
Move a couple assignation of variables inside an else to only execute once
2023-08-15 21:10:48 -06:00
snipe
8810059427
Merge remote-tracking branch 'origin/develop'
2023-08-16 01:40:06 +01:00
snipe
eacbde37e2
Merge pull request #13473 from snipe/fixes/check_for_company_on_labels
...
Check that there is a company before trying to get name property
2023-08-16 01:27:48 +01:00
snipe
74384f14e4
Use clearer translation (from original PR)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-16 01:25:13 +01:00
snipe
027afa71f1
Check that there is a company before trying to get name property
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-16 01:09:22 +01:00
Ivan Nieto Vivanco
993918f47c
Add query to search into the per-component view
2023-08-15 15:31:36 -06:00
Brady Wetherington
8b52bad16f
Merge branch 'develop' into snipeit_v7_laravel10
2023-08-15 21:25:16 +01:00
Ivan Nieto Vivanco
25c58a8486
Fix typo in language variable name
2023-08-15 14:17:39 -06:00
snipe
7eaf3174ab
Merge pull request #13457 from snipe/fixes/remove_autocomplete_off_on_login
...
Fixed #13365 - Added LOGIN_AUTOCOMPLETE as env var
2023-08-15 20:55:05 +01:00
snipe
2848465dd2
Merge remote-tracking branch 'origin/develop'
2023-08-15 20:42:36 +01:00
snipe
297390ae63
Merge pull request #13470 from snipe/fixes/13464_typo_in_accessories_clone
...
Fixed #13464 typo in accessories clone
2023-08-15 20:41:54 +01:00
snipe
01ab360ef3
Fixed accessory clone typo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:39:09 +01:00
snipe
1c2f3cd552
Fixed translation typo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:39:00 +01:00
snipe
06ed8b2f2d
Merge remote-tracking branch 'origin/develop'
2023-08-15 20:31:00 +01:00
snipe
bc4a47421a
Merge pull request #13469 from snipe/fixes/missed_one_checkbox_in_label
...
Fixed checkboxes for accessibility
2023-08-15 20:30:39 +01:00
snipe
0763b5135d
Fixed checkboxes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:28:16 +01:00
snipe
253975ce72
Updated translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:27:55 +01:00
snipe
9af850dbaa
Re-apply a change that was dropped
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:27:47 +01:00
snipe
96b616be89
Downgraded TCPDF
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:11:56 +01:00
snipe
2b9f8ce4a6
Merge pull request #13467 from snipe/fixes/more_label_html_tweaks
...
Fixes more label html tweaks
2023-08-15 20:05:03 +01:00
snipe
fa6c8d864e
Restore label engine checkbox
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:04:19 +01:00
snipe
c957f136aa
More label tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:03:40 +01:00
snipe
697dc10d76
More label tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 20:03:32 +01:00
snipe
2ddf5c9a0b
Merge pull request #13463 from uberbrady/fix_api_accessory_checkin
...
Accessory checkin via API reported wrong target user
2023-08-15 19:24:45 +01:00
snipe
949a88e560
Merge remote-tracking branch 'origin/develop'
2023-08-15 18:55:39 +01:00
snipe
d47b502d86
Merge pull request #13466 from snipe/fixes/weird_label_engine_layout
...
Fixes weird label engine layout
2023-08-15 18:52:54 +01:00
snipe
6b02184e99
Fixed weird layout with checkbox
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 18:48:20 +01:00
snipe
64342838fd
Return the user to the labels page on save
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 18:48:12 +01:00
snipe
28b1461cb4
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/mix-manifest.json
2023-08-15 18:21:51 +01:00
snipe
346f243bc0
Merge pull request #13465 from snipe/fixes/parse_error_in_helper
...
Fixed unclosed brace
2023-08-15 18:14:55 +01:00
snipe
443adc50da
Fixed unclosed brace
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 18:12:25 +01:00
snipe
cebf0e0de1
Add @cram42 as a contributor
2023-08-15 18:07:56 +01:00
snipe
e41368daac
Merge pull request #12050 from cram42/develop
...
New Label Engine
2023-08-15 17:58:57 +01:00
Godfrey M
d1efca2ae1
fixes conflicts
2023-08-15 09:28:42 -07:00
Brady Wetherington
7504c0df13
Accessory checkin via API reported wrong target user
2023-08-15 14:19:36 +01:00
snipe
1c02a7d590
Merge remote-tracking branch 'origin/develop'
2023-08-15 13:26:40 +01:00
snipe
c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies
...
Add email to companies
2023-08-15 13:26:20 +01:00
snipe
8e0b7bee41
Merge remote-tracking branch 'origin/develop'
2023-08-15 13:23:23 +01:00
snipe
6f373aed33
Merge pull request #13461 from snipe/localization/new_translations
...
Updated language strings from CrowdIn
2023-08-15 13:22:14 +01:00
snipe
d1ce1b6f18
Updated language strings from CrowdIn
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 13:21:35 +01:00
Ivan Nieto Vivanco
71cb16118d
Change error string for a better (?) one
2023-08-14 20:52:00 -06:00
Ivan Nieto Vivanco
d365565b6d
Add message in the acceptance assets view to indicate when the user can\'t accept nor deny the asset
2023-08-14 20:51:04 -06:00
snipe
24a3e0ee83
Added LOGIN_AUTOCOMPLETE as env var
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-15 01:56:01 +01:00
Marcus Moore
dc1a8840f1
Ensure empty string is not passed to strpos()
2023-08-14 16:40:34 -07:00
Ivan Nieto Vivanco
96440834bd
Move the declinedCheckout function so it don/'t separate the class properties
2023-08-14 16:16:28 -06:00
snipe
642a09f139
Merge remote-tracking branch 'origin/develop'
2023-08-14 23:12:07 +01:00
snipe
d3fbbec92c
Merge pull request #13455 from snipe/fixes/confusion_around_localization_date
...
Fixed #13382 - confusion around localization date
2023-08-14 22:50:30 +01:00
snipe
9820ab34d7
Use today’s date for date format selectlist
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-14 22:44:29 +01:00
snipe
aa333bcf0b
Merge pull request #13448 from Godmartinz/status-label-translations_fix
...
Fixed #13446 - added translations to status label type column
2023-08-14 22:25:46 +01:00
snipe
ba56746f57
Merge pull request #13437 from marcusmoore/feature/improve-user-factory
...
Allowed permissions in the user factory to be chained
2023-08-14 22:23:55 +01:00
snipe
716e13e5b1
Merge remote-tracking branch 'origin/develop'
2023-08-14 22:23:06 +01:00
snipe
dcec4ba5e2
Merge pull request #13454 from snipe/fixes/13450_removed_escaping_custom_fieldsets
...
Fixed #13450 - remove escaping on saveing new custom fields
2023-08-14 22:22:35 +01:00
snipe
12e9d2adeb
Fixed #13450 - remove escaping on saveing new custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-14 22:21:41 +01:00
Ivan Nieto Vivanco
8da2a8a79c
Allows to save signature for declined items
2023-08-14 14:58:10 -06:00
Ivan Nieto Vivanco
4796598bb6
Add declinedCheckout method to Accessory model
2023-08-14 14:35:31 -06:00
Godfrey M
c3356ab765
fixed translation choice and color choice
2023-08-14 12:20:46 -07:00
Godfrey M
4446b2311d
remove unnecessary changes
2023-08-14 12:14:15 -07:00
Godfrey M
6b94ef6adc
fixes the statuslabeltypeforatter instead of the model
2023-08-14 12:13:01 -07:00
Godfrey M
a0d5774635
adds translations to status label type column
2023-08-14 10:42:17 -07:00
snipe
ec2556f991
Merge remote-tracking branch 'origin/develop'
2023-08-14 13:02:45 +01:00
snipe
291fa1cd29
Merge pull request #13445 from snipe/fixes/typo_in_formatter_for_asset_maintenances
...
Fixed case in BS table formatter for boolean
2023-08-14 13:02:27 +01:00
snipe
58286c9cab
Fixed case in BS table formatter for boolean
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-14 13:01:32 +01:00
Robert-Azelis
1e43d88e06
Create 2023_08_13_172600_add_email_to_companies.php
2023-08-13 17:25:33 +02:00
Robert-Azelis
da701677c7
Update edit.blade.php
2023-08-13 17:24:17 +02:00
Robert-Azelis
30d33310ae
Update CompanyPresenter.php
2023-08-13 17:23:33 +02:00
Robert-Azelis
bbb8ecfee4
Update Company.php
2023-08-13 17:21:55 +02:00
Robert-Azelis
8988a5dfc3
Update CompaniesTransformer.php
2023-08-13 17:20:15 +02:00
Robert-Azelis
ed5b4ca0a2
Update CompaniesController.php
2023-08-13 17:18:25 +02:00
Robert-Azelis
07bafa9508
Update CompaniesController.php
2023-08-13 17:15:20 +02:00
snipe
6134dfa8f2
Merge remote-tracking branch 'origin/develop'
2023-08-11 09:42:30 +01:00
snipe
a1cfa45344
Merge pull request #13439 from snipe/fixes/500_error_when_cloning_invalid_accessory
...
Fixed route for accessory index
2023-08-11 09:42:00 +01:00
snipe
df8f6a8d2b
Correctly call the route for accessory index
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-11 09:40:49 +01:00
Marcus Moore
5b86c02366
Set permissions to empty object in user factory
2023-08-10 16:55:44 -07:00
Marcus Moore
41479b1ec7
Allow permissions in the user factory to be chained
2023-08-10 16:35:10 -07:00
Marcus Moore
3a2b15313c
Bump guzzlehttp/psr7 to 2.4.5
2023-08-10 11:53:20 -07:00
Marcus Moore
6b6bb61400
Bump nyholm/psr7 to 1.6.1
2023-08-10 11:52:42 -07:00
snipe
6adaa32286
Merge pull request #13431 from marcusmoore/feature/custom-report-scoping
...
Removed unneeded `Company::scopeCompanyables` from `ReportsController`
2023-08-10 09:57:53 +01:00
snipe
a599f0c923
Merge pull request #13434 from marcusmoore/chore/improve-test-stability
...
Improved test stability and messaging
2023-08-10 09:57:26 +01:00
snipe
4db4bf7be4
Merge pull request #13432 from marcusmoore/chore/remove-old-testing-code
...
Removed unused Codeception test code
2023-08-10 09:57:11 +01:00
Marcus Moore
04661d5441
Add help text to response assertion helpers
2023-08-09 17:09:31 -07:00
Marcus Moore
3a5ed031bf
Escape values in response assertion helpers
2023-08-09 17:08:49 -07:00
Marcus Moore
60baaae192
Remove unused test bootstrap file
2023-08-09 16:22:58 -07:00
Marcus Moore
8508594a2f
Remove old and unused Codeception test code
2023-08-09 13:32:15 -07:00
Marcus Moore
e0b464dcec
Merge branch 'develop' into feature/custom-report-scoping
2023-08-09 13:03:05 -07:00
snipe
7df3be3a54
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2023-08-09 10:54:49 +01:00
snipe
bd3ba9a5f7
Merge pull request #13428 from snipe/security/update_autotable
...
Updated autotable
2023-08-09 10:49:01 +01:00
snipe
a65ac1ccdf
Updated autotable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-09 10:47:45 +01:00
snipe
ffabc9c331
Merge pull request #13414 from marcusmoore/fixes/chipperci-config
...
Fixes ChipperCi Pipeline
2023-08-09 10:37:21 +01:00
snipe
a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465
...
Added messaging to category edit page to improve clarity around when users will be emailed
2023-08-09 10:36:19 +01:00
Marcus Moore
2e632a3d2d
Improve test readability
2023-08-08 17:40:02 -07:00
Marcus Moore
c32f099053
Remove unneeded call to Company::scopeCompanyables
2023-08-08 17:22:15 -07:00
Marcus Moore
c752e1670c
Add test around company scoping in custom report
2023-08-08 17:21:39 -07:00
Marcus Moore
1405e17251
Add simple test around custom asset report response
2023-08-08 17:10:36 -07:00
snipe
15122bbb55
Merge pull request #13425 from snipe/security/upgrade_webpack_snyk_13416
...
Updated webpack
2023-08-08 22:24:59 +01:00
snipe
c18349d75f
Updated webpack
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-08 22:07:49 +01:00
snipe
70903f068c
Merge remote-tracking branch 'origin/develop'
2023-08-08 19:01:40 +01:00
snipe
521961457d
Merge pull request #13424 from snipe/bug/sc-23552
...
Fixed tooltip not loading on encrypted field lock icon on asset detail view
2023-08-08 19:00:56 +01:00
snipe
6a3a38b6f6
Call tooltip again on custom fields jquery
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-08 18:53:57 +01:00
snipe
40aca9709a
Added container to the tooltip invocation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-08 18:52:26 +01:00
snipe
5a43c5906f
Merge remote-tracking branch 'origin/develop'
2023-08-08 17:54:17 +01:00
snipe
9e6f23c8c7
Merge pull request #13421 from uberbrady/re_add_asset_eol_date
...
Re-add the option for asset_eol_date as an import field
2023-08-08 17:52:05 +01:00
Brady Wetherington
6afbf1b152
Re-add the option for asset_eol_date as an import field
2023-08-08 17:45:33 +01:00
snipe
4b2bf057c7
Merge remote-tracking branch 'origin/develop'
2023-08-08 12:57:27 +01:00
snipe
af91ffb2da
Merge pull request #13418 from snipe/fixes/add_mailgun_endpoint
...
Added mailgun endpoint option, defaulting to the US
2023-08-08 12:56:37 +01:00
snipe
94bef046b8
Added mailgun endpoint option, defaulting to the US
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-08 12:50:38 +01:00
snipe
3091d2cdf0
Merge remote-tracking branch 'origin/develop'
2023-08-08 08:19:15 +01:00
snipe
bd4061e023
Change text on dropdown
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-08 08:18:56 +01:00
snipe
5bda73f151
Ugh - messing with the blade layout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-08 08:18:40 +01:00
Marcus Moore
42055bb69d
Add authentication and authorization tests for department index method
2023-08-07 17:42:28 -07:00
Marcus Moore
7c5a1b376e
Remove redundant Company::scopeCompanyables wrapper
2023-08-07 16:54:23 -07:00
Marcus Moore
f7b2075e9e
Add CompanyableTrait to Department
2023-08-07 16:54:02 -07:00
Marcus Moore
cdfe8e459d
Add simple test cases for api department index
2023-08-07 16:36:01 -07:00
Marcus Moore
b56bcd3596
Troubleshooting pipeline: create both .env and .env.testing
2023-08-07 11:59:58 -07:00
Marcus Moore
999605b591
Troubleshooting pipeline: create .env.testing in place of .env
2023-08-07 11:57:34 -07:00
Marcus Moore
d3a45f73cf
Troubleshooting pipeline: re-add creating .env.testing
2023-08-07 11:48:09 -07:00
Marcus Moore
0d40979724
Troubleshooting pipeline: Remove commented commands
2023-08-07 11:36:51 -07:00
Marcus Moore
81efa7d84e
Revert "Troubleshooting pipeline: use phpunit in place of artisan test"
...
This reverts commit a7d1657111 .
2023-08-07 11:35:18 -07:00
Marcus Moore
a7d1657111
Troubleshooting pipeline: use phpunit in place of artisan test
2023-08-07 11:31:00 -07:00
Marcus Moore
8ea8ff05e5
Troubleshooting pipeline: fix filename
2023-08-07 11:26:04 -07:00
Marcus Moore
6398805fc3
Troubleshooting pipeline: use .env.testing in place of .env.example
2023-08-07 11:24:38 -07:00
Marcus Moore
119ed9c882
Troubleshooting pipeline: remove comment to trigger build
2023-08-07 11:09:10 -07:00
snipe
32d8d8c50e
Merge pull request #13397 from uberbrady/fix_locationless_ldap_sync
...
Fixed #13372 : Put guard around assigning location via LDAP
2023-08-07 17:06:58 +01:00
Marcus Moore
ae9cf1e5b6
Formatting
2023-08-02 18:24:32 -07:00
Ivan Nieto Vivanco
053d3fc9ed
Prevent asset to be checked out if full company support is enabled and companies not match
2023-08-02 19:23:28 -06:00
Marcus Moore
d019e62d39
Remove lazy from eula field to avoid race condition
2023-08-02 18:22:40 -07:00
Ivan Nieto Vivanco
9ca163e8cf
Stop asset acceptances from shown to user if full company support is enabled and companies not match
2023-08-02 19:22:35 -06:00
Marcus Moore
b70a5280f9
Remove unneed jquery
2023-08-02 18:04:21 -07:00
Marcus Moore
cbe5a9bc8a
Persist eula text even when field is disabled
2023-08-02 18:03:09 -07:00
Marcus Moore
3fd0853fd0
Ensure eula field enabled when not using default eula
2023-08-02 18:02:56 -07:00
Marcus Moore
2e7aa01abe
Pass checkin_email value to backend even when unchecked
2023-08-02 17:45:39 -07:00
Marcus Moore
896f038054
Set send email back to original value when eulas cleared
2023-08-02 17:03:56 -07:00
Marcus Moore
48979ce177
Disable send email when it should not be modified
2023-08-02 16:52:56 -07:00
Marcus Moore
e12935f7fa
Disable eula textarea when using global eula
2023-08-02 16:18:57 -07:00
Marcus Moore
6400034435
Improve variable name
2023-08-02 16:06:59 -07:00
Marcus Moore
269414e4f2
Automatically check the send email to user checkbox in certain conditions
2023-08-02 16:04:01 -07:00
akemidx
0bdd8a5917
fixing key names
2023-08-02 16:40:38 -04:00
Marcus Moore
dee6ebf8e0
Scaffold component test
2023-08-02 12:58:07 -07:00
Marcus Moore
105c94aea9
Implement toggling message when email will be sent
2023-08-02 11:36:20 -07:00
snipe
c52a1f94dc
Merge remote-tracking branch 'origin/develop'
2023-08-02 15:19:23 +01:00
Brady Wetherington
0af205dade
Put guard around assigning location via LDAP
2023-08-02 15:01:14 +01:00
Marcus Moore
6349d52803
WIP: migrate to livewire
2023-08-01 17:29:23 -07:00
Marcus Moore
65de9c5e07
Extract translation strings
2023-08-01 15:21:49 -07:00
Marcus Moore
ebfc395e78
Improve messaging
2023-08-01 14:39:30 -07:00
Marcus Moore
5c8c2ca027
Improve variable names
2023-08-01 14:26:21 -07:00
snipe
924f5287f7
Merge pull request #13392 from Godmartinz/change_webhook_variable_type
...
Fixed `webhook_endpoint` data type from varchar to a text
2023-08-01 20:28:39 +01:00
Godfrey M
7560afb8c4
changes webhook_endpoint var to a text
2023-08-01 10:45:39 -07:00
Godfrey M
8a24a47475
removed unnecessary code
2023-08-01 09:45:48 -07:00
Godfrey M
fb52038e7c
applies a check if a sync field is designated
2023-08-01 09:39:58 -07:00
Brady Wetherington
daed0b60bc
Merge branch 'develop' into snipeit_v7_laravel10
2023-07-31 19:40:56 +01:00
snipe
ffb605a37c
Merge pull request #13309 from inietov/fixes/checkout_range_doesnt_include_today
...
Fixed #13300 Custom Asset Report, Checkout date range never includes current day
2023-07-31 15:04:22 +01:00
Brady Wetherington
4654f7aa37
Porting Snipe-IT v7 to Laravel v10
2023-07-31 14:07:12 +01:00
snipe
343aacab85
Merge pull request #13386 from snipe/security/dep_updates
...
Updated BS table and table export plugins
2023-07-31 13:46:41 +01:00
snipe
96d69b654d
Updated BS table and table export plugins
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-31 13:45:15 +01:00
snipe
2e1c3fb51b
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields
...
Fixed #11794 Admins Cannot View Encrypted Field
2023-07-31 13:08:28 +01:00
snipe
3e4b371bf4
Merge pull request #13379 from inietov/fixes/component_checkout_via_api_returns_error
...
Fixed #13376 Component checkout via API returns error
2023-07-31 13:07:38 +01:00
Grant Le Roux
b1464e028c
Merge branch 'develop' into develop
2023-07-31 07:57:29 +08:00
Ivan Nieto Vivanco
0a841ddbb8
Change component validator to the correct asset id we're passing in the API call
2023-07-27 20:22:13 -06:00
Brady Wetherington
70e87dad1c
Merge branch 'develop' into snipeit_v7
2023-07-27 16:21:31 +01:00
akemidx
e35dd2daa1
asset_eol_date stuff
2023-07-26 17:45:18 -04:00
akemidx
f71b69a739
adding eol fields
2023-07-26 17:31:06 -04:00
snipe
af86c6138d
Merge pull request #13361 from Godmartinz/bug/sc-19126
...
Fixed custom fieldset order
2023-07-26 08:55:18 +01:00
snipe
f6545be410
Merge pull request #13363 from inietov/fixes/no_records_found_multipage_license_seats
...
Fixed #13298 "No records Found" when Switching between Single and Multi-Page Licenses
2023-07-26 08:48:44 +01:00
Ivan Nieto Vivanco
c015264181
Adjust the license offset if it exceeds the total of license seats
2023-07-25 16:23:33 -06:00
Godfrey M
9c6e8d57aa
removes typos
2023-07-25 11:44:16 -07:00
Godfrey M
11e3487263
custom field set order starts at 1 now
2023-07-25 11:41:08 -07:00
snipe
a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page
...
Delete button on asset view page
2023-07-25 12:11:35 +01:00
akemidx
e289e95721
no ? needed
2023-07-24 17:22:10 -04:00
akemidx
b082d27c42
removing :item
2023-07-24 17:12:12 -04:00
snipe
ff3bdebb9a
Merge remote-tracking branch 'origin/develop'
2023-07-24 13:27:35 +01:00
snipe
39ea15a27a
Merge pull request #13347 from snipe/fixes/custom_report_error_on_bad_model
...
Possible alternative to fixing #13296 - custom report failing when th…
2023-07-21 15:18:16 +01:00
snipe
f699d9680b
Merge remote-tracking branch 'origin/develop'
2023-07-21 15:00:23 +01:00
snipe
4fe6632167
Merge pull request #13349 from snipe/fixes/check_for_valid_model
...
Fixed: tighter check for valid model
2023-07-21 14:52:00 +01:00
snipe
1a771e6ab9
Check that the model is valid before trying to chain the relationship
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-21 14:46:58 +01:00
snipe
7f761000b4
Use slightly less terrifying and more accurate language
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-21 14:46:39 +01:00
Ivan Nieto Vivanco
cb4ed92639
Use Carbon date objects instead of casting using DB::raw()
2023-07-20 16:17:06 -06:00
snipe
540b09c506
Possible alternative to fixing #13296 - custom report failing when the model is busted
...
Related: https://github.com/snipe/snipe-it/pull/13297
Signed-off-by: snipe <snipe@snipe.net >
2023-07-20 17:45:45 +01:00
Brady Wetherington
ba8d8a6f05
Merge branch 'develop' into snipeit_v7
2023-07-20 17:16:04 +01:00
snipe
d26bc19e3f
Merge remote-tracking branch 'origin/develop'
2023-07-20 16:34:16 +01:00
snipe
0b8a3ee9a5
Merge pull request #13346 from snipe/fixes/depreciable
...
Check that $this->get_depreciation() returns
2023-07-20 16:33:15 +01:00
snipe
1e09320ebe
Check that $this->get_depreciation() returns
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-20 16:30:07 +01:00
snipe
19df0b82b1
Merge remote-tracking branch 'origin/develop'
2023-07-20 14:06:45 +01:00
snipe
ee36497acf
Merge pull request #13344 from snipe/fixes/added_manufacturer_to_licenses
...
Fixes bug/sc-23509: Added manufacturer back into license importer
2023-07-20 14:05:19 +01:00
snipe
d7ac8ef618
Added manufacturer to licenses
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-20 14:02:54 +01:00
snipe
244e4ec11f
Added manufacturer back into license importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-20 13:48:51 +01:00
snipe
917005ceb4
Merge pull request #13342 from Loemnk/develop
...
Fixes #13341 : Clean up correct seats on license delete
2023-07-20 13:05:31 +01:00
Tobias Franzius
90a344af0b
Fixes #13341 Clean up correct seats on license delete
...
Before this, we checked for the `id` collumn in the `license_seats` table, insteasd of
using `license_id` for this.
This way, we ensure that we only alter seats belonging to the correct license.
2023-07-20 13:48:57 +02:00
Ivan Nieto Vivanco
ecf522243b
Add the new rule to proper views and also in the Asset Transformer
2023-07-19 19:52:03 -06:00
Ivan Nieto Vivanco
705411eb4d
Create the Gate that goes with the permission
2023-07-19 19:44:59 -06:00
Ivan Nieto Vivanco
3b4a2b0f5b
Add permission to view and modify encrypted custom fields
2023-07-19 14:57:57 -06:00
snipe
a19a508a80
Merge pull request #13197 from akemidx/current_value_for_assets
...
Current value added to asset index page
2023-07-19 19:06:15 +01:00
akemidx
9e2987e680
changing book value to be NOT searchable or sortable
2023-07-19 13:44:31 -04:00
snipe
b54e7dc3ee
Fixed #13336 - Save unhashed password if no password provided
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-19 17:44:40 +01:00
snipe
1e1aea2eb0
Merge pull request #13299 from ubc-cpsc/bugfix/CVE-2023-37260
...
Update league/oauth2-server for CVE-2023-3726
2023-07-19 13:14:35 +01:00
Brady Wetherington
605d267fe8
Merge branch 'develop' into snipeit_v7
2023-07-19 11:47:51 +01:00
snipe
33fd904c18
Merge pull request #13330 from akemidx/merge_users_typo
...
merge users page typo fix
2023-07-19 10:26:57 +01:00
snipe
74a5bcd490
Merge remote-tracking branch 'origin/develop'
2023-07-19 09:01:19 +01:00
snipe
dc20305db6
Merge pull request #13333 from snipe/fixes/strtolower_on_catgories
...
Added strtolower for category type
2023-07-19 09:00:55 +01:00
snipe
a0a5ca1f40
Added strtolower for category type
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-19 08:56:17 +01:00
akemidx
064e696521
merge users page typo fix
2023-07-18 15:33:33 -04:00
snipe
c1949ffb0d
Merge pull request #13319 from marcusmoore/chore/user-search-test-cases
...
Added test cases around user search
2023-07-18 13:27:22 +01:00
snipe
bc91181917
Merge remote-tracking branch 'origin/develop'
2023-07-18 13:27:05 +01:00
snipe
18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478
...
Fixed the inability to load location select when editing profile
2023-07-18 13:26:30 +01:00
snipe
92e7e79faf
Merge remote-tracking branch 'origin/develop'
2023-07-18 13:25:34 +01:00
snipe
6f8c3ca167
Merge pull request #13322 from uberbrady/fix_ldap_location_3
...
Fix to ldap_location attribute
2023-07-18 13:24:59 +01:00
snipe
1fa703387a
Merge remote-tracking branch 'origin/develop'
2023-07-18 11:30:53 +01:00
snipe
cbdce994b8
Merge pull request #13318 from inietov/fixes/employee_id_not_importing
...
Fixed Employee Number no longer importing [sc-23497]
2023-07-18 11:08:43 +01:00
Brady Wetherington
051830dff4
Fix to ldap_location attribute
2023-07-17 20:42:02 +01:00
Marcus Moore
2eaab6d9fb
Change message to a callout
2023-07-17 12:23:31 -07:00
Marcus Moore
fa0a88289a
Add tests around user search
...
Follow up to #13311
2023-07-17 11:29:22 -07:00
Ivan Nieto Vivanco
88c40c9c14
Change the field name to the same the model uses
2023-07-17 12:08:10 -06:00
snipe
3203f8f97c
Merge remote-tracking branch 'origin/develop'
2023-07-15 10:48:09 +01:00
snipe
f15e14f905
Merge pull request #13315 from snipe/features/add_warranty_link_even_if_no_warranty_set
...
Moved warranty into manufactuer’s section
2023-07-15 10:47:44 +01:00
snipe
c21a7db3c1
Moved warranty into manufactuer’s section
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-15 10:45:36 +01:00
snipe
8bc8ecfc67
Merge remote-tracking branch 'origin/develop'
2023-07-14 09:39:26 +01:00
snipe
bb0eaf8b8d
Merge pull request #13312 from snipe/features/add_show_hide_option_on_custom_fields
...
Added ability to show/hide custom fields in list views by default
2023-07-14 09:38:35 +01:00
snipe
3078cab7ee
Added ability to show/hide custom fields in list views by default
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-14 09:09:43 +01:00
snipe
db8c37cd5b
Merge remote-tracking branch 'origin/develop'
2023-07-14 08:26:12 +01:00
snipe
15bb943210
Merge pull request #13311 from snipe/fixes/deleted_users_showing_in_current_users
...
Fixed: deleted users showing in current users
2023-07-14 07:47:36 +01:00
snipe
f51dd15893
Moved deleted scope down
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-14 07:44:19 +01:00
Marcus Moore
346ace9444
Allow users that have permission to edit their own location to see locations in select list
2023-07-13 17:37:46 -07:00
Ivan Nieto Vivanco
ecac4718fe
Add date casting to the SQL query, so the BETWEEN range doesn't care about time of day in custom report datetimes
2023-07-13 16:02:47 -06:00
snipe
4027acee46
Merge pull request #13184 from akemidx/department_in_side_bar
...
User department now visible in side pane of asset view page
2023-07-13 21:01:48 +01:00
snipe
43d419f051
Merge remote-tracking branch 'origin/develop'
2023-07-13 13:18:52 +01:00
snipe
5aa99a15d8
Merge pull request #13288 from snipe/fixes/line_based_markdown
...
Added Inline markdown method
2023-07-13 13:16:50 +01:00
snipe
016502f637
Added notesFormatter
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-13 13:14:10 +01:00
snipe
66875ff0dc
Merge remote-tracking branch 'origin/develop'
2023-07-13 12:59:30 +01:00
snipe
5d1f294f0e
Added parseEscapedMarkedownInline to accessories API
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-13 12:03:01 +01:00
snipe
981c3a430d
Merge pull request #13301 from uberbrady/better_auto_increment_tags
...
Better auto increment asset-tags [FD-32892]
2023-07-13 09:49:44 +01:00
Joël Pittet
24adcdb586
Revert lock file changes for PHP 7 support
2023-07-12 17:58:52 -07:00
akemidx
1163af3c10
change to make sure department actually exists
2023-07-12 15:57:44 -04:00
snipe
232e84acf7
Merge pull request #13302 from snipe/features/env_setting_for_bs_tables
...
Fixed #13256 - Added option to switch to localStorage instead of cookies
2023-07-12 20:10:33 +01:00
snipe
5d60a38a0e
Added comment with link
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-12 20:08:20 +01:00
snipe
c1c2c38995
Fixed #13256 - Added option to switch to localStorage instead of cookies
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-12 20:06:17 +01:00
snipe
8c74e906ef
Merge remote-tracking branch 'origin/develop'
2023-07-12 19:22:49 +01:00
snipe
3a6d8ef684
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2023-07-12 19:22:34 +01:00
snipe
44231fa52c
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin
...
Fixed #13167 Default location not being set/updated upon check-in
2023-07-12 19:14:53 +01:00
snipe
44b8558e38
Merge pull request #13233 from Godmartinz/barcode_adjusts_if_qr_code_
...
fixed margin if qr_code present
2023-07-12 17:11:58 +01:00
snipe
d3c44a462e
Merge pull request #13268 from inietov/fixes/license_importer_missing_dropdown_items
...
Fixed License importer missing Checkout to: Username and Checkout to: Email in dropdown [sc-23456]
2023-07-12 17:11:27 +01:00
snipe
a569a99e61
Used inline markdown in views
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-12 16:57:04 +01:00
Brady Wetherington
e648da9dc5
Also do a sanity-check that the normal asset autoincrementing works
2023-07-12 16:51:23 +01:00
Brady Wetherington
76191a09ed
Improvements to asset_tag auto-incrementing, with auto-fixups for gaps
2023-07-12 16:39:45 +01:00
snipe
1b8b117f4e
Merge pull request #13292 from marcusmoore/guard-against-wiping-local-db
...
Avoid accidentally wiping local database when running tests
2023-07-12 15:23:11 +01:00
Marcus Moore
3df175fb3e
Improve variable name
2023-07-11 16:36:38 -07:00
Marcus Moore
44d8b2fd5e
Handle default eula checkbox
2023-07-11 16:36:03 -07:00
Ivan Nieto Vivanco
e0df8cc4aa
Add admin role to show encrypted customfield values
2023-07-11 17:21:32 -06:00
Marcus Moore
af681d8190
Display message and update checkbox depending on EULA status
2023-07-11 16:12:43 -07:00
snipe
2bc4235368
Merge pull request #13293 from marcusmoore/run-chipper-on-all-prs
...
Run ChipperCI on all PRs (take three)
2023-07-11 20:36:49 +01:00
Marcus Moore
5b33c00e9f
Run ChipperCI on all PRs
2023-07-11 12:34:39 -07:00
Marcus Moore
48e4ec8cf5
Guard against wiping database when running tests and test specific envs are not created
2023-07-11 12:16:37 -07:00
akemidx
499a3debcd
this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit
2023-07-11 14:08:55 -04:00
snipe
b5695c9ab7
Test parsedown in notes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-11 12:20:47 +01:00
snipe
6d3bf1e5f5
Added additional method for inline
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-11 11:41:58 +01:00
snipe
9b5a67e31f
Use $Parsedown->line instead of $Parsedown->text
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-11 11:33:29 +01:00
snipe
ba37a9db8c
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations
...
Added phone, fax to departments, locations, companies
2023-07-11 11:15:13 +01:00
snipe
9dc7fc93fb
Small fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-11 11:14:19 +01:00
snipe
a5555a1c67
Merge pull request #13281 from inietov/fixes/error_showing_requested_assets
...
Fixed #13276 Error Showing Requested Assets
2023-07-11 11:11:33 +01:00
snipe
d76f420f4e
Merge pull request #13282 from marcusmoore/fixes/allow-installing-on-74-v2
...
Fixes dev dependency on PHP 7.4
2023-07-11 11:10:52 +01:00
Marcus Moore
d8f22880d6
Allow installing on PHP 7.4
2023-07-10 17:35:21 -07:00
Ivan Nieto Vivanco
ec8cb1b09e
Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash
2023-07-10 16:34:00 -06:00
snipe
4845a88c68
Merge pull request #13280 from snipe/security/webpack-upgade
...
[Snyk] Upgrade webpack from 5.86.0 to 5.87.0 #13267
2023-07-10 20:17:44 +01:00
snipe
73c2202d94
[Snyk] Upgrade webpack from 5.86.0 to 5.87.0 #13267
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-10 20:16:09 +01:00
snipe
0d37d1a905
Merge pull request #13279 from snipe/security/acorn-upgrade
...
Upgraded acorn
2023-07-10 20:08:46 +01:00
snipe
83cf106ce5
Upgraded acorn
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-10 20:06:57 +01:00
snipe
7debf126d6
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-10 20:03:12 +01:00
snipe
c5c87ea0ca
Merge pull request #13278 from snipe/security/bs-tables-update
...
Applied Snyk #13272
2023-07-10 20:01:41 +01:00
snipe
8169206943
Applied Snyk #13272
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-10 19:59:08 +01:00
snipe
22d9df304b
Merge pull request #13265 from marcusmoore/chore/chipperci-on-prs
...
Have ChipperCi run on each PR
2023-07-10 19:48:40 +01:00
snipe
14c61e4c17
Added phone, fax to departments, locations, companies
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-10 19:44:21 +01:00
Joël Pittet
a4a676ef0b
Update league/oauth2-server for CVE-2023-3726 and lcobucci/clock to semver to allow dependencies to update
2023-07-10 11:19:54 -07:00
Brady Wetherington
8f2a17585e
Merge branch 'develop' into snipeit_v7
...
Had to do a lot of conflict work here, so this could get ugly :(
2023-07-10 16:53:35 +01:00
Ivan Nieto Vivanco
299e546021
Adds the Username and Email to License Importer dropdown
2023-07-06 18:36:13 -06:00
snipe
5a9c2925c3
Merge pull request #13264 from marcusmoore/bug/sc-23451
...
Fix label wrapping on category edit page
2023-07-06 19:01:36 +01:00
Marcus Moore
149184dc3c
Have ChipperCI on on each PR
...
Following up on #13218
2023-07-06 11:00:03 -07:00
Marcus Moore
ef160b0e15
Add span tag so label is displayed properly
2023-07-06 10:49:57 -07:00
Ivan Nieto Vivanco
f4ca29b4a8
Only show radio inputs for location in checkin view
2023-07-06 11:36:55 -06:00
Ivan Nieto Vivanco
9591442f1e
Evaluate the radio input to update location only or default location too
2023-07-06 10:46:21 -06:00
Ivan Nieto Vivanco
743e852998
Add radio buttons to alter asset checkin location behavior
2023-07-06 10:38:48 -06:00
snipe
2faa73f983
Merge pull request #13169 from akemidx/license_sn_check1
...
Making Serial Number the logic checked against for new imports
2023-07-06 16:40:27 +01:00
snipe
d37aaee4c8
Merge pull request #13257 from snipe/fixes/check_for_ceiling_in_upgrader
...
Check for max PHP version in upgrader
2023-07-06 16:07:10 +01:00
snipe
a9d175a396
Check for max PHP version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-05 18:47:48 +01:00
snipe
a56b040143
Merge remote-tracking branch 'origin/develop'
2023-07-05 17:30:19 +01:00
snipe
35039cd590
Merge pull request #13255 from snipe/fixes/larger_field_for_idp_meta
...
Change settings table `saml_idp_metadata` to MEDIUMTEXT
2023-07-05 17:30:02 +01:00
snipe
c85a33be6a
Change settings table saml_idp_metadata to MEDIUMTEXT
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-05 17:28:08 +01:00
snipe
61fd427678
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-07-05 14:41:34 +01:00
snipe
d890d923ff
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2023-07-05 14:40:54 +01:00
snipe
32747cafde
Merge remote-tracking branch 'origin/develop'
2023-07-05 14:37:53 +01:00
snipe
4b4983e550
Merge pull request #13253 from uberbrady/improve_scim_404s
...
Properly return SCIM Exceptions
2023-07-05 14:37:32 +01:00
Brady Wetherington
a6a89ddd6c
Also log(debug) the error - could be useful for troubleshooting
2023-07-05 14:31:08 +01:00
Brady Wetherington
1f4d2f1e4a
Properly return SCIM Exceptions
2023-07-05 14:27:10 +01:00
Godfrey M
d44e667697
fixed margin if qr_code present
2023-06-29 13:37:38 -07:00
snipe
e18c3e08be
Merge remote-tracking branch 'origin/develop'
2023-06-29 21:23:53 +01:00
snipe
bbbeaaee2b
Merge pull request #13232 from Godmartinz/labels_overlapping_issue
...
fixed barcode and info from overlapping
2023-06-29 21:23:31 +01:00
snipe
33b1a31ed3
Merge remote-tracking branch 'origin/develop'
2023-06-29 21:19:25 +01:00
Godfrey M
df90e924b4
prevent labels from overlapping
2023-06-29 13:18:17 -07:00
snipe
630b6496ec
Merge pull request #13231 from snipe/fixes/small_fix_for_error_during_seeding
...
Redirect if the license can’t be found
2023-06-29 21:18:02 +01:00
snipe
7937542dcb
Redirect if the license can’t be found
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-29 21:15:50 +01:00
snipe
1b71ab6d86
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-29 20:41:16 +01:00
snipe
af26ec471f
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
2023-06-29 20:41:05 +01:00
akemidx
d0212d4bda
formatting fix
2023-06-29 15:39:19 -04:00
snipe
e236bf412c
Merge pull request #13230 from snipe/fixes/windows_backup_filename_colon_wtf_issue
...
Fixed windows backup filename - swapped colon in timestamp to hyphen to handle windows filesystems
2023-06-29 20:37:09 +01:00
snipe
fb9b3a5453
Switched from a colon to a hyphen to handle windows filesystems
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-29 20:32:20 +01:00
snipe
faf2a235fb
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-29 20:31:13 +01:00
snipe
9f99f8275c
Merge pull request #13229 from Godmartinz/status_label_color
...
fixed custom fields labels being unreadable
2023-06-29 20:21:46 +01:00
slong753
8cee3a8218
ok, @marcusmoore was right all along
...
i just didn't get it
2023-06-29 14:06:52 -05:00
Godfrey M
f83effbb85
removed unnecessary css rule
2023-06-29 11:25:40 -07:00
Godfrey M
d4cddebba5
fixes custom fields labels being unreadable
2023-06-29 11:21:21 -07:00
snipe
4dd71e0332
Merge remote-tracking branch 'origin/develop'
2023-06-29 17:14:15 +01:00
snipe
825e988dfa
Merge pull request #13228 from snipe/bug/sc-23434
...
Use proper alias for table scope
2023-06-29 17:11:50 +01:00
snipe
bcefe73c9c
Use proper alias for table scope
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-29 16:52:09 +01:00
slong753
826ea0ded8
move colon to blade based on a comment
2023-06-29 10:40:04 -05:00
snipe
4908082240
Merge remote-tracking branch 'origin/develop'
2023-06-29 16:23:35 +01:00
snipe
a3096e1b47
Merge pull request #13219 from inietov/features/cancel_request_asset
...
Cancel requested assets without checkin/out [ch-17606]
2023-06-29 16:18:13 +01:00
snipe
16ce06a3cc
Merge pull request #13222 from snipe/feature/sc-23427
...
Fixed #13213 - Use the Helper::parseEscapedMarkedown in notes
2023-06-29 16:16:25 +01:00
snipe
8be3a6985b
Merge pull request #13227 from snipe/bug/sc-23433
...
More reshuffling of scopes in assets API
2023-06-29 16:10:26 +01:00
snipe
ead5f039b4
Merge remote-tracking branch 'origin/develop'
2023-06-29 15:33:12 +01:00
snipe
4c3a306a6e
More shuffling of scopes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-29 13:35:41 +01:00
Ivan Nieto Vivanco
011726154c
Set rtd_location if a location is given at checkin
2023-06-29 03:16:59 -06:00
slong753
ea61f634fb
get rid of nice nullsafe
2023-06-28 16:48:52 -05:00
slong753
afe6fe207a
resolved, missed adding errors in a case
2023-06-28 16:45:18 -05:00
akemidx
af03b9f140
user department clarification & translation for that phrase. will be used in a later PR
2023-06-28 17:45:13 -04:00
snipe
f7f2d799f2
Merge pull request #13223 from inietov/fixes/delete_notes_map_from_asset_importer
...
Delete notes column map from assets importer
2023-06-28 20:06:33 +01:00
slong753
8923206ac8
translation string
2023-06-28 13:08:34 -05:00
slong753
3b8ab2d682
clean formatting a little
2023-06-28 13:00:59 -05:00
slong753
2d27941105
added to textarea too
2023-06-28 12:59:54 -05:00
slong753
50a518e5f3
disable input when field is unique
2023-06-28 12:57:23 -05:00
Ivan Nieto Vivanco
a4b8723dcb
Delete notes column map from assets importer
2023-06-28 11:38:51 -06:00
Ivan Nieto Vivanco
e2c2736a9c
Delete (gulp) Form for bulk edit since is not used in this view
2023-06-28 11:23:37 -06:00
Ivan Nieto Vivanco
85e717bc4e
Fix cancel button style and translate title
2023-06-28 10:38:44 -06:00
snipe
2c23c71823
Merge remote-tracking branch 'origin/develop'
2023-06-28 16:41:49 +01:00
snipe
161f4c8d83
Merge pull request #13045 from akemidx/feature/sc-23261
...
Checkin/out info on side bar
2023-06-28 16:41:21 +01:00
slong753
8b8e7cb5ee
couple translation strings
2023-06-28 10:17:28 -05:00
snipe
e1fdfd01f6
Merge pull request #13211 from marcusmoore/company-scoping
...
Improve testing around company scoping
2023-06-28 16:17:07 +01:00
snipe
4278471d81
Merge pull request #13207 from Godmartinz/half_year_dep_fix
...
adds half_year fix from jdickerson71388
2023-06-28 15:12:30 +01:00
snipe
e3f381a1e1
Merge pull request #13212 from marcusmoore/feature/sc-23419
...
Allow running tests in parallel
2023-06-28 15:12:13 +01:00
snipe
8d8adc1639
Use the Helper::parseEscapedMarkedown in notes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-28 15:02:32 +01:00
Brady Wetherington
51424d01a9
Merge branch 'develop' into snipeit_v7
2023-06-28 14:25:33 +01:00
snipe
a455f67d62
Merge pull request #13216 from marcusmoore/bug/sc-23420
...
Fix translation string in user importer
2023-06-28 07:03:11 +01:00
snipe
b6a11cde65
Merge pull request #13218 from marcusmoore/chore/sc-23424
...
Have ChipperCI run on each PR
2023-06-28 07:01:14 +01:00
snipe
a8d4494e68
Merge pull request #13220 from marcusmoore/bug/sc-23425
...
Add missing relationship check in Asset Transformer
2023-06-28 06:59:33 +01:00
Marcus Moore
ab51857854
Check to see if model relationship exists before using it
2023-06-27 19:35:55 -07:00
Ivan Nieto Vivanco
8496e64e16
Adds ternary to set a quantity when needed
2023-06-27 18:37:22 -06:00
Ivan Nieto Vivanco
b4b84f91d0
Redirect to correct page after cancel action
2023-06-27 18:25:38 -06:00
Ivan Nieto Vivanco
1c29bd37a6
Added feature to cancel requests from the Requested Assets view
2023-06-27 18:11:10 -06:00
Marcus Moore
6df7be8c13
Have ChipperCI run on each PR
2023-06-27 16:55:20 -07:00
Ivan Nieto Vivanco
eb4d764601
Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want
2023-06-27 17:13:11 -06:00
Ivan Nieto Vivanco
b647a8fcd2
Change the inline form HTML label to the Form:: facade
2023-06-27 17:02:25 -06:00
Ivan Nieto Vivanco
62347a56ba
Add button with cancel action in requested assets view
2023-06-27 16:41:30 -06:00
Marcus Moore
b0177d513a
Fix translation
2023-06-27 12:37:19 -07:00
slong753
e8988bf51e
add list
2023-06-26 20:22:27 -05:00
Marcus Moore
3f09e6017b
Install paratest to allow for parallel test running
2023-06-26 16:22:28 -07:00
slong753
2736161909
oops, fixed translation
2023-06-26 16:37:06 -05:00
slong753
8cbff0179c
translation strings
2023-06-26 16:35:53 -05:00
slong753
2a352619f7
clean up
2023-06-26 16:25:48 -05:00
Marcus Moore
2abdb8a5fd
Revert unneeded changes
2023-06-26 14:01:09 -07:00
Marcus Moore
7cb22d3d49
Remove incomplete tests
2023-06-26 14:00:53 -07:00
slong753
691faf6340
ok, this kind of works - pr needs some clean up
2023-06-26 14:56:07 -05:00
Marcus Moore
3cb0920411
Merge branch 'develop' into company-scoping
2023-06-26 12:32:10 -07:00
Godfrey M
114d946437
adds half_year fix from jdickerson71388
2023-06-26 11:26:46 -07:00
snipe
4cb9c25e83
Merge remote-tracking branch 'origin/develop'
2023-06-26 08:30:35 +01:00
snipe
49b50d81ee
Merge pull request #13200 from snipe/bug/sc-23417
...
Set table alias for model number sort scope
2023-06-26 08:29:16 +01:00
snipe
4f7b2836b5
Set table alias for model number sort scope
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-26 08:27:17 +01:00
Marcus Moore
acd06927ac
Add helper method for authenticating with passport
2023-06-22 17:37:30 -07:00
Spencer Long
f646623a5e
Merge branch 'develop' into bulk_edit_custom_fields
2023-06-22 18:00:31 -05:00
Marcus Moore
a35d83d14a
Migrate to response macros for readability
2023-06-22 14:41:56 -07:00
akemidx
8df9db76bc
column ordering fix
2023-06-22 17:12:40 -04:00
akemidx
8725d40f8d
current value added to asset index page. translations for this in reports
2023-06-22 17:00:42 -04:00
snipe
8c6bde335e
Merge pull request #13196 from inietov/fixes/default_status_labels_when_import
...
Fixed issue when importing Assets and no status labels exists [sc-23359]
2023-06-22 21:34:25 +01:00
snipe
b2d74f7e95
Merge pull request #13186 from snipe/bug/sc-23386
...
Moved logic for tighter constraints when ids are passed
2023-06-22 21:32:36 +01:00
snipe
78d8e32a22
Fixed weird order number thing
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-22 21:16:24 +01:00
snipe
4029efebfd
Merge pull request #13159 from Godmartinz/audit_image_bug
...
fixed audit log image not appearing
2023-06-22 21:11:39 +01:00
Marcus Moore
8aae5beaba
Add explicit select back to query
2023-06-22 13:09:08 -07:00
Marcus Moore
a8133f62e8
Add explicit select back to query
2023-06-22 13:07:49 -07:00
Ivan Nieto Vivanco
67e47a7d8b
Add guard clause to obtain the default ID of imported asset's status label
2023-06-22 13:53:58 -06:00
Marcus Moore
a333d7b72f
Add context to incomplete tests
2023-06-22 12:48:09 -07:00
Marcus Moore
ab5fed09db
Remove scopeCompanyables call from AssetsController@requestable
2023-06-22 12:36:43 -07:00
Marcus Moore
74b072f1b5
Improve messaging in testing helper
2023-06-22 12:36:30 -07:00
Marcus Moore
0a5e1e3190
Remove scopeCompanyables call from AssetsController@selectlist
2023-06-21 17:21:36 -07:00
Marcus Moore
effd969284
Scaffold test before removing scopeCompanyables call from AssetsController@selectlist
2023-06-21 17:15:02 -07:00
Marcus Moore
fd55c99b87
Remove scopeCompanyables call from AssetsController@index
2023-06-21 16:29:44 -07:00
Marcus Moore
af77fefc61
Scaffold test before removing scopeCompanyables call from AssetsController
2023-06-21 16:19:56 -07:00
Marcus Moore
65e8e4e163
Guard against attempting to use invalid property
2023-06-21 16:18:09 -07:00
snipe
c377e0617c
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-06-21 19:07:07 +01:00
snipe
17a10a4342
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-21 19:06:21 +01:00
snipe
5d4e704fac
Added a comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-21 09:26:54 +01:00
snipe
2d9ddab3f0
Moved logic for tighter constraints when ids are passed
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-21 09:24:17 +01:00
akemidx
4b8a08edc1
typo
2023-06-20 19:32:16 -04:00
akemidx
1a407dc05b
user department now in side view of asset view page
2023-06-20 19:17:14 -04:00
snipe
2ac4449ea3
Merge remote-tracking branch 'origin/develop'
2023-06-15 20:30:07 +01:00
akemidx
00fd541963
improve logging clarity
2023-06-15 15:09:14 -04:00
snipe
f890e1f8b1
Merge pull request #13171 from snipe/features/importer/allow_update_by_user_id
...
Accept user ID as authoratative field for updates
2023-06-15 20:08:20 +01:00
akemidx
eda5bbf305
fix to allow empty SN
2023-06-15 14:42:34 -04:00
snipe
7a425f8a49
Merge pull request #13093 from NojoudAlshehri/features/added_asset_tag_colum_in_requestable_assets
...
feature: Added asset_tag column in requestable assets page
2023-06-15 19:37:18 +01:00
snipe
21a27f43a9
Merge pull request #13158 from Godmartinz/asset_maint_warranty_bug
...
Added warranty confirmation to asset maintenance table
2023-06-15 19:34:16 +01:00
snipe
09d65f810e
Merge pull request #13124 from m4us1ne/fix_dompdf_chroot
...
Fixed #12434 : Include Docker Specific Paths for dompdf chroot
2023-06-15 19:32:34 +01:00
snipe
004992086e
Merge pull request #13098 from ak-piracha/feature/snipe-13049-status-label-chart-color
...
Fixed #13098 : Status Label Chart Color, resets to default when editing a Status Label
2023-06-15 16:55:32 +01:00
snipe
6c684bccd0
Accept user ID as authoratative field for updates
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-15 10:02:05 +01:00
akemidx
df6b4ff349
tagging code
2023-06-14 15:51:14 -04:00
akemidx
efaed3d02c
making serial number logic checked against for new imports
2023-06-14 15:32:47 -04:00
Godfrey M
ee50906e44
attempt to add warranty to api controller
2023-06-13 11:20:55 -07:00
snipe
83708e1be9
Merge remote-tracking branch 'origin/develop'
2023-06-13 18:36:22 +01:00
snipe
157a4341ea
Merge pull request #13041 from snipe/features/refactor_importer_for_localization
...
Refactor importer for localization
2023-06-13 18:12:07 +01:00
snipe
f1bf7267f7
Merge pull request #13164 from snipe/localizations/updated_strings
...
Updated translation strings
2023-06-13 17:24:01 +01:00
snipe
0bb8cc63c5
Updated translation strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-13 17:12:01 +01:00
Godfrey M
fc86530c94
uses the trueFalseFormatter now
2023-06-13 09:10:42 -07:00
Godfrey M
6dd7181d09
fixed audit log image not appearing
2023-06-12 12:10:19 -07:00
Godfrey M
69325beddb
adds warranty confirmation to asset maintenance table
2023-06-12 11:03:32 -07:00
Brady Wetherington
f5ff9b2208
Merge branch 'develop' into snipeit_v7 - 2023-06-12
2023-06-12 16:56:23 +01:00
snipe
d1ab139b0f
Add @qay21 as a contributor
2023-06-12 14:05:43 +01:00
snipe
dc43985884
Applied #13143 to develop
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-12 14:05:26 +01:00
snipe
f552bcef78
Merge pull request #13143 from qay21/patch-1
...
Fixed #13129 : Add missing LDAP lib required for LDAPS support
2023-06-12 14:04:05 +01:00
Quentin Aymard
fc6c5eadd7
Fix missing ldap packages
...
This should provide LDAPS support out of the box, and fix #13129
2023-06-09 11:14:41 +02:00
Lukas Jung
9fca8c2438
Fixed #12434 : Include Docker Specific Paths for dompdf chroot
2023-06-09 11:00:46 +02:00
snipe
924d0b25e8
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/dist/all.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2023-06-08 08:53:22 +01:00
snipe
c78c69700f
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-08 08:49:55 +01:00
snipe
4775eef392
Merge pull request #13140 from snipe/security/misc_libraries
...
Updated libraries and dev assets
2023-06-08 08:48:55 +01:00
snipe
14727700ab
Updated libraries and dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-08 08:48:18 +01:00
snipe
a6b1320b39
Add @stefanstidlffg as a contributor
2023-06-08 08:11:34 +01:00
snipe
4672f6a699
Merge pull request #13139 from snipe/security/updated_webpack
...
Updated webpack, added new dev assets
2023-06-08 08:11:07 +01:00
snipe
03233465c7
Updated webpack, added new dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-08 08:10:12 +01:00
snipe
8a72056bfd
Merge pull request #13123 from osterr-forschungsforderungsges-mbh/fix-slack-notifications
...
fix slack channel notifications
2023-06-08 05:51:08 +01:00
Marcus Moore
7672861b96
Scaffold test before removing scopeCompanyables call from DashboardController
2023-06-07 17:38:23 -07:00
Marcus Moore
6f5252449e
Scaffold test before removing scopeCompanyables call from UsersController
2023-06-07 16:25:18 -07:00
Marcus Moore
0f6051bbe5
Inline method call
2023-06-07 16:18:02 -07:00
Marcus Moore
abaf59c990
Extract and use helper methods
2023-06-07 16:16:30 -07:00
Marcus Moore
27d4d107bb
Scaffold test before removing scopeCompanyables call from DepartmentsController
2023-06-07 16:10:29 -07:00
Marcus Moore
8e6e525b47
Remove scopeCompanyables call from LicensesController
2023-06-07 16:09:45 -07:00
Marcus Moore
a18f5e7fc0
Remove scopeCompanyables call from ConsumablesController
2023-06-07 14:22:22 -07:00
snipe
adb2757532
Add @NojoudAlshehri as a contributor
2023-06-07 16:52:22 +01:00
snipe
b57730ee9d
Added missing assets_fields declaration
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-07 15:52:18 +01:00
snipe
9335bf7033
Merge pull request #13122 from marcusmoore/fixes/increase-consumable-factory-name-length
...
Fixes potentially invalid name in consumable factory
2023-06-07 11:43:13 +01:00
snipe
45b76c4c75
Merge pull request #13127 from NojoudAlshehri/fixes/typo-in-a-html-tag
...
Fix of typo in an HTML tag
2023-06-07 09:21:51 +01:00
NojoudAlshehri
d06bdc2db4
Fix of typo in an HTML tag
2023-06-07 13:46:17 +07:00
Marcus Moore
48850f3597
Remove scopeCompanyables call from ComponentsController
2023-06-06 18:02:18 -07:00
Marcus Moore
4fb86ad2fb
Get name as a string and not an array
2023-06-06 16:31:26 -07:00
Marcus Moore
42a4941ad2
Ensure consumable name is valid in factory
2023-06-06 16:31:26 -07:00
Marcus Moore
6585aa0cf0
Add unit tests for company scoping
2023-06-06 16:31:14 -07:00
Stefan Stidl
ad8c36a51a
fix: slack channel
2023-06-06 10:30:01 +02:00
Marcus Moore
d3a0bacb98
Get name as a string and not an array
2023-06-05 12:57:09 -07:00
Marcus Moore
371d11305b
Ensure consumable name is valid in factory
2023-06-05 12:17:44 -07:00
snipe
fc5b02e392
Merge remote-tracking branch 'origin/develop'
2023-06-01 19:51:49 +01:00
snipe
7ae260b489
More license translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-06-01 19:51:06 +01:00
snipe
ff480a7247
Merge pull request #13114 from inietov/fixes/broken_sorting_manufacturers
...
Fixed Broken order by manufacturer in Assets table [sc-23313]
2023-06-01 19:40:16 +01:00
Ivan Nieto Vivanco
f9a20bc917
Replace join with left join in pertinent eloquent query
2023-06-01 12:08:51 -06:00
ak-piracha
daf6bcb6d5
follow best practices when working with blade and javascript
2023-06-01 11:07:21 +09:30
snipe
18eda15ec1
Merge remote-tracking branch 'origin/develop'
2023-05-31 16:19:34 +01:00
snipe
e431cd5146
Merge pull request #13085 from inietov/fixes/checkboxes_not_holding_value
...
Fixed #12978 Custom Field Checkboxes not holding assigned values
2023-05-31 10:55:37 -04:00
snipe
35942361b6
Add @ak-piracha as a contributor
2023-05-31 15:51:39 +01:00
snipe
596b510a25
Merge pull request #13108 from ak-piracha/fixes/component_delete_showing_in_assest
...
Fixes: issue #13073 : deleted component addearing in asset component t…
2023-05-31 10:50:34 -04:00
ak-piracha
1cdf089306
Fixes: issue #13073 : deleted component addearing in asset component tab fixed
2023-05-31 00:11:11 +09:30
snipe
c05a4452bc
Merge + update assets
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2023-05-29 18:20:12 -04:00
snipe
13e8f91a59
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-29 18:18:46 -04:00
ak-piracha
825a9a384d
Fixed
2023-05-29 14:07:53 +09:30
NojoudAlshehri
980cb53efa
Added asset_tag column in requestable assets page
2023-05-27 07:05:59 +07:00
snipe
60d2046b6d
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-24 16:13:33 -07:00
snipe
67e0eb3193
Merge pull request #13046 from Godmartinz/asset_info_overflow
...
Added Asset info overflow-wrap
2023-05-24 16:13:01 -07:00
snipe
44cbb0c2e9
Merge branch 'develop' into asset_info_overflow
2023-05-24 16:11:34 -07:00
snipe
a3a64be19b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2023-05-24 16:06:26 -07:00
snipe
fb5e33c50f
Updated hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-24 16:03:15 -07:00
snipe
d7f4fa146b
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-24 16:02:28 -07:00
snipe
064dbdd3d4
Fixed missing brace from conflict
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-24 16:02:23 -07:00
snipe
cc07921608
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-24 15:59:52 -07:00
snipe
267a0ffc59
Merge pull request #13077 from Godmartinz/fix_unclickable_nav_bar_and_notifcation_block
...
fixes mobile nav bar and notification position
2023-05-24 15:58:27 -07:00
snipe
9086cb5310
Merge branch 'develop' into fix_unclickable_nav_bar_and_notifcation_block
2023-05-24 15:56:01 -07:00
Ivan Nieto Vivanco
f4947bfa93
Use trim() function when format the custom field values as array
2023-05-24 04:06:31 -06:00
snipe
5e96fd200f
Refactor to remove general_fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 20:31:53 -07:00
snipe
d020825a17
Renamed import samples
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:31:42 -07:00
snipe
3ef081e739
Indenting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:28:42 -07:00
snipe
47fa490e8a
More translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:28:23 -07:00
snipe
01768bf649
Renamed sample csv
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:23:29 -07:00
snipe
52cf54d211
New assets CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:22:08 -07:00
snipe
55683c29dc
Removed method that does the same return
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:22:00 -07:00
snipe
f355a6e9e1
Added first name and last name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:21:31 -07:00
snipe
3e4426c68c
Clearer comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 19:20:52 -07:00
snipe
2e5486a62e
Merge pull request #13076 from marcusmoore/fixes/allow-multi-column-search-in-sqlite
...
Dynamically adapt concatenation searches for MySQL and sqlite
2023-05-23 16:27:12 -07:00
Marcus Moore
0a3d46824e
Automatically add table prefixes when building multi-column search string
2023-05-23 15:58:58 -07:00
snipe
f69caf77e5
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 14:57:57 -07:00
snipe
61d5bd8567
Removed comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 14:57:15 -07:00
snipe
80e8022c76
Merge pull request #13044 from Godmartinz/bug/sc-23260_multi_select_example_text
...
Bug/sc 23260 multi select example text
2023-05-23 14:45:55 -07:00
Marcus Moore
6300909fee
Add test for searching for user's first and last name
2023-05-23 13:39:01 -07:00
Marcus Moore
b2b6f0cf96
Use new dynamic scope where possible
2023-05-23 13:38:50 -07:00
Marcus Moore
054d71aedc
Add docblock
2023-05-23 13:37:04 -07:00
Marcus Moore
9078d4c71c
Add dynamic scope for prettier multiple column search
2023-05-23 13:35:19 -07:00
snipe
d4c5a4eb2e
More aliases
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 13:18:32 -07:00
snipe
35794c8ba2
More translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 12:57:48 -07:00
snipe
62384260bc
Clarifying comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 12:57:40 -07:00
snipe
f2e9b41199
More user fields in asset importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 12:57:34 -07:00
snipe
479350ed7b
Removed unneeded mapping file
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 12:57:24 -07:00
Godfrey M
68a43cb590
fixes mobile nav bar and notification position
2023-05-23 12:43:32 -07:00
snipe
809dcdc50c
Updated CSVs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 12:13:17 -07:00
snipe
d0f5a044ba
More refactoring
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-23 12:13:06 -07:00
Marcus Moore
05a2e568d7
Add comment
2023-05-23 11:37:09 -07:00
snipe
fbed18a984
Merge pull request #13075 from inietov/fixes/api_incorrect_remaining_accessories
...
Fixed #13074 [API] Remaining accessories quantity not correct
2023-05-23 11:08:37 -07:00
Ivan Nieto Vivanco
086265455d
Pass user count to the eloquent query
2023-05-23 11:53:09 -06:00
Marcus Moore
f40e722397
Add docblock
2023-05-22 17:44:17 -07:00
Marcus Moore
50234bc9a5
Formatting
2023-05-22 17:40:06 -07:00
Marcus Moore
9b512648a3
Update searchRelations in Searchable trait
2023-05-22 17:33:19 -07:00
Marcus Moore
64e83ed9f5
Update scopeAssignedSearch in Asset
2023-05-22 16:54:54 -07:00
snipe
0c7acd6a3b
Merge pull request #13070 from inietov/fixes/accessory_image_shown_when_disabled
...
Fixed #12947 Accessory image in checkin email when Show images in emails is disabled
2023-05-22 15:30:14 -07:00
Ivan Nieto Vivanco
6df9a33eab
Add a condition to check if images should be shown in notification
2023-05-22 16:24:16 -06:00
snipe
f9449aa81f
Merge pull request #13069 from marcusmoore/fixes/add-eager-load-to-asset-model-endpoint
...
Add eager loading to Asset Models controller
2023-05-22 14:39:32 -07:00
Marcus Moore
a6eeae6541
Eager load fieldset default values in asset model endpoint
2023-05-22 14:19:03 -07:00
snipe
b2d922f127
New user import sample CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-22 13:20:20 -07:00
snipe
96e86501ad
Additional alias fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-22 13:20:08 -07:00
snipe
4dfe6f0a28
Added gravatar, avatar, start_date and end_date to user importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-22 13:19:57 -07:00
ak-piracha
457f4c410a
add check for default consumable qty
2023-05-21 23:11:03 +09:30
ak-piracha
bb013d5c3c
Bulk Consumable Checkout
2023-05-21 22:49:00 +09:30
snipe
511d83cc47
Added/fixed a few more translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-20 14:52:42 -07:00
snipe
2171d8c83c
Removed requestable field in sample consumable CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-20 14:52:28 -07:00
snipe
0ea29a0224
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-20 14:21:36 -07:00
snipe
18bedb736e
Removed item number, since not everything will have it
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-20 14:21:29 -07:00
snipe
1396e314c4
Updated arrays with translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-20 14:21:13 -07:00
snipe
b75109dcac
Added component mapping switch
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-20 14:20:49 -07:00
snipe
b7149d8339
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-20 14:20:38 -07:00
Marcus Moore
2d86c8f030
Update advancedTextSearch methods in Asset and User models
2023-05-18 17:06:41 -07:00
Marcus Moore
3a9670930d
Define required fields in Custom Field seeder so sqlite can be seeded
2023-05-18 13:17:35 -07:00
Marcus Moore
85974c7f65
Apply formatting
2023-05-18 13:16:52 -07:00
Marcus Moore
ffbde46180
Simplify sqlite query
2023-05-18 13:06:50 -07:00
Marcus Moore
d8d672c4c1
Move multiple column search function to Searchable trait
2023-05-18 13:05:40 -07:00
Marcus Moore
9cb0decf35
Adapt multiple column search based on database driver
2023-05-18 12:54:00 -07:00
Brady Wetherington
a9c7dbd17a
Shift PHP version requiremeents for Snipe-IT v7 to be php 8.0-8.2
2023-05-17 17:51:02 -07:00
Brady Wetherington
09fdc946a0
Merge branch 'develop' into snipeit_v7
...
Had to do some asset rebuilds, and a composer update
2023-05-17 17:37:10 -07:00
Godfrey M
608d07d03c
adds overflow-wrap to asset info table
2023-05-17 13:08:53 -07:00
Godfrey M
addd806653
testing overflow solutions
2023-05-17 10:47:50 -07:00
Godfrey M
fe60309dfd
adds padding to multi select2 inputs
2023-05-17 10:19:25 -07:00
akemidx
deca80ba71
checkin/out info on side bar
2023-05-17 13:17:48 -04:00
Godfrey M
448472b6d3
testing input paddings
2023-05-17 09:45:45 -07:00
snipe
f1b4bba3ae
Merge remote-tracking branch 'origin/develop'
2023-05-16 23:12:41 -07:00
snipe
2c4c9a16c9
Refactored the static arrays into mount arrays for translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-16 22:31:58 -07:00
snipe
d228b7f347
Remove 99% of the defaultMap stuff (might pull all of this later)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-16 22:31:01 -07:00
snipe
7012018e22
Removed todo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-16 22:30:17 -07:00
snipe
13c6a7f89b
Merge pull request #13039 from snipe/features/add_eol_date_to_importer
...
Added EOL date to importer
2023-05-16 20:12:10 -07:00
snipe
3296716dfa
Added EOL date to importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-16 19:06:35 -07:00
snipe
dbae01f545
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/mix-manifest.json
2023-05-16 17:41:39 -07:00
snipe
c4876865cf
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-16 17:36:58 -07:00
snipe
3cbb4620c3
Merge pull request #13008 from Godmartinz/importer_happy_changes
...
Added standardized colors to the importer
2023-05-16 17:26:32 -07:00
snipe
5a1e6c8e29
Merge pull request #13003 from marcusmoore/chipper-config-updates
...
Disable browser tests in ChipperCI
2023-05-16 17:26:09 -07:00
snipe
f1575d2020
Merge pull request #13024 from Godmartinz/adds_localization_to_checkout_notif
...
adds translation to checkout notification
2023-05-16 17:25:50 -07:00
snipe
71234228b4
Merge pull request #13025 from Godmartinz/archived_clears_assigned_to
...
removes assigned_to if archived
2023-05-16 17:25:24 -07:00
snipe
5be993df8d
Merge remote-tracking branch 'origin/develop'
2023-05-16 16:42:17 -07:00
snipe
4ca914d773
Merge pull request #13038 from uberbrady/fix_asset_checkout_on_update
...
Importer fix for non-Location imports
2023-05-16 16:41:27 -07:00
Brady Wetherington
2eb34d423f
Importer fix for non-Location imports
2023-05-16 16:33:07 -07:00
snipe
37f75c5001
Merge remote-tracking branch 'origin/develop'
2023-05-16 16:29:36 -07:00
snipe
b9b9eb86d9
Merge pull request #13036 from snipe/features/multiselect_locations_custom_report
...
Added multi-select option for location, more to custom report
2023-05-16 16:29:13 -07:00
snipe
9e4e9cc708
Merge pull request #13037 from snipe/fixes/actions_text
...
Uses actions text in backups table
2023-05-16 16:06:05 -07:00
snipe
fe92667812
Use actions text in backups table
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-16 16:02:48 -07:00
snipe
02cacf76c6
Additional multi-select options for custom report
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-16 13:58:21 -07:00
Godfrey M
8e3cbdad90
removes assigned_to if archived
2023-05-15 11:52:57 -07:00
Godfrey M
46d6783fc5
adds translation to checkout notification
2023-05-15 09:01:30 -07:00
akemidx
ba4fc146e2
Merge branch 'delete_asset_from_view_page' of https://github.com/akemidx/snipe-it into delete_asset_from_view_page
2023-05-10 19:30:11 -04:00
akemidx
1916594d27
fixing translation
2023-05-10 19:16:11 -04:00
Godfrey M
763176c86b
standardizes the importer colors no matter the theme
2023-05-10 14:52:08 -07:00
snipe
0f3b77ee2d
Added multi-select option to custom report
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 14:45:31 -07:00
snipe
869d195b35
Merge pull request #13007 from snipe/fixes/multiselect_company
...
Fixed multiselect for companies
2023-05-10 13:17:36 -07:00
snipe
a49257ad4b
Wrong eval
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 13:16:59 -07:00
snipe
c6eef86661
Fixed multiselect for companies
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 13:15:22 -07:00
snipe
71c7c82398
Merge pull request #13006 from snipe/fixes/12831_array_for_company_id
...
Fixes PR #12831 use array bracket for multi select company
2023-05-10 12:36:59 -07:00
snipe
23e3d18931
Used brackets for multiselect company
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 12:35:30 -07:00
slong753
5e34ffa2b0
wip
2023-05-10 14:08:12 -05:00
snipe
5f6e528560
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2023-05-10 11:36:28 -07:00
snipe
9f39d71f16
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report
...
Added Multiselect of companies for custom reports
2023-05-10 11:36:21 -07:00
snipe
4c78b49b97
Add @vikaas-cyper as a contributor
2023-05-10 11:31:26 -07:00
snipe
b1fda46e11
Production assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 11:25:28 -07:00
snipe
6b7a7b8aee
Merge remote-tracking branch 'origin/develop'
2023-05-10 11:23:29 -07:00
snipe
aca287d28c
Merge pull request #13004 from snipe/security/upgrade_webpack
...
Updated webpack, new asset files
2023-05-10 11:23:02 -07:00
snipe
1f5e4309fa
Updated webpack, new asset files
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 11:20:06 -07:00
Marcus Moore
a1a11d788f
Disable browser tests in ChipperCI
2023-05-10 11:06:05 -07:00
snipe
63c660f306
Merge pull request #12999 from snipe/develop
...
Google Oauth Recap
2023-05-10 10:01:23 -07:00
snipe
b8a59cc2d8
Merge branch 'master' into develop
2023-05-10 09:32:26 -07:00
snipe
04aedce47e
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 09:29:42 -07:00
snipe
d648e9a01c
Added Google test user
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 09:13:34 -07:00
snipe
7c77f4a697
Extra debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 09:10:53 -07:00
akemidx
537aa04c9a
Merge branch 'develop' into delete_asset_from_view_page
2023-05-10 09:30:54 -04:00
snipe
27e0484072
I lied. Missed one
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 03:12:22 -07:00
snipe
ec76de607b
Final google login tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 03:08:29 -07:00
snipe
14da8934c5
Few more login page tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:53:11 -07:00
snipe
ed370a0104
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:47:28 -07:00
snipe
b99640ecb2
Added ends_with validation message
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:40:55 -07:00
snipe
8bad72a80f
Added validation on google client ID
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:40:45 -07:00
snipe
f3c977aa9d
Nicer button
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:37:01 -07:00
snipe
788c03ef57
Hide client secret if app is locked
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:22:49 -07:00
snipe
3c00f68bda
Added translation string for google auth failure
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:18:50 -07:00
snipe
7062583710
Check for http or https in avatar value
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:18:38 -07:00
snipe
2dd32d8785
Re-add the image update
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:18:27 -07:00
snipe
ff66a938c1
Clearer comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:18:15 -07:00
snipe
7f0e677908
Use normal translation style
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:18:05 -07:00
snipe
e8a0c7f2ce
Remove avatar update, since we don’t take URLs for that
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:59:33 -07:00
snipe
e950cf4279
Switch to using username as match for google login
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:58:36 -07:00
snipe
567a800c51
Added debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:47:52 -07:00
snipe
e5eb5932ca
Create constructor to override expected config variables
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:37:03 -07:00
snipe
a90fc1ab59
Merge pull request #12994 from snipe/features/google_socialite
...
Google OAuth login
2023-05-10 01:23:37 -07:00
snipe
3612526632
Disallow saving data if app is locked
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:14:54 -07:00
snipe
1ef4ea6381
Very ugly login shim just to test functionality
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:14:31 -07:00
snipe
37bc47290c
Disabled fields in demo mode
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:12:55 -07:00
snipe
4da40792ea
Use google logo
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 01:08:28 -07:00
snipe
63bf93b786
Pulled redirect from settings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:56:04 -07:00
snipe
f57e39191d
Added google settings blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:55:16 -07:00
snipe
6ab214d3a6
Added google option to settings index
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:55:04 -07:00
snipe
3fb5188037
Removed redirect option
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:54:46 -07:00
snipe
aefd330e4e
Added methods for google settings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:54:28 -07:00
snipe
b7e8ce3064
Changed redirect
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:54:14 -07:00
snipe
b183e53c45
Added settings routes for google auth
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:34:48 -07:00
snipe
054a2ab9d4
Add validation and fillable fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:34:31 -07:00
snipe
bc9b47c46d
Removed env dependency, switched to DB
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:27:47 -07:00
snipe
72d1c08fbc
Added migration
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:21:17 -07:00
snipe
c52b48c383
Google oauth login
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 00:14:28 -07:00
snipe
11cd875c6d
Merge remote-tracking branch 'origin/develop'
2023-05-09 22:42:45 -07:00
snipe
a1ec8cf490
Merge pull request #12993 from snipe/fixes/checkbox_layout_in_ldap
...
Tightened up some layout issues, checkbox issues in LDAP settings
2023-05-09 22:37:49 -07:00
snipe
0680405f4d
Tightened up some layout issues, checkbox issues in LDAP settings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-09 22:34:46 -07:00
slong753
9a4ba78c19
oops, pattern
2023-05-09 23:41:21 -05:00
slong753
491f670215
I think this is what they're looking for
2023-05-09 22:52:00 -05:00
snipe
cbe70c9cc1
Merge remote-tracking branch 'origin/develop'
2023-05-09 20:14:44 -07:00
snipe
6a7bab453f
Made spacing more compact
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-09 20:14:00 -07:00
snipe
7412bc32e2
Merge pull request #12991 from snipe/fixes/accessories_view
...
Fixed width of columns in details
2023-05-09 20:11:36 -07:00
snipe
ec4697fd3e
Merge remote-tracking branch 'origin/develop'
2023-05-09 19:45:10 -07:00
snipe
5a461d62bc
Merge pull request #12990 from snipe/fixes/12881_missing_icon
...
Added icon field back into assets page
2023-05-09 19:44:30 -07:00
snipe
999dc3c358
Added icon field back into assets page
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-09 19:43:37 -07:00
snipe
a10652797f
Fixed width of columns in details
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-09 19:42:32 -07:00
snipe
090cbab60e
Merge pull request #12989 from marcusmoore/chipper-ci
...
Add ChipperCI configuration
2023-05-09 18:09:23 -07:00
Marcus Moore
1e7986d75b
Limit ChipperCI to running on push to master or develop
2023-05-09 16:39:56 -07:00
snipe
a43dea3c04
Merge remote-tracking branch 'origin/develop'
2023-05-09 16:29:53 -07:00
Marcus Moore
1f11a8a2c1
Configure Dusk for ChipperCI
2023-05-09 14:45:18 -07:00
Marcus Moore
8d205e80e5
Add ejected pipeline configuration for ChipperCI
2023-05-09 14:44:43 -07:00
snipe
2d5da67b1e
Merge pull request #12982 from akemidx/feature/sc-23214
...
Buttons on the Accessory View Page
2023-05-09 14:26:28 -07:00
slong753
1d2596fc54
wip
2023-05-09 14:58:59 -05:00
snipe
7dd41aa574
Removed whitespace
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 15:49:12 -07:00
snipe
c4d40cdbd4
Merge remote-tracking branch 'origin/develop'
2023-05-08 15:11:25 -07:00
snipe
b76c5206ff
Merge pull request #12986 from snipe/features/import_backup_filename
...
Pass filename to pre-import backup
2023-05-08 15:08:59 -07:00
snipe
17efc78816
Merge pull request #12985 from snipe/fixes/increase_state_from_3_chars
...
Increase state from 3 chars
2023-05-08 15:08:44 -07:00
snipe
332b017dcc
Pass filename for manual backups
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 15:00:02 -07:00
snipe
5960a5425d
Pass filename to pre-import backup
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 14:48:26 -07:00
snipe
277618bf16
Added maxlenth to form fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 14:13:24 -07:00
snipe
f84f4ffe99
Migration to embiggen state fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 14:13:06 -07:00
snipe
f1d85c67f1
Make validation match database fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 14:12:54 -07:00
snipe
6cb6beb6c7
Merge remote-tracking branch 'origin/develop'
2023-05-08 13:21:43 -07:00
snipe
6486ea4fb7
Merge pull request #12976 from inietov/fixes/validate_soft-deleted_models_in_asset_model
...
Refactor of #12955
2023-05-08 13:14:02 -07:00
snipe
d685335aea
Merge pull request #12975 from inietov/fixes/import_asset_notes
...
Fixed Notes field doesn't get populate when creating/updating assets via Importer [sc-23222]
2023-05-08 13:11:50 -07:00
snipe
d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177
...
Fixes user name missing in accessory acceptance notifications
2023-05-08 13:04:37 -07:00
snipe
480ef23505
Merge remote-tracking branch 'origin/develop'
2023-05-08 12:44:01 -07:00
snipe
4503815ad7
Merge pull request #12984 from snipe/features/check_for_zip_in_backup_filename
...
Check that the filename we pass ends in zip, add it if not
2023-05-08 12:43:34 -07:00
snipe
ba462d1e93
Check that the filename we pass ends in zip, add it if not
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 12:41:32 -07:00
snipe
3429d1f4b4
Merge remote-tracking branch 'origin/develop'
2023-05-08 12:22:22 -07:00
snipe
0f76eda4af
Merge pull request #12983 from snipe/features/add_optional_filename_to_backup_artisan
...
Add optional filename to backup
2023-05-08 12:21:55 -07:00
snipe
85243423cf
Add optional filename to backup
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 12:20:43 -07:00
snipe
a73205f228
Merge remote-tracking branch 'origin/develop'
2023-05-08 11:24:03 -07:00
snipe
06ffe64f62
Merge pull request #12981 from snipe/fixes/wonky_div_when_saml_disabled
...
Fixed misplaced div when saml is disabled
2023-05-08 11:22:54 -07:00
snipe
223ff5e97e
Fixed misplaced div when saml is disabled
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-08 11:20:26 -07:00
snipe
fe40902765
Merge remote-tracking branch 'origin/develop'
2023-05-06 06:37:29 -07:00
snipe
689ef433b3
Merge pull request #12979 from snipe/fixes/added_use_for_fieldsets_controller
...
Added missing use statement
2023-05-06 06:37:01 -07:00
snipe
8b73fa0053
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-06 06:36:09 -07:00
snipe
3d345d15ac
Merge remote-tracking branch 'origin/develop'
2023-05-04 11:01:15 -07:00
snipe
4efa84270a
Merge pull request #12974 from snipe/fixes/show_sig_column_regardless_of_sig_status
...
Show signature column in asset history regardless of “require sig” state
2023-05-04 11:00:51 -07:00
snipe
60515f1262
Show signature column regardless of “require sig” state
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-04 10:56:35 -07:00
Ivan Nieto Vivanco
fbb7c55450
Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models
2023-05-04 03:12:36 -06:00
Ivan Nieto Vivanco
89fbd60d97
Restore the 'Asset Notes' and 'Model Notes' in the Map Asset Import Fields form
2023-05-04 02:00:04 -06:00
Marcus Moore
96c6d8896f
Add additional information to acceptance notifications for assets, accessories, and consumables
2023-05-03 17:04:01 -07:00
Marcus Moore
9efe13bb5e
Capitalize "declined" in acceptance in notification
2023-05-03 17:03:22 -07:00
Marcus Moore
4a0b3efd1f
Include user's name in Acceptance result notifications for accessories
2023-05-03 14:22:05 -07:00
Marcus Moore
f96d8fe674
Add CheckoutAcceptance factory
2023-05-03 14:21:13 -07:00
snipe
5950ec27ab
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
2023-05-03 13:49:36 -07:00
snipe
cd6f6ee8ff
Bumped version to 6.1.1-pre
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-03 13:47:46 -07:00
akemidx
526c089424
Buttons on the accessory view page
2023-05-03 16:40:06 -04:00
akemidx
67105528d1
Buttons on the accessory view page
2023-05-03 16:31:56 -04:00
akemidx
12f0c42545
buttons added
2023-05-03 16:31:56 -04:00
slong753
815c77f943
wip
2023-05-03 14:49:31 -05:00
snipe
fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130
...
Adds a checkout range for custom asset reports
2023-05-03 11:43:44 -07:00
snipe
fc53b56481
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset
...
Fixed Error 500 after sign and accept asset
2023-05-03 11:43:14 -07:00
akemidx
889be83762
replacing route. sorry!
2023-05-03 14:14:18 -04:00
snipe
b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
...
Added ability to auto-add fields to new fieldsets
2023-05-03 11:04:33 -07:00
snipe
ea17fdeba5
Merge pull request #12846 from snipe/features/livewire_location_import
...
Location importer via Livewire Importer
2023-05-03 11:02:06 -07:00
snipe
f5cd58e9b7
Unmix return type variables
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-03 10:57:02 -07:00
snipe
da4841987e
Use translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-03 10:55:30 -07:00
snipe
4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost
...
Added component costs to asset view
2023-05-03 10:49:03 -07:00
snipe
cdbd68012f
Merge pull request #12878 from joelpittet/patch-2
...
Use environment variable and default to PHP's sendmail_path
2023-05-03 10:48:39 -07:00
snipe
577fff7d65
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-03 10:45:36 -07:00
snipe
79a27085c9
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2023-05-03 10:43:45 -07:00
snipe
27600e1553
Snyk webpack upgrade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-03 10:43:05 -07:00
snipe
914b2658cc
Merge pull request #12943 from marcusmoore/fixes/avoid-loading-unused-models-for-report
...
Remove the loading of asset maintenances that are not used by view
2023-05-03 10:41:52 -07:00
snipe
6a12d5d9a0
Merge pull request #12964 from marcusmoore/fixes/restrict-php-version
...
Restrict PHP version to <8.2
2023-05-03 10:40:52 -07:00
snipe
31f1bce16b
Merge pull request #12958 from uberbrady/snipeit_v7_merge_develop_05_01_2022
...
Snipeit v7 merge develop 05 01 2022
2023-05-03 10:40:18 -07:00
snipe
466c2fd47c
Merge pull request #12966 from Godmartinz/bug/sc-23161
...
fixed color differences in dark themes
2023-05-03 10:38:54 -07:00
slong753
cdda4a56d8
aha, ok thisd kind of works
2023-05-02 19:11:43 -05:00
slong753
b2c2097e8b
just more troubleshooting stuff, still no solution
2023-05-02 18:54:20 -05:00
Godfrey M
87d1a82e35
moar changes to red
2023-05-02 15:15:02 -07:00
Godfrey M
1d494252ef
corrections for dark red
2023-05-02 14:05:29 -07:00
Godfrey M
786e8deb91
removed dead space
2023-05-02 13:54:14 -07:00
Godfrey M
0a3cb5286d
fixes dark red
2023-05-02 12:37:05 -07:00
Godfrey M
f91e76e0f2
fixes dark blue and btn-warning bg
2023-05-02 12:33:40 -07:00
Godfrey M
af2f288286
fixes dark orange theme
2023-05-02 12:17:22 -07:00
Godfrey M
5de30db0a9
fixes dark green theme
2023-05-02 12:10:55 -07:00
Marcus Moore
48ef8443f5
Restrict PHP to >=7.4.3 <8.2
2023-05-02 12:01:09 -07:00
Godfrey M
47370da924
adds fixes to dark black theme
2023-05-02 11:08:37 -07:00
Brady Wetherington
2f3ddaec20
Merge branch 'develop' into snipeit_v7
2023-05-01 18:09:12 -07:00
snipe
7cd37e6e95
Merge pull request #12957 from uberbrady/fix_webpack_for_v7
...
Fix webpack for v7
2023-05-01 18:08:46 -07:00
Brady Wetherington
a938009074
Rebuilt assets with new Node and node_modules and package.json
2023-05-01 18:06:51 -07:00
Brady Wetherington
21d08ff742
Whoops! Forgot to commit this before
2023-05-01 18:05:06 -07:00
snipe
da8b41b12a
Merge pull request #12956 from uberbrady/upgrade_node_and_packages_for_v7
...
Updated Node version, and various packages to more recent
2023-05-01 17:33:20 -07:00
Brady Wetherington
6e031727fa
Updated Node version, and various packages to more recent
2023-05-01 17:05:10 -07:00
akemidx
2cb1545b83
removing route
2023-05-01 19:51:52 -04:00
snipe
63af17da74
Merge pull request #12954 from marcusmoore/fixes/test-suite-fixes
...
Clear the settings cache on app destruction
2023-05-01 16:28:47 -07:00
Godfrey M
7711938f4b
fixes dark yellow
2023-05-01 16:27:21 -07:00
Marcus Moore
f7d2b62d87
Improve method name
2023-05-01 16:06:28 -07:00
Marcus Moore
da08f6ef8c
Add InteractsWithSettings trait to required tests
2023-05-01 16:05:26 -07:00
Marcus Moore
6d594faae7
Clear the settings cache on app destruction
2023-05-01 16:04:43 -07:00
Ivan Nieto Vivanco
6936d76661
Prevent hard fail when retrieving acceptance data
2023-05-01 16:50:18 -06:00
Ivan Nieto Vivanco
1b2d830380
Check if model exists before create asset via API
2023-05-01 16:05:03 -06:00
akemidx
ad7a1d6c3b
edits from Github comments
2023-05-01 15:50:48 -04:00
snipe
609b1646e9
Merge remote-tracking branch 'origin/develop'
2023-04-30 18:40:52 -07:00
snipe
031c9c1204
Added nobr tag to prevent external link icon and link from breaking
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-30 18:40:40 -07:00
snipe
77b51136cf
Merge remote-tracking branch 'origin/develop'
2023-04-30 18:38:19 -07:00
snipe
0222a922a1
Added tooltip
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-30 18:20:23 -07:00
snipe
8ad600085a
Moved external link icon into link
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-30 18:17:56 -07:00
snipe
7fdbc10122
Merge remote-tracking branch 'origin/develop'
2023-04-29 13:49:14 -07:00
snipe
4c27b65d45
Merge pull request #12950 from snipe/fixes/warranty_lookup_validation
...
Fixed #12946 - warranty lookup url was not nullable
2023-04-29 13:48:54 -07:00
snipe
aa814cf761
Fixed #12946 - warranty lookup url was not nullable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-29 13:47:52 -07:00
Marcus Moore
3cae32b236
Eager load default locations
2023-04-27 17:13:09 -07:00
Marcus Moore
429c4cb99f
Remove the loading of asset maintenances that are not used by view
2023-04-27 17:12:53 -07:00
snipe
e250d4c884
Merge remote-tracking branch 'origin/develop'
2023-04-27 17:00:29 -07:00
snipe
8b476e55b6
Merge pull request #12941 from akemidx/feature/sc-23153
...
Created At and Updated At fields on License table view
2023-04-27 16:59:30 -07:00
snipe
b76d2973f7
Merge pull request #12928 from snipe/features/make_hashing_work_rounds_an_env
...
Env-ify hashing variables, setting the normal defaults
2023-04-27 16:57:45 -07:00
snipe
b001f6771d
Merge remote-tracking branch 'origin/develop'
2023-04-27 16:28:42 -07:00
snipe
956bc41e48
Merge pull request #12942 from snipe/bug/sc-23197
...
Added missing case for licenses for item_count
2023-04-27 16:28:12 -07:00
snipe
567e19bcc0
Added missing case for licenses for item_count
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-27 16:26:50 -07:00
akemidx
67a2b796a4
requested edits
2023-04-27 19:19:53 -04:00
akemidx
1c60d686bd
Merge remote-tracking branch 'origin/delete_asset_from_view_page' into delete_asset_from_view_page
...
# Conflicts:
# resources/views/hardware/view.blade.php
2023-04-27 19:08:51 -04:00
akemidx
cd389368f7
adding in script
2023-04-27 19:00:17 -04:00
akemidx
d3675831bb
snippet rewrite
2023-04-27 18:58:59 -04:00
akemidx
84134b45e6
form work
2023-04-27 18:58:59 -04:00
akemidx
b1e68be545
delete button progress
2023-04-27 18:58:59 -04:00
akemidx
d94bed3f57
push for testing
2023-04-27 18:58:59 -04:00
akemidx
aabcf22b40
commiting
2023-04-27 18:58:59 -04:00
akemidx
af549a0be9
Mock Up of the Buttons
2023-04-27 18:58:59 -04:00
Brady Wetherington
381890b578
Merge branch 'develop' into laravel_v9
2023-04-27 13:56:04 -07:00
snipe
1384ca658a
Merge remote-tracking branch 'origin/develop'
2023-04-26 18:42:58 -07:00
snipe
e25dc42121
Switch to externalLinkFormatter
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 18:42:34 -07:00
snipe
dcb7eadfc7
Merge pull request #12933 from snipe/features/unlink_dynamic_urls_if_variables_used
...
Remove auto-link from from manufacturer warranty
2023-04-26 18:40:33 -07:00
snipe
99ef435d40
Fixed translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 18:32:38 -07:00
snipe
e853f8b7fd
Removed SR text for exporting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 18:23:21 -07:00
snipe
deff312381
Remove auto-link from from manufacturer warranty
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 18:16:23 -07:00
snipe
7bffe30fae
Merge remote-tracking branch 'origin/develop'
2023-04-26 17:55:48 -07:00
snipe
73d45bb587
Merge pull request #12932 from snipe/features/add_warranty_url_to_mfgs
...
Added dynamic warranty URL to manufacturers
2023-04-26 17:55:03 -07:00
snipe
7974c172fd
Switch back to “normal” url for support
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 16:48:38 -07:00
snipe
54a766c4f9
Added dynamic warranty URL to manufacturers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 16:39:15 -07:00
snipe
27de5c62c5
Merge remote-tracking branch 'origin/develop'
2023-04-26 15:15:43 -07:00
snipe
ef69df2cdf
Merge pull request #12930 from snipe/fixes/added_help_text_to_support_url
...
Added help text to the now-dynamic manufacturer URLS
2023-04-26 15:15:19 -07:00
snipe
7c0ef581c5
Added help text to the now-dynamic manufacturer URLS
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 15:12:36 -07:00
snipe
0c5837e4a0
Merge pull request #12929 from snipe/fixes/use_asset_tag_if_no_asset_name_given
...
Use the asset tag instead of asset name if no name is given
2023-04-26 14:49:38 -07:00
snipe
5eac314f4d
Merge pull request #12906 from akemidx/feature/sc-20622
...
Dynamic warranty link for manufacturers' support urls
2023-04-26 14:49:22 -07:00
snipe
b5b335a2ca
Use the asset tag instead of asset name if no name is given
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 14:41:19 -07:00
akemidx
497d17835f
requested edits
2023-04-26 17:06:08 -04:00
slong753
52c9fefbe0
ok, this works except error display
2023-04-26 15:06:50 -05:00
snipe
68417a4c15
Env-ify hashing variables, setting the normal defaults
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 13:01:42 -07:00
akemidx
aab53cf683
remove regex, add in starts_with
2023-04-26 15:18:13 -04:00
snipe
75fdd0ac96
Merge remote-tracking branch 'origin/develop'
2023-04-26 09:54:44 -07:00
snipe
4c16dcf5d0
Merge pull request #12922 from snipe/fixes/12918_route_name_for_clone_locations
...
Fixed #12918 - wrong route for clone location
2023-04-26 09:54:18 -07:00
snipe
b6889ff399
Fixed #12918 - wrong toite for clone location
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-26 09:52:13 -07:00
snipe
12cc576b52
Merge remote-tracking branch 'origin/develop'
2023-04-25 23:41:45 -07:00
snipe
19554a7dc2
Merge pull request #12917 from snipe/fixes/applies_pr_12868
...
Applies #12868 - fixes EOL date on asset creation
2023-04-25 23:40:43 -07:00
snipe
8f0b823fb3
Applies #12868
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 23:39:32 -07:00
snipe
2299771e10
Add @zacharyfleck as a contributor
2023-04-25 22:37:17 -07:00
snipe
37b881b906
Add @dboth as a contributor
2023-04-25 22:32:45 -07:00
snipe
22d73f503a
Merge pull request #12756 from dboth/develop
...
Fixed #8208 , #8896 , #8985 and #9789 : Currency issues when using non-english locales (resubmission)
2023-04-25 22:32:13 -07:00
snipe
970b5e556c
Merge pull request #12903 from marcusmoore/bug/sc-15034
...
Fixes sending webhook notifications for checkout and checkin
2023-04-25 22:22:58 -07:00
snipe
17275cbeb8
Merge pull request #12905 from marcusmoore/fixes/checkout-via-artisan
...
Fixes where clause operator in artisan checkout command
2023-04-25 22:21:59 -07:00
snipe
d6ea5de5b8
Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset
2023-04-25 22:20:50 -07:00
snipe
42f0975414
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2023-04-25 22:19:27 -07:00
snipe
470a36a7c9
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 22:12:56 -07:00
snipe
b7632cdbb7
Updated js packages
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 22:12:47 -07:00
snipe
9529cd8235
Merge pull request #12891 from snipe/snyk-upgrade-38ca074c3dd0aada16ad8b85f20ebaa8
...
[Snyk] Upgrade bootstrap-table from 1.21.3 to 1.21.4
2023-04-25 22:04:40 -07:00
snipe
fcddd0827c
Merge pull request #12888 from snipe/snyk-upgrade-4c8ffc584b299eb1e71d6be555624f4e
...
[Snyk] Upgrade webpack from 5.76.2 to 5.77.0
2023-04-25 22:03:49 -07:00
snipe
c8c6f879d4
Merge pull request #12912 from Godmartinz/ldap_location_sync
...
added ldap_location to settings
2023-04-25 21:54:28 -07:00
snipe
31a3be4c6a
Small refactor of HTML, added top submit button
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 21:51:59 -07:00
snipe
27477085fe
Merge branch 'develop' into features/auto_add_to_fieldset
2023-04-25 21:31:50 -07:00
snipe
45f22e7561
Updated the sync to disassociate if all boxed are unchecked
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 21:31:23 -07:00
snipe
5759d2c948
Added a check to fail validation if the associated fieldsets are not value
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 21:30:47 -07:00
snipe
15dc4e4779
Added fieldset sync
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 21:29:57 -07:00
slong753
6bec9cf880
fix a couple things
2023-04-25 23:26:16 -05:00
snipe
5eeca937cb
Added logic for syncing fieldset info
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 21:08:26 -07:00
snipe
662b7787a1
Updated redirect return
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 21:07:50 -07:00
snipe
28d9cec1e3
Added auto_add_to_fieldsets to API response
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 20:59:48 -07:00
snipe
67212f9d57
Changed layout, added fieldsets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 20:59:29 -07:00
snipe
6cd3cfe1ea
Added new field to factory
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 20:57:03 -07:00
snipe
4a063d23b9
We don’t actually use this test?
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 19:36:52 -07:00
snipe
705bb7375a
Merge pull request #12914 from marcusmoore/fixes/fix-test-cases
...
Fixes state leak between tests
2023-04-25 17:22:56 -07:00
snipe
4e3ccb74bc
Fixed slightly weird padding
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 15:59:19 -07:00
snipe
4954b50280
Added new strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 15:57:46 -07:00
snipe
07336bbc6a
Added auto_add_to_fieldsets field
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 15:51:36 -07:00
snipe
0e73923c24
Merge pull request #12913 from uberbrady/fix_scim_id_string
...
Change from a standard Eloquent mapping for ID to a custom setRead
2023-04-25 12:02:36 -07:00
Marcus Moore
a528ebeab0
Use superuser instead of admin state
2023-04-25 11:53:47 -07:00
Brady Wetherington
3da5df0127
Change from a standard Eloquent mapping for ID to a custom setRead
2023-04-25 11:50:55 -07:00
Godfrey M
20d8ff2a4f
removed a typo
2023-04-25 11:49:33 -07:00
snipe
a7e2182ec9
Merge pull request #12904 from zacharyfleck/develop
...
Fixed #8342 : Add ARM64 architecture to Docker Builds
2023-04-25 11:45:27 -07:00
Godfrey M
cb68f41d9c
added ldap_location to settings
2023-04-25 11:44:04 -07:00
Zachary Fleck
af0a0276e0
Merge branch 'snipe:develop' into develop
2023-04-25 14:43:41 -04:00
Zachary Fleck
ef07f39ccf
remove space
2023-04-25 14:43:34 -04:00
Zachary Fleck
aa223359d4
remove space
2023-04-25 14:42:09 -04:00
Godfrey M
c9eb1410d7
swaps version and open source text in the footer
2023-04-25 11:03:05 -07:00
snipe
b0e342508f
Merge remote-tracking branch 'origin/develop'
2023-04-25 08:09:59 -07:00
snipe
efc0929bbc
Merge pull request #12910 from snipe/fixes/finer_permissions_for_bulk_assets
...
Added more granular permissions on bulk actions for assets
2023-04-25 08:09:30 -07:00
snipe
66ce02fc48
Added permission on restore
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 08:09:16 -07:00
snipe
6e7f0728fd
Added more granular permissions on bulk actions for assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-25 08:06:45 -07:00
Marcus Moore
b4f162f316
Fix operator in where clause
2023-04-24 17:26:06 -07:00
akemidx
9cd2783185
Regex added for link instead
2023-04-24 20:07:21 -04:00
zacharyfleck
63ade327a5
add ARM64 architecture
2023-04-24 16:24:44 -04:00
Godfrey M
b8c424fca0
adds users total cost to user profile
2023-04-24 09:17:42 -07:00
snyk-bot
056790e9cd
fix: upgrade bootstrap-table from 1.21.3 to 1.21.4
...
Snyk has created this PR to upgrade bootstrap-table from 1.21.3 to 1.21.4.
See this package in npm:
https://www.npmjs.com/package/bootstrap-table
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
2023-04-22 14:47:28 +00:00
snipe
0c425ed0e7
Merge remote-tracking branch 'origin/develop'
2023-04-21 05:19:19 -07:00
snipe
7d9062c065
Merge pull request #12877 from joelpittet/patch-1
...
Allow an environment variable to set the session cookie path
2023-04-21 04:45:17 -07:00
snipe
fc721a9388
Merge pull request #12887 from marcusmoore/bug/sc-23158
...
Fix: Ensure users editing themselves do not deactivate their account
2023-04-21 04:42:04 -07:00
snyk-bot
6af3ab8954
fix: upgrade webpack from 5.76.2 to 5.77.0
...
Snyk has created this PR to upgrade webpack from 5.76.2 to 5.77.0.
See this package in npm:
https://www.npmjs.com/package/webpack
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
2023-04-21 06:57:42 +00:00
Marcus Moore
2aba8252f3
Ensure users editing themselves do not deactivate their account
2023-04-20 21:59:55 -07:00
akemidx
16a5a883e5
new request, preparing support_url for validation
2023-04-20 16:34:25 -04:00
snipe
c3c22fae3c
Merge pull request #12885 from inietov/fixes/error_call_member_function_totalSeatsByLicenseID
...
Fixed Call to a member function totalSeatsByLicenseID() on null
2023-04-20 10:43:28 -07:00
Ivan Nieto Vivanco
747d6cfdb4
Change the flow of the condition using an early return
2023-04-20 10:37:26 -06:00
Ivan Nieto Vivanco
ae53609b1b
Declare variables only if license is found
2023-04-20 10:16:11 -06:00
Marcus Moore
c357d9f01e
Update data provider name
2023-04-19 18:10:23 -07:00
Marcus Moore
645f6ed692
Remove unneeded doc block
2023-04-19 17:52:44 -07:00
Godfrey M
97df39001d
adds optional breakdowns for total cost
2023-04-19 17:51:37 -07:00
Marcus Moore
dd40798c43
Remove unneeded comments
2023-04-19 17:49:31 -07:00
Godfrey M
6872f8da7b
adding total cost to user view
2023-04-19 17:31:09 -07:00
Marcus Moore
e92c1e7bea
Minor docblock update
2023-04-19 17:22:56 -07:00
Godfrey M
bd212b3108
adds component costs to asset view
2023-04-19 16:35:06 -07:00
Joel Pittet
608c5d037f
Use environment variable and default to PHP's sendmail_path
...
Use sendmail_path in PHP instead of hardcoded path and options
2023-04-19 15:25:48 -07:00
Joel Pittet
351928adff
Allow an environment variable to set the session cookie path
2023-04-19 15:18:50 -07:00
Marcus Moore
144382e57a
Update docblock types
2023-04-19 12:31:12 -07:00
Marcus Moore
835f8876c4
Move notification sending into try catch block
2023-04-19 12:26:48 -07:00
snipe
4a5426f959
Merge pull request #12875 from Godmartinz/sidebar_undeployable_runaway_parenthesis
...
Fixed space from un deployable total in sidebar
2023-04-19 11:49:42 -07:00
Marcus Moore
15280c435e
Merge branch 'develop' into bug/sc-15034
2023-04-19 11:45:16 -07:00
Godfrey M
0e1f50c226
adds checkout-range to jquery
2023-04-19 10:11:26 -07:00
Godfrey M
d2118ba230
removed space from un deployable total in sidebar
2023-04-19 09:46:15 -07:00
Godfrey M
8a5612d1c9
fixes comment
2023-04-19 09:13:43 -07:00
Godfrey M
bdd1045272
adds a checkout range for custom asset reports
2023-04-19 09:11:44 -07:00
snipe
fd5cb32dd9
Honor the “update” flag
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 16:34:47 -07:00
snipe
345662c5c2
Rearrange some of the user creation logic
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 16:34:10 -07:00
snipe
003cd372dd
New location same CSV
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 16:23:07 -07:00
Godfrey M
0ab400f5bc
removed deadspace and pull
2023-04-18 15:23:11 -07:00
Godfrey M
f15b0d8591
fix for footer
2023-04-18 15:20:38 -07:00
snipe
aedfef78d3
Update app/Importer/LocationImporter.php
...
Co-authored-by: Marcus Moore <contact@marcusmoore.io >
2023-04-18 13:26:23 -07:00
Marcus Moore
bad2eead4c
Remove test method
2023-04-18 13:13:57 -07:00
Marcus Moore
508660b1df
Skip notifications for component checkouts and checkins
2023-04-18 13:07:55 -07:00
snipe
c68563ae08
Merge remote-tracking branch 'origin/develop'
2023-04-18 13:01:37 -07:00
snipe
a84a9a8dec
Merge pull request #12867 from snipe/fixes/clearer_tooltip_text_for_non_assets_undeployable
...
Small tooltip improvements for undeployable items in table view
2023-04-18 13:00:11 -07:00
snipe
d3bdaf7cd3
Fixed destination name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 12:59:46 -07:00
snipe
92f516484e
Small tooltip improvements for undeployable items
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 12:54:06 -07:00
snipe
b626e5a3bf
Merge remote-tracking branch 'origin/develop'
2023-04-18 12:33:32 -07:00
snipe
bfda46276a
Merge pull request #12849 from snipe/features/adds_license_checkin_checkout_to_all_in_gui
...
Added license checkin/checkout to all in license GUI
2023-04-18 12:32:30 -07:00
snipe
031586495a
Small cosmetic tweaks to 2FA reset class, fixed weird layout on 2FA reset button
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 12:09:41 -07:00
snipe
d871a14687
Added fa-fw for nicer display
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 11:49:40 -07:00
snipe
00a9591c4c
Added autoassign_licenses in view, added fa-fw
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 11:49:29 -07:00
snipe
4d9d75379f
Improved translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 11:39:16 -07:00
snipe
41358eba85
Updated label
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 11:29:28 -07:00
snipe
59f4fe67d6
Removed duplicate tooltip
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 11:28:35 -07:00
Brady Wetherington
71fa6d765f
Update to Latest Livewire files
2023-04-18 11:05:35 -07:00
Brady Wetherington
9793130f6c
Merge branch 'develop' into laravel_v9
2023-04-18 11:01:00 -07:00
snipe
2c5c4ab974
Nicer layout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 04:40:06 -07:00
snipe
95767c46ac
Fixed delete modal
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 04:37:13 -07:00
snipe
0eadc00f4d
Removed unneeded css class
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 04:37:04 -07:00
snipe
df7b19bc1e
Removed unused validations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 04:35:06 -07:00
snipe
7aab4290c7
Updated tooltips with data-tooltip=true from old method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:44:50 -07:00
snipe
3a808aa806
Updated method for available seat count
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:44:33 -07:00
snipe
4d09021e9c
Compact tooltip for un-deletable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:44:19 -07:00
snipe
beba31afbf
Added tooltip for disabled delete buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:44:09 -07:00
snipe
41490f1e3a
Use “name” instead of “license” for consistency
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:43:59 -07:00
snipe
9da36833be
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:43:44 -07:00
snipe
dc6eb6f104
Throw a warning if there were no users affected
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:07:17 -07:00
snipe
a8a3ca3624
Use count on availSeats
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:06:42 -07:00
snipe
e84ba0c7a0
Revert back to old method name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:06:32 -07:00
snipe
3e53870b37
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:00:13 -07:00
snipe
8a41f37054
Persists buttons through tabs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 02:00:06 -07:00
snipe
9f7058a128
Revert "Renamed/refactorered licenses method"
...
This reverts commit de78f8d41f .
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:36:34 -07:00
snipe
ec0413254e
Removed action menu
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:09:40 -07:00
snipe
f21d9c27e6
Use new translations for logs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:07:26 -07:00
snipe
725adebffe
Translate log message
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:07:12 -07:00
snipe
bfcbd9628a
Refactored license controller with new counts
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:02:58 -07:00
snipe
220e20d208
Changed tooltip invocation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:02:36 -07:00
snipe
d3b087b5da
Clearer padding between buttons, added tooltips
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:02:19 -07:00
snipe
25a83c2915
Removed moved translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:02:01 -07:00
snipe
3f4159f058
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:01:52 -07:00
snipe
de78f8d41f
Renamed/refactorered licenses method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:01:44 -07:00
snipe
6ab4314221
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-18 01:01:13 -07:00
snipe
087f0e596a
Fixed has to where
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-17 22:44:05 -07:00
snipe
0dd967cf2b
Merge remote-tracking branch 'origin/develop'
2023-04-17 21:05:09 -07:00
snipe
912f6c45ee
Reverted #12832
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-17 21:04:47 -07:00
snipe
9a73f5eca3
Updated production assets
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
2023-04-17 20:27:49 -07:00
snipe
9698c3b07b
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-17 20:14:50 -07:00
snipe
3153013715
Fixed semicolon parse error from #12832
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-17 20:14:45 -07:00
snipe
c12ac9912c
Merge pull request #12832 from Godmartinz/fix_footer_space
...
Fixed footer space when customized
2023-04-17 20:11:15 -07:00
snipe
2b10357c4e
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-17 19:06:27 -07:00
Marcus Moore
f6cff90829
Migrate to new test settings interface
2023-04-17 17:31:12 -07:00
Marcus Moore
2d56675ade
Merge branch 'develop' into bug/sc-15034
...
# Conflicts:
# database/factories/SettingFactory.php
2023-04-17 17:22:55 -07:00
snipe
c70cb36c80
Merge pull request #12828 from Godmartinz/bug/sc-20783
...
Fixed dark themes pagination and notification drop menu
2023-04-17 16:26:36 -07:00
Godfrey M
247f47ce69
adjusts button color
2023-04-17 15:29:53 -07:00
snipe
99cecee4b5
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui
2023-04-17 14:54:30 -07:00
Godfrey M
aabd5e92a8
surrounding text aligns correctly
2023-04-17 12:44:06 -07:00
Godfrey M
247c881d87
add back casts
2023-04-17 12:10:54 -07:00
Godfrey M
1001b52c4f
removes unncessary files
2023-04-17 12:01:09 -07:00
slong753
52dc99588e
pushing for now, needs validation work
2023-04-17 13:57:48 -05:00
Godfrey M
0cca45d858
footer now uses flex
2023-04-17 11:57:35 -07:00
snipe
b22cad9ced
Merge pull request #12855 from koelle25/fixes/last_component_checkout
...
Allow checkout of available components down to zero stock (fixes #12854 )
2023-04-17 09:49:14 -07:00
snipe
071a620144
Merge remote-tracking branch 'origin/develop'
2023-04-17 09:36:07 -07:00
snipe
920711dd16
Merge pull request #12857 from snipe/fixes/wtf_datetime_stuff
...
Remove start/end dates form casts array
2023-04-17 09:35:03 -07:00
snipe
e0c53d8d09
Remove start/end dates form casts array
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-17 09:33:31 -07:00
Kevin Köllmann
04f3c4bf69
Fixed #12854 : Allow checkout of available components down to zero stock
2023-04-17 11:45:11 +02:00
snipe
a83991041a
Better placement for errors
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 16:08:06 -07:00
snipe
0afaaa4a6b
Added autoassign_licenses option to create admin
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:28:08 -07:00
snipe
16ab2bec06
Added sorting and searching on autoassign_licenses via user API
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:27:39 -07:00
snipe
4b66ca6ac5
Added method to bulk checkin (much simpler than checking out)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:27:15 -07:00
snipe
844ad83431
Added method to bulk checkout license seats
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:26:59 -07:00
snipe
9833d861d4
Added autoassign_licenses tp bulk users conditional
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:26:33 -07:00
snipe
03cc55cb6a
Set autoassign_licenses to false if unchecked
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:25:52 -07:00
snipe
6a94a2f515
Return true/false for autoassign_licenses in the API
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:25:26 -07:00
snipe
f40bef8f9b
Added autoassign_licenses to user importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:25:08 -07:00
snipe
6acce098c9
Added autoassign_licenses on user model
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:24:56 -07:00
snipe
73cf62e060
Added autoassign_licenses to presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:24:00 -07:00
snipe
dd78d2fc66
Added language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:23:51 -07:00
snipe
add9e561f9
Added buttons on license page, greyed out where appriate
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:23:42 -07:00
snipe
ff9af7ea74
Added genetic modal partial
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:23:15 -07:00
snipe
bc7c0aa80d
Fixed clone tooltip
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:23:00 -07:00
snipe
73188df090
Added autoassign_licenses to bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:22:37 -07:00
snipe
cf7f244942
Added (clarified?) edit autoassign_licenses in user edit
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:19:37 -07:00
snipe
06d46a4523
Indenting change for clarity
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:17:55 -07:00
snipe
8e5042418a
Added buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 12:30:32 -07:00
snipe
79ff6a8fc2
Disallow deleting in the API view if there are things checked out
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 12:30:23 -07:00
snipe
8183b8deba
Added stub method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 12:30:02 -07:00
snipe
0210ecde88
Include confirm modal
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 12:29:55 -07:00
snipe
b2940f9915
Added confirm modal
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 12:29:48 -07:00
snipe
b093e428b3
Merge remote-tracking branch 'origin/develop'
2023-04-16 08:54:38 -07:00
snipe
144a6f28ec
Added intval
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 08:54:23 -07:00
snipe
65ac877918
Merge remote-tracking branch 'origin/develop'
2023-04-16 08:50:20 -07:00
snipe
f50b958b63
Merge pull request #12848 from snipe/fixes/make_limit_into_singletons
...
Used a singleton to filter API limit value
2023-04-16 08:48:28 -07:00
snipe
64256351d8
Used a singleton to filter API limit value
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 08:46:39 -07:00
snipe
62edc0ab7d
Merge remote-tracking branch 'origin/develop'
2023-04-16 08:02:44 -07:00
snipe
2c6d4d6b7f
Merge pull request #12847 from snipe/features/moar_labels
...
Adds a few more auto-labels
2023-04-16 08:01:06 -07:00
snipe
2b11c96ce0
Adds a few more auto-labels
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 08:00:25 -07:00
snipe
78ec21acc4
Added location case
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:47:49 -07:00
snipe
5a1d03c1dc
Added alias maps
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:47:42 -07:00
snipe
a831a34594
New field mapping
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:47:26 -07:00
snipe
bcf9188dcd
Made default password longer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:47:19 -07:00
snipe
c149885ceb
Skip the magical user creation if it’s a location
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:47:04 -07:00
snipe
1509672463
Added location importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:46:36 -07:00
snipe
bceb0b8a47
Allowed slightly longer zip codes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:46:29 -07:00
snipe
7534d27a03
Added CSV sample
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 07:46:18 -07:00
snipe
46cce0115e
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2023-04-16 05:46:26 -07:00
snipe
485f5f3a45
Merge pull request #12845 from snipe/security/update_bs_tables
...
Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733 )
2023-04-16 05:44:52 -07:00
snipe
21f5d39fa1
Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733 )
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 05:43:42 -07:00
snipe
21e78bee71
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# package-lock.json
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2023-04-15 21:05:18 -07:00
snipe
2eeb7ddf58
Merge pull request #12844 from snipe/fixes/small_blade_parial_fixes
...
Small blade parial fixes
2023-04-15 21:04:35 -07:00
snipe
589f7fa183
Larger qty box
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 21:03:09 -07:00
snipe
9ff62c966e
Check for $item (matters mostly in custom report blade)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 21:03:00 -07:00
snipe
86b04c7294
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 20:50:36 -07:00
snipe
2d03ea943b
Applied webpack change from master to develop
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 20:49:34 -07:00
snipe
20ab412e1e
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 20:45:35 -07:00
snipe
513b95e8d7
Merge pull request #12768 from snipe/snyk-upgrade-291b556667d6ffe966495405775b3255
...
[Snyk] Upgrade tableexport.jquery.plugin from 1.26.0 to 1.27.0
2023-04-15 20:44:57 -07:00
snipe
50153717f6
Merge pull request #12798 from snipe/snyk-upgrade-cec198178187b64d2348f74ddc10c797
...
[Snyk] Upgrade webpack from 5.76.1 to 5.76.2
2023-04-15 20:36:48 -07:00
snipe
32030c4f71
Merge remote-tracking branch 'origin/develop'
2023-04-15 18:44:25 -07:00
snipe
955539807c
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components
...
Added supplier to components and consumables
2023-04-15 18:42:23 -07:00
snipe
8c09226b76
Merge pull request #12834 from marcusmoore/mxm/improve-test-setup
...
Introduced improved way to interact with settings in tests
2023-04-15 18:37:34 -07:00
snipe
b73aed2b69
Merge remote-tracking branch 'origin/develop'
2023-04-15 18:30:21 -07:00
snipe
b9a5a8a500
Merge pull request #12843 from snipe/fixes/temp_fix_seeder
...
Temp fix for the seeders
2023-04-15 18:30:00 -07:00
snipe
8ae14c43f3
This is a temp fix for the seeders
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 18:27:53 -07:00
snipe
fc7f1f907d
Fixed variable name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 17:37:25 -07:00
snipe
f6cfec1e49
Merge pull request #12842 from snipe/fixes/take_two_better_handling_limits
...
Use abs() instead of max
2023-04-15 17:33:12 -07:00
snipe
4cbb9c2409
Use abs() instead of max
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-15 17:28:25 -07:00
snipe
a97b2d141d
Merge pull request #12827 from snipe/fixes/tighter_handling_of_offset_and_limit
...
Better handling for weird data passed to the API via limit and offset
2023-04-15 16:52:33 -07:00
snipe
f407a551da
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2023-04-15 16:48:07 -07:00
snipe
36665fde31
Merge pull request #12833 from svpernova09/bump-dockerfile-22-04-php81
...
Update Dockerfile to Ubuntu 22.04 and PHP 8.1
2023-04-14 17:16:42 -07:00
Joe Ferguson
785d2f3558
Update alpine Dockerfiles to PHP 8.1 and Snipe-IT v6.1.0
2023-04-14 13:35:36 -05:00
Joe Ferguson
1d8a4ca090
Update Dockerfile to Ubuntu 22.04 and PHP 8.1
2023-04-14 07:59:16 -05:00
Marcus Moore
473241edca
Move initialization of settings to trait
2023-04-13 16:52:20 -07:00
Godfrey M
42f198ffed
fixes footer space when customized
2023-04-13 12:24:59 -07:00
Godfrey M
b16c062485
fixes partial
2023-04-13 12:05:59 -07:00
snipe
b690ed97d5
Fixed unclosed parens in translation file
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 12:05:06 -07:00
Godfrey M
ab67d903b5
adds multi select to custom report for companies
2023-04-13 12:02:11 -07:00
snipe
2fe7fcecdb
Added case switch for sorting on suppliers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:13:45 -07:00
snipe
d2b3e251ad
Added counters to API controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:12:16 -07:00
snipe
07c0a1927b
Added supplier id to controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:12:01 -07:00
snipe
ab7c75232b
Added supplier to transformers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:10:51 -07:00
snipe
6e183f2ced
Added counters for consumables and components
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:10:32 -07:00
snipe
6097d534e9
Added eloquent model relationships
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:10:16 -07:00
snipe
3aac8bccd2
Added presenters for suppliers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:09:59 -07:00
snipe
e7c6771e73
Added supplier to components and consumables factories for seeding
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:07:22 -07:00
snipe
45142c6888
Migration to add supplier ID to components and consumables
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:06:49 -07:00
snipe
607ab3988a
Added supplier to edit/creatre blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:06:07 -07:00
snipe
b6d3f2827b
Switched to standardized require check
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:05:52 -07:00
snipe
65bb0486d4
Changed blade to use standard required check
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:04:29 -07:00
snipe
a40bad0972
Added consumables and components columns to supplier list
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:04:13 -07:00
snipe
6eed89df91
Added components and consumables tab to suppliers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-13 11:03:26 -07:00
Godfrey M
d476f0de3a
forgot dark blue
2023-04-13 10:34:17 -07:00
Godfrey M
bbb4032050
fixes rest of dark mode themes
2023-04-13 10:32:42 -07:00
Godfrey M
b83daea265
fixes dark orange
2023-04-13 10:27:38 -07:00
Marcus Moore
7c95e45178
Introduce trait to conditionally interact with settings
2023-04-12 17:28:47 -07:00
Godfrey M
46ff738494
fixes the notification dropdown menu
2023-04-12 16:12:48 -07:00
akemidx
0a993b2aa1
added external link icon to warranty link
2023-04-12 18:52:21 -04:00
Godfrey M
cbb25025d5
fixes pagination for rest of skins
2023-04-12 15:41:04 -07:00
Godfrey M
f3d12351a6
fixes paginiation for black-dark
2023-04-12 15:23:56 -07:00
Godfrey M
2d27f0155a
targeting paginiation
2023-04-12 15:06:06 -07:00
slong753
8b9aea8874
very much WIP, but dupe queries reduced
...
but i think this can be cleaned up a bit more
2023-04-12 14:46:48 -05:00
snipe
112a04b108
Better handle weird data passed to the API via limit and offset
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-12 11:28:46 -07:00
snipe
9a37273750
Merge remote-tracking branch 'origin/develop'
2023-04-12 08:28:50 -07:00
snipe
1a7201d3d9
Merge pull request #12826 from snipe/fixes/added_invalid_parse_to_dont_report
...
Added invalid parse to dontReport
2023-04-12 08:28:26 -07:00
snipe
74babfa081
Added maxlength="10"
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-12 08:26:36 -07:00
snipe
04f83d34ff
Added withInput to carry over older fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-12 08:25:03 -07:00
snipe
aac76d40fe
Merge remote-tracking branch 'origin/develop'
2023-04-12 06:37:01 -07:00
snipe
14ec96cf45
Merge pull request #12825 from snipe/fixes/wrong_button_string_on_bulk_user_edit
...
Fixed #12822 - Missing translation on bulk edit user submit button
2023-04-12 06:36:39 -07:00
snipe
0f3702b0fc
Fixed incorrect translation string for bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-12 06:35:28 -07:00
snipe
0e93a9229d
Merge remote-tracking branch 'origin/develop'
2023-04-12 06:32:06 -07:00
snipe
a119484277
Merge pull request #12824 from snipe/fixes/radio_button_submit_on_merge_users
...
Removed iCheck code from merge users script
2023-04-12 06:31:43 -07:00
snipe
89b031d64d
Removed iCheck code from merge users script
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-12 06:30:52 -07:00
snipe
9ae9ea7f68
Merge remote-tracking branch 'origin/develop'
2023-04-12 04:36:30 -07:00
snipe
d3d464e179
Improved commenting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-12 04:36:05 -07:00
snipe
28e0891645
Merge remote-tracking branch 'origin/develop'
2023-04-11 23:36:59 -07:00
snipe
c02bd54826
Merge pull request #12818 from snipe/fixes/better_error_handling_on_dates
...
Check for Carbon exception
2023-04-11 23:36:42 -07:00
snipe
afd01869a5
Check for Carbon exception
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-11 23:35:41 -07:00
akemidx
2453913080
dynamic link w/ dynamic image
2023-04-11 14:53:44 -04:00
akemidx
71ff987e3c
dynamic link w/ dynamic image
2023-04-11 14:32:11 -04:00
akemidx
a65b8025b6
push for testing
2023-04-11 13:53:56 -04:00
akemidx
968701b971
starting to implant the str lower solution
2023-04-10 17:28:19 -04:00
snipe
22336da362
Merge remote-tracking branch 'origin/develop'
2023-04-09 14:08:03 -07:00
snipe
79a8effa25
Merge pull request #12810 from snipe/fixes/maintain_checkbox_state_on_user
...
Maintain activated state on editing a user
2023-04-09 14:07:41 -07:00
snipe
70ce0d9ee6
Maintain activated state on editing a user
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-09 14:06:29 -07:00
snipe
b3fab6d47d
Merge remote-tracking branch 'origin/develop'
2023-04-07 10:47:48 -07:00
snipe
b886f57d92
Merge pull request #12807 from snipe/fixes/handle_arrays_on_validation_failure
...
Echo out the array values in withInput()
2023-04-07 10:47:15 -07:00
snipe
19d5d34ffb
Echo out the array values in withInput()
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-07 10:16:35 -07:00
snipe
b09b562f3a
Merge remote-tracking branch 'origin/develop'
2023-04-07 09:46:02 -07:00
snipe
42eef7eb3f
Merge pull request #12803 from snipe/fixes/small_component_fixes
...
Small component UI/validation/API fixes
2023-04-07 09:45:36 -07:00
snipe
baf267e2e9
Small cleanups
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-07 09:45:16 -07:00
snipe
cb76815e8b
Removed if check on assets, since that’s already handled via validation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-07 09:42:31 -07:00
snipe
42a60a9ccb
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-04-07 08:22:24 -07:00
snipe
734b888de4
Merge pull request #12804 from insert-waffle/remove-unnecessary-vulgar-text
...
Remove "FARTS" from bpay.blade.php
2023-04-07 08:19:40 -07:00
Jens Maes
c42078ea4a
Update bpay.blade.php
...
Removed FARTS from the file. This was shown in production on the master branch.
2023-04-07 10:15:34 +02:00
snipe
4c88c751ef
Code cleanup, better validation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 22:03:40 -07:00
snipe
358b0548fa
Added string for translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 22:03:26 -07:00
snipe
43ad0f58b5
SLightly cleaner layout - still needs work
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 22:03:15 -07:00
snipe
0abb993600
General cleanup and standardization for component API
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 22:02:57 -07:00
snipe
87c7d1aaca
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 20:43:42 -07:00
snipe
1ee1cf1d78
Merge pull request #12802 from snipe/fixes/consumables_checkout_when_0_qty
...
Check for available quantity on consumables before checkout
2023-04-06 20:39:57 -07:00
snipe
4840046f44
Check for available quantity on consumables before checkout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 20:38:02 -07:00
snipe
0414954d3e
Merge pull request #12801 from snipe/translations/updated_for_v6.1.0
...
Translations/updated for v6.1.0
2023-04-06 19:58:41 -07:00
snipe
574b0184fc
Updated Zulu
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:57:35 -07:00
snipe
9db5e328c9
Updated Chinese Traditional
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:57:28 -07:00
snipe
0a77216b6f
Updated Chinese Traditional, Hong Kong
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:57:03 -07:00
snipe
44b4274a49
Updated Chinese Simplified
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:56:43 -07:00
snipe
7711540514
Updated Vietnamese
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:55:47 -07:00
snipe
4d7b2b5747
Updated Urdu (Pakistan)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:55:06 -07:00
snipe
6f92144b96
Updated Ukrainian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:54:41 -07:00
snipe
8446f456ab
Updated Turkish
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:54:06 -07:00
snipe
d5b4971371
Updated Tagalog
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:53:35 -07:00
snipe
0686e1e7c4
Updated Thai
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:52:36 -07:00
snipe
6143f28bb9
Updated Tamil
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:52:03 -07:00
snipe
0e2dd5d76c
Updated Swedish
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:51:37 -07:00
snipe
eae5e7b35d
Updated Serbian (Latin)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:51:15 -07:00
snipe
4f8dc54872
Updated Slovenian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:50:34 -07:00
snipe
81129ed91f
Updated Slovak
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:49:54 -07:00
snipe
48dff4681b
Updated Sinhala
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:48:25 -07:00
snipe
40bb5bb4f0
Updated Russian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:47:56 -07:00
snipe
51f1ad6693
Updated Romanian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:46:22 -07:00
snipe
ca49923371
Updated Portuguese, European
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:45:54 -07:00
snipe
d9d3d11cc6
Updated Portuguese, Brazilan
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:45:42 -07:00
snipe
b7537a73b2
Updated Polish
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:45:10 -07:00
snipe
98aa8623d3
Updated Norwegian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:44:48 -07:00
snipe
aa9420cbad
Updated Dutch
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:44:15 -07:00
snipe
9b7ab63277
Updated Malay
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:43:38 -07:00
snipe
d588b2905d
Updated Mongolian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:43:12 -07:00
snipe
c176f3d030
Updated Malayalam
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:42:40 -07:00
snipe
173e2add88
Updated Macedonian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:42:14 -07:00
snipe
359d8d0e08
Updated Maori
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:41:36 -07:00
snipe
2ea03f66a2
Updated Latvian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:40:55 -07:00
snipe
d2301dae63
Updated Lithuanian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:40:21 -07:00
snipe
e24a9ccf1c
Updated Korean
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:39:35 -07:00
snipe
227d7e75a3
Updated Japanese
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:38:59 -07:00
snipe
8befc23178
Updated Inuktitut
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:38:17 -07:00
snipe
9eac3c2e64
Updated Italian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:37:42 -07:00
snipe
4c220df181
Updated Icelandic
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:36:58 -07:00
snipe
0703d037d6
Updated Indonesian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:35:48 -07:00
snipe
28498857c2
Updated Hungarian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:35:12 -07:00
snipe
7c4e73d660
Updated Croatian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:34:31 -07:00
snipe
c42c9cc832
Updated Hebrew
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:33:41 -07:00
snipe
7cebbf48ee
Updated Irish
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:32:55 -07:00
snipe
70745952b9
Updated French
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:32:12 -07:00
snipe
807509030c
Updated Filipino
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:27:32 -07:00
snipe
0a673f4ffe
Updated Finnish
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:27:01 -07:00
snipe
f1caf69f05
Updated Persian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:26:15 -07:00
snipe
86532746b1
Updated Estonian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:25:35 -07:00
snipe
94035e5e4b
Updated Spanish, Venezuela
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:24:19 -07:00
snipe
5a84a1d15c
Updated Spanish, Mexico
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:23:41 -07:00
snipe
48c924e0b2
Updated Spanish, Spain
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:23:16 -07:00
snipe
54deaf18d1
Updated Spanish, Colombia
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:22:57 -07:00
snipe
4f3617d271
Updated Indonesian English
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:21:43 -07:00
snipe
096be6e095
Updated British English
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:21:33 -07:00
snipe
02601a95e0
Updated Greek
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:20:09 -07:00
snipe
70653419cd
Updated German Informal
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:19:24 -07:00
snipe
8f258d8454
Updated German
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:18:50 -07:00
snipe
9f26a30256
Updated Danish
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:18:16 -07:00
snipe
0b392286ce
Updated Welsh
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:17:33 -07:00
snipe
5f56b30d19
Updated Czech
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:16:42 -07:00
snipe
ba7d8f1c07
Updated Catalan
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:15:38 -07:00
snipe
e391c1322c
Updated Bulgarian
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:14:50 -07:00
snipe
f634640425
Updated Arabic
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:13:56 -07:00
snipe
4bcc1c6aa9
Updated Amharic
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:12:55 -07:00
snipe
88b98e6cf7
Updated Afrikaans
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:11:43 -07:00
snipe
a9bb2f78cc
Fixed borked English string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 19:11:35 -07:00
snipe
a8ca3ad2a9
Merge remote-tracking branch 'origin/develop'
2023-04-06 18:49:51 -07:00
Marcus Moore
cd0796ddda
Allow Settings to be chainable
2023-04-06 18:46:29 -07:00
snipe
38a2f535ad
Merge pull request #12799 from snipe/features/bm_script
...
Added BM JS
2023-04-06 18:46:16 -07:00
snipe
d120fd2a16
Merge remote-tracking branch 'origin/develop'
2023-04-06 18:42:22 -07:00
snipe
6b319bffff
Merge pull request #12800 from snipe/fixes/accessories_checkout
...
Fixed accessories verifying that enough remain to be checked out
2023-04-06 18:42:01 -07:00
snipe
ffdc0d76f7
Fixed accessories verifying that enough remain to be checked out
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 18:40:29 -07:00
Marcus Moore
9561b66613
Add return types and docblock
2023-04-06 17:58:53 -07:00
Marcus Moore
95f195046d
Move cache flush to testing helper
2023-04-06 17:50:24 -07:00
Marcus Moore
52c733b31d
Add ability to set provided settings
2023-04-06 17:48:23 -07:00
Marcus Moore
8ac4d3aeea
Move to a static constructor
2023-04-06 17:42:15 -07:00
Marcus Moore
bbfb6c338a
Remove unused method
2023-04-06 17:28:16 -07:00
Marcus Moore
f767cc082f
Introduce improved way to interact with settings in tests
2023-04-06 17:27:18 -07:00
snipe
74b471bbad
Check for more specifics in env vars
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 16:24:46 -07:00
snipe
6ff3745adf
Added BM JS
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 16:19:33 -07:00
snipe
3d26fbd82f
Merge remote-tracking branch 'origin/develop'
2023-04-06 15:13:13 -07:00
snipe
383d48fd9c
Merge pull request #12787 from Godmartinz/accessory_unavailable_message
...
Added unavailable message to prevent over-checkout of Accessories
2023-04-06 15:05:18 -07:00
snipe
c683233aa3
Updated production assets
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2023-04-06 15:00:38 -07:00
snipe
bd4757ad7a
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css
...
Move from iCheck to pure CSS for radio and checkboxes
2023-04-06 14:58:33 -07:00
snipe
3d29748f7d
Merge remote-tracking branch 'origin/develop'
2023-04-06 13:11:45 -07:00
Godfrey M
3d7c55deb3
removed an unncessary query
2023-04-06 13:06:05 -07:00
akemidx
cc88a361ca
commiting
2023-04-06 15:01:01 -04:00
Godfrey M
55943d8897
uses numRemaining now
2023-04-06 10:05:17 -07:00
snipe
c1daac153b
Updated string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 09:17:47 -07:00
snipe
2a9f816bfe
Prevent wrapping on buttons
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 09:04:56 -07:00
snipe
506021dbe3
Remove iCheck calls, fixed some bootstrap HTML
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 09:03:41 -07:00
snipe
f90a6fed91
Downgraded error logging to debug
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-06 09:02:15 -07:00
snyk-bot
4c05da37c1
fix: upgrade webpack from 5.76.1 to 5.76.2
...
Snyk has created this PR to upgrade webpack from 5.76.1 to 5.76.2.
See this package in npm:
https://www.npmjs.com/package/webpack
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
2023-04-06 14:48:49 +00:00
snipe
39e6ca82bb
Merge pull request #12793 from snipe/fixes/use_app_url_more_consistently
...
Fixed #12772 - use the APP_URL config more consistently
2023-04-05 16:48:45 -07:00
snipe
161999fbca
Fixed #12772 - use the APP_URL config more consistently
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-05 16:05:40 -07:00
snipe
6aec73c720
Merge pull request #12792 from snipe/fixes/eol_size
...
Fixed #12776 - larger EOL field
2023-04-05 16:00:49 -07:00
snipe
5e6a6a81d5
Fixed #12776 - larger EOL text
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-05 16:00:02 -07:00
snipe
c24b398b6f
Merge pull request #12790 from snipe/fixes/support_url
...
Updated support URL
2023-04-05 14:55:41 -07:00
snipe
752365aa85
Updated support URL
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-05 14:54:40 -07:00
snipe
4b4d4e98b6
Use enclosing span for HTML text in grid
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-05 14:10:57 -07:00
slong753
830e3e5594
cleanup
2023-04-05 15:27:28 -05:00
slong753
d56a4e7173
cleanup+formatting
2023-04-05 15:16:46 -05:00
snipe
9af2d0a6de
Merge branch 'develop' into features/replace_icheck_with_only_css
2023-04-05 13:04:12 -07:00
snipe
2e45c4370c
Merge pull request #12782 from marcusmoore/chore/update-crowdin-config
...
Update CrowdIn configuration to allow nested translations
2023-04-05 12:59:20 -07:00
Marcus Moore
5b4d5cadf4
Add tests for sending webhooks on asset and license seat checkin
2023-04-05 12:57:53 -07:00
Marcus Moore
3054d633b0
Improve comments and remove unused imports
2023-04-05 12:39:41 -07:00
Marcus Moore
3cc3662992
Send webhook notifications for accessory checkins when enabled
2023-04-05 12:36:24 -07:00
Marcus Moore
2187310abb
Simplify test case names
2023-04-05 12:27:18 -07:00
Marcus Moore
b41902976b
Improve test class names
2023-04-05 12:23:11 -07:00
Marcus Moore
6df8f0f35c
Merge branch 'develop' into bug/sc-15034
2023-04-05 11:49:53 -07:00
Godfrey M
b038fe8f2e
adds unavailable message to overcheckout
2023-04-05 10:00:39 -07:00
slong753
3929526a57
ok, this works but needs to be tested more
2023-04-04 18:57:51 -05:00
Marcus Moore
32351d0e48
Allow downloading nested CrowdIn translations
2023-04-04 15:35:31 -07:00
akemidx
f5122b01b1
Mock Up of the Buttons
2023-04-04 15:51:04 -04:00
snipe
ead5293ee0
Merge pull request #12765 from spencerrlongg/chore/sc-20230
...
Change protected $dates to casts
2023-04-04 01:29:24 -07:00
snipe
b376181cef
Merge pull request #12769 from marcusmoore/chore/publish-test-stubs
...
Publishes test stubs
2023-04-04 01:28:47 -07:00
snipe
723ef36608
Merge pull request #12781 from snipe/fixes/color-picker-fix
...
Color picker UI fix
2023-04-04 00:34:07 -07:00
snipe
55857c910a
Color picker UI fix
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-04 00:33:05 -07:00
snipe
5919f3843d
Small fixes to the color picker (sorry)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-04 00:27:05 -07:00
snipe
6164e8b3fa
Changed colors for disabled, removed dupe checkmark
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 23:53:57 -07:00
snipe
0e68b8e9f2
Small fixes for profile edits
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 23:06:09 -07:00
snipe
3bd87a2785
Removed iCheck
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 22:52:54 -07:00
snipe
5df34d0058
Diable SAML submit if in demo mode
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 22:40:25 -07:00
snipe
9a3e727390
Updated other form fields to use new label class, fixed HTML for accessibility
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 22:38:56 -07:00
snipe
aca64dc088
Updated check groups for permissions to skip iCheck
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 22:38:24 -07:00
snipe
3473e24de5
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 22:36:23 -07:00
snipe
1af7cdb715
Wrapped the image delete into the existing image upload partial
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 22:35:55 -07:00
snipe
2c47b63e91
Small tweaks to overrides
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 19:37:07 -07:00
snipe
a7787a6cdc
Fixed string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 19:20:58 -07:00
snipe
62c99d4e2e
Added check all to user delete
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 19:19:28 -07:00
snipe
858f1c2d12
Updated audit with icheck, removed popover text - need a better solution with layout
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 19:19:12 -07:00
snipe
76b9608de3
Typo fix
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 19:18:40 -07:00
snipe
8b315a6502
Updated contrller to use trans_choice
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 18:55:09 -07:00
snipe
1ea813a1c5
Updated strings to trans_choice
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 18:54:59 -07:00
snipe
a861672146
Standardized model bulk blades a little more
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 18:54:46 -07:00
snipe
146976975c
Removed <wire:ignore> in model edit for default custom fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:38:34 -07:00
snipe
58b3369234
Requestable partial - removing icheck
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:38:12 -07:00
snipe
21448f6adf
Model edit - removing icheck
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:38:02 -07:00
snipe
899b936152
Models bulk edit - removing icheck
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:37:49 -07:00
snipe
866ba36090
Hardware editing un-icheckification
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:37:34 -07:00
snipe
60d60be0ac
Small style specification for notes partial field
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:37:16 -07:00
snipe
5ed9385685
Clearer tab name for user info
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:09:25 -07:00
snipe
c05ee5db0e
Built assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:08:54 -07:00
snipe
c5d74ac27f
Additional form CSS tweaks for disabled and unchecked
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:08:47 -07:00
snipe
9146850ffe
Added string for emailing user credentials
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:08:31 -07:00
snipe
2c5ddca695
More jquery and form fixes for users
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 17:08:21 -07:00
slong753
29e3d202fe
checking something, quick push
2023-04-03 17:54:31 -05:00
snipe
790f9c2fc4
Updated 2FA to non-icheck
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 15:38:52 -07:00
snipe
b4df9eb586
More checkbox tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 15:33:21 -07:00
snipe
0d050e4016
Updated user edit page with with non-icheck toggles
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 14:55:12 -07:00
snipe
4035cd118e
Handle the column selector in bs table styling
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 14:35:47 -07:00
snipe
5c89439ba3
Updated login page to use non-icheck
...
TODO: override that style for the labels
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 12:18:18 -07:00
snipe
85c0ddf475
Tweaked the col-md to use offset
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 12:17:49 -07:00
snipe
868615d5e7
Removed iCheck from snipeit.js and webpack
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 12:17:31 -07:00
snipe
5078b51d4d
Removed temp disabled attributes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 11:39:02 -07:00
snipe
e066f033c8
First attempt at moving us away from iCheck
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 10:54:01 -07:00
snipe
2d9ff795e3
Add @mezzle as a contributor
2023-04-02 09:00:03 -07:00
Marcus Moore
524249d4d7
Implement tests for webhook notifications on accessory checkout
2023-03-30 16:58:16 -07:00
Marcus Moore
44e05eecbf
Publish test stubs
2023-03-30 16:42:59 -07:00
Marcus Moore
b2292db3c8
Implement tests for webhook notifications on consumable checkout
2023-03-30 16:40:53 -07:00
Marcus Moore
aefc53cfcf
Explicitly disable webhook settings in tests
2023-03-30 16:40:21 -07:00
Marcus Moore
621d8500eb
Merge branch 'develop' into bug/sc-15034
2023-03-30 16:17:42 -07:00
snyk-bot
91c67c3116
fix: upgrade tableexport.jquery.plugin from 1.26.0 to 1.27.0
...
Snyk has created this PR to upgrade tableexport.jquery.plugin from 1.26.0 to 1.27.0.
See this package in npm:
https://www.npmjs.com/package/tableexport.jquery.plugin
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
2023-03-30 22:55:38 +00:00
Marcus Moore
134ab631d4
Add test to ensure notification is not sent for license checkouts if not enabled
2023-03-30 15:38:22 -07:00
Marcus Moore
158e1544cd
Test the event instead of the checkout
2023-03-30 15:38:00 -07:00
snipe
fcda478712
Merge remote-tracking branch 'origin/develop'
2023-03-30 14:51:23 -07:00
snipe
986c73982e
Check if status is set
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-30 14:50:56 -07:00
snipe
080a4c823b
Merge remote-tracking branch 'origin/develop'
2023-03-30 14:49:19 -07:00
snipe
ed8535a197
Merge pull request #12767 from snipe/fixes/bulk_restore
...
Quick fix for bulk restore menu
2023-03-30 14:48:43 -07:00
snipe
1fc0a0f94d
Quick fix for bulk restore menu
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-30 14:44:38 -07:00
snipe
048be49c14
Merge remote-tracking branch 'origin/develop'
2023-03-30 14:37:47 -07:00
snipe
cfef9d8cca
Merge pull request #12763 from inietov/fixes/call_to_member_function_licenses_on_null
...
Fixed Call to a Member Function Licenses() on null [sc-20606]
2023-03-30 14:20:13 -07:00
snipe
dfa9c07217
Merge pull request #12760 from akemidx/apple_warranty_link_fix2
...
Updating Apple warranty link to match current Apple webpage
2023-03-30 12:47:09 -07:00
akemidx
0c38257f80
fixing one liner
2023-03-30 15:40:23 -04:00
snipe
9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304
...
Bulk Restore from Deleted
2023-03-30 12:37:50 -07:00
slong753
0f72554a9f
translations for messages
2023-03-30 13:57:18 -05:00
slong753
382d849ee1
added catch for no assets selected
2023-03-30 13:52:29 -05:00
slong753
b84eaaf61a
translations done
2023-03-30 13:48:05 -05:00
slong753
8c1c0e81b6
rm deplicates
2023-03-30 13:31:58 -05:00
snipe
b7c09042b0
Merge pull request #12758 from inietov/fixes/call_to_member_function_present_null
...
Fixed Call to a member function present() on null [sc-20594]
2023-03-30 11:01:38 -07:00
snipe
10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix
...
Fixes potential unwanted overwrites in asset imports
2023-03-30 09:40:58 -07:00
slong753
e126a75f7a
pretty sure this was it
2023-03-29 21:37:26 -05:00
Ivan Nieto Vivanco
d10b7fd6af
Use firstorfail on eloquent query to return error if asset is not found
2023-03-29 19:11:28 -06:00
slong753
d5d50264c3
fix permissions stuff + optional parameter
2023-03-29 19:53:04 -05:00
Ivan Nieto Vivanco
d622dbb943
Revert the php codeblock and replace it with a ternary
2023-03-29 18:37:47 -06:00
snipe
da940a6bcc
Merge remote-tracking branch 'origin/develop'
2023-03-29 17:19:50 -07:00
Marcus Moore
6beb3b551a
Fix typo
2023-03-29 17:01:24 -07:00
Marcus Moore
0998c70a92
Remove unneeded import
2023-03-29 16:59:26 -07:00
Marcus Moore
9f8b8f6cc1
Remove unneeded variable
2023-03-29 16:58:55 -07:00
slong753
d033733fc0
oops, remove a couple things
2023-03-29 18:30:39 -05:00
slong753
e4c76f454c
this is good, just needs translations done in view
2023-03-29 18:24:56 -05:00
slong753
162b70d5a9
wireframed, needs a view and should work
2023-03-29 17:34:36 -05:00
Marcus Moore
863a346d6e
Translate strings
2023-03-29 13:37:14 -07:00
Marcus Moore
e05546d1fa
Display helpful messages when importing assets
2023-03-29 13:23:45 -07:00
slong753
b0fa298d8f
delete a couple things
2023-03-29 15:14:48 -05:00
slong753
65bbecd145
this all works - could use some eyes
2023-03-29 14:46:31 -05:00
akemidx
6bee4c1a75
Updating Apple warranty link to match current Apple webpage
2023-03-29 15:09:14 -04:00
Marcus Moore
4cbe683a1a
Explicitly cast asset tag to string when querying
2023-03-29 11:28:04 -07:00
Marcus Moore
9cc74caa9e
Add wire:model to import form checkboxes
2023-03-29 10:58:25 -07:00
Ivan Nieto Vivanco
d7c531e1c7
Checks if user variable exist before using its properties
2023-03-29 10:33:15 -06:00
Dominik Both
3271c9dc9f
Fix #8208 , #8896 , #8985 , #9789
2023-03-29 09:56:34 +02:00
slong753
032ae4348e
custom fields display, need to get saving
...
+some clean up
2023-03-28 21:45:31 -05:00
slong753
804a788a27
initial fetch working
2023-03-28 20:31:24 -05:00
snipe
c9d1274edc
Merge pull request #12753 from snipe/fixes/lang_for_group_not_found
...
Fixes/lang for group not found
2023-03-28 16:45:22 -07:00
snipe
32922e6461
Use corrected language string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 16:39:52 -07:00
snipe
527c812d04
Use icon for group users header
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 16:39:41 -07:00
snipe
b57b5e23d9
Merge pull request #12752 from inietov/fixes/attempt_to_read_property_on_null
...
Fixed ErrorException: Attempt to read property "rtd_location_id" on null [sc-20562]
2023-03-28 16:32:34 -07:00
snipe
94de9edce7
Merge pull request #12751 from snipe/features/added_snipeagent_link
...
Added link to SnipeAgent
2023-03-28 16:27:03 -07:00
snipe
88826c1115
Added link to SnipeAgent
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 16:26:27 -07:00
Ivan Nieto Vivanco
77d513f80b
Assign target variable as the other checkout types
2023-03-28 17:25:57 -06:00
Ivan Nieto Vivanco
d70b7dbf41
Checks if exist on API checkout
2023-03-28 16:12:48 -06:00
snipe
70764cc783
Merge remote-tracking branch 'origin/develop'
2023-03-28 14:27:14 -07:00
snipe
2306f30158
Updated author link to @Karpadiem
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 14:26:59 -07:00
snipe
99a05c6401
Merge remote-tracking branch 'origin/develop'
2023-03-28 13:43:24 -07:00
snipe
667a5a9274
Merge pull request #12750 from snipe/features/added_kandji_and_unifi_links
...
Added links to kandji2snipe and UnifiSnipeSync
2023-03-28 13:42:40 -07:00
snipe
a0eb9dc735
Added links to kandji2snipe and UnifiSnipeSync
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 13:41:58 -07:00
snipe
e03a961bcc
Merge pull request #12747 from svpernova09/preflight-strings
...
Pre-Flight String fixes for step 2
2023-03-28 08:37:43 -07:00
Joe Ferguson
47e18db172
Fix next button string for Step 2 preflight
2023-03-28 10:30:56 -05:00
Joe Ferguson
d667ae53ed
Add missing strings to Step 2 preflight
2023-03-28 10:30:35 -05:00
snipe
03aadc4abf
Merge remote-tracking branch 'origin/develop'
2023-03-28 07:20:22 -07:00
snipe
099173fb94
Merge pull request #12744 from snipe/fixes/12742_wrong_url_on_requestable_models
...
Use named route with params
2023-03-28 07:19:49 -07:00
snipe
09674c012c
Use named route with params
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 07:18:45 -07:00
snipe
c680274a92
Merge remote-tracking branch 'origin/develop'
2023-03-28 06:56:35 -07:00
snipe
52fd334745
Merge pull request #12743 from snipe/fixes/quieter_logging
...
Changed log level to debug vs info/error
2023-03-28 06:56:06 -07:00
snipe
feef06e7bf
Changed log level to debug vs info/error
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 06:54:41 -07:00
snipe
d2daaf30eb
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-03-28 03:32:04 -07:00
snipe
6800098469
Bumped version for 6.1.0-pre
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-28 03:31:02 -07:00
Marcus Moore
2cbc6276f7
Implement test for license checkout notification
2023-03-27 14:09:31 -07:00
Marcus Moore
362d5b9fd4
Merge branch 'develop' into bug/sc-15034
2023-03-27 11:46:30 -07:00
snipe
468805bab5
Merge pull request #12732 from svpernova09/preflight-translation-string-fixes
...
User preflight fix translation strings w/ bad path
2023-03-27 10:43:13 -07:00
Joe Ferguson
cd49f65c0b
User preflight fix translation strings w/ bad path
2023-03-24 15:27:08 -05:00
snipe
dcbd216e2c
Merge remote-tracking branch 'origin/develop'
2023-03-24 08:29:22 -07:00
snipe
008ba83128
Merge pull request #12729 from snipe/fixes/file_importer_string
...
Fixed translation string for importer
2023-03-24 08:28:51 -07:00
snipe
697cb4fe6d
Fixed translation string for importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-24 08:27:53 -07:00
snipe
8a395d63a1
Merge remote-tracking branch 'origin/develop'
2023-03-24 07:23:06 -07:00
snipe
4d1e28ad03
Merge pull request #12727 from snipe/fixes/add_json_to_mimes
...
Fixed #12641 - added JSON to mimes
2023-03-24 07:22:30 -07:00
snipe
47eccb665e
Merge pull request #12728 from snipe/fixes/fixes_typo_in_category_list
...
Use single “accessory” translation
2023-03-24 07:19:59 -07:00
snipe
150a2b572e
Use single “accessory” translation
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-24 07:14:02 -07:00
snipe
6bc0df73e8
Merge pull request #12661 from Godmartinz/gh12655_missing_translations
...
Adds translations for category types to index and edit of categories
2023-03-24 07:09:40 -07:00
snipe
16dcc2d3ed
Fixed #12641 - add JSON to mimes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-24 06:57:43 -07:00
snipe
43c286c61f
Merge remote-tracking branch 'origin/develop'
2023-03-24 06:18:10 -07:00
snipe
aa4bdd4eb3
Merge pull request #12726 from snipe/fixes/12724_custom_fields
...
Fixed #12724 - fieldset not saving on model
2023-03-24 06:17:42 -07:00
snipe
e869b1fd53
Fixed #12724 - fieldset not saving on model
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-24 06:11:24 -07:00
snipe
13ad69ee75
Merge pull request #12713 from inietov/fixes/trying_access_array_offset_null
...
Fixed Trying to access array offset on value of type null [sc-20528]
2023-03-24 04:52:56 -07:00
snipe
642d1e9f36
Merge pull request #12720 from inietov/fixes/undefined_array_key_266
...
Fixed Undefined array key 266 rollbar 17086
2023-03-24 04:50:47 -07:00
snipe
3792d3fdd2
Merge pull request #12721 from marcusmoore/fixes/allow-migrating-sqlite
...
Fixes the migration of sqlite databases
2023-03-24 04:50:15 -07:00
Marcus Moore
317335e79f
Allow the migration of sqlite databases
2023-03-23 17:40:03 -07:00
Marcus Moore
fa69a580ab
Start to scaffold license checkout notification test
2023-03-23 17:18:33 -07:00
Marcus Moore
fc043a35d9
Fix checkouts for licenses
2023-03-23 17:03:48 -07:00
Marcus Moore
25e859c866
Simplify test case
2023-03-23 16:42:21 -07:00
Marcus Moore
2dcf4e3d16
Standardize on sending anonymous notifications for asset checkouts
2023-03-23 16:31:40 -07:00
Marcus Moore
1f664709ba
Merge branch 'develop' into bug/sc-15034
...
# Conflicts:
# app/Notifications/CheckoutAssetNotification.php
2023-03-23 13:04:40 -07:00
Ivan Nieto Vivanco
fbb3684022
Add a condition to 'restart' the color index for the status pie chart
2023-03-23 12:43:02 -06:00
snipe
b91e914a61
Merge remote-tracking branch 'origin/develop'
2023-03-23 10:55:58 -07:00
snipe
fc3672c119
Merge pull request #12717 from marcusmoore/fixes/update-slack-property-names
...
Fixes calls to changed webhook properties names
2023-03-23 10:55:02 -07:00
Marcus Moore
9d2c4a4dee
Update webhook message
2023-03-23 10:38:35 -07:00
Marcus Moore
fe6295a5e4
Update slack_* properties to webhook_*
2023-03-22 14:43:00 -07:00
Ivan Nieto Vivanco
aa8dfcf89f
Added a ternary to avoid null offset in array
2023-03-22 13:48:23 -06:00
Marcus Moore
b396f2bed3
Update test case names
2023-03-22 12:41:30 -07:00
Marcus Moore
28ced46b9d
Clean up test code
2023-03-22 12:38:14 -07:00
Marcus Moore
66224765ea
Use factory state for webhook settings
2023-03-22 12:31:47 -07:00
Marcus Moore
9c4a3ce56a
Update slack_endpoint to webhook_endpoint in test and notification
2023-03-22 12:27:36 -07:00
Marcus Moore
f6d0dd0f93
Merge branch 'develop' into bug/sc-15034
2023-03-22 11:58:47 -07:00
Marcus Moore
e303aeadd1
Fix test name
2023-03-22 11:56:54 -07:00
snipe
e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178
...
#20178 : Added Dell and Lenovo to warranty link function
2023-03-22 00:54:40 -07:00
snipe
58ea1592bb
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/livewire/slack-settings-form.blade.php
2023-03-22 00:26:15 -07:00
snipe
f3785acf4d
Merge pull request #12710 from snipe/localization/fixing_a_few_more_hardcoded_strings
...
Handled a few more hard-coded strings
2023-03-22 00:22:06 -07:00
snipe
545d023a18
Handled a few more hard-coded strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 23:56:07 -07:00
snipe
473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent
...
Livewire importer without subcomponent
2023-03-21 23:07:04 -07:00
snipe
e28d4fa588
Merge pull request #12709 from snipe/fixes/null_location_in_bulk_users
...
Ability to remove user location from users
2023-03-21 23:04:31 -07:00
snipe
e08327be95
Ability to remove user location from users
...
Rework of #9677 - sorry @godmartinez - I suck :(
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 23:03:57 -07:00
snipe
418ce75a9f
Merge pull request #11431 from ntbutler-nbcs/develop
...
[Fix / Minor Change] Asset checkinbytag now consistent with existingAPI
2023-03-21 22:40:21 -07:00
Brady Wetherington
6fe520a55d
Hooked various the contents of the components together
2023-03-21 22:26:32 -07:00
snipe
0418d390f0
Corrected width to 100%
...
I should not be allowed to touch computers
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 22:25:15 -07:00
snipe
b3d5bb75a3
Apply master patch to develop because I am an idiot on the wrong branch
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 22:23:09 -07:00
snipe
5346ebba94
Make select2 list in slack settings not searchable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 22:21:21 -07:00
snipe
6c2c36469a
Merge remote-tracking branch 'origin/develop'
2023-03-21 22:18:53 -07:00
snipe
1fa9f80c03
Correctly disable the select2 in demo mode
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 22:18:42 -07:00
snipe
4efac7827b
Trying other save method, I guess?
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 22:10:30 -07:00
snipe
b45dc09f57
Merge pull request #12707 from snipe/fixes/fixed_migration_for_demo
...
Fixes back-in-time Slack v slack migration
2023-03-21 22:01:17 -07:00
snipe
76425ca2a5
Fixes back-in-time Slack v slack migration
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 21:59:17 -07:00
snipe
e609130291
Merge pull request #12706 from snipe/fixes/static_helper
...
Forgot the static method declaration - derp
2023-03-21 21:21:56 -07:00
snipe
41eb2464e2
Forgot the static method declaration - derp
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 21:21:01 -07:00
snipe
8aec28fad6
Merge remote-tracking branch 'origin/develop'
2023-03-21 21:14:06 -07:00
snipe
e55fc4d047
Merge pull request #12705 from snipe/fixes/webhook_ui
...
Slack webhook UI tweaks, added select2
2023-03-21 21:11:14 -07:00
snipe
e40762cf7f
Small anal-retentive spacing/indenting tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 21:00:43 -07:00
snipe
2d3ddd1c7a
Fixed default value for webhook_selected
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 20:56:08 -07:00
snipe
637438ccf6
Added select2 to slack settings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 20:00:11 -07:00
snipe
647f47cdfe
Check for demo mode in the clear method for the controller
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 19:27:05 -07:00
snipe
a14d1b981d
Switched singleton to static helper method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 19:22:18 -07:00
snipe
5217141dfb
Yuck, but added helper function to return the demo mode form warning
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 18:59:34 -07:00
snipe
b28a25f544
Normalize the flash session to the way we do it elsewhere
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 18:59:18 -07:00
snipe
d55ae44638
Helper method to make it easier (shorter) to determine if the app is in demo mode
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 18:59:03 -07:00
snipe
f29e813332
Translated “Clear & Save”
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 18:58:35 -07:00
snipe
d883084830
Fixed some funky HTML tags
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 18:58:26 -07:00
snipe
658252125e
Added new partial for the form inline “demo mode”
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 18:57:27 -07:00
Marcus Moore
315f5231cd
Send slack notification for check outs to assets and locations
2023-03-21 17:03:51 -07:00
snipe
35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up
...
adds clear and save button, save button updates accordingly
2023-03-21 17:02:33 -07:00
snipe
342b399191
Merge pull request #12700 from marcusmoore/fixes/purify-factories
...
Purifies model factories
2023-03-21 16:52:30 -07:00
Godfrey M
2754277068
adds csrf token and missing divs
2023-03-21 16:12:46 -07:00
snipe
4cc29b76f0
Merge remote-tracking branch 'origin/develop'
2023-03-21 16:07:03 -07:00
snipe
7059a57be1
Merge pull request #12704 from snipe/features/next_audit_date
...
Added next audit date override in bulk asset edit
2023-03-21 16:02:37 -07:00
snipe
c229d69cec
Added next audit date override in bulk asset edit
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 16:01:41 -07:00
Godfrey M
3c28242a2e
save button updates accordingly
2023-03-21 15:53:09 -07:00
snipe
c41aa8ac7f
Merge pull request #12701 from snipe/features/add_default_location_to_maintenance_report
...
Fixed #12682 - add default location to maintenance report
2023-03-21 13:55:09 -07:00
snipe
ecb11c3a12
Fixed #12682 - add default location to maintenance report
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-21 13:52:21 -07:00
snipe
4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories
...
Clone accessories
2023-03-21 13:37:04 -07:00
akemidx
bb7b655fd2
translating screen reader lines
2023-03-21 16:02:34 -04:00
akemidx
3134279a95
small edits
2023-03-21 15:48:53 -04:00
Marcus Moore
751abe1438
Re-add asset factory states
2023-03-21 09:54:55 -07:00
Marcus Moore
d214bd0b06
Remove temporary command
2023-03-20 16:41:33 -07:00
Marcus Moore
3b16a65988
Merge branch 'develop' into fixes/purify-factories
2023-03-20 16:24:35 -07:00
Marcus Moore
918239961a
Add simple test case for assets
2023-03-20 15:47:57 -07:00
Marcus Moore
272cc1adac
Skip creating user when creating a setting since it isn't needed
2023-03-20 15:33:40 -07:00
Marcus Moore
16e3416225
Update test case
2023-03-20 14:27:45 -07:00
snipe
8012c966b0
Merge pull request #12696 from snipe/dependabot/github_actions/docker/build-push-action-4
...
Bump docker/build-push-action from 3 to 4
2023-03-20 14:19:44 -07:00
Marcus Moore
a0e547c7fb
Remove some unused imports
2023-03-20 14:18:59 -07:00
Marcus Moore
44a91f0a2b
Seed license checkouts
2023-03-20 14:18:54 -07:00
dependabot[bot]
4537ab3d54
Bump docker/build-push-action from 3 to 4
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-03-20 21:18:50 +00:00
snipe
05b4170116
Merge pull request #12694 from uberbrady/config_cachable_if_no_rollbar
...
Fixed #12671 : Re-enable config:cache when there's no Rollbar
2023-03-20 14:17:53 -07:00
Marcus Moore
92e0c59f89
Fix typo in Keyboard accessory name
2023-03-20 12:01:39 -07:00
Marcus Moore
1bad8e1fc2
Remove outdated comments
2023-03-20 11:42:15 -07:00
Marcus Moore
1fd574779b
Remove unneeded or outdated comments and update imports
2023-03-20 11:39:27 -07:00
Marcus Moore
a37d69fcf1
Replace remaining user_ids in factories
2023-03-20 11:19:34 -07:00
Brady Wetherington
3a4ca5acad
Re-enable config:cache *only* if there's no Rollbar
2023-03-18 21:07:00 -07:00
Brady Wetherington
704a2ad858
WIP: trying to merge two LW components into one, not working yet
2023-03-18 20:31:56 -07:00
snipe
3a30f04b51
Merge remote-tracking branch 'origin/develop'
2023-03-18 12:00:42 -07:00
snipe
f2a3c2a349
Merge pull request #12693 from snipe/fixes/use_statements
...
Updates the Gate “use” statement to be more specific
2023-03-18 12:00:23 -07:00
snipe
f9e190eb32
Updates the Gate “use” statement to be more specific
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-18 11:58:09 -07:00
snipe
de6b663833
Merge pull request #12692 from snipe/fixes/small_group_api_fixes
...
Corrected gates, added fillable
2023-03-18 11:56:15 -07:00
snipe
8dd3ae8a37
Corrected gates, added fillable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-18 11:53:20 -07:00
snipe
03b4a87a65
Merge remote-tracking branch 'origin/develop'
2023-03-18 00:16:34 -07:00
snipe
c7f4a93c17
Merge pull request #12691 from snipe/fixes/small_cleanup_for_bulk_delete_checkin
...
Small cleanup for bulk delete checkin
2023-03-18 00:16:15 -07:00
snipe
071a642509
Changed phrasing in translatons
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-18 00:15:28 -07:00
snipe
e39a75f2cc
Fixed min width on select2 bulk menus
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-18 00:14:57 -07:00
snipe
ea4a37d8ef
Fixed cancel button alignment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-18 00:14:09 -07:00
snipe
d7363a41c8
Merge remote-tracking branch 'origin/develop'
2023-03-17 17:30:32 -07:00
snipe
789c4b4df8
Merge pull request #12690 from snipe/features/more_merge_user_olish
...
More merge-user polishing
2023-03-17 17:29:12 -07:00
snipe
12a2d8ad49
Fixed admin ID
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 17:03:10 -07:00
snipe
e47fc9527b
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:50:02 -07:00
snipe
820ae09a6f
Reworked the layout of the confirm merge form a little
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:42:41 -07:00
snipe
fb54a21e12
Added strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:42:22 -07:00
snipe
b39fa1d987
Added merge icon
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:42:17 -07:00
snipe
28cc8f9d69
Nicer user history display
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:41:43 -07:00
snipe
a54e50961e
Added event and listener
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:41:33 -07:00
snipe
82dc57aa18
Renamed some variables, invoked the event listener
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:24:58 -07:00
snipe
9ac4efb912
Better commenting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 16:24:38 -07:00
snipe
a4e6b3c022
Merge remote-tracking branch 'origin/develop'
2023-03-17 02:48:51 -07:00
snipe
c752e3bb86
Fixed divs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 02:48:41 -07:00
snipe
934f43e104
Merge remote-tracking branch 'origin/develop'
2023-03-17 02:45:04 -07:00
snipe
1a8622dc3b
Merge pull request #12689 from snipe/features/add_password_lock_and_use_new_strings
...
Features/add password lock and use new strings
2023-03-17 02:44:37 -07:00
snipe
e557f03cc2
Disable submit if app is locked
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 02:43:33 -07:00
snipe
30cf7eb750
Disallow action in demo mode
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-17 02:42:50 -07:00
snipe
ccdd6ef5e0
Merge remote-tracking branch 'origin/develop'
2023-03-16 23:14:47 -07:00
snipe
13a02ff241
Merge pull request #12687 from snipe/features/nicer_ui_for_merge
...
Made the table wider, used icons to compact space
2023-03-16 23:14:25 -07:00
snipe
c93096b767
Made the table wider, used icons to compact space
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 23:13:05 -07:00
snipe
94a275f239
Merge remote-tracking branch 'origin/develop'
2023-03-16 22:50:11 -07:00
snipe
d8d7ed4465
Merge pull request #12686 from snipe/features/added_email_and_username_to_merge_confirm
...
Added email and username to merge user confirmation screen
2023-03-16 22:49:54 -07:00
snipe
736777e1e6
Added email and username to merge user confirmation screen
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 22:48:20 -07:00
Marcus Moore
3849bb838d
Make a few more factories a bit more pure
2023-03-16 18:29:51 -07:00
snipe
0ef8aba36f
Merge remote-tracking branch 'origin/develop'
2023-03-16 18:20:57 -07:00
snipe
f566a71658
Merge pull request #12685 from snipe/features/merge_users
...
Added user merge
2023-03-16 18:20:24 -07:00
snipe
0dd11575c5
Added merge controller
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 18:19:16 -07:00
snipe
d3d26cb988
Added translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 18:19:03 -07:00
snipe
07fbbf5f7f
Added merge to user menu
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 18:18:54 -07:00
snipe
0dfb51f642
User merge blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 18:18:32 -07:00
snipe
853e809ff8
Added route
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 18:18:26 -07:00
Marcus Moore
605f214597
Add properties necessary for factories to be called in isolation
2023-03-16 17:08:18 -07:00
Marcus Moore
d9c1a548f1
Update deprecated faker calls
2023-03-16 17:07:46 -07:00
Marcus Moore
582c3b987b
Update some faker calls
2023-03-16 16:38:21 -07:00
snipe
ffd9bbd7c6
Merge remote-tracking branch 'origin/develop'
2023-03-16 16:27:41 -07:00
snipe
ffb87a0a87
Merge pull request #12684 from snipe/features/added_console_command_to_normalize_names
...
Added console command to normalize capitalization on names
2023-03-16 16:24:33 -07:00
snipe
8f04342fc2
Added console command to normalize capitalization on names
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 16:23:52 -07:00
snipe
d6434fa55a
Merge pull request #12683 from snipe/fixes/additional_sort
...
Fixes/additional sort
2023-03-16 16:08:51 -07:00
snipe
b374834999
Added extra order by switch for first_name and last_name
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 16:07:51 -07:00
snipe
5e4455f042
Deleted duplicate statement
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-16 16:07:36 -07:00
Marcus Moore
f47a28f790
Actually remove unused methods
2023-03-16 15:40:16 -07:00
Marcus Moore
ca677038b0
Remove unused methods
2023-03-16 15:39:02 -07:00
Marcus Moore
a50ddb4a5d
Improve actionlog factory and seeder
2023-03-16 15:25:23 -07:00
Marcus Moore
daf6e9fa4b
Seed assets with randomized locations
2023-03-16 14:23:40 -07:00
Marcus Moore
31630e3677
Seed licenses with categories
2023-03-16 13:47:02 -07:00
Marcus Moore
2f0f9586b1
Remove default category relationship from license factory
2023-03-16 13:46:30 -07:00
Marcus Moore
a98cc01766
Seed users with departments
2023-03-16 13:25:35 -07:00
Marcus Moore
345946d6d4
Remove default department relationship from user factory
2023-03-16 13:25:02 -07:00
Marcus Moore
76861c0c30
Remove hard-coded manager_id in factory
2023-03-16 12:46:47 -07:00
Marcus Moore
7062b0acaa
Remove hard-coded supplier_id in factories
2023-03-16 12:41:34 -07:00
Marcus Moore
0ec885bf18
Remove hard-coded fieldset_id in factories
2023-03-15 18:49:21 -07:00
Marcus Moore
dfd6cf0d29
Improve factories for location relationships
2023-03-15 18:31:08 -07:00
snipe
b64d7e38f2
Merge pull request #12679 from snipe/bug/sc-20451
...
Handle already-deleted license files more gracefully
2023-03-15 16:26:15 -07:00
Godfrey M
371e142bae
removes unnecessary function
2023-03-15 15:57:45 -07:00
Marcus Moore
b944945377
Remove hard-coded company_id in factories and update seeders
2023-03-15 14:12:34 -07:00
akemidx
a8e2f72e25
accessory cloning, WITHOUT copying over the image.
2023-03-15 16:55:24 -04:00
snipe
e9601bcf13
Handle already-deleted license files more gracefully
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-15 13:05:51 -07:00
snipe
b89dcfbb8e
Merge remote-tracking branch 'origin/develop'
2023-03-15 12:55:55 -07:00
akemidx
0909d94c8f
actually added the icons haha
2023-03-15 15:07:07 -04:00
akemidx
68094b23b9
moved dell and levono icons to local machine
2023-03-15 15:02:33 -04:00
snipe
fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf
...
Datestamp on "Print All Assigned" generated form
2023-03-15 11:31:52 -07:00
akemidx
f38f6f57ae
fixed localization and formatting. simplified code to remove php snippet
2023-03-15 14:00:29 -04:00
akemidx
a3353b8496
committing
2023-03-15 13:48:22 -04:00
snipe
f463c02783
Merge remote-tracking branch 'origin/develop'
2023-03-14 19:56:26 -07:00
snipe
08e09a3215
Merge pull request #12675 from snipe/security/webpack_upgrade
...
Updated webpack
2023-03-14 19:55:42 -07:00
snipe
039a5dde7d
Updated webpack
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-14 19:54:58 -07:00
snipe
3b3bdb6535
Merge remote-tracking branch 'origin/develop'
2023-03-14 19:03:59 -07:00
snipe
1968aebf78
Merge pull request #12674 from snipe/fixes/translation_variable_for_slack
...
Fixed missing variable in Slack hook test
2023-03-14 19:03:42 -07:00
snipe
a0617edaf0
Fixed missing variable in Slack hook test
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-14 19:02:38 -07:00
snipe
723e4ebd15
Merge remote-tracking branch 'origin/develop'
2023-03-14 18:55:07 -07:00
Marcus Moore
fb789eb048
Remove hard-coded depreciation_id in factories
2023-03-14 17:51:20 -07:00
snipe
4c66267f3b
Merge pull request #12668 from inietov/fixes/undefined_array_key_0
...
Fixed ErrorException: Undefined array key 0 [sc-20424]
2023-03-14 17:10:04 -07:00
Marcus Moore
f7577bff52
Merge branch 'develop' into fixes/purify-factories
2023-03-14 17:09:30 -07:00
snipe
322fd76353
Merge pull request #12664 from Godmartinz/The_final_lowercase
...
The final lowercase in webhooks
2023-03-14 17:09:20 -07:00
snipe
c12d261fc8
Merge pull request #12673 from marcusmoore/fixes/fix-component-factory
...
Fixed Component factory
2023-03-14 17:05:38 -07:00
snipe
a991bdd136
Merge pull request #12672 from inietov/fixes/consumable_factory_seeder
...
Fixed Consumable Factory Seeder
2023-03-14 17:04:33 -07:00
Marcus Moore
9cd8460e1e
Add proper date format to purchase date in the component factory
2023-03-14 17:02:45 -07:00
Marcus Moore
72a61783a3
Inline two relationships in asset maintenance factory
2023-03-14 14:59:34 -07:00
snipe
f0d05a7461
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2023-03-14 14:34:11 -07:00
snipe
88624ff2c0
Add @marcusmoore as a contributor
2023-03-14 14:34:03 -07:00
snipe
f71ee699f4
Add @spencerrlongg as a contributor
2023-03-14 14:33:31 -07:00
snipe
ce83d3aec1
Merge pull request #12670 from spencerrlongg/bug/sc-20437
...
Catch Duplicate Headers in Asset History Import
2023-03-14 14:32:34 -07:00
slong753
60b70a4074
catch and redirect back with error
2023-03-14 16:07:09 -05:00
Marcus Moore
1ff094dd47
Remove hard-coded model_id in asset factory
2023-03-14 13:56:25 -07:00
Marcus Moore
ef8007a890
Remove hard-coded status_id in asset factory
2023-03-14 13:24:50 -07:00
akemidx
d50a5d1880
dell and lenovo icons/links added
2023-03-14 16:04:03 -04:00
Marcus Moore
a2efe3fa67
Remove hard-coded category_id in factories
2023-03-14 12:50:02 -07:00
akemidx
a9782b7e00
testing links
2023-03-14 15:26:44 -04:00
Marcus Moore
4c4101fe64
Fix key name
2023-03-14 12:04:31 -07:00
akemidx
9c5ee060d3
WIP string/int error
2023-03-14 15:01:56 -04:00
Marcus Moore
7cf424b914
Remove hard-coded manufacturer_id in factories
2023-03-14 12:01:23 -07:00
Marcus Moore
e8ff7cc09c
Remove hard-coded user_id in factories
2023-03-14 11:34:58 -07:00
snipe
dfd9fcc5e0
Merge pull request #12599 from inietov/fixes/unknown_column_0_in_field_list
...
Fixed Column not found: 1054 Unknown column '0' in 'field list' [sc-20004]
2023-03-14 09:51:42 -07:00
snipe
b83980299a
Merge pull request #12667 from snipe/fixes/small_livewire_ui_fixed
...
Small UI tweaks
2023-03-14 09:47:45 -07:00
snipe
5a709a83e7
Small UI tweaks
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-14 09:38:30 -07:00
Ivan Nieto Vivanco
66bb897ac4
Fix format to purchase date
2023-03-14 02:55:20 -06:00
Ivan Nieto Vivanco
67471a3a77
Evaluate if the collection is empty before access the array index
2023-03-13 21:44:06 -06:00
Marcus Moore
adba450b40
Remove some hard-coded ids in factories
2023-03-13 17:27:06 -07:00
snipe
7acf449ed3
Merge pull request #12665 from snipe/fixes/fixed_migration_for_smaller_chunking
...
Removed loading and reduced chunking to 10
2023-03-13 17:23:19 -07:00
Godfrey M
955d8313b2
the final lowercase
2023-03-13 17:14:02 -07:00
snipe
1b9c3c93ad
Removed loading and reduced chunking to 10
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-13 17:12:51 -07:00
snipe
a2667a7520
Merge pull request #12663 from Godmartinz/webhook_tweaks
...
fixes webhook variables to lowercase
2023-03-13 16:55:32 -07:00
Marcus Moore
099ec3f550
Remove creation of category within category factory state
2023-03-13 16:45:43 -07:00
Marcus Moore
6e6a021928
Add temporary command to display model counts
2023-03-13 16:44:47 -07:00
Godfrey M
1bd37b49e9
adds translations for webhook names
2023-03-13 16:13:02 -07:00
Marcus Moore
2813b7ea58
Scaffold tests for slack notification on checkout
2023-03-13 15:47:50 -07:00
Ivan Nieto Vivanco
d224f3177e
Delete a rule that was breaking validation
2023-03-13 16:43:10 -06:00
Godfrey M
6474249ea8
uppercased names
2023-03-13 15:29:53 -07:00
Godfrey M
7612c5d852
lowercases variables
2023-03-13 15:26:51 -07:00
Ivan Nieto Vivanco
e7b3daa80c
Adjust validator to only receive valid groups id's
2023-03-13 16:10:08 -06:00
snipe
477bd27cba
Merge pull request #12570 from Godmartinz/generalize_webhooks
...
Adds General option to the webhooks settings
2023-03-13 14:54:51 -07:00
Ivan Nieto Vivanco
e4204a6dd1
Adds validator to PATCH request in the API UsersController
2023-03-13 15:49:05 -06:00
Godfrey M
11bf3f5285
aligned inputs
2023-03-13 14:06:05 -07:00
Godfrey M
576b8f8c48
adds translations to edit and index of categories
2023-03-13 13:33:03 -07:00
snipe
cacb000693
Merge pull request #12660 from snipe/upgrades/bump_codacy
...
Bumped codacy workflow
2023-03-13 11:13:46 -07:00
snipe
4f772468e6
Bumped codacy workflow
...
Relates to #12657 but for develop
Signed-off-by: snipe <snipe@snipe.net >
2023-03-13 11:10:41 -07:00
Godfrey M
542332ea0c
removes discord from rules
2023-03-13 10:54:18 -07:00
Godfrey M
b6d105c4f4
removes help text from general integrations
2023-03-13 10:49:41 -07:00
Godfrey M
27a2ed5c79
Merge branch 'develop' into generalize_webhooks
2023-03-13 10:41:08 -07:00
snipe
8a977c66f0
Merge pull request #12659 from Godmartinz/update_notification_name
...
fixes alerts to notifications in notification settings
2023-03-13 09:57:43 -07:00
Godfrey M
82504c9764
updates alerts to notifications in notification settings
2023-03-13 09:51:25 -07:00
snipe
1e6a3b8c45
Add @floschoepfer as a contributor
2023-03-10 14:24:56 -08:00
snipe
785ba3b5ed
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2023-03-10 14:23:45 -08:00
snipe
d1d89f872a
Merge pull request #12638 from snipe/fixes/dashboard_category_count_with_show_archived
...
Fixed #12635 - dashboard category should not show archived
2023-03-10 14:19:40 -08:00
snipe
58d2e658d2
Merge pull request #12648 from floschoepfer/patch-1
...
Fixed #12647 : fix translation and adds icon on property reassignable
2023-03-10 14:13:48 -08:00
Florian
86205bc996
fix translation and adds icon on property reassignable
...
Fixing #12647
2023-03-10 10:36:42 +01:00
akemidx
4533982345
added time of day
2023-03-09 15:11:07 -05:00
snipe
65c2f27644
Merge pull request #12640 from marcusmoore/fix/test-suite
...
Fixes unit and feature test suite
2023-03-09 11:57:39 -08:00
snipe
88eb73d160
Use Carbon’s diffForHumans() method instead of our own home-grown stuff
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:47:54 -08:00
snipe
f4bd307421
Added comments, removed gthe AgeFormat() helper method
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:47:27 -08:00
snipe
059ead5af5
Added comments (not related to this, sorry)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:47:08 -08:00
snipe
02dd0669dc
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:36:08 -08:00
snipe
b3b9efbaff
New helper method to return icon type
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:34:04 -08:00
snipe
a6f4e53e2b
Added translation strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:33:49 -08:00
snipe
fe470b32fc
Added icon and import type to header, more translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:33:40 -08:00
snipe
474e32ea2a
Added translations and formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:33:02 -08:00
snipe
b9e4b2a0ba
Added some translations, date formatting, and filesize human reporting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 16:32:45 -08:00
Brady Wetherington
087fe19ae7
Merge branch 'livewire_importer_2_squashed_and_rebased' of github.com:uberbrady/snipe-it into livewire_importer_2_squashed_and_rebased
2023-03-08 13:57:21 -08:00
Brady Wetherington
22d7d2a04e
Aliases could get selected when they weren't for an import_type
2023-03-08 13:56:29 -08:00
snipe
b8887bd3e3
Translated strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 13:47:56 -08:00
snipe
65c2d75c04
Added aliases
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 13:47:38 -08:00
snipe
dccd6fd4b1
Duplicate withCount
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 13:06:14 -08:00
snipe
7f8bdbd252
Added showableAssets() relationship to Category model
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 13:01:38 -08:00
snipe
00896a8615
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 12:51:53 -08:00
Marcus Moore
44b48a954a
Remove unneed section of testing docs
2023-03-08 12:15:37 -08:00
Marcus Moore
0be882dc35
Merge branch 'develop' into fix/test-suite
2023-03-08 12:13:53 -08:00
akemidx
2a4d30a748
forgot to add datestamp to title of page
2023-03-08 15:09:33 -05:00
Marcus Moore
5fb18af245
Update testing documentation
2023-03-08 11:58:36 -08:00
Marcus Moore
697824007a
Move DB_CONNECTION back to .env.testing.example
2023-03-08 11:58:29 -08:00
akemidx
cd9f2f7fb7
datestamp for print all assigned form generation
2023-03-08 14:56:14 -05:00
Godfrey M
15c19a7ab7
silenced Discord option and validation, more translations
2023-03-08 10:35:45 -08:00
snipe
ac0b22d696
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 00:33:04 -08:00
snipe
1ed7cd27b4
Lots of HTML/CSS tweaks for better UI
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 00:32:30 -08:00
snipe
e143e0c5ee
Make the <tr> reflect that it’s active
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-08 00:32:16 -08:00
snipe
42601fecbf
Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased
2023-03-07 21:42:32 -08:00
Brady Wetherington
7c09de3ea8
Re-introduce the 'placeholder' option for our form-helper
2023-03-07 21:38:55 -08:00
snipe
094859cfe8
Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased
2023-03-07 21:38:04 -08:00
Brady Wetherington
037489a6c0
If fields were already mapped, they would cause a 500 on re-mapping on import
2023-03-07 21:33:20 -08:00
snipe
5defd5ec0a
Merge develop into master
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 19:59:17 -08:00
snipe
e66b19aca0
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 19:44:06 -08:00
snipe
fd96ff0160
Add @kenchan0130 as a contributor
2023-03-07 19:42:52 -08:00
snipe
1ccedf6426
Merge pull request #12617 from kenchan0130/patch-12249
...
Fixed #12249 : fix csv importer for serial_number field
2023-03-07 19:42:23 -08:00
snipe
8adeee41e6
Merge pull request #12633 from snipe/bug/sc-20332
...
Fixed 500 when admin erroneously tries to upload a tiff as logo, cleaned up logo upload layout
2023-03-07 19:41:10 -08:00
snipe
19d19a4c42
Updated language string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 19:18:32 -08:00
snipe
383b5b43bb
Added a few more jquery options for prevoew flexibility
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 18:54:38 -08:00
snipe
379c5f6790
Reworked the layout for logo upoloads
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 18:54:09 -08:00
snipe
e55d02fd59
Added new string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 18:53:53 -08:00
Brady Wetherington
942bedaf06
Re-add VIP and BYOD to importer, but in Livewire
2023-03-07 18:53:32 -08:00
Brady Wetherington
09c1298e03
Merge branch 'develop' into livewire_importer_2_squashed_and_rebased
...
I'll be taking in the changes to the importer front-end elsewhere
2023-03-07 18:51:05 -08:00
Brady Wetherington
fe699737eb
Add improved field-guessing logic; make sure 'do not map' fields work
2023-03-07 18:26:59 -08:00
Marcus Moore
dd9c00195b
Remove old $tester variable and usused imports
2023-03-07 17:04:46 -08:00
snipe
e60fa15414
Nicer layout, but it kinda dosn’t work :(
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 17:02:52 -08:00
Marcus Moore
43ff7261b2
Remove redundant base test case
2023-03-07 16:57:55 -08:00
Marcus Moore
8c13a4c5c9
Use LazilyRefreshDatabase instead of RefreshDatabase
2023-03-07 16:43:18 -08:00
Godfrey M
69944853f9
more translations
2023-03-07 15:57:58 -08:00
snipe
45b5a8b6ab
Catch exception if the file can’t be handled via Intervention
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 15:56:36 -08:00
Godfrey M
35dd0d8def
adds generalized webhooks, updates settings page, translations, validation
2023-03-07 15:48:21 -08:00
snipe
8b70a7f216
Merge remote-tracking branch 'origin/develop'
2023-03-07 14:00:37 -08:00
snipe
182a5ea5fc
Merge pull request #12631 from snipe/bug/sc-20297/expected-checkin-email-report-link-back-error
...
Dynamically determine target route for expected checkin emails
2023-03-07 13:57:26 -08:00
snipe
ea54f540de
Dynamically determine target route for expected checkin emails
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 13:42:51 -08:00
akemidx
ec5836dab4
cloning accessories first bit
2023-03-07 16:41:48 -05:00
snipe
e399015427
Merge pull request #12628 from marcusmoore/fixes/keep-asset-name-on-import
...
Maintain asset name during import with checkout
2023-03-07 11:22:53 -08:00
Marcus Moore
c80595e05c
Ensure asset name is maintained when importing assets that are checked out
2023-03-07 11:09:25 -08:00
Marcus Moore
8fad377114
Remove helper methods by inlining where needed
2023-03-07 10:28:33 -08:00
Tadayuki Onishi
f4675927a0
fix csv importer for serial_number filed
...
Signed-off-by: Tadayuki Onishi <tt.tanishi100@gmail.com >
2023-03-07 22:53:02 +09:00
Marcus Moore
a3c8c3757a
Remove unused method
2023-03-06 17:50:44 -08:00
Marcus Moore
ddcb8d8dd9
Remove commited .env.testing file
2023-03-06 17:37:08 -08:00
Marcus Moore
245f0aff72
Ignore the correct env file
2023-03-06 17:35:49 -08:00
Marcus Moore
ba92501670
Add .env.testing.example file
2023-03-06 17:34:43 -08:00
Marcus Moore
9aad981895
Update phpunit schema location and remove unneeded environment variable
2023-03-06 17:25:03 -08:00
Marcus Moore
a24d734ee9
Alphabetize keys in phpunit.xml
2023-03-06 17:24:09 -08:00
snipe
c7fb542dc3
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2023-03-06 17:13:29 -08:00
snipe
1ebbc767f1
Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer
...
Added `vip` and `byod` to importer
2023-03-06 17:11:28 -08:00
snipe
a34cb8b862
Check for boolean on requestable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 17:11:08 -08:00
snipe
d36b4c1bd3
Merge remote-tracking branch 'origin/develop'
2023-03-06 17:04:15 -08:00
Marcus Moore
d27fe7d4b9
Merge branch 'develop' into fix/test-suite
2023-03-06 17:04:00 -08:00
snipe
d55393a3d9
Merge pull request #12626 from marcusmoore/fixes/checkouts-in-seeders
...
Fix seeder so assets are checked out to users
2023-03-06 17:01:47 -08:00
Marcus Moore
ef27c35d1d
Update array keys to set asset location properly
2023-03-06 16:33:40 -08:00
snipe
0d3388b3ae
Merge pull request #12623 from snipe/bug/sc-20254/errorexception-filesize-stat-failed-for-snipe
...
Check that the file exists before trying to stat it for filesize
2023-03-06 15:43:17 -08:00
snipe
fffe5da2e0
Merge pull request #12625 from uberbrady/quiet_down_scim_exceptions
...
Suppress SCIMExceptions from cluttering up Rollbar
2023-03-06 15:42:58 -08:00
Brady Wetherington
dd3c3a1428
Suppress SCIMExceptions from cluttering up Rollbar
2023-03-06 15:24:16 -08:00
snipe
16bd2cde0f
Updated string for file not found
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:09:45 -08:00
snipe
e1069ac234
Return a file not found error if it doesn’t appear on disk
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:09:37 -08:00
snipe
8b6e8898c1
Fixed hardcoded string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:09:12 -08:00
snipe
2cb06165c4
Added missing vip field to transformer and request
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:00:04 -08:00
snipe
b46c455e0a
Updated mappings.md with byod and vip fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:34 -08:00
snipe
304ccaa30e
Added byod to asset importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:24 -08:00
snipe
f672bdd3b7
Added vip to user importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:14 -08:00
snipe
eec5163e7f
Updated vue assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:04 -08:00
snipe
f460d881da
Updated vue
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:27:53 -08:00
snipe
27a495223d
Updated sample CSVs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:27:45 -08:00
Marcus Moore
bc54144284
Fix test by passing proper user
2023-03-06 12:40:47 -08:00
snipe
cc7325074e
Check that the file exists before trying to stat it for filesize
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 10:47:28 -08:00
snipe
04ff472428
Merge remote-tracking branch 'origin/develop'
2023-03-06 10:29:07 -08:00
snipe
3a1cf26e98
Merge pull request #12621 from Godmartinz/bug/sc-20259/divisionbyzeroerror-division-by-zero-in-snipe
...
Fixes depreciation model rule for months
2023-03-06 10:28:39 -08:00
Godfrey M
e5deb4b413
doesn't allow months to be zero
2023-03-06 09:41:14 -08:00
snipe
f54d83ed59
Merge pull request #12612 from manuteleco/add_path_in_preflight_url_message
...
Fixed #11800 : Include path in the expected URL during Pre-Flight
2023-03-06 09:36:15 -08:00
snipe
39193a71b7
Merge pull request #12611 from manuteleco/add_reverse_proxy_support_in_preflight
...
Fixed #10779 : Add Reverse Proxy support to Pre-Flight URL check
2023-03-06 09:35:34 -08:00
snipe
83b906b153
Merge remote-tracking branch 'origin/develop'
2023-03-06 09:27:43 -08:00
snipe
191f955333
Merge pull request #12610 from veenone/feat/sortable_group_id
...
enable sortable for ID column
2023-03-06 09:26:52 -08:00
Manuel Rodríguez Guimeráns
548ae7ad22
Add Reverse Proxy support to Pre-Flight URL check
...
Before this change, the Pre-Flight URL check would inevitably fail
whenever Snipe-IT was running behind a reverse proxy or load balancer.
The URL check tries to ensure that the configured application URL
matches the URL that is actually used to reach the application. However,
when running behind an HTTP intermediary (like a reverse proxy or a load
balancer) the HTTP connection that Snipe-IT receives is not the _real_
connection from the user anymore, but a connection from the HTTP
intermediary. The scheme, host and port that Snipe-IT would obtain from
that incoming intermediary connection wouldn't match what is configured
as application URL and, therefore, the URL check would fail.
This commit solves the situation by making Snipe-IT's Pre-Flight URL
check aware of the `X-Forwarded-Proto` and `X-Forwarded-Host` HTTP
headers. These headers represent the _de-facto_ standard used by reverse
proxies and other HTTP intermediary components to convey information
about the incoming HTTP connection to the upstream application. Being
the upstream application, Snipe-IT can then make use of this information
to correctly evaluate the validity of the configured application URL.
2023-03-05 18:15:16 +01:00
Manuel Rodríguez Guimeráns
1d4f4b92de
Include path in the expected URL during Pre-Flight
...
So that the message displayed to the user when the URL Pre-Flight check
fails is:
> Snipe-IT thinks your URL is SCHEME://DOMAIN, but your real
URL is SCHEME://DOMAIN/setup
instead of:
> Snipe-IT thinks your URL is SCHEME://DOMAIN/setup, but your real
URL is SCHEME://DOMAIN/setup
Having a missing "/setup" in the expected URL might confuse the user
into thinking that it is an additional configuration problem they need
to fix.
With this change, the comparison between the expected and actual URL
will not contain any accidental difference anymore. Only those that the
user really needs to be aware of and fix in their setup.
2023-03-05 17:52:45 +01:00
Achmad Fienan Rahardianto
0b3becee7a
enable sortable for ID column
2023-03-04 11:27:00 +07:00
Ivan Nieto Vivanco
95f568b934
Remove unnecessary try/catch
2023-03-02 19:50:47 -06:00
snipe
95bd58487a
Merge pull request #12602 from inietov/fixes/error_checkin_license_seat
...
Fixed #12601 Error checkin license seats
2023-03-02 17:48:22 -08:00
Ivan Nieto Vivanco
8a5d426ccd
Use correct LicenseSeat property
2023-03-02 19:33:32 -06:00
Marcus Moore
e8da6d8bac
Set purchase date in correct format
2023-03-02 13:47:58 -08:00
Marcus Moore
ad9eef6393
Update deprecated faker calls in Asset and Supplier factories
2023-03-02 13:41:52 -08:00
Marcus Moore
c3cc20fe0c
Merge branch 'develop' into fix/test-suite
2023-03-02 13:23:00 -08:00
snipe
f817027fc2
Merge pull request #12593 from snipe/features/add_clone_to_locations
...
Added ability to clone location
2023-03-02 13:15:38 -08:00
Marcus Moore
45d7e9b134
Switch to using LazilyRefreshDatabase in unit test suite
2023-03-02 13:13:30 -08:00
Marcus Moore
75fc624ec6
Globally disable SecurityHeaders in tests
2023-03-02 13:12:25 -08:00
Ivan Nieto Vivanco
e0b2dc043a
Adds try/catch to users API
2023-03-02 11:13:56 -06:00
Brady Wetherington
7edec26e73
Fixes to layout, improvements to import types, better icons for processing.
2023-03-01 17:18:36 -08:00
Godfrey M
aae178a606
gets select working, placeholders update dynamically
2023-03-01 17:10:10 -08:00
snipe
778787db3c
Rip out jquery for location parent
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 15:36:01 -08:00
snipe
b8231f420b
Remove name from blanking paroperties
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 14:12:33 -08:00
snipe
9b522006f3
Usew route group for locations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 14:05:53 -08:00
snipe
84a14918bb
Updated comments
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 14:03:33 -08:00
snipe
473553c464
Moved gate
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 14:01:40 -08:00
snipe
dac877f184
Added location clone
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-01 13:51:35 -08:00
Godfrey M
354f04534e
add multi array, migration, still having issues
2023-03-01 12:30:32 -08:00
snipe
ca2619ca12
Merge remote-tracking branch 'origin/develop'
2023-03-01 12:28:34 -08:00
snipe
78b36c7886
Merge pull request #12592 from uberbrady/fix_accessories_report
...
The 'download activity report' displayed the wrong value for 'admin' (fixes FD-33368)
2023-03-01 12:28:03 -08:00
Brady Wetherington
ca849db316
The 'download activity report' displayed the wrong value for 'admin'
2023-03-01 12:23:13 -08:00
snipe
816d2f99cc
Merge remote-tracking branch 'origin/develop'
2023-03-01 11:52:29 -08:00
snipe
c1b57064d4
Merge pull request #12591 from uberbrady/accessories_report_companies
...
Actually display name of company in Accessories Report
2023-03-01 11:52:10 -08:00
Brady Wetherington
9b80e86306
Actually display name of company in Accessories Report
2023-03-01 11:34:30 -08:00
snipe
d954c841e6
Merge pull request #12590 from snipe/fixes/check_for_array_in_linux_setup
...
Fixes/check for array in linux setup
2023-03-01 11:06:31 -08:00
snipe
562546a853
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 23:37:30 -08:00
snipe
4860440306
Check that it’s an array (versus checking that it’s not a bool)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 23:32:10 -08:00
snipe
b72a9cc6fd
Check if the $owner is boolean
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 23:31:26 -08:00
snipe
823203641d
Updated assets with new font awesome
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 23:18:58 -08:00
snipe
b2fe3c36e9
Merge pull request #12589 from snipe/security/update_font_awesome_to_6_3_0
...
Updated font-awesome to ^6.3.0
2023-02-28 23:16:54 -08:00
snipe
1911480d3a
Updated font-awesome to ^6.3.0
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 23:15:50 -08:00
Brady Wetherington
c48e19d236
Whoops, went a little overboard there. Whoopsie!
2023-02-28 22:51:48 -08:00
Brady Wetherington
863b30a07a
Remove extraneous change to composer.json
2023-02-28 22:49:48 -08:00
Brady Wetherington
f3c500014c
Another file I didn't really need to commit
2023-02-28 22:37:16 -08:00
Brady Wetherington
4f8710db63
Whoops, mis-committed something here that doesn't belong
2023-02-28 22:36:26 -08:00
Brady Wetherington
54cb38603b
Cleaned up the last of the FIXME's (or downgraded them to TODO's)
2023-02-28 22:34:44 -08:00
Brady Wetherington
5cf66851f7
Finalizing the Livewire Importer! Just going to do some testing now
2023-02-28 21:58:02 -08:00
snipe
a6816c5e15
Merge remote-tracking branch 'origin/develop'
2023-02-28 20:53:32 -08:00
snipe
463ef02fae
Merge pull request #12578 from inietov/fixes/undefined_variable_total
...
Fixed Undefined variable `$total`
2023-02-28 20:50:00 -08:00
snipe
b29276579f
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 20:34:31 -08:00
snipe
dbe0a3352b
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2023-02-28 20:34:20 -08:00
snipe
6fec3f4303
Merge pull request #12586 from snipe/assets/compiled_dev_assets
...
Compiled dev assets
2023-02-28 20:32:41 -08:00
snipe
f9b5a67dc2
Compiled dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 20:32:08 -08:00
snipe
2189a74d6a
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 20:32:00 -08:00
snipe
44e2796645
Merge pull request #12579 from Godmartinz/gh12571_sidebar_adjustment
...
Fixes the sidebar margin top
2023-02-28 20:30:07 -08:00
snipe
70d0347fe9
Merge pull request #12580 from marcusmoore/feature/crowdin-source-upload
...
Add GitHub Action to push translation sources to Crowdin
2023-02-28 20:28:04 -08:00
Brady Wetherington
2f94bf96ff
Everything's all wired up; just need to clean up all the FIXME's and stuff
2023-02-28 18:36:52 -08:00
snipe
417a1e624a
Merge remote-tracking branch 'origin/develop'
2023-02-28 18:22:24 -08:00
snipe
34f13eaa8a
Merge pull request #12393 from snipe/features/make_eol_sortable
...
Added EOL as de-normed and sortable on assets
2023-02-28 18:22:00 -08:00
snipe
1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable
2023-02-28 18:05:09 -08:00
snipe
3a4e20ae82
Merge remote-tracking branch 'origin/develop'
2023-02-28 16:57:59 -08:00
snipe
2ab0abc8a1
Merge pull request #12575 from inietov/fixes/typeError_get_class_argument_must_be_object_null_given
...
Fixed: TypeError: get_class(): Argument #1 ($object) must be of type object, null given
2023-02-28 16:45:53 -08:00
snipe
373aeb26da
Merge remote-tracking branch 'origin/develop'
2023-02-28 16:14:42 -08:00
snipe
d838662f48
Merge pull request #12585 from marcusmoore/fixes/fix-license-seeder
...
Fix license seeder
2023-02-28 16:03:15 -08:00
snipe
ff122bd07c
Merge remote-tracking branch 'origin/develop'
2023-02-28 15:56:35 -08:00
snipe
5e626e75ad
Merge pull request #12584 from snipe/fixes/error_on_datepicker
...
Convert string to date object for formatting
2023-02-28 15:55:59 -08:00
Marcus Moore
a7a26bb154
Fix License Factory
2023-02-28 15:55:28 -08:00
snipe
af9f9d2523
Convert string to date object for formatting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-28 15:48:45 -08:00
snipe
d13e1b32e7
Merge pull request #12583 from inietov/fixes/user_start_and_end_date_error
...
Fixed User start and end date throws error [sc-20228]
2023-02-28 15:30:46 -08:00
Ivan Nieto Vivanco
ad598425ef
Adds format to the dates cast
2023-02-28 17:24:14 -06:00
snipe
ec2ce1dff8
Merge remote-tracking branch 'origin/develop'
2023-02-28 15:13:22 -08:00
snipe
5194711a6a
Merge pull request #12582 from akemidx/bug/sc-20065/license-export-does-not-show-info-of-boolean
2023-02-28 15:13:04 -08:00
Marcus Moore
4197e613b2
Fix License Factory
2023-02-28 14:50:48 -08:00
akemidx
25f3e4d41a
Adding ability to see boolean values when using normal export
2023-02-28 16:01:23 -05:00
Marcus Moore
589a5d0d8b
Merge branch 'develop' into fix/test-suite
2023-02-28 09:48:48 -08:00
Godfrey M
e8fbb0608f
adjusts the sidebar margin top
2023-02-28 09:30:02 -08:00
Marcus Moore
d707f2d391
Add GitHub Action to push translation sources to Crowdin
2023-02-28 09:07:34 -08:00
Ivan Nieto Vivanco
1be0a8d911
Declare variable as an empty array
2023-02-28 10:22:49 -06:00
Ivan Nieto Vivanco
0d860c0b72
Check if target is not null to retrieve the proper data
2023-02-27 19:01:37 -06:00
Ivan Nieto Vivanco
9d94bd6567
Validate if the license seat is not checked out, it can't be checked in
2023-02-27 18:57:38 -06:00
snipe
ae35af55d1
Merge remote-tracking branch 'origin/develop'
2023-02-27 15:55:58 -08:00
snipe
23fe11c71e
Merge pull request #12574 from inietov/fixes/address_in_mailbox_not_comply_rfc
...
Fixed Address in mailbox given does not comply with RFC 2822, 3.6.2. [sc-202022]
2023-02-27 15:55:31 -08:00
Ivan Nieto Vivanco
b4e578c95e
Convert the alert_email setting from string to array
2023-02-27 17:34:29 -06:00
Brady Wetherington
53db266b69
WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation
2023-02-27 14:29:02 -08:00
Brady Wetherington
fb201e61f3
More wiring up Livewire to the back-end.
2023-02-27 14:29:02 -08:00
Brady Wetherington
e1c8f155bb
Wiring up more bits to Livewire
2023-02-27 14:29:02 -08:00
Brady Wetherington
5c97e45d00
WIP - trying to get select2 wired up for importer
2023-02-27 14:29:02 -08:00
Brady Wetherington
8009ee79db
I think I have, now, full parity on the base Importer level
...
Meaning that you can upload new files, delete old files, have error
messages, have status updates - and all of them seem to work.
2023-02-27 14:29:02 -08:00
Brady Wetherington
0a085af0a0
Getting the basic wiring of the importer over into Livewire
...
WIP: Wiring up more and more of the actions on the importer
Files now upload okay, a little glitchy on the display-side though
add to readmes so i dont forget
2023-02-27 14:28:59 -08:00
snipe
c2cdf5dae1
Merge remote-tracking branch 'origin/develop'
2023-02-27 13:34:16 -08:00
snipe
23ca124e94
Merge pull request #12573 from snipe/fixes/ambiguous_model_clause
...
Added table aliases to fix ambiguous SQL clause
2023-02-27 13:33:52 -08:00
snipe
c7106a1df2
Added table aliases to fix ambiguous SQL clause
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-27 13:24:09 -08:00
snipe
3f4a4e72a7
Merge remote-tracking branch 'origin/develop'
2023-02-27 12:17:33 -08:00
snipe
b78aba787f
Merge pull request #12572 from snipe/fixes/add_max_results_limit_to_acitivity_report
...
Added max results limit to report index
2023-02-27 12:16:57 -08:00
snipe
96c851468c
Added max results limit to report index
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-27 12:04:46 -08:00
Godfrey M
e8fc895e51
"adds variables, but still not working"
2023-02-27 09:19:59 -08:00
snipe
a5ccef5e96
Merge pull request #12564 from uberbrady/upgrade_acorn
...
Upgrade Acorn
2023-02-26 12:12:21 -08:00
Brady Wetherington
059190f002
Upgrade Acorn
2023-02-26 11:29:10 -08:00
snipe
6428cc259f
Merge remote-tracking branch 'origin/develop'
2023-02-24 10:02:43 -08:00
snipe
cb0b234b80
Merge pull request #12561 from inietov/fixes/unable_to_import_purchase_date
...
Fixed #12559 Unable to import Purchase Date field
2023-02-24 10:02:25 -08:00
snipe
8caf29975f
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# config/version.php
2023-02-24 09:58:19 -08:00
snipe
95501bf57c
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-24 09:57:25 -08:00
snipe
75a73d095f
Merge pull request #12560 from snipe/fixes/bulk_checkout_nulles_asset_name
...
Pass the existing asset name to the bulk checkout form
2023-02-24 09:56:13 -08:00
snipe
3e47d9e689
Pass the existing asset name to the bulk checkout form
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-24 09:54:46 -08:00
Ivan Nieto Vivanco
51efd9b413
Adjust the date format for purchase_date field
2023-02-24 10:59:31 -06:00
snipe
bd0b00e361
Merge pull request #12558 from inietov/fixes/non_numeric_value_in_license_seat
...
Fixed ErrorException: A non-numeric value encountered in app/Models/License [sc-20187]
2023-02-24 00:29:26 -08:00
Ivan Nieto Vivanco
6bd72125bd
Deletes problematic cast
2023-02-23 22:31:41 -06:00
snipe
1415c8c6e2
Merge remote-tracking branch 'origin/develop'
2023-02-23 15:00:03 -08:00
snipe
41253b2680
Merge pull request #12556 from marcusmoore/fixes/asset-seeder
...
Fix purchase date field in asset seeder
2023-02-23 14:05:45 -08:00
Marcus Moore
bdac0f16ce
Set purchase date field to the correct format in asset factory
2023-02-23 13:39:05 -08:00
snipe
dde2b946da
Merge pull request #12555 from snipe/security/upgrade_dompdf
...
Update dompdf
2023-02-23 13:00:46 -08:00
snipe
0b408218b0
Update dompdf
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-23 12:59:04 -08:00
snipe
5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report
...
Paginate accessories report
2023-02-23 12:26:17 -08:00
snipe
8e72da42e8
Merge pull request #12406 from akemidx/vip_tag
...
Added a checkbox to notate VIP status
2023-02-23 12:23:29 -08:00
snipe
309c0ff66f
Merge remote-tracking branch 'origin/develop'
2023-02-23 11:41:36 -08:00
snipe
eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies
...
Fix full company scoping in user selects
2023-02-23 10:36:33 -08:00
snipe
adb166fb8d
Merge remote-tracking branch 'origin/develop'
2023-02-22 18:01:06 -08:00
snipe
4a9ced192b
Merge pull request #12550 from marcusmoore/fixes/closing-tag-in-mail-template
...
Properly close tag in mail template
2023-02-22 17:59:20 -08:00
Marcus Moore
6c8de181cf
Properly close tag in mail template
2023-02-22 17:52:47 -08:00
snipe
5a1e5f740d
Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation
...
Fixed #12531 Expected Checkin Date on Asset Checkout throws an error
2023-02-22 16:03:51 -08:00
akemidx
690970b4aa
fixing ff error
2023-02-22 18:18:20 -05:00
Marcus Moore
f63710fb5c
Remove unused import
2023-02-22 12:34:56 -08:00
Marcus Moore
7667b0a216
Remove extra line
2023-02-22 12:34:35 -08:00
Marcus Moore
931ca98c02
Remove middleware bypass
2023-02-22 12:33:55 -08:00
snipe
225b6ef310
Merge remote-tracking branch 'origin/develop'
2023-02-22 12:24:52 -08:00
snipe
13ed2a05a3
Add @AndrewSav as a contributor
2023-02-22 12:24:13 -08:00
Marcus Moore
aae2106658
Use existing language translation string
2023-02-22 12:02:14 -08:00
snipe
81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report
...
Added images to emailed user inventory report [sc-19801]
2023-02-22 10:38:07 -08:00
snipe
05f6d0bd5e
Merge pull request #11984 from nh314/Correct-assignedusers-relation
...
Correct assignedusers relation setting
2023-02-21 20:15:20 -08:00
snipe
4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during
...
Adds Boolean to Users Table for Auto Assigning Licenses
2023-02-21 20:10:46 -08:00
snipe
0c3115553e
Merge branch 'develop' into vip_tag
2023-02-21 20:03:49 -08:00
Brady Wetherington
aadfa9aa9c
Back out Laravel Vite stuff - we're so far away from that right now
2023-02-21 19:54:14 -08:00
snipe
942fee4d43
Merge pull request #12447 from akemidx/user_setup_translation
...
FIXED: Translations on the User Creation setup page
2023-02-21 19:53:00 -08:00
snipe
ba461d0114
Merge pull request #12538 from AndrewSav/develop
...
Added #12532 : add version endpoint
2023-02-21 19:50:07 -08:00
snipe
3ae783a9c7
Merge pull request #12525 from uberbrady/add_sodium_php_shim
...
Add libsodium shim, and mark the sodium extension as 'optional'
2023-02-21 19:38:14 -08:00
Brady Wetherington
645bba96cd
WIP: First stabs at getting Laravel Vite to work; no luck so far :(
...
Probably going to back out all the 'vite' stuff anyways :/
2023-02-21 19:35:37 -08:00
Ivan Nieto Vivanco
d494afcf01
Add order by clause, to ensure assets and accessories are in order in the report
2023-02-21 21:24:19 -06:00
snipe
57065b8936
Merge remote-tracking branch 'origin/develop'
2023-02-21 09:20:59 -08:00
snipe
40a38486b9
Merge pull request #12545 from snipe/localizations/more_new_translations
...
Two more translations
2023-02-21 09:20:38 -08:00
snipe
29158dece5
Two more translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-21 09:19:34 -08:00
snipe
f6e4e17e5c
Merge remote-tracking branch 'origin/develop'
2023-02-21 09:05:50 -08:00
snipe
8185f264a4
Merge pull request #12544 from snipe/localizations/updated_general
...
Updated the general translation file with new strings
2023-02-21 09:05:24 -08:00
snipe
04d3938f0c
Updated the general translation file with new strings
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-21 09:04:13 -08:00
snipe
f109218e16
Re-added dropped translations from CrowdIn
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-21 09:00:10 -08:00
snipe
049213c3da
Merge remote-tracking branch 'origin/develop'
2023-02-21 04:02:08 -08:00
snipe
9c1a71e04a
Merge pull request #12541 from snipe/localizations/new_strings
...
Updated translations with new strings and new translations
2023-02-21 03:58:25 -08:00
snipe
a0b05bac8d
Updated translations with new strings and new translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-21 03:54:55 -08:00
Andrew Savinykh
d2ede75de8
fixes #12532 adds version endpoint
2023-02-20 22:19:18 +13:00
Ivan Nieto Vivanco
6e994c209f
Adds setter to model Asset class for expected checkin
2023-02-19 12:31:10 -06:00
akemidx
f33b6a3e26
Update user.blade.php
2023-02-17 12:52:54 -05:00
akemidx
dfc2aa35f4
Update general.php
2023-02-17 12:51:58 -05:00
snipe
f71d8b2f07
Merge remote-tracking branch 'origin/develop'
2023-02-16 17:05:48 -08:00
snipe
248eb0885c
Merge pull request #12533 from snipe/fixes/expected_checkin_wtf
...
FML - this is a hotfix and I don’t know why this is causing problems
2023-02-16 17:01:54 -08:00
snipe
754842f620
FML - this is a hotfix and I don’t know why this is causing problems
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-16 16:58:00 -08:00
snipe
43eacff265
Merge remote-tracking branch 'origin/develop'
2023-02-16 12:11:26 -08:00
snipe
fdffe76b9f
Merge pull request #12529 from Godmartinz/bug/sc-20046/allow-user-to-submit-the-slack-livewire-form
...
allows users to clear their slack settings
2023-02-16 11:47:58 -08:00
Godfrey M
58801dbb0b
allows users to clear their slack settings
2023-02-16 08:43:12 -08:00
snipe
e9ab90eafc
Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting
...
Have acceptance result notifications adhere to alerts enabled setting
2023-02-15 18:46:08 -08:00
snipe
495d7e057d
Merge remote-tracking branch 'origin/develop'
2023-02-15 18:37:39 -08:00
snipe
9f8ea9a243
Merge pull request #12524 from snipe/fixes/small_UI_tweaks
...
Cleanup some small UI bugaboos (padding, etc)
2023-02-15 18:20:08 -08:00
Brady Wetherington
3a2b54fd47
Add libsodium shim, and mark the sodium extension as 'optional'
...
Trying to handle some composer.lock conflicts, as savely as possible.
2023-02-15 18:16:39 -08:00
snipe
71334b5eae
More tweaking for top button alignment
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 18:13:38 -08:00
snipe
f124249e1c
More padding twiddles
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 18:08:11 -08:00
snipe
e451ca1a5c
Stray semicolon
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 17:37:53 -08:00
snipe
3e111fca6e
Cleanup some small UI bugaboos (padding, etc)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 17:13:40 -08:00
snipe
df64e0e291
Merge pull request #12523 from Godmartinz/bug/sc-20041/slack-ui-livewire-tweaks
...
Fixes slack settings submit button availability
2023-02-15 16:28:57 -08:00
snipe
51c9a7d4f8
Merge pull request #12521 from akemidx/weird_checkout_text
...
Fixed awkward checkout text in checkedout side panel
2023-02-15 16:28:05 -08:00
akemidx
d8d713426d
indent?
2023-02-15 19:24:20 -05:00
akemidx
7dd789d5c0
translate no assets at checkout
2023-02-15 19:22:13 -05:00
Godfrey M
2d8c8e8f48
removes lazy loading
2023-02-15 16:16:14 -08:00
Godfrey M
7b510d5f2b
greys out submit button conditionally
2023-02-15 15:46:05 -08:00
snipe
221f5f5ca7
Merge pull request #12522 from snipe/fixes/slack_livewire_translations
...
Fixes slack livewire translations, UI
2023-02-15 14:45:46 -08:00
snipe
d4634e83c9
Nicer padding, removed unused ids
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 14:45:18 -08:00
snipe
6c3ffa7918
Removed unused CSS
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 14:39:24 -08:00
snipe
27e5832a28
Use existing slack translations
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 14:06:52 -08:00
snipe
2d0bd2b292
Make spinner actually spin
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 14:06:40 -08:00
akemidx
b96f2f738d
fixed weird phrasing in asset checkout screen
2023-02-15 16:47:48 -05:00
snipe
ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs
...
Adds Livewire slack inputs
2023-02-15 13:27:07 -08:00
snipe
de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
...
Enforce Y-m-d as date format for date fields
2023-02-15 12:54:22 -08:00
snipe
25461caa2c
Removed date validation rule
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 12:53:55 -08:00
snipe
bfac0fc811
Merge pull request #12470 from inietov/fixes/rollbar_16883_attempt_assign_on_null
...
Fixed Rollbar 16883 Error: Attempt to assign property "assigned_to" on null
2023-02-15 12:33:32 -08:00
snipe
057f0be20a
Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null
...
Fixed ErrorException: Attempt to read property "id" on null [sc-19855]
2023-02-15 12:32:53 -08:00
snipe
7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions
...
Silence E_WARNING "exceptions"
2023-02-15 11:56:37 -08:00
Marcus Moore
f99f6d32fa
Make phpstan configuration more flexible
2023-02-15 11:33:08 -08:00
Marcus Moore
d088b39fb2
Remove ignore errors section covered by larastan config
2023-02-15 11:33:08 -08:00
Marcus Moore
6bfd2fd5ad
Sort paths
2023-02-15 11:33:08 -08:00
Marcus Moore
6778cf79a0
Include Larastan configuration file
2023-02-15 11:33:08 -08:00
snipe
ac4103281c
Still throwing errors, but trying to fix the docblock
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
03af417e89
We shouldn’t need this because aliases??
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
77362b3b41
Added larastan and psalm to composer dev
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
db8c29b901
Psalm and phpstan configs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
3d219f578e
The sea, Brady.
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
8c3511a00b
Fixed wonky switch statement indenting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
c1ae406049
Fixed visibility for constants and methods
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
1ef3112628
FIxed yoda operator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
0325cbad64
Removed unused else condition
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
6dc89fc2b0
Use null coalescing operator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
b25676c96b
Fixed Implicit array creation is disallowed.
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
14e95c47e1
Made constant DATA_SESSION_KEY public
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
dc43c4f68a
Removed unneeded concat
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
0e7ac5c95e
Added phpinsights
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
c7f90f304d
Added insights config
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
78a0b06a61
Fixed array bracket indenting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
40f487beae
Added parens
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
2992ca1fa2
Fixed yoda operator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
15f9c6af67
Removed unused variable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
snipe
7a19da4f64
Removed unused variable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-15 11:33:08 -08:00
Ivan Nieto Vivanco
07f501408f
Add migration to fix already escaped formats in the database
2023-02-15 11:33:08 -08:00
Ivan Nieto Vivanco
53e449899b
Remove e() function from customfield format input
2023-02-15 11:33:08 -08:00
Godfrey M
b2f1ca95df
missing things like mr magoo
2023-02-15 11:33:08 -08:00
Godfrey M
f3ab384e70
simplified to an else instead of elseif
2023-02-15 11:33:08 -08:00
Godfrey M
61bf1e91e7
adds the red x icon to a false deployable status
2023-02-15 11:33:08 -08:00
Godfrey M
1c54feea5b
adds a red icon next to broken- not fixable status label
2023-02-15 11:33:08 -08:00
Marcus Moore
7423570e6b
Add comment
2023-02-15 11:33:08 -08:00
Marcus Moore
b946a6066d
Use name if provided by asset checkout request
2023-02-15 11:33:07 -08:00
Marcus Moore
9c25dd4eb6
Improve error message wording
2023-02-15 11:33:07 -08:00
Marcus Moore
e69fcf10b7
Use translation strings for importer exceptions
2023-02-15 11:33:07 -08:00
akemidx
937e2813e9
fixing external if statement
2023-02-15 11:33:07 -08:00
akemidx
a84081068d
functionality to Apple Warranty link
2023-02-15 11:33:07 -08:00
akemidx
d9857d955b
translations for the layout setup
2023-02-15 11:33:07 -08:00
akemidx
66251bfd8a
sweedish chef fixes up your typos
2023-02-15 11:33:07 -08:00
akemidx
677f7a446e
manufacturer marker removal
2023-02-15 11:33:07 -08:00
Marcus Moore
fdce6f98ff
Return 422 instead of 500 when import is invalid
2023-02-15 11:33:07 -08:00
Marcus Moore
5a00685c81
Fix return type
2023-02-15 11:33:07 -08:00
Marcus Moore
18f0b1cc3d
Formatting
2023-02-15 11:33:07 -08:00
Marcus Moore
6da43bc940
Catch json encoding exceptions and display them to the user
2023-02-15 11:33:07 -08:00
Ivan Nieto Vivanco
98187773f7
Adds translation strings to theinventory report sent to users
2023-02-15 11:33:07 -08:00
Brady Wetherington
3757c7e353
Make early-boot errors (syntax, others) be more easy-to-read
2023-02-15 11:31:13 -08:00
snipe
3800cdd0da
Merge pull request #12466 from snipe/fixes/style_fixes
...
Style fixes
2023-02-15 11:07:59 -08:00
Brady Wetherington
a1b0eaf128
Got working E_WARNING-in-production going. YAY!
2023-02-14 20:00:06 -08:00
Marcus Moore
8b183490ba
Use "testing" environment for tests
2023-02-13 18:56:22 -08:00
Marcus Moore
228c59e6ed
Bring phpunit.xml closer to default
2023-02-13 18:55:50 -08:00
snipe
2dd7690d2d
Merge pull request #12464 from snipe/dependabot/github_actions/docker/build-push-action-4
...
Bump docker/build-push-action from 3 to 4
2023-02-13 14:45:21 -08:00
Ivan Nieto Vivanco
f0bf16d784
Fix more uneven tags
2023-02-12 12:01:40 -06:00
Ivan Nieto Vivanco
9a68a747a0
Fix uneven tags
2023-02-12 11:59:56 -06:00
Ivan Nieto Vivanco
81cc9f3700
Adds images to emailed user inventory report
2023-02-12 08:23:50 -06:00
snipe
201728989f
Merge pull request #12486 from svpernova09/patch-1
...
Don't auto assign feature requests to Snipe
2023-02-08 07:59:58 -08:00
Joe Ferguson
dea175bd40
Don't auto assign feature requests to Snipe
2023-02-08 09:57:54 -06:00
snipe
23b1e8da27
Merge remote-tracking branch 'origin/develop'
2023-02-07 18:46:30 -08:00
Marcus Moore
4f9ebf6cde
Fix array key
2023-02-07 16:40:27 -08:00
Marcus Moore
787f619a6b
Standardize test method syntax
2023-02-07 16:28:40 -08:00
Marcus Moore
505ca48da2
Remove test method without assertions
2023-02-07 16:17:36 -08:00
Marcus Moore
6b8c0f9e88
Make BaseTest abstract
2023-02-07 16:17:16 -08:00
Marcus Moore
3fdf4dea1b
Use factories for relationships in asset factory
2023-02-07 16:17:05 -08:00
Marcus Moore
6dbcec2310
Exclude Dusk tests from phpunit test suite
2023-02-07 16:16:39 -08:00
snipe
4f9587da57
Merge remote-tracking branch 'origin/develop'
2023-02-07 13:34:57 -08:00
Marcus Moore
321a34a9d3
Make phpstan configuration more flexible
2023-02-07 13:32:32 -08:00
Marcus Moore
fd524c5f14
Remove ignore errors section covered by larastan config
2023-02-07 12:48:41 -08:00
Marcus Moore
e4cf59c034
Sort paths
2023-02-07 12:46:13 -08:00
Marcus Moore
efac2259db
Include Larastan configuration file
2023-02-07 12:25:13 -08:00
snipe
ea644f8d47
Still throwing errors, but trying to fix the docblock
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-07 11:02:20 -08:00
snipe
dd5f256450
We shouldn’t need this because aliases??
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-07 11:02:02 -08:00
snipe
f4617d8d5b
Added larastan and psalm to composer dev
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-07 11:01:21 -08:00
snipe
32be88d796
Psalm and phpstan configs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-07 11:00:59 -08:00
snipe
219d92dcfb
The sea, Brady.
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-07 11:00:30 -08:00
Ivan Nieto Vivanco
d4c838a979
Add condition in activity report to only access assigned item id if it exist
2023-02-07 11:26:49 -06:00
Ivan Nieto Vivanco
ddabe7cc9f
Added Guard Clause to License Importer to return if no empty seat is found
2023-02-07 01:36:55 -06:00
Marcus Moore
c03079944a
Be more explicit in test case
2023-02-06 16:06:13 -08:00
snipe
cd5546e4a1
Fixed wonky switch statement indenting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:44:17 -08:00
snipe
d52d32fed9
Fixed visibility for constants and methods
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:44:02 -08:00
snipe
7363d4e223
FIxed yoda operator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:43:35 -08:00
snipe
c8c5dddcc1
Removed unused else condition
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:43:19 -08:00
snipe
1651dbb68d
Use null coalescing operator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:43:00 -08:00
snipe
d95adcae37
Fixed Implicit array creation is disallowed.
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:41:54 -08:00
snipe
8a8575bf2d
Made constant DATA_SESSION_KEY public
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:40:32 -08:00
snipe
590cb6a15b
Removed unneeded concat
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:40:09 -08:00
snipe
aeb8dfb07d
Added phpinsights
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:39:55 -08:00
snipe
a60510c063
Added insights config
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:39:48 -08:00
snipe
8841f04333
Fixed array bracket indenting
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:39:38 -08:00
snipe
ab6ca0e066
Added parens
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:39:22 -08:00
snipe
ec2afee57d
Fixed yoda operator
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:39:12 -08:00
snipe
b10ea0c25c
Removed unused variable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:38:56 -08:00
snipe
686d1aaae7
Removed unused variable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:38:29 -08:00
Marcus Moore
0e57e4836e
Add translation for Company
2023-02-06 12:21:23 -08:00
Marcus Moore
45e8e9bbed
Move company name to better location
2023-02-06 12:21:09 -08:00
Marcus Moore
38cdcdf064
Eager load company
2023-02-06 10:59:51 -08:00
Marcus Moore
78343ddb7c
Add asset's company name to checkout page
2023-02-06 10:58:10 -08:00
Godfrey M
74c64c1fc5
adds validation to the update hook, removes typos and deadlines
2023-02-06 09:40:57 -08:00
dependabot[bot]
ea0f505db7
Bump docker/build-push-action from 3 to 4
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-02-06 08:07:13 +00:00
snipe
b37c4553ef
Merge remote-tracking branch 'origin/develop'
2023-02-02 23:41:05 -08:00
Marcus Moore
0cefc7de15
Skip security headers middleware when testing
2023-02-02 18:37:35 -08:00
Marcus Moore
9a0c66bd30
Clear some extra lines
2023-02-02 18:30:18 -08:00
Marcus Moore
d8e92d29c0
Improve readability
2023-02-02 18:25:54 -08:00
Marcus Moore
93a62c87c2
Implement test for searching users
2023-02-02 17:57:24 -08:00
Marcus Moore
89eff23e44
Continue implementing tests
2023-02-02 17:41:32 -08:00
snipe
41b0756286
Merge remote-tracking branch 'origin/develop'
2023-02-02 15:35:41 -08:00
Marcus Moore
a2e47d19fc
Scaffold tests for user select list api and begin to implemenet
2023-02-02 13:47:00 -08:00
akemidx
b8951e2b54
fixing name from vipuser to vip
2023-02-02 15:58:05 -05:00
akemidx
29851c626f
Merge branch 'develop' into user_setup_translation
2023-02-02 14:34:09 -05:00
snipe
1f60afa8e3
Merge remote-tracking branch 'origin/develop'
2023-02-02 11:28:41 -08:00
snipe
782abe1cf3
Merge remote-tracking branch 'origin/develop'
2023-02-02 11:09:18 -08:00
akemidx
69c38bf686
translations on the User Creation page
2023-02-01 20:32:16 -05:00
Brady Wetherington
039d159cbd
WIP: working on better Rollbar filtering in prod
2023-02-01 17:15:22 -08:00
Godfrey M
17f1772143
removes postslack from settings controller
2023-02-01 16:58:08 -08:00
Godfrey M
3a86547ef5
fixes messages for integration test, removes slack request file, rehouses ajax method
2023-02-01 16:51:05 -08:00
snipe
4bc804e876
Merge remote-tracking branch 'origin/develop'
2023-02-01 16:50:19 -08:00
snipe
c706759b5c
Merge remote-tracking branch 'origin/develop'
2023-02-01 16:42:11 -08:00
snipe
d9cdb92014
Merge branch 'develop' into vip_tag
2023-02-01 16:03:23 -08:00
Godfrey M
f95a904d90
adds integration button, working on its functionality
2023-02-01 12:08:13 -08:00
Marcus Moore
a45ce468cc
Update return type for routing mail notifications
2023-02-01 11:44:56 -08:00
Marcus Moore
3580bdae86
Use object accessor instead of array accessor
2023-02-01 11:44:35 -08:00
cram42
0f3c5d10ba
Merge branch 'feature-label2' into develop
2023-02-01 18:01:46 +11:00
cram42
73fd0a24ca
Clarify example asset variable
2023-02-01 17:58:58 +11:00
cram42
4b4c228f1a
Correct parameter order
2023-02-01 17:56:23 +11:00
cram42
b72c6b7afc
Fix 2D barcode defaults
2023-02-01 17:48:39 +11:00
snipe
6fbd20a11b
Merge remote-tracking branch 'origin/develop'
2023-01-31 19:50:18 -08:00
Godfrey M
1e0c58c3cf
saves data correctly now
2023-01-31 11:32:05 -08:00
Godfrey M
fc044528b8
validation is working, success message appears, database is not updating
2023-01-30 16:10:02 -08:00
Godfrey M
a63ea560ae
adds submit button, getting setAttribute error
2023-01-26 15:17:08 -08:00
Marcus Moore
39289dd18e
Use user provided alert email for checkout acceptances
2023-01-26 13:18:18 -08:00
snipe
8b94b208e3
Merge remote-tracking branch 'origin/develop'
2023-01-26 13:17:28 -08:00
Marcus Moore
6fc8982478
Have acceptance result notifications adhere to alerts enabled setting
2023-01-26 12:59:33 -08:00
akemidx
df31a76906
fixed apostraphe
2023-01-26 15:02:39 -05:00
Brady Wetherington
4a54586690
Add to Accessories#index an additional gate-check against reports.view
2023-01-26 11:56:06 -08:00
Godfrey M
62b4c79150
adds a couple error messages
2023-01-25 16:38:08 -08:00
Godfrey M
a69cb6204a
adds rest of inputs, and corrects Data binding
2023-01-25 16:22:34 -08:00
Godfrey M
2e22eeade5
adds one input
2023-01-25 14:29:20 -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
e7917d1f93
Rebuild prod assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-24 19:16:03 -08:00
snipe
be6f367565
Merge remote-tracking branch 'origin/develop'
2023-01-24 19:12:50 -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
Brady Wetherington
b00333c9f5
Merge remote-tracking branch 'upstream/develop' into develop
2023-01-24 17:36:39 -08:00
Brady Wetherington
c9f0f5fe8b
Change Accessories report to use server-side pagination from URL
2023-01-24 17:35:44 -08:00
snipe
a61ccbb965
Added very clunky but better error messages on that validation for date_format
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-24 17:33:49 -08:00
snipe
91394f7262
Removed duplicate comment section
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-24 17:23:06 -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
Marcus Moore
b92d1d3ec7
Logically group query when searching users to scope to company
2023-01-24 11:54:56 -08:00
Godfrey M
0f8ee22053
Creates Slack Setting Form
2023-01-24 09:25:05 -08:00
snipe
86812b024d
Merge remote-tracking branch 'origin/develop'
2023-01-23 22:03:12 -08:00
cram42
c2c009a018
Merge branch 'develop' into develop
2023-01-24 09:53:42 +08:00
snipe
4c7b731acc
Merge remote-tracking branch 'origin/develop'
2023-01-23 15:36:05 -08:00
snipe
41537a2449
Added field to the API controller endpoints
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:56:44 -08:00
snipe
5f9af7d509
Updated API response
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:56:28 -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
cad76f671a
Added asset_eol_date to blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:55:42 -08:00
snipe
4104d7260f
Include new eol date picker blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:55:31 -08:00
snipe
3587017591
Updated EOL date in view blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:55:19 -08:00
snipe
8040d08e8c
Removed formatter from EOL date
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:54:37 -08:00
snipe
2f7ca37666
Migration to normalize eol date for assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:54:24 -08:00
snipe
abad579306
Added eol date picker
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-22 00:45:33 -08:00
snipe
2564da648b
Merge remote-tracking branch 'origin/develop'
2023-01-19 16:22:09 -08:00
snipe
d020ab455d
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-19 15:56:53 -08:00
snipe
05a3f20d51
Updated production assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-19 15:55:59 -08:00
Godfrey M
7ce230fadc
missed a few renames
2023-01-18 08:57:59 -08:00
Godfrey M
6fbb484dfd
renames db column for auto_assign boolean, rewords trans string, default value of 1 now
2023-01-18 08:43:03 -08:00
Godfrey M
8a0517fb5d
removes data dump
2022-11-15 15:59:47 -08:00
Godfrey M
90828e3a87
fixes variable name
2022-11-15 15:51:52 -08:00
Godfrey M
45636b8114
adds should_autoassign boolean to users table
2022-11-15 15:42:57 -08: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
60ef5686ab
Add "Pop Out" button for preview
2022-11-12 19:02:38 +08:00
Cram42
af0872dc23
Fix form refresh after bootstrap-table
2022-11-11 14:23:38 +08:00
Cram42
30a7a31724
Move label preview to alpine component
2022-11-11 14:23:02 +08:00
Cram42
67d021e457
Add alpinejs to deferred scripts
2022-11-11 11:25:41 +08:00
Cram42
7108156072
Fix button disabling
2022-11-10 19:24:02 +08:00
Cram42
a4b93d4bbd
Create Field Definitions helper control
2022-11-10 19:20:18 +08:00
Cram42
f849fcca89
Change the way fields are passed
2022-11-10 18:54:02 +08:00
Cram42
fd9616683c
Label preview auto-refresh
2022-11-03 10:20:12 +08:00
Cram42
3d470d6f2f
Drop asset tag from default field def.
2022-11-02 22:39:08 +08:00
Cram42
53513d93fa
Rework TZe labels for Asset Tag support
2022-11-02 22:38:00 +08:00
Cram42
f5fac50e91
Add preview pane
2022-11-02 19:31:34 +08:00
Cram42
36210f1c6a
Allow settings to be overridden in request
2022-11-02 19:30:45 +08:00
Cram42
48fb4f2439
Add labels route for testing layouts
2022-11-02 17:23:52 +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
06ce40ac08
Don't add data if it's not there
2022-11-02 16:05:52 +08:00
Cram42
a8b6a4a259
Allow passing "template" param
2022-11-02 16:04:40 +08:00
Cram42
a60ee7736b
Add P-touch TZe 12mm Tape Example
2022-11-02 12:22:55 +08:00
Cram42
d0eb3cfc9b
Merge branch 'feature-label2' into develop
2022-11-02 10:09:46 +08:00
Cram42
19150aeb44
Add P-touch TZe 24mm Tape Example
2022-11-02 10:09:11 +08:00
Cram42
cde2ba7720
Fix: Oops
2022-11-02 09:51:02 +08:00
Cram42
6b2fe582ca
Merge branch 'feature-label2' into develop
2022-11-01 20:12:28 +08:00
cram42
7e2546b31f
Merge branch 'snipe:develop' into develop
2022-11-01 20:04:59 +08:00
Cram42
7b29ddd283
Tie into tag generation
2022-11-01 20:02:12 +08:00
Cram42
d37605ff18
Add localization strings
2022-11-01 20:01:18 +08:00
Cram42
6de48b4dc8
Implement settings for labels
2022-11-01 20:00:53 +08:00
Cram42
5558a005b9
Implement API for labels
2022-11-01 19:57:51 +08:00
Cram42
bb09f0168f
Create Label View/Generator
2022-11-01 19:56:53 +08:00
Cram42
4ed728d954
Add template to simulate legacy label
2022-11-01 19:54:00 +08:00
Cram42
bbecdb6768
Add QR example
2022-11-01 19:53:11 +08:00
Cram42
df89406987
Create Label model and example
2022-11-01 19:52:34 +08:00
Cram42
7c355cef2d
Add helper to convert between units of measurement
2022-11-01 19:49:57 +08:00
Cram42
35536b5dbd
Require tecnickcom/tcpdf
2022-11-01 19:47:59 +08:00
Cram42
0e69e4248c
Fix: Multiple outputs at hardware/{id}/label
2022-10-27 08:12:42 +08:00
Phan Nguyen
e457b2e98d
Correct assignedusers relation setting
2022-10-17 13:10:09 +07:00
Nathan Butler
0617480f73
Asset checkinbytag now consistent with existingAPI
...
This is a non-breaking change to the checkinbytag endpoint to bring it
inline with the usage/formatting of the other bytag endpoints that
currently exist - using the URL path to define the asset_tag instead of
passing it through as a url query.
Both methods will work, but the URL Path method will take precidence if
it is used (the query will be ignored if included)
2022-06-30 09:23:52 +10:00