lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
3772 commits 1 branch 0 tags 220 MiB
Commit graph

292 commits

Author SHA1 Message Date
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
0182615e7e Bumped version 2018-07-09 19:18:38 -07:00
snipe
c162e9a4de Bumped hash 2018-07-09 19:06:56 -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
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
snipe
bdbc189a4f Bumped hash 2018-04-20 13:51:54 -07:00
snipe
c1838a60df Bumped hash 2018-04-04 17:36:47 -07:00
snipe
83781f3a70 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-26 15:20:40 -07:00
snipe
5f1ec550ec Fixed hash 2018-03-26 15:16:35 -07:00
snipe
95f8dccc14 Bumped hash 2018-03-26 15:15:43 -07:00
snipe
846613c244 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-22 20:48:02 -07:00
snipe
c4c137dc08 Bumped to 4.2.0 2018-03-22 20:47:09 -07:00
snipe
469efc923b Merge branch 'develop' 
# Conflicts:
#	README.md
#	config/version.php
 2018-03-22 20:08:55 -07:00
snipe
dcd74f6922 Bumped version 2018-03-22 20:07:06 -07:00
snipe
96bab5697d Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
#	database/migrations/2018_02_22_160436_add_remote_user_settings.php
 2018-03-22 09:46:50 -07:00
snipe
abac3e7758 Bumped hash 2018-03-22 09:44:54 -07:00
snipe
01eaf48471 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-07 18:25:12 -08:00
snipe
238a075c6a Bumped hash 2018-03-07 18:24:09 -08:00
snipe
95d935d917 Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
snipe
d42361bac1 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-05 20:27:50 -08:00
snipe
fabc9e5d1c Bumped hash 2018-03-03 17:15:59 -08:00
snipe
2dd56f5bda Backup the .env if BACKUP_ENV is set to true 2018-02-26 18:12:48 -08:00
snipe
c250c632f3 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-26 15:46:49 -08:00
snipe
e3fb4f8799 Bumped hash 2018-02-26 15:44:36 -08:00
snipe
7c9c6ea3df Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-22 16:40:19 -08:00
snipe
7d49c4de87 Bumped hash 2018-02-22 16:39:12 -08:00
snipe
3131c0d0ac Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 16:45:21 -08:00
snipe
364e9cf3de Bumped version 2018-02-21 16:43:00 -08:00
snipe
d511d90a2f Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 06:50:42 -08:00
snipe
54d6cafda9 Bumped hash 2018-02-21 06:49:36 -08:00
snipe
cccd75fc42 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 05:48:02 -08:00
snipe
dbc16a6c9b Bumped hash 2018-02-21 05:47:12 -08:00
snipe
42c8de5620 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 04:44:48 -08:00