d8a9d2d3eb
Bumped version
2015-11-26 14:08:24 -08:00
b925c5766f
Set company_id to null if no logged in user to fix seeder
2015-11-26 14:03:29 -08:00
6bedaa903a
CSRF token for ajax
2015-11-26 13:53:51 -08:00
1efb1f7038
Remove MAC address fields since they are now custom fields
2015-11-26 13:42:13 -08:00
6708911d5d
Remove mac address (now custom field)
2015-11-26 13:33:01 -08:00
3bbcbf5f47
Merge branch 'hotfixes/ldap_settings' into develop
2015-11-26 13:11:47 -08:00
989ce59a5b
Fixes #1399 - Import LDAP config into database
2015-11-26 13:10:28 -08:00
774b1cb28b
Merge pull request #1398 from snipe/custom_fields_erroring
...
Custom fields erroring
2015-11-25 20:45:02 -08:00
10086479b7
Better erroring, return previous input on error.
2015-11-25 20:38:22 -08:00
c0e988b6b1
Basic validation on customFieldset
2015-11-25 20:14:26 -08:00
93cf37336d
Merge pull request #1277 from snipe/custom_fields
...
Basic custom fields support - needs UI refinements
2015-11-25 19:14:53 -08:00
924f61fce9
Cache custom field listing for assets, custom fields are sortable
2015-11-25 16:09:16 -08:00
c6f8d3e6f2
A little bit of basic, terrible navigation for Custom Fields.
2015-11-25 15:40:58 -08:00
a212abee1d
Strip out stale comments
2015-11-25 15:30:06 -08:00
4508225d65
Add default layout basic styling to custom fields
2015-11-25 15:16:20 -08:00
e3ec2ae3ec
Style the drop-down for custom fieldset to match
2015-11-25 14:55:49 -08:00
d653126a2a
Merge branch 'develop' into custom_fields
...
Conflicts:
app/controllers/admin/AssetsController.php
app/views/backend/hardware/index.blade.php
app/views/backend/hardware/view.blade.php
2015-11-25 14:22:22 -08:00
ba39cbb5e0
Merge remote-tracking branch 'origin/develop'
2015-11-25 03:50:08 -08:00
34276984f3
Bumped version
2015-11-25 03:49:47 -08:00
2195e27d61
Added company_list to license clone
2015-11-25 03:48:05 -08:00
948be5c74b
Updated language strings
2015-11-25 03:37:48 -08:00
93c582970c
Merge remote-tracking branch 'origin/develop'
2015-11-25 03:19:34 -08:00
9624388522
Added company_list to clone asset
2015-11-25 03:19:13 -08:00
6abfb1b968
Merge remote-tracking branch 'origin/develop'
2015-11-25 02:47:48 -08:00
59b2b8c63e
Switch to hash version for more consistent cookie resets
2015-11-25 02:47:21 -08:00
658462cda5
Merge remote-tracking branch 'origin/develop'
2015-11-25 02:39:13 -08:00
dad1ffb355
Specify table name in select to prevent id overwriting
2015-11-25 02:38:13 -08:00
12b82d6679
Merge remote-tracking branch 'origin/develop'
2015-11-25 00:22:31 -08:00
20490986c6
Fixes #1325 - zenbra striping and borders on table for money value clarity
2015-11-24 23:43:10 -08:00
64eecc8df7
Added image to model listing view for #1370
2015-11-24 23:24:20 -08:00
0f33bad1b6
Commented out version of export all
...
This still works sorta wonky, and only exports 50 per page. Possibly related to https://github.com/wenzhixin/bootstrap-table/issues/1576
2015-11-24 23:15:01 -08:00
632fa92f92
Fixes #1333 - hide checkout button if asset status is not deployable
2015-11-24 22:49:31 -08:00
99391d0179
Fixes #1332 - added location to accessories
2015-11-24 22:43:13 -08:00
c6c6bd02bb
Possible fix for weird UTF-8 issues
2015-11-24 22:30:00 -08:00
904ddddce9
Removed consumable search sicne it doesn't do anything yet
2015-11-24 22:20:13 -08:00
d34e7178b3
Order consumable assignments by most recent
2015-11-24 22:18:28 -08:00
0428d21c5e
Order consumable assignments by most recent
2015-11-24 22:18:16 -08:00
d8b43215b0
Fix for missing admin ID
2015-11-24 22:00:29 -08:00
b39c53a5ea
Closes #1375 - More data in consumables detail view
2015-11-24 21:58:30 -08:00
67e968b032
Fixed attach() timestamps
2015-11-24 21:52:29 -08:00
032aabeadd
Bumped version
2015-11-24 20:34:16 -08:00
1202ce4a81
Compound search for consumables
2015-11-24 20:34:10 -08:00
406e077c1e
Fixed indenting
2015-11-24 20:34:00 -08:00
4be046a675
Fixes #1387 - adds server-side compound search
2015-11-24 20:33:51 -08:00
535263788d
Fixed dumb indenting
2015-11-24 20:20:34 -08:00
29bb6a3c4f
Fixed issue where deleted asset tags could not be re-used
...
This was by-design to start off with, since it would b weird to re-use an asset tag that legitimately belonged to someone else, however sometimes when assets are accidentally deleted and users don't restore them (or if there were weird duplicates), this can be problematic.
2015-11-24 20:20:28 -08:00
f04e4b1fb4
Bumped version
2015-11-24 19:38:23 -08:00
c8c755f8c3
Fixed filename renaming
2015-11-24 19:38:13 -08:00
287c7735b6
Added CSRF token for upload
2015-11-24 19:37:59 -08:00
2a28c73845
Importer fixes - check for asset before inserting
2015-11-24 19:37:37 -08:00
snipe