DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
492 commits 97 branches 266 tags 291 MiB
Commit graph

156 commits

Author SHA1 Message Date
Daniel Meltzer d484636bba Add model number column to the hardware list. (#2204) 
* Add model number column to the hardware list and allow searching based on model number.   Column is hidden by default.

* Fix sorting.  Add scope to order by model number.
 2016-06-27 22:32:40 -07:00
snipe 0cf563ae5b Show admin in maintenances 2016-06-22 17:04:47 -07:00
snipe e5a5de6a0d Just use inline validation instead of form request, since it's a one-off 2016-06-22 15:59:00 -07:00
snipe 0ca85f8a8a Updates to components 2016-06-22 14:55:17 -07:00
snipe 014e7ba9c4 Updated strings 2016-06-22 14:39:19 -07:00
snipe fdd17a2088 Fixed weird capitalisation of language strings 2016-06-22 12:58:29 -07:00
Daniel Meltzer 43e64a5f8c Store a list of errors associated with each field instead of overwriting the error if multiple occur. Also Adjust the importer to extract the asset tag earlier in the process so all asset related errors are associated with the asset tag rather than some being tied to the name. 2016-06-22 15:13:01 -04:00
snipe dd1241f964 Fix in case crated_at is blank 2016-06-21 17:19:46 -07:00
snipe e9227f77b6 Fixes #2163 - put model image in view if no asset image 2016-06-21 12:20:22 -07:00
snipe 6165d804f9 Merge pull request #2145 from dmeltzer/disable-select2-on-ios 
Disable select2 on ios.
 2016-06-17 17:15:47 -07:00
snipe 161c6fe2e6 Merge pull request #2173 from twistedR/fix-password-login 
Use app.url for password reset instead of hard coded one.
 2016-06-17 17:15:05 -07:00
snipe 1c51db876c Merge pull request #2172 from ddreier/v3-label-changes 
Center 1D Barcode and include Custom CSS in barcodes view
 2016-06-17 17:14:28 -07:00
snipe 48595e3d76 Merge pull request #2135 from YetAnotherCodeMonkey/v3 
Swap bgutter and sgutter as they seem to be reversed.
 2016-06-17 17:12:47 -07:00
Raveesh bb3d88cce5 Use the full app.url for the password link 2016-06-17 17:52:14 -04:00
Daniel Dreier 52084a2c24 Add CSS to center the 1D barcode and add PHP to include the custom CSS from Settings. 2016-06-17 14:38:50 -05:00
snipe 412756b651 Fix link to view manufacturer in hardware view 2016-06-15 21:14:26 -07:00
snipe 87352470c0 Added sortable created_at to assets and users 2016-06-15 21:06:17 -07:00
snipe 6a277a5391 Added inheritance back into users/groups 2016-06-15 20:45:45 -07:00
snipe 1efa69e51f Fixes #2158 2016-06-15 11:50:57 -07:00
snipe 0fd43c0a5d Updated language strings 2016-06-13 12:16:43 -07:00
snipe 3ca81f4d73 Fixes #2140 2016-06-13 12:07:01 -07:00
snipe dec95c3e06 Updated blade for box panel 2016-06-13 11:39:57 -07:00
snipe 2daed3c271 Fix for custom fields not saving 2016-06-10 16:36:46 -07:00
Daniel Meltzer 2159d77fc2 No longer necessary. 2016-06-10 07:46:38 -05:00
Daniel Meltzer 9c4c91063f Merge branch 'v3' into Fix-Asset-Creation-with-old-data 2016-06-10 07:35:30 -05:00
Daniel Meltzer 4e74c553bd Fix editing of assets. This also uses the asset form request for validation. 2016-06-10 07:33:33 -05:00
snipe 7a9cfb1a8f Fixed label weirdness when no serial 2016-06-10 04:43:17 -07:00
snipe 4e1472f66d Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-10 00:48:33 -07:00
Daniel Meltzer 25c10c43dd Disable select2 on ios. It's terribly slow, doesn't register click events, and has forces focus to the search bar by default (which makes the keyboard popup and take over the screen. The latter issue might justify disabling it for all mobile devices, but the performance issues certainly justify it on iOS. 2016-06-09 20:31:23 -05:00
Daniel Meltzer 044695cb02 Fix hardware creation error making old input disappear. This should be redone to dynamically update on the client side based on a JSON response instead of flashing and reloading, but that's a lot of change for v3 at this point. 2016-06-09 20:28:49 -05:00
snipe 66adffe6d9 Moved include 2016-06-09 14:41:58 -07:00
snipe a04d6293d1 Proper hypenation of Snipe-IT in footer 2016-06-09 03:08:42 -07:00
snipe 2b5fb04ba9 Allow admin to add user on checkout screen 2016-06-09 00:36:52 -07:00
snipe bb758d618b Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-08 23:28:53 -07:00
snipe 9b2c7d749b Fixed barcode descriptions 2016-06-08 23:28:44 -07:00
Drew Wilkinson 7f22d3f486 Fix margin for bottom to not be equal to side gutter, looks like a typo 2016-06-07 13:03:21 -04:00
Drew Wilkinson c9d6857c73 Swap bgutter and sgutter as they seem to be reversed. I assume s=side=horizontal and b=bottom=vertical... 2016-06-07 12:39:53 -04:00
Daniel Meltzer 9648c6f1d3 Fix license Checkout. 
A mistake in the sqlite porting led to "Please select an asset"
disappearing.  This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.

Also use the proper name on the components checkout page.

AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
 2016-06-07 07:58:08 -05:00
Daniel Meltzer cd9cca9c6b Modify Helper::categoryList() to take a category type parameter. 
This allows for centralizing the category fetching code more and fixes
an error in asset model viewing (#2118).  Also add a few translated
strings and standardize on a base of 'Select a *' for the default value
in our lists.
 2016-06-05 09:47:44 -05:00
snipe fd32f6d4d5 New language strings 2016-06-02 19:01:09 -07:00
snipe 6de6052185 Hardcoded page number to prevent error 2016-06-02 17:17:50 -07:00
snipe 402c955f1c Fixed title 2016-06-02 17:17:42 -07:00
snipe 485fb26393 Fixes #1985 - disallow checkin/checkout if the asset is not in a deployable status 2016-06-02 14:04:54 -07:00
snipe 9551c07528 Fixes #2087 - bad route to maintenance edit 2016-06-02 11:18:17 -07:00
snipe a3e9b3df86 Updated error page title 2016-06-02 02:39:44 -07:00
snipe 89e656e709 Switched to can/cannot for blade 2016-06-02 02:39:36 -07:00
snipe 4998b5ab1b Fixes #2080 2016-06-02 00:15:38 -07:00
Daniel Meltzer 37b416d5c7 Fix my git terrribleness. 2016-06-01 23:00:29 -05:00
Daniel Meltzer c7e695d3fe Revert "Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list" 
This reverts commit 9c77de6473.
 2016-06-01 22:55:37 -05:00
Daniel Meltzer a152b0ae54 Center the logo text on small screens. It's looking more reasonable by the week... 2016-06-01 22:52:25 -05:00