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

13384 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button 
Added a License Export function and button
 2024-04-24 04:42:56 +01:00
snipe 685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels 
Removed encrypted fields from label options
 2024-04-23 13:31:38 +01:00
snipe e2d1e6b0c5
Merge pull request #14608 from akemidx/bug/sc-25232 
Left Sidebar Was Not Respecting Theme
 2024-04-23 12:32:48 +01:00
snipe c8c81a360c Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-23 10:26:43 +01:00
snipe bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields 
Re-enabled updating encrypted custom fields via API [sc-41465]
 2024-04-23 10:20:55 +01:00
snipe c50d5a678a
Merge pull request #14616 from akemidx/bug/sc-25235 
REMOVED: Dark Theme Button Text Coloring
 2024-04-23 09:20:57 +01:00
Godfrey M 96b3af7cbc fixed view from sending all custom fields 2024-04-22 18:27:34 -07:00
Godfrey Martinez 9e7bbc968d
Merge pull request #15 from Godmartinz/License-export-button_p2 
adds licenses available, updated teranslations
 2024-04-22 17:59:52 -07:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
Marcus Moore 155f5f35cd
Remove todo 2024-04-22 15:47:05 -07:00
snipe 7ad6caf30a
Merge pull request #14632 from marcusmoore/bug/sc-25384 
Added "select" option to top of data sources in new label engine
 2024-04-22 20:40:31 +01:00
Marcus Moore ac8aab0043
Add default "select an option" to data source options 2024-04-22 12:22:10 -07:00
Godfrey M 14ddf36d46 removed two duplicate translations 2024-04-22 10:43:11 -07:00
Godfrey M 25f1167c9d adds company scoping to license export 2024-04-22 10:38:55 -07:00
Godfrey M 420225c2d5 Merge branch 'refs/heads/develop' into License-export-button 2024-04-22 10:33:30 -07:00
Marcus Moore 45f5eaac5b
Extract CanSkipTests trait 2024-04-22 10:32:37 -07:00
snipe cfe39afc11
Merge pull request #14630 from snipe/bug/sc-25377/double_encoding_assets_and_model_notes_on_upload 
Removed escaping on notes for file uploads
 2024-04-22 14:59:55 +01:00
snipe 2aa3ce15bd Removed escaping on notes for file uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 14:55:02 +01:00
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 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 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
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