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
0c830fa564
Added hidden ID column
2015-10-21 19:08:30 -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
73d4c65daf
Finished work on #1088 . Added info to view, translation strings and logic to controllers.
2015-10-06 19:29:44 -05:00
4f74ad077a
Fixes #1136 - allow consumables to be deleted, even if they have been assigned
2015-10-06 16:08:32 -07:00
899e543173
Switch to new method
2015-08-18 16:12:23 +09:30
d62d6ebf05
Add extra fields for email
2015-07-24 09:28:17 +09:30
5ff84d80b4
Change user list from email to username
2015-07-20 10:16:58 +09:30
0fbccef759
Change user list to include email address
2015-07-16 10:23:28 +09:30
fd7d4eb3f2
Removed checkin for consumables
2015-06-22 17:57:44 -07:00
e4517a8782
Removed checkin for #782 , since that doesn't exist in consumables
2015-06-09 19:58:22 -07:00
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
snipe