Commit graph

3663 commits

Author SHA1 Message Date
snipe
0b57f74e36 Check for model name (this should never be blank, but…) 2016-07-22 02:14:12 -07:00
snipe
03d7d01e12 Fixes #2300 2016-07-22 02:12:04 -07:00
snipe
a1640d7fe3 Form cleanup 2016-07-22 02:11:57 -07:00
snipe
297820d347 Newer required style 2016-07-22 01:33:55 -07:00
snipe
78fda31379 Helper method to introspect into the model level validation to see if the field is required
(This does not yet handle form request validation)
2016-07-22 00:29:23 -07:00
snipe
3a04686ade Nicer demo mode message 2016-07-22 00:28:22 -07:00
snipe
ca5d3e3006 Nicer license form display 2016-07-22 00:25:41 -07:00
snipe
e256bdc9f7 Clearer version in footer 2016-07-21 21:39:23 -07:00
snipe
b0dc5b4183 Fixes #2290 2016-07-21 21:28:17 -07:00
snipe
f6a4d4aaab Better display for some features disabled for demo mode 2016-07-21 19:40:23 -07:00
Daniel Meltzer
c2f6e0cfd8 Don't escape html in default eula. Fixes #2277 (#2279) 2016-07-20 19:39:48 -07:00
Daniel Meltzer
ba6f26cef9 If a category has items in it, disable changing the category type (#2288) 2016-07-20 19:27:33 -07:00
Daniel Meltzer
68d8e6a3a9 Importer again (#2260)
* Quote item names when displaying in error table.

* Remove the danger class as well as the warning class when uploading a file.  Fixes a display error if a file is successful after a file fails upload.
2016-07-18 15:46:03 -07:00
snipe
616f922306 Fixes #2254 2016-07-14 19:50:00 -07:00
snipe
99a42dfc38 More AD fixes 2016-07-14 16:27:32 -07:00
snipe
0cf8ac1d95 Add AD domain to settings 2016-07-14 15:52:52 -07:00
snipe
e6b872299d Possible fix for #2246 - needs AD testing 2016-07-13 15:18:29 -07:00
snipe
a00198abc7 Added spinner for LDAP test 2016-07-13 07:34:54 -07:00
snipe
ab6e2a7301 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-07-13 05:50:45 -07:00
snipe
ff6c3cfa17 Added LDAP settings check in settings page 2016-07-13 05:47:23 -07:00
Daniel Meltzer
bf88cd8233 Check for variables to exist and not null rather than assuming it does. Fixes #2247. (#2248) 2016-07-12 21:03:23 -07:00
Daniel Meltzer
f683c78a69 Fix adding an image to an asset when public/uploads/assets does not exist (#2240)
* Fix adding an image to an asset when public/uploads/assets does not exist.

 First check to see if we can create directory and do so.  If any errors occur, display the error string as an error on the page.

* Add the public/uploads/assets directory to new installs.

* Add some comments explaining this code so I remember what it does next time.
2016-07-10 18:43:00 -07:00
snipe
6bdc88cfea Removed extra space 2016-07-09 18:20:14 -07:00
snipe
5e8d8d6df0 Nicer date display 2016-07-07 02:07:31 -07:00
snipe
f2ddc7b0ae Added purchase cost and purchase date to listing 2016-07-07 02:07:21 -07:00
snipe
a7a748385f Longer cookie 2016-07-01 01:05:22 -07:00
snipe
0c65b6cad1 Nicer bulk delete layout 2016-06-29 04:30:21 -07:00
snipe
0c98390eef Hide bulk actions, checkbox and checkout/in if deleted 2016-06-29 04:19:37 -07:00
Daniel Meltzer
52c89ca889 Hide Delete action if user is deleted. (#2205)
Issue: 1493
2016-06-28 11:50:11 -07:00
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
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
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