DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-20 04:24:23 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
15711 commits 97 branches 267 tags 296 MiB
Commit graph

15711 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 980dccf31c Add @5quirrel as a contributor 2018-07-12 18:19:35 -07:00
snipe bb2193d481 Add @tilldeeke as a contributor 2018-07-12 18:19:14 -07:00
5quirrel bf8fe316df Fix for #4901 (#5829) 2018-07-12 16:45:12 -07:00
snipe 96716626c6 Fixed #5828 - typo 2018-07-12 14:07:07 -07:00
snipe e20338ff9e Merge branch 'develop' 2018-07-09 22:38:04 -07:00
snipe 78530ae123 Fix tests 2018-07-09 21:57:45 -07:00
snipe 52d605d13e Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-09 19:21:23 -07:00
snipe 0182615e7e Bumped version 2018-07-09 19:18:38 -07:00
snipe fad84d4437 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-09 19:07:49 -07:00
snipe c162e9a4de Bumped hash 2018-07-09 19:06:56 -07:00
snipe bf1e742df6 Merge branch 'develop' 2018-07-09 19:05:19 -07:00
snipe 0e88a6b268 Fixed bug in branding image upload size text 2018-07-09 19:04:18 -07:00
Till Deeke c1e870528e Fixes the label association (#5510) (#5790) 2018-07-09 14:51:17 -07:00
snipe 35fc001c58 Fixed #5742 - create_function() is deprecated 2018-07-05 20:49:01 -07:00
snipe 339263a295 Fixed #5751 - added option for unique constraint on serial 2018-07-05 19:30:36 -07:00
snipe a44bd9abe0 Disallow deleting category if there are licenses 2018-07-05 18:02:25 -07:00
snipe b850d47282 Merge branch 'develop' 2018-07-05 15:40:07 -07:00
snipe 4099c06b27 fix middleware priority: handle trusted proxies prior setup check 
From @plexorama
 2018-07-05 15:36:59 -07:00
snipe e559879f91 Add @plexorama as a contributor 2018-07-05 15:35:37 -07:00
snipe abb95e7872 Tweaked custom field default value layout 
This still needs work. It’s ugly.
 2018-07-05 15:31:27 -07:00
snipe 869de3d251 Fixed broken pagination on status labels API 2018-07-05 14:42:39 -07:00
snipe f3526eccb9 Merge branch 'features/textarea-custom-field' into develop 
# Conflicts:
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
 2018-07-05 12:37:07 -07:00
Daniel Meltzer 880faa83a6 Importer2 checkout (#5771) 
* Importer: checkout to location, backend changes+tests.

* Import location checkout. Frontend changes.

* Allow importing of item number/model number for consumables.
 2018-07-05 12:22:24 -07:00
Juan Font 311f9fcefb Implemented method to get info on the current user of the API (#5722) 
* Implemented method to get info on the current user of the API

* Move userinfo method to UsersController

* Added missing files
 2018-07-02 20:35:10 -07:00
snipe 8732f299e6 Added logo class for logo override in custom CSS 2018-07-02 18:47:30 -07:00
Arunas Skirius b30aac536a fixed the alignment of a couple navbar icons (#5764) 2018-07-02 18:10:25 -07:00
snipe d7dc4ae0c0 Added manager to custom report 2018-06-27 00:45:09 -07:00
snipe 5bb4c85ccb Update twitter handle 2018-06-27 00:44:54 -07:00
snipe 80dda198c5 Parse line breaks in the detail view 2018-06-21 09:44:10 -07:00
snipe 9442736518 Adds textarea as a custom field type 2018-06-21 09:35:04 -07:00
snipe 2fbad52c71 Merge branch 'develop' 2018-06-21 07:54:01 -07:00
snipe 5975c9fac7 Add @ParadoxGuitarist as a contributor 2018-06-21 07:52:24 -07:00
snipe 7b0e392ecd Add @thelamer as a contributor 2018-06-21 07:52:04 -07:00
snipe b51a10b46b Add @RichardRay as a contributor 2018-06-21 07:51:39 -07:00
snipe 6c58f59d72 Add @EarlRamirez as a contributor 2018-06-21 07:51:24 -07:00
snipe cd9caa24ad Add @SjamonDaal as a contributor 2018-06-21 07:51:13 -07:00
snipe cbb4b4d846 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-06-21 07:46:27 -07:00
snipe ea4cdadc6e Bumped version 2018-06-21 07:44:58 -07:00
snipe 6638d64d68 Merge remote-tracking branch 'origin/master' into develop 2018-06-21 07:43:32 -07:00
snipe eb412c2bcb Missed one 2018-06-21 07:43:12 -07:00
snipe fde4a59510 Bumped version 2018-06-21 07:40:37 -07:00
snipe 1ee394aa69 Added Select2 to class for dropdowns 2018-06-21 07:40:30 -07:00
snipe 707f90573c Merge branch 'thelamer-docker-fixes' into develop 2018-06-21 07:31:55 -07:00
snipe f8429ad357 Merge branch 'docker-fixes' of https://github.com/thelamer/snipe-it into thelamer-docker-fixes 2018-06-21 07:31:15 -07:00
snipe aa5003d297 Merge branch 'develop' 2018-06-21 07:21:24 -07:00
snipe e9901f5e58 Set composer timeout to 3000 2018-06-21 07:17:51 -07:00
Djamon Staal f0d04a4a57 End help text with a period consistently. (#5731) 2018-06-21 07:13:29 -07:00
Djamon Staal 32e3f748d8 Make version footer configurable. (#5730) 2018-06-21 07:12:16 -07:00
Earl Ramirez fa465a84df Added cron to list of packages (#5729) 2018-06-20 23:28:35 -07:00
Earl Ramirez 82cf1a4467 Updated SELinux label (#5728) 2018-06-20 23:28:20 -07:00