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

14057 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c9873da732
Merge pull request #14628 from snipe/bug/sc-25375/icon_mimetype_validation_fix 
Added `ico`, `image/x-icon`, `image/vnd.microsoft.icon` to favicon validation
 2024-04-22 13:58:08 +01:00
snipe 8dd71f99cc Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 13:54:19 +01:00
Brady Wetherington ab45975883 Mark custom fields tests as 'incomplete' if the DB is mysql 2024-04-22 13:11:36 +01:00
snipe 7f38ca239e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-04-19 16:24:32 +01:00
snipe c3b982e759
Merge pull request #14622 from snipe/bug/sc-25363/z-index-bs-table-check-boxes-fix 
Reeduced z-index of bs table override
 2024-04-19 16:11:21 +01:00
snipe e330e80c46 Reeduced z-index of bs table override 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-19 16:06:43 +01:00
akemidx f0836d4d3a changes for button hover, removing text color changes. also added in a border for yellow and black themes 2024-04-18 19:36:35 -04:00
akemidx 1289920217 black button border 2024-04-18 19:29:56 -04:00
snipe a6a58094c9 Merge remote-tracking branch 'origin/develop' 2024-04-18 14:26:53 +01:00
snipe 424cbd3248 Removed noisy debug 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-18 14:25:54 +01:00
snipe e59b9627c7
Merge pull request #14511 from jeffclay/features/14508_pdo_ssl_verify 
Fixed #14508: Added PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT options to database.php …
 2024-04-18 14:23:00 +01:00
snipe f080c0cdcd
Merge pull request #14578 from Q4kK/features/add_no_interactive 
Feat: add no-interactive flag for `upgrade.php`
 2024-04-18 14:19:38 +01:00
snipe 29bda2ef7d
Merge pull request #14613 from marcusmoore/additional-test-cases 
Added test cases around modifying user groups via api
 2024-04-18 13:53:03 +01:00
akemidx e8d9701a26 array key existing 2024-04-17 19:16:25 -04:00
Marcus Moore 1d64692fd6
Add two test cases 2024-04-17 15:23:26 -07:00
snipe 6f195cb8ec
Merge pull request #14591 from snipe/bug/sc-25258/naive_fix_for_user_scoping 
First fix for user FMCS scoping
 2024-04-17 21:49:53 +01:00
snipe 4c02a63acc Removed activated attribute on test users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 20:29:51 +01:00
snipe 0fc9fc7516 Minor updates to tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 20:29:01 +01:00
snipe 4450351b75 Only sync groups if API user is superadmin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 11:06:50 +01:00
snipe 9bb15aaf1b Added individual gates to keep response consistent with other company-ed things 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:49 +01:00
snipe 65dd729e19 Additional gates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:20 +01:00
snipe c21142605d Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:47:56 +01:00
snipe 86e274faa3 Added API tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:47:48 +01:00
snipe 5e8c129c7f Revert accidental commit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 09:26:50 +01:00
snipe ab3b5ca4ef Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 09:26:07 +01:00
Marcus Moore 60a5afd752
Merge branch 'factory-refactors' into fix_saving_encrypted_custom_fields 2024-04-16 17:15:22 -07:00
Marcus Moore 9d0ea857fe
Import facade 2024-04-16 17:14:17 -07:00
Marcus Moore f763aea4fc
Update tests to send post request 2024-04-16 17:13:18 -07:00
Marcus Moore e16c04250e
Improve model factories 2024-04-16 16:58:28 -07:00
Marcus Moore ad99aa460b
Remove unneeded imports 2024-04-16 15:09:49 -07:00
Marcus Moore e47f64f62d
Separate test methods 2024-04-16 15:03:05 -07:00
Marcus Moore c6d9da1571
Remove unneeded fields in factory state 2024-04-16 12:36:41 -07:00
Marcus Moore ab561d1ce8
Simplify factory state 2024-04-16 12:36:13 -07:00
akemidx f39ba0136c errant carraige return 2024-04-16 14:26:18 -04:00
akemidx df60045bfe sidebar hover fix 2024-04-16 14:21:47 -04:00
akemidx 5e122f780f sidebar_hover_color 2024-04-16 14:00:20 -04:00
Marcus Moore eefe377159
Correct order of arguments 2024-04-16 10:51:33 -07:00
q4kK 20920c262d Feat: add no-interactive flag for upgrade.php 
Having a no-interactive flag is useful because attempting
to automate snipe-it upgrades is currently extremely janky.
You have to either:
  a) read the prompts and pass in the input (the "correct" way)
  b) pipe in input, e.g. `yes` and hope no new prompts
  are added.

With the `no-interactive` flag, this can be fixed by both
allowing new prompts to be added without conflict
to user prompts, but also allowing automated upgrades (you could
choose to crash, or assign defaults).
 2024-04-16 11:54:50 -05:00
Brady Wetherington 870612be1c Break 'update' API statements into its own test file. Split tests up 2024-04-16 15:34:28 +01:00
Brady Wetherington 266424ff0e Some simple renames for better readability as suggested by Marcus 2024-04-16 15:17:02 +01:00
snipe a8d48b758e
Merge pull request #14594 from marcusmoore/bug/sc-25314/multiple-label-fields-on-one-row 
Fixed label fields only showing first option
 2024-04-15 18:53:03 +01:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
snipe 7b7d424962
Merge pull request #13880 from Godmartinz/department-validation-bug 
Fixed department validation to allow updates
 2024-04-12 10:50:26 +01:00
Marcus Moore a4e959818a
Add comment 2024-04-11 17:23:28 -07:00
Marcus Moore c3a71cc182
Improve variable names and add comment 2024-04-11 16:44:13 -07:00
Marcus Moore da03cfdbe5
Formatting 2024-04-11 16:39:29 -07:00
Marcus Moore 2b137d76fa
Trim string to avoid leading whitespace if label is empty 2024-04-11 16:38:22 -07:00
Marcus Moore 81b8c111ca
Allow multiple fields to be displayed in one row 2024-04-11 15:00:14 -07:00
snipe fce98b9ca4 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2024-04-11 18:58:50 +01:00
snipe c0dcae16f7 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 18:57:06 +01:00