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

..

commands

Use domain from config

2015-10-16 01:20:38 -07:00

config

Make groups table responsive

2015-10-21 22:41:50 -07:00

controllers

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -07:00

database

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

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

lang

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -07:00

models

Asset maintenances for #1266

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

private_uploads

Added username column to sample CSV

2015-10-16 01:26:34 -07:00

start

License importer, small tweaks to asset importer

2015-08-14 14:08:34 -07:00

storage

Ignore SQL dumps

2015-06-19 17:31:51 -07:00

tests

Placeholder phpunit test

2015-08-13 00:26:26 -07:00

views

Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop

2015-10-21 23:06:43 -07:00

filters.php

Resolves #478 - redirects non-reporting users to view assets page

2015-02-04 09:31:01 -08:00

helpers.php

Fixes #1170 - barcode alternative

2015-09-11 16:13:44 -07:00

macros.php

Fixes #514 - adds RM as currency

2015-09-21 20:07:36 -07:00

routes.php

New API routes for #1266

2015-10-21 19:09:47 -07:00

validators.php

Added custom CSS field in settings

2015-09-09 13:17:36 -07:00