snipe
6b6cf06530
Display asset name if one exists and the user cannot edit
2018-10-15 17:02:31 -07:00
snipe
539c3023b9
Added - check whether the user can edit an asset before allowing them to change the name on checkout
2018-10-15 16:52:45 -07:00
snipe
78b6e84774
Allow min:0 for consumables
2018-10-15 16:52:20 -07:00
snipe
b8f8d49927
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-11 15:29:48 -07:00
snipe
63a2727077
Fixed #6323 - typo in link for low inventory
2018-10-11 15:29:38 -07:00
Ivan Nieto
5516978f2e
#5696 proposed fix ( #6314 )
...
* Another 'or' caught in a blade template
* Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view.
* Getting right the permission in the view checkout-license
2018-10-11 14:08:09 -07:00
Wes Hulette
19ee62f704
Fixed: Missing JS file import ( #6320 )
...
* Fixed missing oauth tables during setup.
* Fixed missing JS import
2018-10-11 13:51:37 -07:00
snipe
dff674b4ab
Production assets
2018-10-09 16:12:43 -07:00
snipe
73788817ff
Fixed #6306 - seed settings if no record exists
2018-10-09 16:12:26 -07:00
Wes Hulette
d715ecf41d
Fixed: Tooltips ( #6309 )
...
* Fixed missing oauth tables during setup.
* Fixed missing tooltips
Updated spelling in bootstrap-table.blade.php to use bootstrap data element.
Using custom jquery-ui without tooltips to fix conflict issue.
* Removed custom jQuery ui file added fix in bootstrap.js file
2018-10-09 15:20:27 -07:00
Wes Hulette
6818901f7d
Fixed: Admin LTE left menu bar not working ( #6308 )
...
* Fixed missing oauth tables during setup.
* Updated per AdminLTE upgrade guide.
2018-10-09 15:20:12 -07:00
Wes Hulette
19bc158ff4
Fixed tooltips and iCheck ( #6303 )
...
* Fixed missing oauth tables during setup.
* Fixed duplicate style tag
This was causing webpack issues.
* Deleted erroneously created directory
* Removed duplicate imports
* Fixed tooltips, iCheck audit page
https://github.com/snipe/snipe-it/pull/6285#issuecomment-427235280
* Merge remote-tracking branch 'origin/#6285-Fixes' into #6285-Fixes
Fixed Manifest file
2018-10-05 07:41:04 -07:00
snipe
a516e4278e
Remove company select option if the user is not an admin and FCS is enabled
2018-10-05 07:30:42 -07:00
snipe
c21524f240
Fixed NaN when no asset tag is provided
2018-10-05 05:42:28 -07:00
snipe
ecb8204c3c
Associate serials with multiple asset creation
2018-10-05 05:30:13 -07:00
snipe
476b58632b
Handle array of asset tags
...
TODO: figure out how to display validation errors more sanely
2018-10-05 04:34:47 -07:00
snipe
d4a97d0431
Increase max fields in multi-asset creation
2018-10-05 04:18:06 -07:00
snipe
ade9a0c995
Removed server-side validation right now
...
Getting an unexpected keyword ‘export’ error. I’ll come back to this.
2018-10-05 03:47:58 -07:00
snipe
7e33051c7a
Remove console logging
2018-10-05 03:44:30 -07:00
snipe
4a448ba5f9
Increment tag based on first
2018-10-05 03:43:40 -07:00
snipe
8e90ed00d8
Added alt tags to logo
2018-10-05 03:43:16 -07:00
snipe
81d8c1cc52
Fixed remove-asset-tag javascript on asset edit, added server side validation support
2018-10-05 02:51:14 -07:00
snipe
4920dced6e
Enabled toggleDisabled on form validator
2018-10-05 01:12:14 -07:00
snipe
4a4fc38c43
Style updates
2018-10-05 00:57:18 -07:00
snipe
907d1d0f61
Validate if name is required
2018-10-05 00:46:27 -07:00
snipe
6f71abd0e0
Fixed improper html nesting
2018-10-05 00:45:58 -07:00
snipe
c1b0b8dee2
Move validator to main layout
2018-10-05 00:45:45 -07:00
snipe
a6449fa16e
Added jquery-form-validator
2018-10-04 23:50:57 -07:00
snipe
4cc1351bdd
More JS tweaks (WIP)
2018-10-04 23:37:52 -07:00
snipe
701beeac2a
Merge branch 'develop' into features/create_multiple_asset_tags_on_asset_create
2018-10-04 22:08:18 -07:00
snipe
6489081cd6
Pass variable to edit-form to determine whether we should have a top submit button
...
This is just so very short forms don’t look too silly
2018-10-04 21:19:25 -07:00
snipe
408f9978e9
More help text updates
2018-10-04 21:14:45 -07:00
snipe
4a7f61b554
Tenporarily replacing the blue@2x.png for icheck
2018-10-04 21:00:13 -07:00
snipe
db765e4a0b
Reformatted help popover
2018-10-04 20:51:50 -07:00
snipe
54d916fd05
Pulled “more info” popover header into translated string
2018-10-04 20:41:09 -07:00
snipe
8d680d071b
Create help translation file
2018-10-04 20:37:49 -07:00
snipe
252341fd5c
Pulled help icon text into its own blade
2018-10-04 20:35:07 -07:00
snipe
c8210131b4
Updated assets
2018-10-04 20:24:59 -07:00
snipe
3843764d15
Added save button at top of form as well
2018-10-04 20:24:53 -07:00
snipe
accafbf1eb
Added basic JS to edit blade
2018-10-04 19:28:56 -07:00
snipe
ef9817e12d
Updated to latest rollbar
2018-10-04 18:24:41 -07:00
snipe
b5211b2dd5
Fixed #6291 - send-welcome argument in cli importer
2018-10-04 04:44:12 -07:00
snipe
0a72751b37
Fixed issue where admin users could disable activation when editing their own profile
2018-10-04 02:23:12 -07:00
Wes Hulette
3c59452e33
Fixed Tooltips and Rounded corners from previous cleanup ( #6285 )
...
* Fixed missing oauth tables during setup.
* Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
snipe
84848fabd7
Fixed #6284 - missing checkout information on Status Labels API assets endpoint
2018-10-03 10:30:24 -07:00
Wes Hulette
4a88e155c4
Fixed : #6263 V5 (develop) - Missing oauth tables when using the setup wizard ( #6268 )
...
* Fixed missing oauth tables during setup.
* Merged develop changes
Removed PHP_CS file
2018-10-03 10:06:24 -07:00
snipe
66a9421fac
Production assets
2018-10-03 01:07:47 -07:00
snipe
be609f4a8f
Merge branch 'jwhulette-V5_cleanup_js' into develop
2018-10-03 00:56:49 -07:00
snipe
90b8acdd3b
Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js
...
# Conflicts:
# public/mix-manifest.json
2018-10-03 00:56:09 -07:00
snipe
c8ad45b11e
Port import manager code to develop
2018-10-03 00:52:29 -07:00