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

1122 Commits

Author SHA1 Message Date
snipe c22dcdafa4 Show used in column regardless for Custom Fields 2015-12-01 04:16:31 -08:00
snipe e5cc6d32d1 More small UI tweaks for Custom Fields 
Still lots of work to be done here, this is just a rough improvement
 2015-12-01 04:14:36 -08:00
snipe 3b42738a2d Custom field enhancements for UI 2015-12-01 04:11:01 -08:00
Brady Wetherington 9316af7ed8 Deletion support for fields and fieldsets 2015-11-30 17:09:57 -08:00
snipe fffc8ed644 Merge pull request #1412 from snipe/same_field_twice 
Custom Fields - shouldn't be able to add the same field twice to the same fieldset
 2015-11-29 17:25:11 -08:00
snipe 948e9c2a2b Merge branch 'develop' into custom_fields_adminify 
# Conflicts:
#	app/routes.php
 2015-11-29 17:24:26 -08:00
snipe a44c56c937 Merge branch 'hotfixes/fix_1413' into develop 
# Conflicts:
#	app/config/version.php
#	app/models/Company.php
 2015-11-29 16:49:34 -08:00
Brady Wetherington 418be7f5de Fix to adding same custom field twice. Helps with #1397. Requires 
PR #1408 to be merged first.
 2015-11-29 13:16:03 -08:00
Brady Wetherington beeb28bf09 Fix routes for custom fields, fix admin access. Helps with #1397 2015-11-28 18:18:53 -08:00
snipe 7d2ae0d10d CSRF for ajax 2015-11-26 14:11:38 -08:00
snipe 6bedaa903a CSRF token for ajax 2015-11-26 13:53:51 -08:00
snipe 1efb1f7038 Remove MAC address fields since they are now custom fields 2015-11-26 13:42:13 -08:00
Brady Wetherington 10086479b7 Better erroring, return previous input on error. 2015-11-25 20:38:22 -08:00
Brady Wetherington c0e988b6b1 Basic validation on customFieldset 2015-11-25 20:14:26 -08:00
Brady Wetherington c6f8d3e6f2 A little bit of basic, terrible navigation for Custom Fields. 2015-11-25 15:40:58 -08:00
Brady Wetherington 4508225d65 Add default layout basic styling to custom fields 2015-11-25 15:16:20 -08:00
Brady Wetherington e3ec2ae3ec Style the drop-down for custom fieldset to match 2015-11-25 14:55:49 -08:00
Brady Wetherington d653126a2a Merge branch 'develop' into custom_fields 
Conflicts:
	app/controllers/admin/AssetsController.php
	app/views/backend/hardware/index.blade.php
	app/views/backend/hardware/view.blade.php
 2015-11-25 14:22:22 -08:00
snipe 59b2b8c63e Switch to hash version for more consistent cookie resets 2015-11-25 02:47:21 -08:00
snipe 20490986c6 Fixes #1325 - zenbra striping and borders on table for money value clarity 2015-11-24 23:43:10 -08:00
snipe 64eecc8df7 Added image to model listing view for #1370 2015-11-24 23:24:20 -08:00
snipe 0f33bad1b6 Commented out version of export all 
This still works sorta wonky, and only exports 50 per page. Possibly related to https://github.com/wenzhixin/bootstrap-table/issues/1576
 2015-11-24 23:15:01 -08:00
snipe 99391d0179 Fixes #1332 - added location to accessories 2015-11-24 22:43:13 -08:00
snipe 904ddddce9 Removed consumable search sicne it doesn't do anything yet 2015-11-24 22:20:13 -08:00
snipe b39c53a5ea Closes #1375 - More data in consumables detail view 2015-11-24 21:58:30 -08:00
snipe 287c7735b6 Added CSRF token for upload 2015-11-24 19:37:59 -08:00
snipe a3dbd87f9f Fixed weird company table styles 2015-11-24 13:47:43 -08:00
snipe 6d42d2c614 Fixed bootstrap class for button 2015-11-24 13:44:58 -08:00
snipe a777499c0b Fixes #1376 - added new fields to consumables view 2015-11-24 13:30:05 -08:00
snipe 256f33e6b4 Company/category search on accessories 2015-11-24 12:08:49 -08:00
snipe f6e2654609 Added searching on company name, ordering on company name for PR #1321 2015-11-24 11:47:34 -08:00
snipe e60c0e3b4d Warning message about EOL 2015-11-23 21:04:41 -08:00
snipe 120c8394bb Fixes #1380 - groups pagination 2015-11-23 19:18:00 -08:00
snipe 4a49e6f471 Added popover code 2015-11-23 17:43:43 -08:00
snipe 61107769e8 Add user ID and make company name hidden by default 2015-11-23 15:18:10 -08:00
snipe f87a25bf3f Moved company down further, since it's not used as often 2015-11-23 14:44:08 -08:00
snipe 4ae02c1fb3 Merge pull request #1321 from Ahimta/multiple-companies 
Add support for multiple companies
 2015-11-23 14:40:37 -08:00
snipe 9ec132acde Small fixed for LDAP in settings table 2015-11-23 14:33:00 -08:00
Walter 6ea3bedb9e set decryption and set pword in migraiton 2015-11-22 23:08:18 -05:00
Walter 840e5b1523 Revert "begin work on idap import button" 
This reverts commit 3942fd1869.
 2015-11-22 11:10:36 -05:00
Walter 1ee3f29d2e Revert "working on ldap import button" 
This reverts commit 113dfc9c24.
 2015-11-22 11:02:19 -05:00
Walter 6b26640077 Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings 2015-11-22 11:01:07 -05:00
Abdullah Alansari e4a634a8a3 Merge remote-tracking branch 'upstream/develop' into multiple-companies 2015-11-21 11:27:00 +03:00
Abdullah Alansari 86a174201e Only users with no company or supers can manage users' companies 2015-11-21 04:30:15 +03:00
snipe 01b574069a Fixes #1362 - status labels losing type on edit 2015-11-20 09:20:14 -08:00
Abdullah Alansari fe44846c1b Fix: only super users can change multiple companies support option 2015-11-19 09:17:50 +03:00
Wahlstedt, Walter 113dfc9c24 working on ldap import button 
add route for button
added button and open/close for form
 2015-11-18 16:22:04 -05:00
Walter 3942fd1869 begin work on idap import button 2015-11-18 12:11:42 -05:00
Abdullah Alansari d2423b2fc8 Show company name for the remaining entities 2015-11-18 19:15:56 +03:00
Wahlstedt, Walter 73a183677d Revert "add escaping to ldap fields in blades" 
This reverts commit 1d24450dcd.
 2015-11-17 16:12:24 -05:00