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
6212 commits 97 branches 266 tags 291 MiB
Commit graph

498 commits

Author SHA1 Message Date
snipe 2e6bac7db5 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 18:36:43 -07:00
snipe aebb30cea8 Fixed Cors wildcard 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-12 00:23:51 -07:00
snipe 2cddd7faf0 Fixed filesystem config 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:26:10 -07:00
snipe a5f144b4e0 Merge branch 'shift-46327' into develop-v6-integration 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-11 14:10:10 -07:00
snipe a8123092af Misc fixes for shift 
// TODO - re-fix the exception handler

Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 14:07:50 -07:00
snipe aae6a8fc6c Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-10 17:42:29 -07:00
Laravel Shift 7e93086dd4 Default config files 
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them and merged your true customizations -
where ENV variables may not be used.
 2021-06-10 20:18:10 +00:00
Laravel Shift cc3c59bf97 Shift config files 2021-06-10 20:18:10 +00:00
Laravel Shift 934afa036f Adopt Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
 2021-06-10 20:15:52 +00:00
snipe 7d5a9180e6 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:57:56 -07:00
snipe aa98e4ea7a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-05-05 00:04:17 -07:00
snipe 6935d94184 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-05 00:03:33 -07:00
snipe a1bc984d17 Generate production assets, bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:34:02 -07:00
snipe 31944cd4d4 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-26 17:28:38 -07:00
Renee Margaret McConahy e6c3d7fe57
Restore LOG_CHANNEL environment variable. (#9464) 
This allows selecting the Monolog channel with the LOG_CHANNEL variable.
 2021-04-21 11:40:23 -07:00
Brady Wetherington 792a31cc7f Merge branch 'develop' 2021-04-06 20:10:22 -07:00
Tetrachloromethane250 157d9e4ebb
Added #5977: Add permission to view files attached to licenses (#9264) 
* Add permission to view and modify files for licenses

* Actually use the permission
 2021-04-05 21:51:47 -07:00
snipe b2a3a80f96 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	composer.lock
#	config/version.php
 2021-03-17 20:04:43 -07:00
snipe afb7fcfa3e Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-17 20:02:54 -07:00
snipe 9f3a8a43cc Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	composer.lock
 2021-03-17 19:41:02 -07:00
snipe 72f7baf5ee Removed unused class references 2021-03-17 16:56:32 -07:00
snipe ab092fd209 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	app/Providers/AppServiceProvider.php
#	config/logging.php
#	config/services.php
 2021-03-15 12:29:29 -07:00
snipe 3fc24b4e61 Set spatie encryption to null 2021-03-09 21:07:41 -08:00
snipe 0fa07a4bca Bumped point version 2021-03-09 16:19:21 -08:00
snipe c3871c98df Updated rollbar package 2021-03-09 16:16:57 -08:00
snipe f05a8d782c Added spatie encryption line 2021-03-09 13:38:53 -08:00
snipe e9ee9ea2e9 Fixed rollbar integration 2021-03-09 12:40:00 -08:00
snipe fcd805638e Changed branch from develop to master 2021-02-25 16:54:23 -08:00
snipe 6373ef3283 Bumped version 2021-02-25 16:53:37 -08:00
snipe db3f80bb9b Fixed #9198 - added stdout as a log driver 2021-02-24 09:10:03 -08:00
snipe a5731a3088 Updated hash 2021-02-19 10:09:22 -08:00
snipe 681c41bd18 Bumped version 2021-02-05 14:28:31 -08:00
snipe fdde844ce5 Bumped version to 5.1.0 2021-02-02 21:48:42 -08:00
snipe bf7a856fa6 Update minimum PHP requirements to 7.2.5 2021-02-02 21:05:37 -08:00
snipe f871759753 Bumped version to 5.0.13-pre 2021-01-26 20:08:44 -08:00
snipe 8e17818f1e Bumped version to 5.0.13-pre 2021-01-26 20:08:08 -08:00
snipe 01d3606c42 Merge remote-tracking branch 'origin/develop' 2021-01-26 12:20:57 -08:00
Ivan Nieto 79549dbfb9
Use the correct env variables in config/auth.php file. (#9048) 2021-01-26 12:04:41 -08:00
snipe eb423c252a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2021-01-04 09:09:39 -08:00
snipe 4a5cb94d94 Switch version file back to develop 2020-12-14 17:47:02 -08:00
Alexander Chibrikin fb37dbed92
use supported package for slack (#8867) 
* Updated version.php to master

* use supported package for slack

Co-authored-by: snipe <snipe@snipe.net>
 2020-12-14 17:45:00 -08:00
snipe adc0d3a6ac Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-12-08 16:53:43 -08:00
snipe 8b15841c4b Bumped version 2020-12-07 19:16:42 -08:00
snipe 60d269afb5 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-11-30 17:28:46 -08:00
snipe e2cb7a0242 Bumped version 2020-11-30 17:28:03 -08:00
snipe 74b26a349c Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-11-24 13:54:02 -08:00
snipe e9bfb157bb Bumped version. Again. 2020-11-24 13:53:28 -08:00
snipe 02fef7049f Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-11-24 12:17:38 -08:00
snipe 712363f861 Bumped version 2020-11-23 12:33:07 -08:00
snipe 124af6ac6b Merge remote-tracking branch 'origin/develop' 2020-11-17 14:33:35 -08:00