ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,988 Commits 84 Branches 293 Tags
b433b49469f01cfb60b5d4bea89b7987c29b0773
Commit Graph

4988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe b433b49469 Ficing webpack, CSS and JS (*whew* that sucked) 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 22:41:33 -07:00
snipe 72a1616b3c Removed wonky assets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 21:02:42 -07:00
snipe f172747495 Handle parse error in custom fields edit per #7997 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 19:36:07 -07:00
snipe 6427f46a6b Removed mix (switched to url()) for now until assets are fixed 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 19:35:21 -07:00
snipe b76b97d89b Fix path in seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-27 18:17:44 -07:00
snipe 6847a331a7 Backport the column icon fix from master 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 05:55:38 -07:00
snipe bea3a7b982 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 00:39:32 -07:00
snipe 88d39b4287 Updated generated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:46:41 -07:00
snipe f66ce02756 Added debugging logs 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:46:02 -07:00
snipe c7b300a50d Updated LDAP sync controller to use new Adldap2 connections 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:45:44 -07:00
snipe 44962d1eb9 Switched to use Primary button 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:44:48 -07:00
snipe e69461d797 Cleaned up LDAP sync blade 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:44:28 -07:00
snipe 796e693dda Removed duplicate signature padd css files 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 22:44:17 -07:00
snipe c9ed205bb0 Added @throws to documentation 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 14:41:37 -07:00
snipe b01e8720dc Fixed ldap settings JS error 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-23 14:41:20 -07:00
snipe e9135eceb3 Better json formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 11:16:31 -07:00
snipe c50b81ff19 Added resources 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:15:24 -07:00
snipe b5cc845216 Removed vendor.js from setup blade 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:15:12 -07:00
snipe 599cf23d63 Added icheck icons to resources 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:14:23 -07:00
snipe b0d848caec Updated wedbpack to only pull from resources or node_modules 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:13:32 -07:00
snipe 94e8343f63 Generated skins in css/dist/skins 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:13:09 -07:00
snipe cdd0e405be Fixed weird merge 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:12:29 -07:00
snipe eb8c20880a Updated package.json 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:12:12 -07:00
snipe af6dc0068b Updated node, set min requirement 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:12:00 -07:00
snipe a160da6619 Removed unused styles 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 07:11:38 -07:00
snipe 3435485a46 Updated path to skin css 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 06:41:19 -07:00
snipe 3a446e6396 Updated variables.less with additional values 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 06:40:27 -07:00
snipe b725e788ec Applied new selectlist search to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 06:39:41 -07:00
snipe fa5134603f Added type casting and a few more validation rules 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 06:37:40 -07:00
snipe a44d1cc0cf Fixed iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 06:02:55 -07:00
snipe 69a1732245 Removed duplicate form request in asset models controller 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 03:51:10 -07:00
snipe 7e9e5214ef Fixed status label create error 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 03:50:43 -07:00
snipe e1784394b3 Moved js, skins and primary CSS into dist directory 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 03:39:42 -07:00
snipe edc29bf6d5 Moved font-awesome fonts to make life easier 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 03:33:14 -07:00
snipe 6103524ebc Moved skins into css/dist directory 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 03:32:52 -07:00
snipe 2db527f4d2 Removed CSS skins (these are generated in the css dir) 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 03:27:51 -07:00
snipe 60851c2eb2 Fixed AssetsController namespace in route 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-22 03:15:54 -07:00
snipe 905fb09c5b Removed unused light skins 2020-04-22 01:56:22 -07:00
snipe 82b6d2b31b Fixed a few more tests 2020-04-21 21:13:00 -07:00
snipe c5e587f33b Added codeception testing modules for —dev 2020-04-21 20:15:45 -07:00
snipe 7a33e335d4 Fixes PSR autoloading issue 2020-04-21 20:15:24 -07:00
snipe bbc2ac2f9d Updated tests with new location.id!=location.parent_id rule 2020-04-21 19:51:42 -07:00
snipe c02adace61 Ensure at the model level that location.id/user.id and location.parent_id/user.manager_id cannot be the same 2020-04-21 19:51:20 -07:00
snipe 5dc64ea91b Re-added EasySlugger to fix tests 2020-04-21 19:28:24 -07:00
snipe 1c5486e588 Updated test method for newer codeception from assertContains to assertStringContainsString 2020-04-21 19:28:06 -07:00
snipe 05e9861b71 Checkin/checkout fixes 2020-04-21 11:28:31 -07:00
snipe cff2a65f62 Fixed broken if/else in view from bad merge 2020-04-21 11:13:29 -07:00
snipe 7a6ca5cb40 Tempt fix for css weirdness 
TODO: figure out why overrides isn’t being compiled into css/dist/all.css
 2020-04-21 11:03:32 -07:00
snipe 63259418b2 Package updates 2020-04-21 10:43:25 -07:00
snipe 1d8c3a73ea Use non-min version of skin until we can get the other webpack stuff sorted 2020-04-21 10:43:04 -07:00