 snipe
|
784d1995d8
|
Added auth login log note
|
2015-12-03 02:06:34 -08:00 |
|
|
snipe
|
7802af837b
|
One more fix for LDAP and local users working together
|
2015-12-02 22:47:22 -08:00 |
|
|
snipe
|
6f8a76246e
|
LDAP fix for local users
|
2015-12-02 21:22:56 -08:00 |
|
|
snipe
|
66e9203b97
|
Save fieldset on create
|
2015-12-02 19:21:09 -08:00 |
|
|
snipe
|
b41461698d
|
Fix for error on asset create
|
2015-12-02 19:03:08 -08:00 |
|
|
Brady Wetherington
|
8cdb032a14
|
Fixes error messages, and re-filling old input on failed asset create
|
2015-12-02 17:57:28 -08:00 |
|
|
snipe
|
3417d833ba
|
Save on create for custom fields
|
2015-12-02 17:12:17 -08:00 |
|
|
snipe
|
aff7b99d91
|
Nicer add/edit formatting putting required fields at the top
|
2015-12-02 16:31:57 -08:00 |
|
|
snipe
|
3944553bfc
|
Commented out show_mac_address field in model creation
|
2015-12-02 16:11:45 -08:00 |
|
|
snipe
|
3dc79197c3
|
Fix for LDAP error if username is wrong
|
2015-12-02 15:59:01 -08:00 |
|
|
snipe
|
f1b00853c6
|
Final localization and UI improvemets for #1397
|
2015-12-02 15:21:18 -08:00 |
|
|
snipe
|
7f46a48173
|
Attempting to fix #1430 - commented out FK drop to prevent collisions, remove FK creation for new installs
|
2015-12-02 13:59:20 -08:00 |
|
|
snipe
|
ae8c9f420d
|
Set table engine specifically to InnoDB
It's declasse to alter migrations after the fact, but for some folks with MyISAM set as a default
|
2015-12-02 12:23:54 -08:00 |
|
|
snipe
|
aa385571cf
|
Additional refinements for #1397
|
2015-12-01 20:50:54 -08:00 |
|
|
snipe
|
9920cb2744
|
Nicer detail view for #1397
|
2015-12-01 18:17:02 -08:00 |
|
|
snipe
|
179f96c8e8
|
More strings for #1397
|
2015-12-01 18:16:44 -08:00 |
|
|
snipe
|
7562552f7a
|
More UI nice-ifications for #1397
|
2015-12-01 17:56:03 -08:00 |
|
|
snipe
|
5f9d5ae836
|
More laguage strings for #1397
|
2015-12-01 17:55:42 -08:00 |
|
|
snipe
|
639d6214d8
|
Switch to fa-icons from glyphicon
|
2015-12-01 17:55:02 -08:00 |
|
|
snipe
|
dad492d131
|
Fixed back/cancel urls for #1397
|
2015-12-01 17:33:31 -08:00 |
|
|
snipe
|
6e78fc0a2d
|
Merge pull request #1427 from snipe/ajax_custom_fields_asset
Add new form partial and AJAX endpoint for custom fields.
|
2015-12-01 17:27:11 -08:00 |
|
|
snipe
|
e98020fa89
|
Starter UI improvements and localization for #1397
|
2015-12-01 17:26:20 -08:00 |
|
|
Brady Wetherington
|
6ec4f605f4
|
Handle selecting 'no model' without JS errors.
|
2015-12-01 17:22:09 -08:00 |
|
|
Brady Wetherington
|
e88f5629df
|
Add new form partial and AJAX endpoint for custom fields.
|
2015-12-01 17:17:32 -08:00 |
|
|
snipe
|
475fc4855c
|
Merge pull request #1414 from madd15/patch-6
Fix incorrect routes for update and delete in Asset Maintenance
|
2015-12-01 14:38:17 -08:00 |
|
|
madd15
|
edb2a0b1b7
|
Readd <nobr>
|
2015-12-02 07:49:47 +10:30 |
|
|
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 |
|
|
madd15
|
bb83a14707
|
Fix incorrect routes for update and delete
|
2015-11-30 12:41:37 +10:30 |
|
|
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 |
|