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'
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
|
2024-08-15 15:53:52 +01:00 |
|
|
snipe
|
b39a7c6f0c
|
String constraint
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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 |
|