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

2371 commits

Author SHA1 Message Date
Brady Wetherington
ea1f1eb972 Get some basic Livewire going for 'edit model's default values. 2021-06-28 21:00:20 -07:00
Brady Wetherington
8e66abb926 Basic Laravel7 compatibility, starting getting Livewire going 2021-06-28 21:00:16 -07:00
Godfrey M
aba912001d Table striping on dark mode skins is too [ch16594] 2021-06-28 20:41:56 -07:00
snipe
dc125af029 Fixed locations link on homepage module 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 19:56:41 -07:00
snipe
2365634139 Added dashboard module for locations [ch9199] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 19:46:56 -07:00
Brady Wetherington
dce1dd41c8 Regenerate assets after repairing Vue integration 2021-06-28 16:38:05 -07:00
snipe
4af247f845 Added additional boxes to the dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 16:36:15 -07:00
snipe
d4e46ee41f Added comma in US currency format [ch16628] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 16:14:32 -07:00
snipe
f504d7ef5f Merge remote-tracking branch 'origin/develop' 2021-06-28 13:12:10 -07:00
snipe
a016f4ecd0 Applies PR #9761 to integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:11:22 -07:00
snipe
30297e479e Hide notes field by default 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:08:32 -07:00
snipe
a4fd0c9c6d Fixed #9745 - added searchable, sortable notes field to status labels 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:52:57 -07:00
snipe
3ca3de9e4f Merge remote-tracking branch 'origin/develop' 2021-06-23 20:05:38 -07:00
snipe
174d53aff9 Fixed #9729 - order number maxlength updated to 200 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 20:05:22 -07:00
snipe
1ea843248b Fixed #9729 - bulk edit order number capped at 20 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 20:04:45 -07:00
Brady Wetherington
8268aca9fc Removed Ziggy.baseUrl references for meta references that had baseUrl 2021-06-23 19:57:45 -07:00
snipe
32a6fa5f0c Pushed less changes into integration branch 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 18:00:33 -07:00
snipe
b5a75206fe Merge remote-tracking branch 'origin/develop' 2021-06-23 17:19:48 -07:00
snipe
3f39cff225
Merge pull request #9738 from Godmartinz/bug/ch16594/table-striping-on-dark-mode-skins-is-too 
corrected a link color in the dark mode yellow skin
 2021-06-23 16:39:02 -07:00
Godfrey M
a37edd5c5b darkened back-sub-alt more 2021-06-23 16:34:41 -07:00
Godfrey M
f199098a59 undid the color change for links, darkened the back-sub-alt 2021-06-23 16:29:21 -07:00
snipe
7b51bf4f51 Merge remote-tracking branch 'origin/develop' 2021-06-23 14:41:27 -07:00
snipe
4db5a8f62b
Merge pull request #9695 from Joly0/master 
Update print.blade.php
 2021-06-23 14:33:25 -07:00
snipe
b3ec4bb31b Porting PR #9720 to v6 integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:28:06 -07:00
snipe
ac52ea3463 Porting PR #9720 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:27:15 -07:00
Godfrey M
154adeb9b2 corrected a link color in the dark mode yellow skin 2021-06-23 14:06:36 -07:00
Brady Wetherington
9456a03a88 Almost finished with the routes which is...hopefully? The last thing? 2021-06-22 16:58:23 -07:00
bmkalle
a330dca7d4
Update company-select.blade.php 
select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.
 2021-06-17 10:51:00 +02:00
Joly0
9a429952ff update print.blade.php 2021-06-15 08:52:01 +02:00
snipe
3095a78664 Small tweaks to Dashboard controller 
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:43:47 -07:00
Joly0
72f27ccc5b Update print.blade.php 2021-06-11 11:05:39 +02:00
Laravel Shift
ec0dc681ba Shift core files 2021-06-10 20:16:59 +00:00
Laravel Shift
934afa036f Adopt Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
 2021-06-10 20:15:52 +00:00
Ivan Nieto Vivanco
9f944ad497 Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471]. 2021-05-27 15:48:13 -05:00
snipe
9f2b4c721d Allow password reset from user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:32:23 -07:00
snipe
3f09d17389 Fixed typo “synchronization” 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-25 18:45:06 -07:00
snipe
9eea46adef Fixed parse error in user print view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-20 13:53:43 -07:00
Jonathon Reinhart
fd082addff
Fix incorrect case of ldap sync status string (#9563) 
Fixes #9562
 2021-05-12 19:15:39 -07:00
snipe
76897f3a3a Make label printing from asset page more consistent with normal UI 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-12 17:08:53 -07:00
tbrconnect
a29ef73346
Feature #3088 Print labels from asset detail page (#9559) 
This PR adds a "Generate Label" button to the detail asset page as
described in #3088.

Fixes #3088

Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>
 2021-05-12 13:38:26 -07:00
Brady Wetherington
62199f6255
Manually re-add support for Label Logos in Labels (#9552) 2021-05-07 17:01:32 -07:00
snipe
9aac3ae628 Fixed HTML causing two backup headers to appear 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-07 16:36:07 -07:00
snipe
ece627b3a3 Small fixes for location printing when relationships are missing/invalid, per #9521 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:23:46 -07:00
snipe
d8d3fa2293 Only show department if it’s valid 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 10:13:19 -07:00
snipe
57b9b571dc
Fixed #9531 - highlight search box when filled, add clear button (#9534) 2021-05-04 22:00:34 -07:00
snipe
b01baec7a8 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 18:11:48 -07:00
snipe
32f043c5df Set the body skin style if one was overridden by the user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:25:39 -07:00
snipe
23376c317e Use correct URL for css for subdirs 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:22:02 -07:00
snipe
b3b02933a5 Removed duplicate code 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:21:48 -07:00
snipe
882732b2de WTF kind of gendered language was this mess? 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:18:17 -07:00