 snipe
|
e81fe52aa8
|
Merge branch 'hotfixes/asset_maintenances_create' into develop
|
2015-12-01 11:59:49 -08:00 |
|
|
snipe
|
74ed75dd24
|
Fixes #1426 - use Asset class for asset maintenances
|
2015-12-01 11:59:10 -08:00 |
|
|
snipe
|
17e681ba7c
|
Merge branch 'hotfixes/backup_CSRF' into develop
# Conflicts:
# app/config/version.php
|
2015-12-01 11:47:56 -08:00 |
|
|
snipe
|
4e065e8df7
|
Bumped version
|
2015-12-01 11:47:27 -08:00 |
|
|
snipe
|
9e0f7089c4
|
Fixes #1415 - Added CSRF token to backup form
|
2015-12-01 11:47:13 -08:00 |
|
|
snipe
|
c22dcdafa4
|
Show used in column regardless for Custom Fields
|
2015-12-01 04:16:31 -08:00 |
|
|
snipe
|
e5cc6d32d1
|
More small UI tweaks for Custom Fields
Still lots of work to be done here, this is just a rough improvement
|
2015-12-01 04:14:36 -08:00 |
|
|
snipe
|
54655faf83
|
Bumped version
|
2015-12-01 04:11:13 -08:00 |
|
|
snipe
|
3b42738a2d
|
Custom field enhancements for UI
|
2015-12-01 04:11:01 -08:00 |
|
|
snipe
|
65feb00ea4
|
Merge pull request #1420 from snipe/delete_custom_fields
Deletion support for fields and fieldsets
|
2015-12-01 03:12:41 -08:00 |
|
|
snipe
|
82a3560f27
|
Merge branch 'hotfixes/image_fix' into develop
|
2015-11-30 22:02:32 -08:00 |
|
|
snipe
|
e8ca98a37d
|
Fixes issue with assets without a model (which should never happen, but can occur from imports)
|
2015-11-30 22:01:42 -08:00 |
|
|
Brady Wetherington
|
9316af7ed8
|
Deletion support for fields and fieldsets
|
2015-11-30 17:09:57 -08:00 |
|
|
snipe
|
bbdb576519
|
Merge branch 'hotfixes/remove_fk' into develop
# Conflicts:
# app/config/version.php
|
2015-11-30 12:28:14 -08:00 |
|
|
snipe
|
43c26f853b
|
Bumped version
|
2015-11-30 12:27:25 -08:00 |
|
|
snipe
|
1cd7f10f10
|
Remove foreign key constraint for #1411
|
2015-11-30 12:27:06 -08:00 |
|
|
snipe
|
e4ceddd6ce
|
Fix for merge conflict on routes
|
2015-11-30 10:19:37 -08:00 |
|
|
snipe
|
fffc8ed644
|
Merge pull request #1412 from snipe/same_field_twice
Custom Fields - shouldn't be able to add the same field twice to the same fieldset
|
2015-11-29 17:25:11 -08:00 |
|
|
snipe
|
c6db29e6c4
|
Merge pull request #1408 from snipe/custom_fields_adminify
Custom fields adminify
|
2015-11-29 17:24:54 -08:00 |
|
|
snipe
|
948e9c2a2b
|
Merge branch 'develop' into custom_fields_adminify
# Conflicts:
# app/routes.php
|
2015-11-29 17:24:26 -08:00 |
|
|
snipe
|
62fe4b8cd3
|
Merge branch 'hotfixes/1403' into develop
|
2015-11-29 17:20:42 -08:00 |
|
|
snipe
|
9b46a5b0f6
|
Fixes #1403 - hide checkout on asset model listing assets when nt deployable
|
2015-11-29 17:20:03 -08:00 |
|
|
snipe
|
8158c12242
|
Merge branch 'hotfixes/EOL' into develop
# Conflicts:
# app/controllers/admin/AssetsController.php
|
2015-11-29 17:11:55 -08:00 |
|
|
snipe
|
36ecf3032f
|
Fixes #1402 - remoe warranty date from EOL calc
|
2015-11-29 17:09:02 -08:00 |
|
|
snipe
|
19820db0cc
|
Fixes #1406 - Fixes link to suppliers delete
|
2015-11-29 16:55:30 -08:00 |
|
|
snipe
|
fc06caded5
|
Fixes #1406 - Fixes link to suppliers delete
|
2015-11-29 16:54:48 -08:00 |
|
|
snipe
|
a44c56c937
|
Merge branch 'hotfixes/fix_1413' into develop
# Conflicts:
# app/config/version.php
# app/models/Company.php
|
2015-11-29 16:49:34 -08:00 |
|
|
snipe
|
2accfab79e
|
Fixes #1413 - wrong link for manufacturers delete
|
2015-11-29 16:45:55 -08:00 |
|
|
Brady Wetherington
|
418be7f5de
|
Fix to adding same custom field twice. Helps with #1397. Requires
PR #1408 to be merged first.
|
2015-11-29 13:16:03 -08:00 |
|
|
Brady Wetherington
|
beeb28bf09
|
Fix routes for custom fields, fix admin access. Helps with #1397
|
2015-11-28 18:18:53 -08:00 |
|
|
snipe
|
92410ba054
|
Bumped version
|
2015-11-26 14:12:06 -08:00 |
|
|
snipe
|
078750726f
|
Set default value for company_id to fix seeder
|
2015-11-26 14:11:56 -08:00 |
|
|
snipe
|
7d2ae0d10d
|
CSRF for ajax
|
2015-11-26 14:11:38 -08:00 |
|
|
snipe
|
d8a9d2d3eb
|
Bumped version
|
2015-11-26 14:08:24 -08:00 |
|
|
snipe
|
b925c5766f
|
Set company_id to null if no logged in user to fix seeder
|
2015-11-26 14:03:29 -08:00 |
|
|
snipe
|
6bedaa903a
|
CSRF token for ajax
|
2015-11-26 13:53:51 -08:00 |
|
|
Brady Wetherington
|
4f3cdc20f5
|
Start of moving custom fields to the /admin/ space
|
2015-11-26 13:47:09 -08:00 |
|
|
snipe
|
1efb1f7038
|
Remove MAC address fields since they are now custom fields
|
2015-11-26 13:42:13 -08:00 |
|
|
snipe
|
6708911d5d
|
Remove mac address (now custom field)
|
2015-11-26 13:33:01 -08:00 |
|
|
snipe
|
3bbcbf5f47
|
Merge branch 'hotfixes/ldap_settings' into develop
|
2015-11-26 13:11:47 -08:00 |
|
|
snipe
|
989ce59a5b
|
Fixes #1399 - Import LDAP config into database
|
2015-11-26 13:10:28 -08:00 |
|
|
snipe
|
774b1cb28b
|
Merge pull request #1398 from snipe/custom_fields_erroring
Custom fields erroring
|
2015-11-25 20:45:02 -08:00 |
|
|
Brady Wetherington
|
10086479b7
|
Better erroring, return previous input on error.
|
2015-11-25 20:38:22 -08:00 |
|
|
Brady Wetherington
|
c0e988b6b1
|
Basic validation on customFieldset
|
2015-11-25 20:14:26 -08:00 |
|
|
snipe
|
93cf37336d
|
Merge pull request #1277 from snipe/custom_fields
Basic custom fields support - needs UI refinements
|
2015-11-25 19:14:53 -08:00 |
|
|
Brady Wetherington
|
924f61fce9
|
Cache custom field listing for assets, custom fields are sortable
|
2015-11-25 16:09:16 -08:00 |
|
|
Brady Wetherington
|
c6f8d3e6f2
|
A little bit of basic, terrible navigation for Custom Fields.
|
2015-11-25 15:40:58 -08:00 |
|
|
Brady Wetherington
|
a212abee1d
|
Strip out stale comments
|
2015-11-25 15:30:06 -08:00 |
|
|
Brady Wetherington
|
4508225d65
|
Add default layout basic styling to custom fields
|
2015-11-25 15:16:20 -08:00 |
|
|
Brady Wetherington
|
e3ec2ae3ec
|
Style the drop-down for custom fieldset to match
|
2015-11-25 14:55:49 -08:00 |
|