dba7983189
Added new fields to index view
2015-10-21 23:07:23 -07:00
5ff75e7f42
Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop
...
# Conflicts:
# app/controllers/admin/CategoriesController.php
# app/views/backend/accessories/view.blade.php
# app/views/backend/categories/index.blade.php
# app/views/backend/settings/edit.blade.php
2015-10-21 23:06:43 -07:00
69c95f1f73
Merge pull request #1225 from ddreier/1088-acc-prices
...
Accessory and Consumable Price info #1088
2015-10-21 22:44:14 -07:00
def6b4ff50
Categories for accessories in #1266
2015-10-21 13:48:52 -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
66fd0c2315
Fixes #1232 - adds category to accessory listing view
2015-10-09 13:22:36 -07:00
73d4c65daf
Finished work on #1088 . Added info to view, translation strings and logic to controllers.
2015-10-06 19:29:44 -05:00
567ad6c3bb
Switch to new method
2015-08-18 14:11:03 +09:30
6d96d6cba4
Add email to postCheckin
2015-07-24 10:22:54 +09:30
e4277b47e8
Add extra fields for email
2015-07-24 09:27:44 +09:30
89df6fc6da
Change user list from email to username
2015-07-20 10:15:28 +09:30
0f489b34b5
Change user list to include email address
2015-07-16 10:22:19 +09:30
19604480bb
Consumables section
...
TODO:
- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
2015-06-09 19:50:34 -07:00
7556f989df
Accessories Slack integration
2015-04-30 20:53:44 -07:00
6a7fcd5c40
Fixes #769 - set sort order for Accessory Category
2015-04-29 13:54:54 -07:00
7f03c7538f
Convert Accessories View to use Datatable
2015-03-25 12:03:47 +10:30
abf91c7b29
Update for dataTables
2015-03-19 16:08:38 +10:30
7d5ee9750f
Added #596 fix for accessories
2015-03-04 15:21:31 -08:00
1273c4ca87
EULA/req improvements
2015-02-26 18:20:52 -08:00
04735f1aff
Fixed assetlog display
2015-02-26 17:04:21 -08:00
d33dcbbcb1
Fixed bad method call in accessories on delete
2015-02-26 16:17:25 -08:00
74a7b304c2
Limit categories to accessory categories
2015-02-26 16:09:40 -08:00
47f1488acc
Get the accessory pivot ID
2015-02-26 15:24:41 -08:00
a20e1f6943
Fixed attach to relation
2015-02-26 14:08:31 -08:00
1ac401f0c0
Fixed EULA mail
2015-02-26 11:54:56 -08:00
acedab5587
Checkout for accessories
2015-02-26 11:42:02 -08:00
54bad2e4f6
More accessory relationships
2015-02-26 03:19:45 -08:00
95fd96f29a
Accessory checkout/checkin methods
2015-02-26 03:08:17 -08:00
3ba6e45011
Added Accessories scaffolding
2015-02-25 16:31:22 -08:00
snipe