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 |
|
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 |
|
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 |
|