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
14537 commits 101 branches 268 tags 288 MiB
Commit graph

14537 commits

This branch
This branch
All branches
Author SHA1 Message Date
spencerrlongg e8864ffb01 test added, permission fixed 2024-07-23 14:29:17 -05:00
spencerrlongg b9fdb5880a quick push 2024-07-23 13:48:43 -05:00
spencerrlongg 1139ed676a $id to $asset->id (thanks tests) 2024-07-23 13:03:25 -05:00
Spencer Long 64be353156
Merge branch 'develop' into bug/sc-24884 2024-07-23 12:55:19 -05:00
snipe 900c19b76d
Merge pull request #15143 from snipe/fixes/no-NO-language 
Switch to nb-NO from no-NO for Norwegian
 2024-07-23 18:25:27 +01:00
snipe effd2bce24 Fixed test to use nb-NO 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 18:22:13 +01:00
snipe de8816d837
Merge pull request #15144 from snipe/localization/updated_strings_2024_07_23 
Updated translations
 2024-07-23 18:17:45 +01:00
snipe 593554daed Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 18:14:19 +01:00
snipe fecd877e8b Migration 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:35:06 +01:00
snipe ba6d8ae8c7 Switch to nb-NO from no-NO 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 17:15:44 +01:00
snipe 175862d3c9 Added route param to message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 16:37:01 +01:00
snipe 30835fe9ba
Merge pull request #15134 from snipe/upgrade_bs_table 
[Snyk] Upgrade bootstrap-table from 1.22.5 to 1.23.0 #15131
 2024-07-22 10:50:53 +01:00
snipe 910e98b573 [Snyk] Upgrade bootstrap-table from 1.22.5 to 1.23.0 #15131 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:45:35 +01:00
snipe 4623e40077
Merge pull request #15133 from snipe/fixes/load_english_separately_for_table_locale 
Load the english file again in case BS table doesn’t have a translation
 2024-07-22 10:40:01 +01:00
snipe 20868b9ede Load the english file again in case BS table doesn’t have a translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:30:42 +01:00
snipe efc84efabf
Merge pull request #15132 from snipe/fixes/disable_remote_login_force_via_env 
Hides the “Disable Other Login Mechanisms” option via env
 2024-07-22 10:20:34 +01:00
snipe 7c7fa96334 Pulled from the app.php as well 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:19:55 +01:00
snipe e08acb851c Removed env part, just check for the remote user login 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:18:33 +01:00
snipe bbad84c6cc Hides the “Disable Other Login Mechanisms” option via env 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 10:13:59 +01:00
snipe f2acb98afa
Merge pull request #15128 from snipe/fixes/nicer_consumables_layout 
Nicer consumables layout
 2024-07-20 17:01:15 +01:00
snipe 38affea3f3 More updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:57:10 +01:00
snipe cea31c5b11 Added more generic buttons with variables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:53:01 +01:00
snipe 254e2f120b Added clone to consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:40:32 +01:00
snipe 2bfee0c29a Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:21:11 +01:00
snipe c08bd8f88b Nicer consumables layout 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:11:45 +01:00
snipe f63fd25ce0 Fixed default 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 08:08:29 +01:00
snipe 9d890b35c6
Merge pull request #15127 from snipe/fixes/small_default_avatar_tweaks 
Fixes #15076 - Removes ability to remove the default avatar from disk
 2024-07-20 07:42:39 +01:00
snipe 8fc5c0b5be Use other default avatar, not in the avatars directory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:34:40 +01:00
snipe c4e7448d31 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:56 +01:00
snipe ffd2687734 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:46 +01:00
snipe 6f3eedf5e6 Removed restoreDefaultAvatar method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:27 +01:00
snipe 241eb7b031 One more bad sig 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:06:27 +01:00
snipe ca399794c3 Fixed incorrect signature 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:05:01 +01:00
snipe 736d4cc59a Use new deleting method in ImageUploadRequest 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:34 +01:00
snipe ad85f8be2f Cleaned up 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:12 +01:00
snipe be17ef4047 Added option to restore from default demo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:06 +01:00
snipe c6c006f143 Added restore from demo method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:54:40 +01:00
snipe 10856516ac Split out the image deletion into a separate method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:40:16 +01:00
snipe beac4c8b8a Updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:39:54 +01:00
snipe b39b39bc8a Ignore the test uploads directory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:39:05 +01:00
snipe e373be7dde Skip deleting default avatar from disk on delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 01:01:27 +01:00
snipe ca7c0aa47c Added default avatar to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:59:25 +01:00
snipe 48a8cf6b70 Removed unused default avatar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:58:57 +01:00
snipe 7ba1646703 Remove unusued default avatar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:58:42 +01:00
snipe e9f9d3c259 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:30:03 +01:00
snipe 63377853b8
Merge pull request #15125 from snipe/fixes/display_avatar_on_user_edit 
Show existing images on user edit page
 2024-07-20 00:29:28 +01:00
snipe fc86eefeac Show existing images on user edit page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:27:28 +01:00
snipe 32c768792a
Merge pull request #15124 from snipe/fixes/path_for_crypt_in_importer 
Fixed use statement for Crypt in the importer, removed unused statements
 2024-07-19 22:54:18 +01:00
snipe 793cf27318 Fixed use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 22:50:24 +01:00
snipe ba568b7975
Merge pull request #15123 from snipe/tests/added_bulk_delete_assets 
Added tests for bulk asset deletion and restore
 2024-07-19 22:36:09 +01:00