a67951fbce
Merge branch 'develop' into custom_fields
...
Conflicts:
app/controllers/admin/AssetsController.php
app/views/backend/hardware/index.blade.php
2015-10-22 02:30:30 -07:00
a3f5dc331d
Fixes #1007 and #1053
2015-10-22 02:11:39 -07:00
0f6de6a477
Asset editing works.
2015-10-22 01:06:35 -07:00
5890d26545
Terribly rough Custom Fields creation
2015-10-22 00:38:07 -07:00
9d6608c8f1
Asset maintenances for #1266
2015-10-21 22:19:02 -07:00
7a306cd0f0
Depreciations bootstrap tables for #1266
2015-10-21 19:43:09 -07:00
0b87357f3b
Search text method for #1266
2015-10-21 19:10:00 -07:00
f761b2e953
Suppliers for #1266
2015-10-21 19:09:20 -07:00
e03f07bb44
Manufacturers for #1266
2015-10-21 19:09:02 -07:00
d1192095d0
Fix for showing deleted items
2015-10-21 18:05:27 -07:00
b18be5aee8
Fixed relationshop again?
2015-10-21 16:14:15 -07:00
7dc0039c3b
Fixed parent relationship
2015-10-21 16:01:54 -07:00
b5b8865b36
Locations in bootstrap tables for #1266
2015-10-21 15:43:12 -07:00
4e3c196664
Manager search for #1266
2015-10-21 14:49:09 -07:00
27735a8821
Asset model text search for #1266
2015-10-21 14:48:59 -07:00
21982a1d51
Additional fields for text search on licenses
2015-10-21 13:14:56 -07:00
dfca1386ac
Accessories bootstrap tables for #1266
2015-10-21 13:05:14 -07:00
644cfee086
Merge branch 'develop-bootstrap-tables-integration' of github.com:snipe/snipe-it into develop-bootstrap-tables-integration
2015-10-20 21:51:23 -07:00
c346dbaff6
Location search, deleted users for #1266
2015-10-20 21:50:58 -07:00
07f1c5774e
Add scopeTextSearch
2015-10-21 14:31:26 +10:30
f96e4ebd4c
Add scopeTextSearch
2015-10-21 14:30:32 +10:30
20c35fd0bb
Okay, most migrations are kinda-sorta working now, but validations aren't
2015-10-20 20:26:18 -07:00
b56aba3cc2
Added basic text search - this needs to be fleshed out more with more search options
2015-10-20 19:51:10 -07:00
b492ac4950
Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration
...
# Conflicts:
# .gitignore
# app/controllers/admin/AccessoriesController.php
# app/controllers/admin/AssetsController.php
# app/controllers/admin/LicensesController.php
# app/models/Accessory.php
# app/models/Asset.php
# app/routes.php
# app/views/backend/accessories/index.blade.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/hardware/index.blade.php
# app/views/backend/licenses/index.blade.php
2015-10-20 17:52:02 -07:00
bdc0619016
Merge branch 'develop' into custom_fields
...
Conflicts:
app/helpers.php
2015-10-20 17:11:04 -07:00
273d838a42
Wide swing at custom fields
2015-10-20 17:06:07 -07:00
52a60bd6a5
Removed extra method
2015-10-16 01:20:31 -07:00
71b85732b0
Updates to importer
2015-10-16 00:32:35 -07:00
66fd0c2315
Fixes #1232 - adds category to accessory listing view
2015-10-09 13:22:36 -07:00
b943ace21b
Fixed wrong model type reference
2015-09-23 09:58:09 -07:00
39f82e546f
Fixes #1174 - broken migration if asset_logs table has uploads
2015-09-14 21:40:05 -07:00
d79e2a0864
Allow > tags for custom CSS to modify bootstrap
2015-09-14 16:47:16 -07:00
fcec12f3b2
Allow asset-level EOL to override model level if given
2015-09-14 15:48:42 -07:00
0074e1abcc
Add name text search
2015-08-25 16:37:10 +09:30
a27a98f4b3
Fixes #1081- include asset name on checkout
2015-08-19 11:13:51 -07:00
5aff3d9380
remove search explode
2015-08-18 16:17:46 +09:30
611f59b507
Add name text search
2015-08-18 16:13:05 +09:30
5568f7fc5f
Add name text search
2015-08-18 14:15:03 +09:30
c5e5930c1b
Make sure lock passwords isn't true before emailing
2015-08-13 00:54:57 -07:00
463469e7c7
Added validation for notes
2015-08-12 22:34:35 -07:00
738e253375
Fixed Slack notifier
2015-08-12 18:37:48 -07:00
f7874ec106
Refactored assets controller and model for cleaner code
2015-08-12 18:19:53 -07:00
4b68efb80b
use CustomModel; is stupid, and doesn't mean anything.
2015-08-12 15:52:25 -07:00
b22789aa59
Unbreaking the dashboard :(
2015-08-11 19:44:02 -07:00
4247904f19
Resolving hostname problems
2015-08-11 18:52:42 -07:00
4538bca29f
Allow 0 qty consumable
2015-08-11 14:34:54 -07:00
481b905331
Fixes #1045 - allow 0 value for accessories
2015-08-11 14:01:13 -07:00
3ebbd030e7
Fixed issue with Asset model
2015-08-07 18:52:19 -04:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
afbe23c214
Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query
...
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
2015-08-07 18:50:55 -04:00
Brady Wetherington