Commit graph

1155 commits

Author SHA1 Message Date
Manasses Ferreira
47ac59abef We noted that the barcode folder was not being created. (what is done now in the entrypoint.sh) At the same time, a wrong directory was being created. (which explains the deleted line in Dockerfile) (#3456) 2017-03-31 13:48:50 -07:00
snipe
265a896211 Bumped version 2017-02-22 22:38:33 -08:00
snipe
f7e4fca70d Add model_number to accessory search 2017-02-22 22:34:56 -08:00
snipe
bb4c443cd9 Added notes to custom report 2017-02-03 02:20:56 -08:00
snipe
7b1d2ee050 Fixed typo 2017-01-17 11:57:24 -08:00
snipe
b3f70a046f Don’t require superadmin for checkin and delete user 2017-01-17 09:19:14 -08:00
morph027
734e87f85f Installer fine tuning (#2993)
* used shellcheck to lint snipeit.sh

* do not depend on lsb-release command

* add lsb codename

* really use perms()

* more fixes

* quiet apt

* silent logging using log()

* start mysql if not running

* added curl to ubuntu

* added logfile to log function

* update apt index after adding mariadb repo

* fixed typo

* review fixes
2017-01-10 23:07:06 -08:00
snipe
f371c5fd62 Merge branch 'master' of github.com:snipe/snipe-it 2017-01-10 19:02:18 -08:00
snipe
4b3edbd2f5 Fixed #3130 - model ID not being saved weith model info on modal for create asset 2017-01-10 19:02:13 -08:00
Byron Wolfman
1f3106b9da Use debian base container and clean up apt-get (#3011)
* Use debian base container and clean up apt-get

Attempt to slim down the docker image by replacing ubuntu:trusty with debian:jessie and clean up after apt-get invocation. Building against the 3.6.0 commit shows a healthy reduction of 44MB, or 9%, compared to the ubuntu-based image.

* Use debian:jessie-slim for an even smaller image

If we're using a debian base image for sizing reasons, we may as well go the full distance and use debian-slim.
2017-01-10 16:22:06 -08:00
snipe
9fd3a9a82d Removed logging 2017-01-06 03:12:49 -08:00
snipe
a6e6991a2d Removed second number_format 2017-01-06 03:11:27 -08:00
snipe
93ba0717d8 Removed number_format 2017-01-06 03:02:38 -08:00
snipe
a8839e0ef4 Fixes #3104, #2914 and #2918 - auto-increment incorrectly generating next ID 2017-01-06 02:52:10 -08:00
snipe
3e4152c966 Bumped version 2017-01-06 00:04:26 -08:00
snipe
1bf34d73f5 Use correct authorize rule in middleware for user delete 2017-01-06 00:02:46 -08:00
snipe
d1e360d64d Fix logic to use gate instead of asking if superuser 2017-01-06 00:02:19 -08:00
snipe
3b5b19848c Added oauth keys to gitignore 2017-01-06 00:01:55 -08:00
snipe
93ba90e837 Merge remote-tracking branch 'origin/develop' 2016-12-12 19:24:00 -08:00
snipe
dd28c5709e Add action=“” to form (possible IE11 fix) 2016-12-12 19:23:41 -08:00
snipe
fc70d79a17 Merge remote-tracking branch 'origin/develop' 2016-12-12 19:07:07 -08:00
snipe
42fe481f71 Bumped hash 2016-12-12 19:06:36 -08:00
snipe
95f1a98b96 Removed extraneous closing label tags 2016-12-12 19:03:45 -08:00
snipe
6f1e0d6d9f Updated readme with security notice 2016-12-12 19:03:12 -08:00
snipe
ae66bba0f1 Fixes #3015 - increase size of state field in suppliers 2016-12-07 17:50:20 -08:00
snipe
32c5a258a7 Updated hash 2016-12-07 17:14:48 -08:00
snipe
e7ac860f77 Supress error if pagination isn’t set up on the server 2016-12-07 17:07:48 -08:00
snipe
899a991a3b Added package.json 2016-12-07 17:07:07 -08:00
snipe
f26d86dff2 Updated gulpfile 2016-12-07 17:06:48 -08:00
snipe
84317f7f50 Fixes #2990 - disabled autocomplete on login 2016-12-06 11:50:20 -08:00
snipe
65016a2383 Merge remote-tracking branch 'origin/develop' 2016-12-05 16:12:41 -08:00
snipe
eb48e5ed1c Bumped hash 2016-12-05 16:12:05 -08:00
snipe
dbcb2ccb46 Merge remote-tracking branch 'origin/develop' 2016-12-05 15:09:49 -08:00
Daniel Meltzer
927a12f78d Fix #2985. Missed in the field rename (#3014) 2016-12-05 15:09:14 -08:00
Brady Wetherington
dd52b4828c Make .gitignore and .gitkeep files permissions match their directories (#3018) 2016-12-05 15:08:37 -08:00
snipe
6273e313bc Set DB_SSL to false for config 2016-12-03 17:33:36 -08:00
snipe
2afcfcc87c Set DB_SSL to false for config 2016-12-03 17:32:44 -08:00
snipe
1afef9416a Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	config/version.php
2016-12-03 17:15:02 -08:00
snipe
77685fd52b Bumped version 2016-12-03 17:13:09 -08:00
snipe
f532abebd4 Updated translations 2016-12-03 17:10:05 -08:00
Brady Wetherington
6f9a82f4ea On a succesful LDAP user-creation, we should return the $user, not (#3008)
just 'true'.
2016-12-01 15:54:13 -08:00
snipe
4049143ebf Bumped version 2016-12-01 06:11:03 -08:00
snipe
4df53bdf8d Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	config/version.php
#	resources/views/account/view-assets.blade.php
2016-12-01 06:10:50 -08:00
snipe
d49a1ea304 More graceful error message if log doesn’t exist 2016-12-01 06:05:14 -08:00
snipe
521f4facd5 Bumped version 2016-12-01 05:56:24 -08:00
snipe
b4653dfc15 Ignore npm log 2016-12-01 05:55:29 -08:00
snipe
659d9c10ca Bumped hash 2016-12-01 05:54:21 -08:00
snipe
2ab0594530 Prevent errors if company support conflict prevents viewing the item 2016-12-01 05:54:14 -08:00
snipe
8a81b29901 Fixed missing closing angle bracket 2016-12-01 05:53:20 -08:00
snipe
93d9a6e4bb Ignore npm log 2016-12-01 05:52:50 -08:00