Commit Graph

  • d3b3ed0d16 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2015-12-22 10:56:37 -08:00
  • 0484924490 Merge pull request #1513 from adamdunson/quantity_is_misspelled snipe 2015-12-22 10:55:34 -08:00
  • 894579314c s/([Qq])uanitity/\1uantity/g Adam Dunson 2015-12-22 11:11:11 -05:00
  • b76f014669 Better handling for invalid locations snipe 2015-12-22 02:40:31 -08:00
  • f03d1cd4cc Simplified currency display until we can fix it on a broader level snipe 2015-12-22 00:25:30 -08:00
  • a0db241ac8 Merge pull request #1504 from ddreier/1143-acceptance-by-incorrect-user snipe 2015-12-18 16:18:34 -05:00
  • 0c27717c20 Added check and error message for trying to accept an asset that was not checked out to that user. Daniel Dreier 2015-12-18 14:51:51 -06:00
  • ce1565a545 Re-commented mac address - bad merge :-/ snipe 2015-12-18 12:08:08 -05:00
  • ac5527e7d3 Merge branch 'hotfixes/custom_reports_fix' into develop snipe 2015-12-18 12:06:35 -05:00
  • 865468d091 Fix for location error snipe 2015-12-18 12:06:11 -05:00
  • b20f4d245e Fixes #1494 - uncommented mac_address fields snipe 2015-12-17 20:09:47 -05:00
  • 927c368235 Fix for weird location info in asset report snipe 2015-12-17 19:37:20 -05:00
  • eacd4ee2b0 Fix for bad data in asset report snipe 2015-12-17 18:59:58 -05:00
  • 8dab50edc6 Fixes #1498 - better regex for characters in custom field name snipe 2015-12-17 18:19:35 -05:00
  • ee097dd1da Bumped version snipe 2015-12-15 05:36:04 -08:00
  • 775ea95458 Fix inability to edit models (unique constraint) snipe 2015-12-15 05:35:14 -08:00
  • 73f0a19adb Fixes #1459 - fieldset_id error if null snipe 2015-12-15 05:34:54 -08:00
  • a68cbcf767 Fixes #1472 - only fire DB seeder if the user inputs 'y' snipe 2015-12-15 05:24:15 -08:00
  • 5c698d7cfd Fixes #1469 - don't require currency at model level snipe 2015-12-15 05:17:44 -08:00
  • efc06f4b31 Bumped version snipe 2015-12-15 04:15:51 -08:00
  • bac1b313f6 Added the 2x2 gif to stop stupid 404s snipe 2015-12-15 04:15:42 -08:00
  • cac254ded6 Fixes #1371 - problem saving new models with non-latin characters snipe 2015-12-15 04:15:28 -08:00
  • e217d354dc Fixed bug in strict mode for fieldsets snipe 2015-12-15 04:14:19 -08:00
  • e1837069da Allow bulk model update for #1462, fixes #1442 snipe 2015-12-09 20:35:24 -08:00
  • eb83d9c486 Add header banner if app is running in production mode with debug on snipe 2015-12-09 16:37:34 -08:00
  • 25338c00e5 Fixes #1456 - email notification when asset requested snipe 2015-12-09 01:40:13 -08:00
  • 599ea20d65 Fixes #1449 - full link to order number snipe 2015-12-09 01:06:25 -08:00
  • 72f3b459c5 Merge branch 'hotfixes/user_import_company_id' into develop snipe 2015-12-08 23:00:27 -08:00
  • c34c9438da Bumped version snipe 2015-12-08 22:59:33 -08:00
  • 3d8733c612 Comment out company ID for now until we can handle it more smartly snipe 2015-12-08 22:59:22 -08:00
  • cab1642ead Small extra logging for LDAP snipe 2015-12-08 21:06:54 -08:00
  • 6aa3e21b4c TidyUp: Surpress errors on unreachable statements with link to discussion on github. Hereward Mills 2015-12-04 08:09:01 +00:00
  • b1e48b7054 More debugging snipe 2015-12-03 13:33:28 -08:00
  • 2686dd640c Additional debugging info snipe 2015-12-03 13:30:56 -08:00
  • bb7b8f3964 Show error if LDAP failed and local auth failed because user doesn't exist snipe 2015-12-03 04:14:05 -08:00
  • 5bed0bd7ed Fixes #1437 - set expected checkout correctly snipe 2015-12-03 03:14:29 -08:00
  • be3c8e4515 Fixes #1440 - make employee number searchable/sortable snipe 2015-12-03 02:07:20 -08:00
  • 784d1995d8 Added auth login log note snipe 2015-12-03 02:06:34 -08:00
  • 7802af837b One more fix for LDAP and local users working together snipe 2015-12-02 22:47:22 -08:00
  • 6f8a76246e LDAP fix for local users snipe 2015-12-02 21:22:56 -08:00
  • 66e9203b97 Save fieldset on create snipe 2015-12-02 19:21:09 -08:00
  • b41461698d Fix for error on asset create snipe 2015-12-02 19:03:08 -08:00
  • 8cdb032a14 Fixes error messages, and re-filling old input on failed asset create Brady Wetherington 2015-12-02 17:57:28 -08:00
  • 3417d833ba Save on create for custom fields snipe 2015-12-02 17:12:17 -08:00
  • aff7b99d91 Nicer add/edit formatting putting required fields at the top snipe 2015-12-02 16:31:57 -08:00
  • 3944553bfc Commented out show_mac_address field in model creation snipe 2015-12-02 16:11:45 -08:00
  • 3dc79197c3 Fix for LDAP error if username is wrong snipe 2015-12-02 15:59:01 -08:00
  • f1b00853c6 Final localization and UI improvemets for #1397 snipe 2015-12-02 15:21:18 -08:00
  • 7f46a48173 Attempting to fix #1430 - commented out FK drop to prevent collisions, remove FK creation for new installs snipe 2015-12-02 13:59:20 -08:00
  • ae8c9f420d Set table engine specifically to InnoDB snipe 2015-12-02 12:23:54 -08:00
  • aa385571cf Additional refinements for #1397 snipe 2015-12-01 20:50:54 -08:00
  • 9920cb2744 Nicer detail view for #1397 snipe 2015-12-01 18:17:02 -08:00
  • 179f96c8e8 More strings for #1397 snipe 2015-12-01 18:16:44 -08:00
  • 7562552f7a More UI nice-ifications for #1397 snipe 2015-12-01 17:56:03 -08:00
  • 5f9d5ae836 More laguage strings for #1397 snipe 2015-12-01 17:55:42 -08:00
  • 639d6214d8 Switch to fa-icons from glyphicon snipe 2015-12-01 17:55:02 -08:00
  • dad492d131 Fixed back/cancel urls for #1397 snipe 2015-12-01 17:33:31 -08:00
  • 6e78fc0a2d Merge pull request #1427 from snipe/ajax_custom_fields_asset snipe 2015-12-01 17:27:11 -08:00
  • e98020fa89 Starter UI improvements and localization for #1397 snipe 2015-12-01 17:26:20 -08:00
  • 6ec4f605f4 Handle selecting 'no model' without JS errors. Brady Wetherington 2015-12-01 17:22:09 -08:00
  • e88f5629df Add new form partial and AJAX endpoint for custom fields. Brady Wetherington 2015-12-01 17:17:32 -08:00
  • 475fc4855c Merge pull request #1414 from madd15/patch-6 snipe 2015-12-01 14:38:17 -08:00
  • edb2a0b1b7 Readd <nobr> madd15 2015-12-02 07:49:47 +10:30
  • e81fe52aa8 Merge branch 'hotfixes/asset_maintenances_create' into develop snipe 2015-12-01 11:59:49 -08:00
  • 74ed75dd24 Fixes #1426 - use Asset class for asset maintenances snipe 2015-12-01 11:59:10 -08:00
  • 17e681ba7c Merge branch 'hotfixes/backup_CSRF' into develop snipe 2015-12-01 11:47:56 -08:00
  • 4e065e8df7 Bumped version snipe 2015-12-01 11:47:27 -08:00
  • 9e0f7089c4 Fixes #1415 - Added CSRF token to backup form snipe 2015-12-01 11:47:13 -08:00
  • c22dcdafa4 Show used in column regardless for Custom Fields snipe 2015-12-01 04:16:31 -08:00
  • e5cc6d32d1 More small UI tweaks for Custom Fields snipe 2015-12-01 04:14:36 -08:00
  • 54655faf83 Bumped version snipe 2015-12-01 04:11:13 -08:00
  • 3b42738a2d Custom field enhancements for UI snipe 2015-12-01 04:11:01 -08:00
  • 65feb00ea4 Merge pull request #1420 from snipe/delete_custom_fields snipe 2015-12-01 03:12:41 -08:00
  • 82a3560f27 Merge branch 'hotfixes/image_fix' into develop snipe 2015-11-30 22:02:32 -08:00
  • e8ca98a37d Fixes issue with assets without a model (which should never happen, but can occur from imports) snipe 2015-11-30 22:01:42 -08:00
  • 9316af7ed8 Deletion support for fields and fieldsets Brady Wetherington 2015-11-30 17:09:57 -08:00
  • bbdb576519 Merge branch 'hotfixes/remove_fk' into develop snipe 2015-11-30 12:28:14 -08:00
  • 43c26f853b Bumped version snipe 2015-11-30 12:27:25 -08:00
  • 1cd7f10f10 Remove foreign key constraint for #1411 snipe 2015-11-30 12:27:06 -08:00
  • e4ceddd6ce Fix for merge conflict on routes snipe 2015-11-30 10:19:37 -08:00
  • bb83a14707 Fix incorrect routes for update and delete madd15 2015-11-30 12:41:37 +10:30
  • fffc8ed644 Merge pull request #1412 from snipe/same_field_twice snipe 2015-11-29 17:25:11 -08:00
  • c6db29e6c4 Merge pull request #1408 from snipe/custom_fields_adminify snipe 2015-11-29 17:24:54 -08:00
  • 948e9c2a2b Merge branch 'develop' into custom_fields_adminify snipe 2015-11-29 17:24:26 -08:00
  • 62fe4b8cd3 Merge branch 'hotfixes/1403' into develop snipe 2015-11-29 17:20:42 -08:00
  • 9b46a5b0f6 Fixes #1403 - hide checkout on asset model listing assets when nt deployable snipe 2015-11-29 17:20:03 -08:00
  • 8158c12242 Merge branch 'hotfixes/EOL' into develop snipe 2015-11-29 17:11:55 -08:00
  • 36ecf3032f Fixes #1402 - remoe warranty date from EOL calc snipe 2015-11-29 17:09:02 -08:00
  • 19820db0cc Fixes #1406 - Fixes link to suppliers delete snipe 2015-11-29 16:55:30 -08:00
  • fc06caded5 Fixes #1406 - Fixes link to suppliers delete snipe 2015-11-29 16:54:48 -08:00
  • a44c56c937 Merge branch 'hotfixes/fix_1413' into develop snipe 2015-11-29 16:49:34 -08:00
  • 2accfab79e Fixes #1413 - wrong link for manufacturers delete snipe 2015-11-29 16:45:55 -08:00
  • 418be7f5de Fix to adding same custom field twice. Helps with #1397. Requires PR #1408 to be merged first. Brady Wetherington 2015-11-29 13:16:03 -08:00
  • beeb28bf09 Fix routes for custom fields, fix admin access. Helps with #1397 Brady Wetherington 2015-11-28 18:18:53 -08:00
  • 92410ba054 Bumped version snipe 2015-11-26 14:12:06 -08:00
  • 078750726f Set default value for company_id to fix seeder snipe 2015-11-26 14:11:56 -08:00
  • 7d2ae0d10d CSRF for ajax snipe 2015-11-26 14:11:38 -08:00
  • d8a9d2d3eb Bumped version snipe 2015-11-26 14:08:24 -08:00
  • b925c5766f Set company_id to null if no logged in user to fix seeder snipe 2015-11-26 14:03:29 -08:00
  • 6bedaa903a CSRF token for ajax snipe 2015-11-26 13:53:51 -08:00