DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
3234 commits 97 branches 266 tags 291 MiB
Commit graph

245 commits

Author SHA1 Message Date
snipe cbca126d9d Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-19 17:53:15 -08:00
snipe a9ffe8d210 Bumped hash 2018-01-19 17:52:40 -08:00
snipe c242abb42e Added Company policy to fix company deletion issue 2018-01-19 17:51:28 -08:00
snipe f38dc37152 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-17 19:31:09 -08:00
snipe 6133f09056 Bumped hash 2018-01-17 19:30:31 -08:00
snipe e35b3745eb Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-17 12:41:51 -08:00
snipe e8252d9468 Bumped hash 2018-01-17 12:41:11 -08:00
snipe 0eff821928 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-17 12:12:33 -08:00
snipe 9e605e0f79 Bumped hash 2018-01-17 12:11:39 -08:00
snipe 1f04d7aafd Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-11 15:27:17 -08:00
snipe 78efeec368 Bumped hash 2018-01-11 15:24:37 -08:00
snipe efe668d26d Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-10 22:59:02 -08:00
snipe bc3d27fac6 Bumped hash 2018-01-10 22:57:22 -08:00
snipe 1f36e7997f Bumped version 2017-12-20 03:31:43 -08:00
snipe 33b5c26da5 Bumped hashcount 2017-12-19 22:16:31 -08:00
snipe 6220f0d8a5 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-15 18:57:21 -08:00
snipe 30716b349b Bumped dev hash 2017-12-15 18:55:56 -08:00
snipe a85d5cfe92 Merge branch 'develop' 2017-12-12 12:58:52 -08:00
snipe 9018af4f1d Bumped hash 2017-12-12 10:45:20 -08:00
snipe 5204e84703 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-12 09:25:45 -08:00
snipe 55eaea0110 Derp. 2017-12-12 09:25:06 -08:00
snipe 671a125c62 Bumped hash 2017-12-12 09:24:40 -08:00
snipe a988011f0c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-12 03:07:43 -08:00
snipe 035f7a5292 Formatted version 2017-12-07 19:24:03 -08:00
snipe 0ea3100896 Bumped hash 2017-12-07 19:23:34 -08:00
snipe 0d92ffc7ed Merge branch 'develop' 2017-12-05 18:13:08 -08:00
snipe 808cd0f728 Nicer groups permission edit UI 2017-12-05 18:11:06 -08:00
snipe 79fe092c81 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-05 13:20:39 -08:00
snipe 027f6a7c12 Bumped hash 2017-12-05 13:18:52 -08:00
snipe 244eceadec Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-04 23:51:53 -08:00
snipe 28fdbdd5d8 Bumped version 2017-12-04 23:50:45 -08:00
snipe 9f10080243 Fixed parsed error 2017-12-01 21:13:18 -08:00
snipe b3c386663f Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-01 21:11:33 -08:00
snipe 2aafdb1400 Bumped version 2017-12-01 20:49:04 -08:00
snipe cbc09f3a12 Fixes #4508 - adds image to location view (and google map, if address and API key exist) 2017-12-01 19:12:35 -08:00
snipe 5a3233da37 Grr. 2017-12-01 14:54:18 -08:00
snipe 80109071a2 Fixed version number 2017-12-01 14:54:02 -08:00
snipe c43bb670d2 Bumped hash 2017-12-01 14:50:46 -08:00
snipe 5979a18852 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-11-30 16:43:59 -08:00
snipe 5efb803b60 Auto-bumped hash/version 2017-11-30 16:41:06 -08:00
snipe 51168e8e10 Auto-bumped hash/version 2017-11-30 13:40:36 -08:00
snipe cc5eee1890 Auto-bumped hash/version 2017-11-30 13:32:12 -08:00
snipe b934d2e504 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-11-27 22:19:24 -08:00
snipe 8cf70e7e20 Auto-bumped hash/version 2017-11-27 22:10:54 -08:00
snipe 290cf79778 Auto-bumped hash/version 2017-11-27 21:25:21 -08:00
snipe 8af1481749 Auto-bumped hash/version 2017-11-27 21:20:38 -08:00
snipe fcc87b3219 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-11-24 11:27:54 -08:00
snipe 82fca0c72d Auto-bumped hash/version 2017-11-24 11:25:57 -08:00
snipe 83c8449aca Auto-bumped hash/version 2017-11-22 18:43:18 -08:00
snipe 76e3398d44 Auto-bumped hash/version 2017-11-22 18:42:33 -08:00