DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8549 commits 101 branches 268 tags 320 MiB
Commit graph

8549 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco 267997f0a6 Customize the notifications with the needed data 2022-08-11 14:01:11 -05:00
Ivan Nieto Vivanco 0172fe6403 Add Notifiable trait to the CheckoutAcceptance Model 2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco 509bbbc685 Create Notifications classes for accepted and declined and add some necesary lang strings 2022-08-11 13:01:21 -05:00
snipe c7d9baad8e Merge remote-tracking branch 'origin/master' into develop 2022-08-10 16:11:29 -07:00
snipe c77d763f05
Merge pull request #11650 from snipe/fixes/6877_add_notes_to_consumables 
Fixed #6877 - Added notes to consumables, components on checkout
 2022-08-10 16:11:08 -07:00
snipe ef099aa644 Reverted notes to note since pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 16:09:56 -07:00
snipe acd666fdf5 Added notes to user consumables tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:34:07 -07:00
snipe 8de7e9a2ab Use route name in case the user biffs the checkout twice 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:17:52 -07:00
snipe dd0260c3be Use old note on validation failure 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:15:29 -07:00
snipe 512348cc5a Added withInput() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:15:09 -07:00
snipe fb3d7bf82e Made button wider 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:07:58 -07:00
snipe e3293151a2 Added note on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:59 -07:00
snipe 3ec77724d8 Added note pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:34 -07:00
snipe 024a014298 Changed notes to note 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:19 -07:00
snipe c1e5d03340 Added pivot for note 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:03:41 -07:00
snipe fb2fe61daf Use a less stupid URL for this endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:03:26 -07:00
snipe 0d9eccb7eb Addeed note field 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:03:12 -07:00
snipe f9956cc5df Added DB migration 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 14:54:33 -07:00
snipe f7cceaedd5
Merge pull request #11649 from snipe/features/add_url_in_export 
Fixed #8928 - add URL and ID to custom asset report
 2022-08-10 13:58:22 -07:00
snipe e7c47408a7 Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:57:42 -07:00
snipe 637604dfaf Fixed #8928 - add URL and ID to custom asset report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:51:47 -07:00
snipe f66df4d468
Merge pull request #11648 from uberbrady/reimplement_active_flag 
Fixed the active flag to be as it was in later v5 releases
 2022-08-10 13:32:52 -07:00
Brady Wetherington b6adfa294c Fixed the active flag to be as it was in later v5 releases 
Originally implemented here:

https://github.com/snipe/snipe-it/pull/10610/files
 2022-08-10 12:55:30 -07:00
snipe f374f231d4 Added ERD link 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 11:37:17 -07:00
snipe d4e60a46c1 Merge remote-tracking branch 'origin/develop' 2022-08-09 15:15:31 -07:00
snipe a834ac6ec2
Merge pull request #11642 from Godmartinz/monthly_depreciation_calculation 
Fixes Monthly depreciation calculation if EOL is blank
 2022-08-09 15:14:57 -07:00
Godfrey M 92e6ea96b2 if eol is missing from asset model monthly depreciation will be recalculated 2022-08-09 15:05:15 -07:00
snipe de449fd1c2
Merge pull request #11635 from exula/fix/missing_closing_div_in_general_admin_settings 
Added a closing div tag around the mail text help block, this was cau…
 2022-08-09 11:07:19 -07:00
Brad Coudriet 77a1fcb1fc There was actually a missing p tag too 2022-08-09 06:36:53 -04:00
Brad Coudriet 0cf0598936 Added a closing div tag around the mail text help block, this was causing labels further down the page to be formatted in correctly 2022-08-09 06:32:03 -04:00
snipe 80d91c0c51 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-08-08 15:33:10 -07:00
snipe c39bf7b7e6 Added German (Informal) to select list 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 15:30:58 -07:00
snipe 9db0b038a5 Updated translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 15:29:28 -07:00
snipe 4f4c4ed5be Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 14:35:04 -07:00
snipe 51f7298720 Merge remote-tracking branch 'origin/develop' 2022-08-05 18:16:20 -07:00
snipe bc4032c2cd
Merge pull request #11617 from inietov/fixes/components_wrong_remaining_inventory 
Fixed wrong calculation of assigned components
 2022-08-05 18:05:21 -07:00
Ivan Nieto Vivanco c055c91739 Change db query for an existing method 2022-08-04 09:20:20 -05:00
Ivan Nieto Vivanco ea8f12579d Calculate the proper amount of assigned components 2022-08-04 07:58:25 -05:00
snipe 88db2d9e18 Merge remote-tracking branch 'origin/develop' 2022-08-03 17:57:07 -07:00
snipe 5f93d7b3be
Merge pull request #11615 from inietov/fixes/autoincrement_in_importer 
Fix auto incrementing in CSV importer [sc-19366]
 2022-08-03 17:50:23 -07:00
snipe 1875ed55cc
Merge pull request #11612 from snipe/fixes/improved_report_search 
Added relations to report search
 2022-08-03 17:49:59 -07:00
Ivan Nieto Vivanco 9f0ecba9b9 Add autoincrementing asset tags to the import if the CSV column is empty 2022-08-03 12:48:48 -05:00
snipe 9acfceba29 Added relations to report search 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 23:50:10 -07:00
snipe 92bf8b4436 Merge remote-tracking branch 'origin/develop' 2022-08-02 20:22:02 -07:00
snipe b52c00d49b
Merge pull request #11611 from snipe/fixes/added_configuration_change_to_maintenance_types 
Added configuration change to maintenance types
 2022-08-02 20:21:25 -07:00
snipe 20fcf7a1e9 Added configuration change to maintenance types 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:43 -07:00
snipe 095dd3ecf2 Added configuration, PAT test strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:28 -07:00
snipe 5a1b8bc4b6 Fixed icheck checkbox class 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:19 -07:00
snipe eadb36cb26 Merge remote-tracking branch 'origin/develop' 2022-08-02 20:00:13 -07:00
snipe 6eac133caf
Merge pull request #11610 from snipe/fixes/adds_deleted_at_to_custom_report_export 
Added deleted at to custom report export
 2022-08-02 19:59:39 -07:00