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

17890 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe
fab1a6c33a Merge remote-tracking branch 'origin/develop' 2025-04-15 20:30:02 +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
be73c30194 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/dist/bootstrap-table.js
#	public/mix-manifest.json
 2025-04-15 20:01:20 +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
451646fe4f Prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-15 19:42:26 +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
decc919991 Merge remote-tracking branch 'origin/develop' 2025-04-15 19:33:23 +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
e0b4005921 Merge remote-tracking branch 'origin/develop' 2025-04-15 16:48:17 +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
3ef36e7534 Merge remote-tracking branch 'origin/develop' 2025-04-14 11:02:06 +01: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
1949e1e1e9 Merge remote-tracking branch 'origin/develop' 2025-04-14 09:26:25 +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
3358382358 Comment out location scoping option for now 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-09 21:44:38 +01:00
snipe
3eca3ecd75 Merge remote-tracking branch 'origin/develop' 2025-04-09 21:31:41 +01:00
snipe
0d6a83197a Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2025-04-09 21:29:31 +01:00