snipe
|
123caf42c2
|
Merge remote-tracking branch 'origin/develop' into 1.3.0
# Conflicts:
# app/views/backend/hardware/labels.blade.php
# app/views/backend/layouts/default.blade.php
|
2015-05-27 11:17:14 -07:00 |
|
snipe
|
a80d67c1ff
|
Escaping on labels
|
2015-05-19 19:37:22 -07:00 |
|
Daniel Nemanic
|
6e8ad5b085
|
Generating Asset Name to Label Print
Added the Asset Name to the Label printing page.
|
2015-05-13 10:51:06 +02:00 |
|
snipe
|
80d2347095
|
Better label layout
|
2015-03-20 12:38:39 -07:00 |
|
snipe
|
fa794d7a15
|
Basic QR code printing
|
2015-03-19 18:06:50 -07:00 |
|