DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9757 commits 101 branches 268 tags 288 MiB
Commit graph

9757 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 8dd3ae8a37 Corrected gates, added fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 11:53:20 -07:00
snipe c7f4a93c17
Merge pull request #12691 from snipe/fixes/small_cleanup_for_bulk_delete_checkin 
Small cleanup for bulk delete checkin
 2023-03-18 00:16:15 -07:00
snipe 071a642509 Changed phrasing in translatons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:15:28 -07:00
snipe e39a75f2cc Fixed min width on select2 bulk menus 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:57 -07:00
snipe ea4a37d8ef Fixed cancel button alignment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:09 -07:00
snipe 789c4b4df8
Merge pull request #12690 from snipe/features/more_merge_user_olish 
More merge-user polishing
 2023-03-17 17:29:12 -07:00
snipe 12a2d8ad49 Fixed admin ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 17:03:10 -07:00
snipe e47fc9527b Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:50:02 -07:00
snipe 820ae09a6f Reworked the layout of the confirm merge form a little 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:41 -07:00
snipe fb54a21e12 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:22 -07:00
snipe b39fa1d987 Added merge icon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:17 -07:00
snipe 28cc8f9d69 Nicer user history display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:41:43 -07:00
snipe a54e50961e Added event and listener 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:41:33 -07:00
snipe 82dc57aa18 Renamed some variables, invoked the event listener 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:24:58 -07:00
snipe 9ac4efb912 Better commenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:24:38 -07:00
snipe c752e3bb86 Fixed divs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:48:41 -07:00
snipe 1a8622dc3b
Merge pull request #12689 from snipe/features/add_password_lock_and_use_new_strings 
Features/add password lock and use new strings
 2023-03-17 02:44:37 -07:00
snipe e557f03cc2 Disable submit if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:43:33 -07:00
snipe 30cf7eb750 Disallow action in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:42:50 -07:00
snipe 13a02ff241
Merge pull request #12687 from snipe/features/nicer_ui_for_merge 
Made the table wider, used icons to compact space
 2023-03-16 23:14:25 -07:00
snipe c93096b767 Made the table wider, used icons to compact space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 23:13:05 -07:00
snipe d8d7ed4465
Merge pull request #12686 from snipe/features/added_email_and_username_to_merge_confirm 
Added email and username to merge user confirmation screen
 2023-03-16 22:49:54 -07:00
snipe 736777e1e6 Added email and username to merge user confirmation screen 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 22:48:20 -07:00
snipe f566a71658
Merge pull request #12685 from snipe/features/merge_users 
Added user merge
 2023-03-16 18:20:24 -07:00
snipe 0dd11575c5 Added merge controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:19:16 -07:00
snipe d3d26cb988 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:19:03 -07:00
snipe 07fbbf5f7f Added merge to user menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:54 -07:00
snipe 0dfb51f642 User merge blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:32 -07:00
snipe 853e809ff8 Added route 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:26 -07:00
snipe ffb87a0a87
Merge pull request #12684 from snipe/features/added_console_command_to_normalize_names 
Added console command to normalize capitalization on names
 2023-03-16 16:24:33 -07:00
snipe 8f04342fc2 Added console command to normalize capitalization on names 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:23:52 -07:00
snipe d6434fa55a
Merge pull request #12683 from snipe/fixes/additional_sort 
Fixes/additional sort
 2023-03-16 16:08:51 -07:00
snipe b374834999 Added extra order by switch for first_name and last_name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:51 -07:00
snipe 5e4455f042 Deleted duplicate statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:36 -07:00
snipe b64d7e38f2
Merge pull request #12679 from snipe/bug/sc-20451 
Handle already-deleted license files more gracefully
 2023-03-15 16:26:15 -07:00
snipe e9601bcf13 Handle already-deleted license files more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-15 13:05:51 -07:00
snipe fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf 
Datestamp on "Print All Assigned" generated form
 2023-03-15 11:31:52 -07:00
akemidx f38f6f57ae fixed localization and formatting. simplified code to remove php snippet 2023-03-15 14:00:29 -04:00
snipe 08e09a3215
Merge pull request #12675 from snipe/security/webpack_upgrade 
Updated webpack
 2023-03-14 19:55:42 -07:00
snipe 039a5dde7d Updated webpack 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 19:54:58 -07:00
snipe 1968aebf78
Merge pull request #12674 from snipe/fixes/translation_variable_for_slack 
Fixed missing variable in Slack hook test
 2023-03-14 19:03:42 -07:00
snipe a0617edaf0 Fixed missing variable in Slack hook test 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 19:02:38 -07:00
snipe 4c66267f3b
Merge pull request #12668 from inietov/fixes/undefined_array_key_0 
Fixed ErrorException: Undefined array key 0 [sc-20424]
 2023-03-14 17:10:04 -07:00
snipe 322fd76353
Merge pull request #12664 from Godmartinz/The_final_lowercase 
The final lowercase in webhooks
 2023-03-14 17:09:20 -07:00
snipe c12d261fc8
Merge pull request #12673 from marcusmoore/fixes/fix-component-factory 
Fixed Component factory
 2023-03-14 17:05:38 -07:00
snipe a991bdd136
Merge pull request #12672 from inietov/fixes/consumable_factory_seeder 
Fixed Consumable Factory Seeder
 2023-03-14 17:04:33 -07:00
Marcus Moore 9cd8460e1e
Add proper date format to purchase date in the component factory 2023-03-14 17:02:45 -07:00
snipe f0d05a7461 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-03-14 14:34:11 -07:00
snipe 88624ff2c0 Add @marcusmoore as a contributor 2023-03-14 14:34:03 -07:00
snipe f71ee699f4 Add @spencerrlongg as a contributor 2023-03-14 14:33:31 -07:00