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'
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
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
|
2024-11-14 17:10:16 +00:00 |
|
|
snipe
|
306c97b5b5
|
Merge pull request #15816 from Godmartinz/Teams_fix
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
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
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
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-11-14 01:11:29 +00:00 |
|
|
snipe
|
a060f603b5
|
Versioning stuff is hard - fixed v7.0.14 to v7.1.14
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-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 |
|
|
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 |
|