DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14806 commits 102 branches 268 tags 288 MiB
Commit graph

14806 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d66d6e70a6 Added checkedOutToUser factory for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:18:53 +01:00
snipe 4635e9269d Added user update log factory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:18:34 +01:00
snipe 574867536d Standardize query for merging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 19:41:34 +01:00
snipe 5488a4d118 One more test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:36:27 +01:00
snipe e34f3c7c2c Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:32:41 +01:00
snipe ceaff7b645 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:30:11 +01:00
snipe d27a025347 Added factories 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:30:06 +01:00
snipe 2b2853a183 Added acceptance model 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:29:58 +01:00
snipe a25263f868 Transfer files and acceptances on merge 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:29:49 +01:00
snipe 4b9727067b
Merge pull request #15010 from snipe/fixes/translation_strings 
Added missing translations
 2024-07-03 12:43:50 +01:00
snipe 00fc392a12 Added missing traslations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 12:41:04 +01:00
spencerrlongg e79111fed5 fix test :( 2024-07-02 16:01:18 -05:00
spencerrlongg 423b48279b merge 2024-07-02 15:53:28 -05:00
spencerrlongg 6f29c0a7cf Merge branch 'refs/heads/develop' into bug/sc-24884 
# Conflicts:
#	routes/api.php
 2024-07-02 15:48:39 -05:00
snipe 27bc16604b Add @Galaxy102 as a contributor 2024-07-02 09:48:32 +01:00
snipe 86ae4a3513 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-07-02 09:37:40 +01:00
snipe 1da90fe1ec Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-02 09:37:05 +01:00
snipe 25ba50d6f7
Merge pull request #14870 from Galaxy102/feature/rotate-labels 
Add Label Template: Use with endless 62mm Brother printer rolls
 2024-07-02 08:45:42 +01:00
snipe f22e99aec8
Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades 
Use more modern reference for input text
 2024-07-02 08:43:34 +01:00
snipe f027fd5f21
Merge pull request #14986 from marcusmoore/bug/sc-25926 
Fixed extension requirement checking in upgrade script
 2024-07-02 08:42:45 +01:00
snipe 37a038c24f
Merge pull request #15001 from marcusmoore/features/link-user-table-counts-to-section 
Added links on user table to tabs on show user page
 2024-07-02 08:37:05 +01:00
spencerrlongg 0b60cbc531 remove $rules2 2024-07-01 19:37:49 -05:00
Marcus Moore 3a8f825de5
Link user table counts to section in user show 2024-07-01 14:06:05 -07:00
snipe d2df83cf2f
Merge pull request #14999 from marcusmoore/fixes/hide-edit-profile-button 
Removed "Edit Your Profile" button from View Assets page if user is not able to edit their profile
 2024-07-01 18:15:47 +01:00
Marcus Moore d481850d4c
Add @can around Edit Your Profile button on view assets page 2024-07-01 10:11:27 -07:00
snipe e502968707 Prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-01 10:00:28 +01:00
snipe 12dcac4994 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-07-01 10:00:15 +01:00
Konstantin Köhring 6c55e2bd9d Add a Brother compatible 62mm wide label. 
Tested with QL-600. Set print mode to landscape.
 2024-06-28 09:49:53 +02:00
Konstantin Köhring 2fd357c346 Add rotation attribute to Label class to allow rotation of the generated label PDF. 
This is necessary when printing labels with width = label width.
 2024-06-28 09:49:53 +02:00
Marcus Moore 0a5e58201a
Correctly account for "or" dependent extensions in upgrade script 2024-06-27 12:38:50 -07:00
snipe d687b20467 Use more modern reference for input text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 15:05:47 +01:00
snipe 7dbcedad40
Merge pull request #14981 from uberbrady/fix_backup_translations 
Fixed #14976, #14975, #14973 - Translation strings aren't always working
 2024-06-27 14:36:52 +01:00
snipe b6e8d28ed3
Merge pull request #14982 from snipe/fixes/check_for_user_on_patch_api 
Check that the user exists before trying to fill the request
 2024-06-27 14:36:21 +01:00
snipe 85ce47f5bb Updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 14:21:27 +01:00
snipe 55c98cc27a Check that the user exists before trying to fill the request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 14:05:28 +01:00
snipe 422f3ec81e Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 13:53:38 +01:00
snipe 54fb91c03b
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3 
Updated Livewire to v3
 2024-06-27 13:21:52 +01:00
Brady Wetherington 6df9742664 Built a workaround for backup notification translations 2024-06-27 13:17:16 +01:00
snipe f23a221750
Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms 
WIP - First start at switching to regular html labels
 2024-06-27 13:12:29 +01:00
snipe 1837da4508 Merge branch 'develop' 2024-06-26 13:46:40 +01:00
snipe 4637accb51 Built assets, bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 13:35:24 +01:00
snipe 74f067d893
Merge pull request #14974 from uberbrady/improve_saml_behind_proxy 
Fixed #14895 and #14919 - set SAML baseurl to a sensible default for docker users and users behind a reverse proxy
 2024-06-26 13:34:18 +01:00
snipe 43773954cd
Merge pull request #14966 from Godmartinz/css_issue 
Fixed importer table background color
 2024-06-26 13:33:14 +01:00
Brady Wetherington 30cafef9f2 Add a reasonable-looking SAML baseurl, mosty for users behind proxies 2024-06-26 13:25:11 +01:00
snipe e1a6b441d7 Merge remote-tracking branch 'origin/develop' 2024-06-26 12:53:18 +01:00
snipe 251f2d82b3 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 12:53:03 +01:00
snipe e905550778
Merge pull request #14971 from snipe/fixes/updated_translation_string 
Fixes #14968 - translate forbidden page
 2024-06-26 11:25:51 +01:00
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
Godfrey M eda2eb2283 fixes all dark modes 2024-06-25 10:24:35 -07:00
Godfrey M a7123a04ba fixes importer background color 2024-06-25 10:19:18 -07:00