DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3976 commits 52 branches 269 tags 311 MiB
Commit graph

320 commits

Author SHA1 Message Date
snipe 9035707bd6 Bumped point version 2019-02-13 07:40:52 -08:00
snipe c0669150fb Bumped point version 2019-02-12 23:48:31 -08:00
snipe 117b4c59cc Bumped minor version 2019-01-25 21:06:08 -08:00
snipe 601c129bbf Embed images in emails 2019-01-17 20:45:24 -08:00
snipe 794824713e Bumped minor version 2019-01-03 11:22:06 -08:00
Ben RUBSON 4ffb8f14b8 Improve Memcached settings (#6485) 
* Improved memcached settings

* Improved memcached settings
 2018-12-06 14:39:14 -08:00
snipe 925258bfb4 Bumped version 2018-10-26 15:29:10 -07:00
snipe 41b5b1dfd0 Bumped hash 2018-10-09 17:32:46 -07:00
snipe c39e3acb59 Bumped hash 2018-10-04 02:24:41 -07:00
snipe db385e024b Possible proxy issue fix 2018-10-03 13:04:25 -07:00
snipe ef0bd72076 Bumped version 2018-09-28 11:21:39 -07:00
snipe ba3662a9ed Bumped hash 2018-09-07 18:12:29 -07:00
snipe 22ef2ce0b6 Bumped hash 2018-09-07 03:20:31 -07:00
snipe d8a8e1cc09 Bumped version 2018-08-28 11:43:56 -07:00
snipe 101dfd01f2 Bumped hash 2018-08-14 18:22:53 -07:00
snipe 4e55a18a60 Bumped version 2018-07-24 19:46:23 -07:00
snipe 3de1de9dc6 Merge branch 'develop' 2018-07-24 14:04:16 -07:00
snipe 376eb52f00 Fixed #5938 - added “self location edit” as permission 2018-07-24 12:42:16 -07:00
snipe aa9c0078a1 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-19 14:47:27 -07:00
snipe 9677115055 Bumped version 2018-07-19 14:46:08 -07:00
snipe f692fb5bff Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-19 10:50:18 -07:00
snipe 83692696ba Bumped version 2018-07-19 10:49:40 -07:00
snipe 8d23398176 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-18 20:07:14 -07:00
snipe 5aae930e8c Bumped version 2018-07-18 20:05:48 -07:00
snipe 8a25677a8d Bumped hash 2018-07-16 21:35:21 -07:00
Till Deeke 27699aa99c Adds permission checks for custom fields and custom fieldsets (#5645) (#5795) 
* adds permission checks to custom fields

* adds permission checks to custom fieldsets

* adds separate permissions for custom fieldsets

* check for permissions in views

* Removes custom fieldsets from permissions config

* Proxy the authorization for custom fieldsets down to custom fields.

This allows us to use the existing permissions in use and have more semantically correct authorization checks for custom fieldsets.

* simplifies the authorization check for the custom fields overview

* removes special handling of custom fieldsets in base policy

I just realised that this code duplicates the logic from the custom fieldset policy.
Since we are checking for the authorization of custom fields anyway, we can just use the columnName for the fields.

* cleanup of unused imports
 2018-07-12 18:28:20 -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 ea4cdadc6e Bumped version 2018-06-21 07:44:58 -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 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 087e114d34 Merge branch 'develop' 2018-05-31 16:34:25 -07:00
snipe 6ec75714f0 Force default srtorage engine 2018-05-22 14:57:05 -07:00
snipe 2ecc4aead7 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 15:43:48 -07:00
snipe d8210847a4 Bumped version 2018-05-21 15:43:04 -07:00
snipe 11832daf5c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 15:17:40 -07:00
snipe 79555f5647 Bumped version 2018-05-21 15:16:56 -07:00
snipe 1868013704 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-21 14:59:08 -07:00
snipe 39cc13f155 Bumped version 2018-05-21 14:58:16 -07:00
snipe 0b5bb520a7 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-16 19:24:31 -07:00
snipe fa89f45cb8 Bumped hash 2018-05-16 19:22:59 -07:00
snipe 25f537e730 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-08 03:49:28 -07:00
snipe 6d8af3d9c0 Bumped hash 2018-05-08 03:48:35 -07:00
snipe 0116fa9b95 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-05-02 14:35:16 -07:00
snipe 42f0eebf8f Bumped version 2018-05-02 14:33:01 -07:00
snipe 4c5f20fde4 Merge branch 'develop' 
# Conflicts:
#	app/Importer/Importer.php
#	config/version.php
 2018-04-23 13:33:34 -07:00
snipe def1eb0b5f Bumped hash 2018-04-20 13:52:32 -07:00