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

310 commits

Author SHA1 Message Date
snipe 054de06522 Added cache variables to S3 2018-07-25 07:29:23 -07:00
snipe 9a99626b9e Added SFTP to filesystem config 2018-07-25 07:27:31 -07:00
snipe 684a892e8b Removed rackspace for now 2018-07-25 06:59:58 -07:00
snipe 501f096a2c Updated spatie backup config file for their latest version 2018-07-25 01:36:30 -07:00
snipe 4cc7ed9ec7 Backup updates 2018-07-25 01:28:30 -07:00
snipe 24c949c886 Bumped version to v5.0.0-pre 2018-07-24 21:13:02 -07:00
snipe de84e1bd88 Added hashing config 2018-07-24 21:13:02 -07:00
snipe 60c4fa1d90 Updated trustedproxy w/config 2018-07-24 21:13:02 -07:00
snipe 3d3ed6ab03 Logging updates for 5.6 2018-07-24 21:13:02 -07:00
snipe 14735057a8 New spatie config file 2018-07-24 21:13:02 -07:00
snipe b58314493a Use array for db dump configs 2018-07-24 21:13:02 -07:00
snipe 6ebc653620 Sparie backups config upgrade 2018-07-24 21:13:02 -07:00
snipe f69e34f6ca Applying @dmeltzer’s changes from afc8ac5e72 2018-07-24 21:13:02 -07:00
snipe e332442132 Bumped version 2018-07-24 19:45:23 -07:00
snipe 376eb52f00 Fixed #5938 - added “self location edit” as permission 2018-07-24 12:42:16 -07:00
snipe 9677115055 Bumped version 2018-07-19 14:46:08 -07:00
snipe 83692696ba Bumped version 2018-07-19 10:49:40 -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 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