Commit Graph

  • 0d088f3031 Fixes #2491 - show asset tag on dashboard v3.4.0-alpha snipe 2016-08-25 21:28:46 -07:00
  • a92ed97b4e Definitely not beta ;) snipe 2016-08-25 21:06:43 -07:00
  • fcdea4825e Bumped version snipe 2016-08-25 21:04:43 -07:00
  • 35439f9976 Additional strings snipe 2016-08-25 21:04:36 -07:00
  • d473432436 Show encryption in fieldset list snipe 2016-08-25 21:04:25 -07:00
  • 4dff58ec26 Fix array generation for select snipe 2016-08-25 21:04:10 -07:00
  • 537ad28a67 Don’t make required encrypted custom fields required if user is not an admin snipe 2016-08-25 21:03:52 -07:00
  • 96eb832fd3 Only decrypt if the user is an admin snipe 2016-08-25 21:03:24 -07:00
  • 130c798c90 Only accept a new value for encrypted fields if the user is an admin snipe 2016-08-25 20:59:54 -07:00
  • e1229bfb0f Graceful decryption method snipe 2016-08-25 20:58:56 -07:00
  • f185c2e0de Hide radio and checkboxes for now snipe 2016-08-25 19:48:11 -07:00
  • 122f0b9cba Custom fields form in asset edit view snipe 2016-08-25 18:35:28 -07:00
  • c49f10c9bb Removed line break snipe 2016-08-25 18:35:16 -07:00
  • 97a938f119 Method helper to translate piped field_values into a useable array snipe 2016-08-25 18:35:01 -07:00
  • 308fcf96de Updated language strings snipe 2016-08-25 17:43:07 -07:00
  • f1fab8b164 Added Indonesian to dropdown locale list snipe 2016-08-25 17:22:08 -07:00
  • 0e8502a323 Removed newline snipe 2016-08-25 17:12:50 -07:00
  • 3171d9230b Better language snipe 2016-08-25 17:12:34 -07:00
  • 11b9df4b48 Use updated L5 request method snipe 2016-08-25 17:11:52 -07:00
  • 0c2524954f Removed unusued status_id variable snipe 2016-08-25 17:10:09 -07:00
  • b76ad5ea88 Reverted name of form field snipe 2016-08-25 17:08:39 -07:00
  • 43fbd54a12 Store new fields in the database snipe 2016-08-25 17:08:08 -07:00
  • 406d270c01 Use L5 Request method for input snipe 2016-08-25 17:07:58 -07:00
  • 98eb26a2bd Merge branch 'features/cusom_field_types' into develop snipe 2016-08-25 16:36:21 -07:00
  • 61aa9beddb Added new fields to custom fields views snipe 2016-08-25 16:36:00 -07:00
  • e89fd9b3a2 Additional strings snipe 2016-08-25 16:35:45 -07:00
  • d72443c335 Use trans() for custom format text snipe 2016-08-25 16:35:31 -07:00
  • f38593b530 Merge remote-tracking branch 'origin/develop' snipe 2016-08-23 19:01:53 -07:00
  • 4cf2d16c7a Temp fix for number import on cost snipe 2016-08-23 19:01:40 -07:00
  • f38912a5cf Custom fields additions snipe 2016-08-23 18:52:54 -07:00
  • ad22293f4b Added show in nav for status label views and controller snipe 2016-08-23 18:52:42 -07:00
  • fb402e138d Smaller dashboard number snipe 2016-08-23 18:52:12 -07:00
  • 90d2d0c7e1 Fixes #2469 - corrected config app.url snipe 2016-08-23 16:04:22 -07:00
  • 9d730af50f Added single quotes to env for mail sender snipe 2016-08-23 16:03:57 -07:00
  • 9407b4e28c Removed console warning snipe 2016-08-23 15:53:18 -07:00
  • ec19924bea Custom field types snipe 2016-08-23 15:52:34 -07:00
  • 7b8403cdb9 Pass status ID to ajax snipe 2016-08-23 15:52:10 -07:00
  • 85f3e7e3d4 Added filter by status type snipe 2016-08-23 15:51:59 -07:00
  • 11dc20de61 Show in nav language option snipe 2016-08-23 15:51:45 -07:00
  • 14fa7ed965 Fixed indenting snipe 2016-08-23 15:51:14 -07:00
  • 5cf1c8dfa3 Added DB DUMP PATH to docker.env snipe 2016-08-23 15:51:05 -07:00
  • f04cfb3e7f Allow admins to show status labels in nav snipe 2016-08-23 15:50:52 -07:00
  • d970daa666 Add new fields to custom fields table snipe 2016-08-23 15:50:43 -07:00
  • 0b0c81a110 Merge remote-tracking branch 'origin/develop' snipe 2016-08-23 11:38:03 -07:00
  • b1324c2e64 Removed beta from version snipe 2016-08-23 11:37:49 -07:00
  • 3c28be33c5 Bumped version snipe 2016-08-23 11:37:00 -07:00
  • e52a0f65bb Update asset report to show deployed if asset is checked out snipe 2016-08-23 11:36:34 -07:00
  • b726d131a4 More helpful message for LDAP TLS issue snipe 2016-08-23 11:32:11 -07:00
  • 014167699d Fixes #2441 - use showAssetName to avoid blank entries in link name which makes Slack do weird things snipe 2016-08-18 13:10:31 -07:00
  • d9f2e7bf58 If custom field is type URL, display it as a link snipe 2016-08-18 12:44:55 -07:00
  • 4c8c58d453 Clean up divs for gates in list view snipe 2016-08-18 12:31:45 -07:00
  • 923352537c Moved column for in/out snipe 2016-08-18 07:06:55 -07:00
  • be8049b41a Include asset maintenances in purge snipe 2016-08-18 07:06:15 -07:00
  • 4419dc7434 Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format snipe 2016-08-16 18:53:45 -07:00
  • ac63642224 Add manufacturer to licenses (#2436) Daniel Meltzer 2016-08-16 20:49:54 -05:00
  • 5959f83de3 Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better. Daniel Meltzer 2016-08-16 20:47:53 -05:00
  • 0c912bcf49 Fix more number_format madness. Daniel Meltzer 2016-08-15 21:57:34 -05:00
  • 16014945b6 Merge remote-tracking branch 'origin/develop' v3.3.0 snipe 2016-08-16 18:23:36 -07:00
  • 44821b9667 Fixes #2404 Only update name of asset if it isn't null. snipe 2016-08-16 18:23:20 -07:00
  • c5d7a1fdd6 Merge remote-tracking branch 'origin/develop' snipe 2016-08-16 18:21:05 -07:00
  • 29c4189419 Bumped version snipe 2016-08-16 18:20:42 -07:00
  • 7ef4f23d0f Validate that purchase_cost is a numeric value. (#2452) Daniel Meltzer 2016-08-16 20:18:50 -05:00
  • 8232cefbba Fix path to snipeit-ssl.crt (#2428) timwsuqld 2016-08-17 06:03:55 +10:00
  • a852c624d3 Fix 2347 (#2394) Daniel Meltzer 2016-08-16 15:02:42 -05:00
  • 7edf1db101 Small tweaks to history snipe 2016-08-12 19:03:32 -07:00
  • 5e9740e0b4 Merge branch 'develop' of github.com:snipe/snipe-it into develop v3.3.0-beta snipe 2016-08-12 17:10:10 -07:00
  • 41a20d8f66 Tidied up some debugging code, better explanation snipe 2016-08-12 17:10:03 -07:00
  • 7a0843e954 Import history language file snipe 2016-08-12 16:02:51 -07:00
  • 4a9f3fd6ff Generate email method snipe 2016-08-12 16:02:39 -07:00
  • 9ae1841fc4 Make additional fields fillable snipe 2016-08-12 16:02:18 -07:00
  • ba5a2edd54 CSV history routes snipe 2016-08-12 16:02:09 -07:00
  • c73cbccffc Method to import CSV history snipe 2016-08-12 16:01:59 -07:00
  • 24d2726c86 Added helper for imports snipe 2016-08-12 16:01:45 -07:00
  • 06fcf3e07d Import history blade snipe 2016-08-12 16:01:34 -07:00
  • cc15a4f018 Use showAssetName instead of asset->name to include the asset tag (#2437) Daniel Meltzer 2016-08-12 01:56:40 -05:00
  • 18e576e5fd Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-08-11 22:03:25 -07:00
  • 4c787891e4 Use custom maintenance middleware snipe 2016-08-11 19:22:26 -07:00
  • dbd96a4c10 Don't try to format a formatted number string. (#2396) Daniel Meltzer 2016-08-11 21:13:49 -05:00
  • d314f85b93 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-08-11 15:58:22 -07:00
  • 3a81b7e612 Eager load asset query on maintenances to prevent n+1 queries snipe 2016-08-11 15:56:21 -07:00
  • 7992258b46 Updated UI with new required indicator snipe 2016-08-11 15:44:01 -07:00
  • 869da1da78 Add maintenance notes to maintenances tab in hardware view snipe 2016-08-11 15:40:41 -07:00
  • a6a6aa78b0 Fixing the script freezing prior to mysql secure install (#2434) Michael T 2016-08-11 15:17:55 -07:00
  • 4ffea7ceaa Fixes #2406 - added missing gate for assets.edit snipe 2016-08-09 16:38:43 -07:00
  • 1d3255a00b Allow admin to turn LDAP password sync off. snipe 2016-08-04 14:29:28 -07:00
  • 29eadb10ae Fixes #2387 snipe 2016-08-02 17:03:15 -07:00
  • 1ca5f8bee5 Removed asterisks, use orange bar for req fields in locations snipe 2016-08-02 16:40:38 -07:00
  • 8dbc098836 Bumped hash for 3.2.0 3.2.0 snipe 2016-08-02 15:25:23 -07:00
  • 45ea44e172 Bumped hash snipe 2016-08-02 15:16:16 -07:00
  • fff2bce9e4 Added missing username in header row snipe 2016-08-02 15:16:01 -07:00
  • 75e0c5565c Add username and custom fields option to custom report snipe 2016-08-02 15:04:10 -07:00
  • 098e7e4feb Hide email address if there is no value snipe 2016-08-02 15:03:45 -07:00
  • e4355292e4 Bumped hash version snipe 2016-08-02 13:30:00 -07:00
  • ca8ca89955 Added custom color to status labels, only show status labels if there are results snipe 2016-08-02 13:25:50 -07:00
  • 30c45442f9 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 12:40:06 -07:00
  • 03c2c267bc Added favicon explicit link snipe 2016-08-02 12:39:49 -07:00
  • a76fe98b2d Only show a logo if a logo is uploaded snipe 2016-08-02 12:34:08 -07:00
  • 9e43a44d20 Better styling for forgotten password screens snipe 2016-08-02 12:30:22 -07:00
  • 6fe639f490 Skip email if no email domain is given snipe 2016-08-02 12:30:02 -07:00
  • a5467ba25d Slug the username to handle spaces, etc. snipe 2016-08-02 11:12:28 -07:00