Commit Graph

  • 4f3cdc20f5 Start of moving custom fields to the /admin/ space Brady Wetherington 2015-11-26 13:47:09 -08:00
  • 1efb1f7038 Remove MAC address fields since they are now custom fields snipe 2015-11-26 13:42:13 -08:00
  • 6708911d5d Remove mac address (now custom field) snipe 2015-11-26 13:33:01 -08:00
  • 3bbcbf5f47 Merge branch 'hotfixes/ldap_settings' into develop snipe 2015-11-26 13:11:47 -08:00
  • 989ce59a5b Fixes #1399 - Import LDAP config into database snipe 2015-11-26 13:10:28 -08:00
  • 774b1cb28b Merge pull request #1398 from snipe/custom_fields_erroring snipe 2015-11-25 20:45:02 -08:00
  • 10086479b7 Better erroring, return previous input on error. Brady Wetherington 2015-11-25 20:38:22 -08:00
  • c0e988b6b1 Basic validation on customFieldset Brady Wetherington 2015-11-25 20:14:26 -08:00
  • 93cf37336d Merge pull request #1277 from snipe/custom_fields snipe 2015-11-25 19:14:53 -08:00
  • 924f61fce9 Cache custom field listing for assets, custom fields are sortable Brady Wetherington 2015-11-25 16:09:16 -08:00
  • c6f8d3e6f2 A little bit of basic, terrible navigation for Custom Fields. Brady Wetherington 2015-11-25 15:40:58 -08:00
  • a212abee1d Strip out stale comments Brady Wetherington 2015-11-25 15:30:06 -08:00
  • 4508225d65 Add default layout basic styling to custom fields Brady Wetherington 2015-11-25 15:16:20 -08:00
  • e3ec2ae3ec Style the drop-down for custom fieldset to match Brady Wetherington 2015-11-25 14:55:49 -08:00
  • d653126a2a Merge branch 'develop' into custom_fields Brady Wetherington 2015-11-25 14:22:22 -08:00
  • ba39cbb5e0 Merge remote-tracking branch 'origin/develop' v2.0.6 snipe 2015-11-25 03:50:08 -08:00
  • 34276984f3 Bumped version snipe 2015-11-25 03:49:47 -08:00
  • 2195e27d61 Added company_list to license clone snipe 2015-11-25 03:48:05 -08:00
  • 948be5c74b Updated language strings snipe 2015-11-25 03:37:48 -08:00
  • 93c582970c Merge remote-tracking branch 'origin/develop' snipe 2015-11-25 03:19:34 -08:00
  • 9624388522 Added company_list to clone asset snipe 2015-11-25 03:19:13 -08:00
  • 6abfb1b968 Merge remote-tracking branch 'origin/develop' snipe 2015-11-25 02:47:48 -08:00
  • 59b2b8c63e Switch to hash version for more consistent cookie resets snipe 2015-11-25 02:47:21 -08:00
  • 658462cda5 Merge remote-tracking branch 'origin/develop' snipe 2015-11-25 02:39:13 -08:00
  • dad1ffb355 Specify table name in select to prevent id overwriting snipe 2015-11-25 02:38:13 -08:00
  • 12b82d6679 Merge remote-tracking branch 'origin/develop' snipe 2015-11-25 00:22:31 -08:00
  • 20490986c6 Fixes #1325 - zenbra striping and borders on table for money value clarity snipe 2015-11-24 23:43:10 -08:00
  • 64eecc8df7 Added image to model listing view for #1370 snipe 2015-11-24 23:24:20 -08:00
  • 0f33bad1b6 Commented out version of export all snipe 2015-11-24 23:15:01 -08:00
  • 632fa92f92 Fixes #1333 - hide checkout button if asset status is not deployable snipe 2015-11-24 22:49:31 -08:00
  • 99391d0179 Fixes #1332 - added location to accessories snipe 2015-11-24 22:43:13 -08:00
  • c6c6bd02bb Possible fix for weird UTF-8 issues snipe 2015-11-24 22:30:00 -08:00
  • 904ddddce9 Removed consumable search sicne it doesn't do anything yet snipe 2015-11-24 22:20:13 -08:00
  • d34e7178b3 Order consumable assignments by most recent snipe 2015-11-24 22:18:28 -08:00
  • 0428d21c5e Order consumable assignments by most recent snipe 2015-11-24 22:18:16 -08:00
  • d8b43215b0 Fix for missing admin ID snipe 2015-11-24 22:00:29 -08:00
  • b39c53a5ea Closes #1375 - More data in consumables detail view snipe 2015-11-24 21:58:30 -08:00
  • 67e968b032 Fixed attach() timestamps snipe 2015-11-24 21:52:29 -08:00
  • 032aabeadd Bumped version snipe 2015-11-24 20:34:16 -08:00
  • 1202ce4a81 Compound search for consumables snipe 2015-11-24 20:34:10 -08:00
  • 406e077c1e Fixed indenting snipe 2015-11-24 20:34:00 -08:00
  • 4be046a675 Fixes #1387 - adds server-side compound search snipe 2015-11-24 20:33:51 -08:00
  • 535263788d Fixed dumb indenting snipe 2015-11-24 20:20:34 -08:00
  • 29bb6a3c4f Fixed issue where deleted asset tags could not be re-used snipe 2015-11-24 20:20:28 -08:00
  • f04e4b1fb4 Bumped version snipe 2015-11-24 19:38:23 -08:00
  • c8c755f8c3 Fixed filename renaming snipe 2015-11-24 19:38:13 -08:00
  • 287c7735b6 Added CSRF token for upload snipe 2015-11-24 19:37:59 -08:00
  • 2a28c73845 Importer fixes - check for asset before inserting snipe 2015-11-24 19:37:37 -08:00
  • 3dc0381e2b Updated contributing docs snipe 2015-11-24 18:05:48 -08:00
  • a3dbd87f9f Fixed weird company table styles snipe 2015-11-24 13:47:43 -08:00
  • 6d42d2c614 Fixed bootstrap class for button snipe 2015-11-24 13:44:58 -08:00
  • e910b532c7 Account for invalid categories snipe 2015-11-24 13:31:54 -08:00
  • a777499c0b Fixes #1376 - added new fields to consumables view snipe 2015-11-24 13:30:05 -08:00
  • b99c138cb0 Fixes #1369 - fixed searching/sorting on location snipe 2015-11-24 12:48:41 -08:00
  • cbb2151f1a Allow re-use of usernames snipe 2015-11-24 12:29:25 -08:00
  • 256f33e6b4 Company/category search on accessories snipe 2015-11-24 12:08:49 -08:00
  • 59315878c3 Bumped version snipe 2015-11-24 11:47:40 -08:00
  • f6e2654609 Added searching on company name, ordering on company name for PR #1321 snipe 2015-11-24 11:47:34 -08:00
  • 4ad241e65e Merge pull request #1386 from RealEnder/develop snipe 2015-11-24 10:51:55 -08:00
  • 808b66b9f5 Merge pull request #1384 from merid14/develop snipe 2015-11-24 10:50:46 -08:00
  • edbfdc6eb1 pointed wget to snipe master Walter 2015-11-24 09:13:01 -05:00
  • 716c459985 Fix ident Alex Stanev 2015-11-24 12:30:28 +02:00
  • ef011cdf7e Add Bulgarian lev Alex Stanev 2015-11-24 12:25:57 +02:00
  • b93f36a856 Bumped version snipe 2015-11-23 21:04:47 -08:00
  • e60c0e3b4d Warning message about EOL snipe 2015-11-23 21:04:41 -08:00
  • 407b341510 Updated bootstrap tables snipe 2015-11-23 20:57:18 -08:00
  • 120c8394bb Fixes #1380 - groups pagination snipe 2015-11-23 19:18:00 -08:00
  • cc17862eae Back out the encryption constructor for now snipe 2015-11-23 18:18:49 -08:00
  • c24f1721d7 Bumped version snipe 2015-11-23 17:44:00 -08:00
  • c80f1789d4 Set default hasher in constructor snipe 2015-11-23 17:43:53 -08:00
  • 4a49e6f471 Added popover code snipe 2015-11-23 17:43:43 -08:00
  • e9f4be711a Added required fields snipe 2015-11-23 17:43:35 -08:00
  • 1bccb6127e Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-11-23 15:18:22 -08:00
  • 61107769e8 Add user ID and make company name hidden by default snipe 2015-11-23 15:18:10 -08:00
  • 4e96a5a793 Merge pull request #1374 from vabue/features/ukrainian-currency snipe 2015-11-23 15:17:24 -08:00
  • f87a25bf3f Moved company down further, since it's not used as often snipe 2015-11-23 14:44:08 -08:00
  • 4ae02c1fb3 Merge pull request #1321 from Ahimta/multiple-companies snipe 2015-11-23 14:40:37 -08:00
  • 9ec132acde Small fixed for LDAP in settings table snipe 2015-11-23 14:33:00 -08:00
  • 318b4b48c6 Fixes null value for LDAP settings snipe 2015-11-23 14:11:55 -08:00
  • 329a2282e4 Merge pull request #1357 from merid14/features/ldap-settings snipe 2015-11-23 14:10:44 -08:00
  • f8014c4677 Insure running as root. added comment Wahlstedt, Walter 2015-11-23 16:37:54 -05:00
  • 7a07c07e29 removed password insert to database Walter 2015-11-23 16:16:05 -05:00
  • 4b926f015b fixed typo in installer Wahlstedt, Walter 2015-11-23 16:08:02 -05:00
  • aa834aa72b Merged changes to new snipeit.sh install file. Wahlstedt, Walter 2015-11-23 16:04:12 -05:00
  • 400b97c40a Merge remote-tracking branch 'refs/remotes/snipe/develop' into develop Wahlstedt, Walter 2015-11-23 16:02:59 -05:00
  • 8394212df7 update tzone for centos7 Wahlstedt, Walter 2015-11-23 15:49:08 -05:00
  • 2487ce42e3 remove installers Wahlstedt, Walter 2015-11-23 15:22:39 -05:00
  • fb59ad9fe6 remove force root Wahlstedt, Walter 2015-11-23 15:15:08 -05:00
  • 8af5fd0384 Merge remote-tracking branch 'origin/develop' into develop Wahlstedt, Walter 2015-11-23 14:43:00 -05:00
  • 4de42f69ba adding some IO redirection Wahlstedt, Walter 2015-11-23 14:40:15 -05:00
  • 620d4754c0 install epel repo before IUS Walter 2015-11-22 23:15:01 -05:00
  • 6ea3bedb9e set decryption and set pword in migraiton Walter 2015-11-22 23:08:18 -05:00
  • 840e5b1523 Revert "begin work on idap import button" Walter 2015-11-22 11:10:36 -05:00
  • 1ee3f29d2e Revert "working on ldap import button" Walter 2015-11-22 11:02:19 -05:00
  • 6b26640077 Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings Walter 2015-11-22 11:01:07 -05:00
  • 964d2bc463 Add ukrainian and russian currencies for #1373 Val Budkin 2015-11-22 17:50:08 +02:00
  • e4a634a8a3 Merge remote-tracking branch 'upstream/develop' into multiple-companies Abdullah Alansari 2015-11-21 11:27:00 +03:00
  • 5445a7d16b Scope users like other companyables Abdullah Alansari 2015-11-21 11:16:59 +03:00
  • 86a174201e Only users with no company or supers can manage users' companies Abdullah Alansari 2015-11-21 04:30:15 +03:00
  • 7a03a56498 Fix: company field required Abdullah Alansari 2015-11-21 03:59:12 +03:00