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
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
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'
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-12 20:47:45 +01:00 |
|
|
snipe
|
e6106aa7cf
|
Merge pull request #15272 from snipe/fixes/added_selectlist_permission_for_reports
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
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'
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-12 10:10:59 +01:00 |
|
|
snipe
|
ce5be8ac24
|
Merge pull request #15100 from Godmartinz/depreciation_percentage
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
Added Depreciation Percentage as an option
|
2024-08-12 10:10:25 +01:00 |
|
|
snipe
|
1e213c31ef
|
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-11 10:26:16 +01:00 |
|
|
snipe
|
1777bb4b93
|
Pulled searchable relation on model - needs revisit
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-11 10:26:02 +01:00 |
|
|
snipe
|
91874dfe0b
|
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-10 19:37:37 +01:00 |
|
|
snipe
|
5c6c655cdc
|
Added sounds to quickscan checkin
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-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 |
|