snipe 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

..

accessories

Finished work on #1088. Added info to view, translation strings and logic to controllers.

2015-10-06 19:29:44 -05:00

asset_maintenances

Asset maintenances for #1266

2015-10-21 22:19:02 -07:00

categories

Updated language files

2015-07-27 10:25:35 -07:00

consumables

Merge pull request #1225 from ddreier/1088-acc-prices

2015-10-21 22:44:14 -07:00

depreciations

Initial COMMIT to set the file modified tracking. No changes made.

2014-08-05 13:22:08 +09:00

groups

New language strings

2015-04-13 11:26:02 -07:00

hardware

Updated localization for new backup strings

2015-09-15 02:10:01 -07:00

licenses

English is hard :(

2015-08-04 12:54:45 -07:00

locations

Disllow delete if parent

2015-07-28 20:45:32 -07:00

manufacturers

Fixed english language string

2014-11-12 15:52:08 -05:00

models

Fixes #948 - validate on model name+modelno+manufacturer combination

2015-08-06 05:58:50 -07:00

reports

New reports language files

2014-11-12 17:05:46 -05:00

settings

fixed layout and added branding option

2015-10-12 19:14:05 +02:00

statuslabels

Updated language strings

2015-02-10 20:52:22 -08:00

suppliers

Lang changes for new licenses functions

2014-11-06 14:15:09 +10:30

users

Updated language strings

2015-08-24 12:59:35 -07:00