 Daniel Meltzer
|
4b92cdf684
|
Use the same values/calculations in the view as the index. Should fix #1140 I believe
|
2015-12-23 20:32:48 -05:00 |
|
|
snipe
|
f42a3c8918
|
Added company to bulk edit
|
2015-12-22 11:12:26 -08:00 |
|
|
Adam Dunson
|
894579314c
|
s/([Qq])uanitity/\1uantity/g
|
2015-12-22 11:11:11 -05:00 |
|
|
snipe
|
eacd4ee2b0
|
Fix for bad data in asset report
|
2015-12-17 18:59:58 -05:00 |
|
|
snipe
|
e1837069da
|
Allow bulk model update for #1462, fixes #1442
|
2015-12-09 20:35:24 -08:00 |
|
|
snipe
|
eb83d9c486
|
Add header banner if app is running in production mode with debug on
|
2015-12-09 16:37:34 -08:00 |
|
|
snipe
|
25338c00e5
|
Fixes #1456 - email notification when asset requested
|
2015-12-09 01:40:13 -08:00 |
|
|
snipe
|
be3c8e4515
|
Fixes #1440 - make employee number searchable/sortable
|
2015-12-03 02:07:20 -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
|
f1b00853c6
|
Final localization and UI improvemets for #1397
|
2015-12-02 15:21:18 -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
|
7562552f7a
|
More UI nice-ifications for #1397
|
2015-12-01 17:56:03 -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
|
17e681ba7c
|
Merge branch 'hotfixes/backup_CSRF' into develop
# Conflicts:
# app/config/version.php
|
2015-12-01 11:47:56 -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
|
3b42738a2d
|
Custom field enhancements for UI
|
2015-12-01 04:11:01 -08:00 |
|
|
Brady Wetherington
|
9316af7ed8
|
Deletion support for fields and fieldsets
|
2015-11-30 17:09:57 -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
|
948e9c2a2b
|
Merge branch 'develop' into custom_fields_adminify
# Conflicts:
# app/routes.php
|
2015-11-29 17:24:26 -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 |
|
|
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
|
7d2ae0d10d
|
CSRF for ajax
|
2015-11-26 14:11:38 -08:00 |
|
|
snipe
|
6bedaa903a
|
CSRF token for ajax
|
2015-11-26 13:53:51 -08:00 |
|
|
snipe
|
1efb1f7038
|
Remove MAC address fields since they are now custom fields
|
2015-11-26 13:42:13 -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 |
|
|
Brady Wetherington
|
c6f8d3e6f2
|
A little bit of basic, terrible navigation for Custom Fields.
|
2015-11-25 15:40:58 -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 |
|
|
Brady Wetherington
|
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 |
|
|
snipe
|
59b2b8c63e
|
Switch to hash version for more consistent cookie resets
|
2015-11-25 02:47:21 -08:00 |
|
|
snipe
|
20490986c6
|
Fixes #1325 - zenbra striping and borders on table for money value clarity
|
2015-11-24 23:43:10 -08:00 |
|
|
snipe
|
64eecc8df7
|
Added image to model listing view for #1370
|
2015-11-24 23:24:20 -08:00 |
|
|
snipe
|
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 |
|
|
snipe
|
99391d0179
|
Fixes #1332 - added location to accessories
|
2015-11-24 22:43:13 -08:00 |
|
|
snipe
|
904ddddce9
|
Removed consumable search sicne it doesn't do anything yet
|
2015-11-24 22:20:13 -08:00 |
|
|
snipe
|
b39c53a5ea
|
Closes #1375 - More data in consumables detail view
|
2015-11-24 21:58:30 -08:00 |
|
|
snipe
|
287c7735b6
|
Added CSRF token for upload
|
2015-11-24 19:37:59 -08:00 |
|
|
snipe
|
a3dbd87f9f
|
Fixed weird company table styles
|
2015-11-24 13:47:43 -08:00 |
|
|
snipe
|
6d42d2c614
|
Fixed bootstrap class for button
|
2015-11-24 13:44:58 -08:00 |
|