DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
5689 commits 101 branches 268 tags 320 MiB
Commit graph

453 commits

Author SHA1 Message Date
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 8b15841c4b Bumped version 2020-12-07 19:16:42 -08:00
snipe e2cb7a0242 Bumped version 2020-11-30 17:28:03 -08:00
snipe e9bfb157bb Bumped version. Again. 2020-11-24 13:53:28 -08:00
snipe 712363f861 Bumped version 2020-11-23 12:33:07 -08:00
snipe 7f126969d0 Fixed #8601 - Switched to “attachment” from “base64” 2020-11-17 14:33:16 -08:00
snipe 3237411b5d Bumped version 2020-11-16 23:57:17 -08:00
snipe 58c476195b Bumped hash 2020-11-13 14:14:27 -08:00
snipe dcd98a7bf1 Bumped hash 2020-11-13 14:13:44 -08:00
snipe 2aa9412565 Bumped version 
# Conflicts:
#	config/version.php
 2020-11-09 23:09:46 -08:00
snipe 35ab5c7df0 Bumped version 2020-11-09 23:09:10 -08:00
snipe b7cc12a466 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:53:23 -08:00
snipe 5abfbdd1d2 Allow API token expiration in years to be configured via env 2020-11-09 22:52:55 -08:00
snipe b59269d5e2 Bumped version 2020-11-09 21:46:42 -08:00
snipe 8bbf8409b1 Bumped hash 2020-11-09 21:46:08 -08:00
snipe d76eea53c4 Bumped hash 2020-11-09 19:45:27 -08:00
snipe e0103a7fbd Fixed #8595 - Updated spatie settings 2020-11-03 14:50:02 -08:00
snipe 4d003ac97a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	config/version.php
 2020-11-03 11:49:34 -08:00
snipe 9f4a212b44 Bumped hash 2020-11-03 11:47:58 -08:00
snipe 12667f41b9 bumped hash 2020-11-03 11:47:13 -08:00
snipe b29f794b35 password.expire updated for forgotten password token expiration 2020-11-02 23:58:09 -08:00
snipe 001bb3cbe2 Bumped version to “pre” 2020-10-26 15:04:22 -07:00
snipe 2844800caf Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-26 14:26:05 -07:00
snipe 7937258f6e Bumped version 2020-10-26 14:24:19 -07:00
snipe c93f4ef0d5 Merge remote-tracking branch 'origin/develop' 2020-10-23 19:50:56 -07:00
snipe 2602e4d602 Exclude the config directory from backups 
Everything there is handled via .env anyway
 2020-10-23 18:21:32 -07:00
snipe 79a4acae1a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-23 14:29:40 -07:00
snipe 91e0b26bbb Bumped version 2020-10-23 14:28:55 -07:00
snipe f182ce1c89 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-23 01:12:54 -07:00
snipe c6dde67e86 Bumped version 2020-10-23 01:12:19 -07:00
snipe 810f6a3970 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-21 12:03:23 -07:00
snipe 33236f16ac Bumped minor version 2020-10-21 12:01:36 -07:00
Folke Ashberg 1687e4b850
Fix for Issue #8543 
* trustedproxy.php sets 'proxies' again according to
  env('APP_TRUSTED_PROXIES') again
 2020-10-21 10:36:27 +02:00
snipe 870b097f03 Derp. Should be master 2020-10-19 17:49:56 -07:00
snipe a62e8413ba Updated version 2020-10-19 16:36:25 -07:00
snipe 2dc027e479 Bumped GM version 2020-10-09 17:29:31 -07:00
snipe 4dbf1f58e3 Bumped RC to GM 2020-10-06 19:11:34 -07:00
snipe b0e9875a50 Counting is hard. :( 2020-09-24 14:20:29 -07:00
snipe 7314bc4c4e Bumped hash for newest RC 2020-09-24 14:19:34 -07:00
Bennett Blodinger 83dfa2a28c
Merge branch 'develop' into gmaps-8465 2020-09-22 17:41:38 -05:00
snipe b9e19468e5
Bumped version for v4.9.5 2020-09-15 18:43:19 -07:00
snipe 426897c902
Bumped hash 2020-09-15 10:13:55 -07:00
snipe 24a52eaeae
Bumped hash 2020-09-12 10:04:36 -07:00
snipe e321aeabae
Merge branch 'master' into integrations/2020-08-31-v5-rc 
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/Loggable.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/importer/importer-file.vue
#	resources/assets/less/overrides.less
#	resources/macros/macros.php
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/edit.blade.php
#	resources/views/hardware/labels.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	routes/web/fields.php
#	tests/unit/UserTest.php
 2020-08-31 12:14:44 -07:00
snipe 5aaa2430b4
Fixes for backups 2020-08-28 14:10:43 -07:00
snipe daf748e531
Bumped hash 2020-07-17 12:32:01 -07:00
snipe ec6ed256fb
Bumped minor version 2020-07-06 18:45:43 -07:00
snipe 05b3a9ad7e
Config variable for HSTS 2020-06-22 23:17:27 -07:00
snipe af06e42056
Bumped version 2020-06-17 11:17:25 -07:00