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

225 commits

Author SHA1 Message Date
snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop 
# Conflicts:
#	.all-contributorsrc
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/ImportsController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Requests/ItemImportRequest.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/version.php
#	docker/startup.sh
#	public/css/build/all.css
#	public/css/dist/all.css
#	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
 2019-03-20 02:17:02 -07:00
snipe 79f4f46e3a Add @timothyfarmer as a contributor 2019-03-13 19:45:40 -07:00
snipe 7c3bbe3097
Fixes #6776 hungary date format (#6823) 
* Add @timothyfarmer as a contributor

* Fixed #6776 - added hungary time format
 2019-03-13 19:39:38 -07:00
snipe ab1f34604e Add @Mezzle as a contributor 2019-03-06 18:46:36 -08:00
snipe 27280b8866 Added link to marksman 2019-03-01 17:41:02 -08:00
snipe c1ad2f9376 Added link to Marksman - A Windows agent for Snipe-IT 
Per https://github.com/Scope-IT/marksman/issues/9#issuecomment-468275142
 2019-03-01 17:39:50 -08:00
snipe b5aadd4b74 Add @lubo as a contributor 2019-02-13 20:50:25 -08:00
snipe 533649f24e Merge branch 'develop' into dev-master-integration 
# Conflicts:
#	.gitignore
#	.travis.yml
#	app/Console/Commands/LdapSync.php
#	app/Console/Commands/SendExpectedCheckinAlerts.php
#	app/Console/Commands/SendExpirationAlerts.php
#	app/Console/Commands/SendInventoryAlerts.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/ForgotPasswordController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/Importer.php
#	app/Importer/ItemImporter.php
#	app/Importer/UserImporter.php
#	app/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/License.php
#	app/Models/Location.php
#	app/Models/Recipients/AlertRecipient.php
#	app/Models/User.php
#	app/Providers/AppServiceProvider.php
#	composer.json
#	composer.lock
#	config/trustedproxy.php
#	config/version.php
#	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/lang/ar/admin/settings/general.php
#	resources/lang/bg/admin/settings/general.php
#	resources/lang/en-ID/admin/settings/general.php
#	resources/lang/en-ID/passwords.php
#	resources/lang/en/passwords.php
#	resources/lang/es-CO/passwords.php
#	resources/lang/es-ES/passwords.php
#	resources/lang/es-MX/passwords.php
#	resources/lang/es-VE/passwords.php
#	resources/lang/fi/admin/settings/general.php
#	resources/lang/id/admin/settings/general.php
#	resources/lang/id/passwords.php
#	resources/lang/ja/passwords.php
#	resources/lang/nl/passwords.php
#	resources/lang/pl/admin/settings/general.php
#	resources/lang/pl/passwords.php
#	resources/lang/pt-BR/admin/settings/general.php
#	resources/lang/pt-BR/passwords.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/admin/statuslabels/table.php
#	resources/lang/ru/passwords.php
#	resources/lang/sr-CS/general.php
#	resources/lang/sr-CS/mail.php
#	resources/lang/sv-SE/admin/settings/general.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/passwords.php
#	resources/lang/vi/admin/models/message.php
#	resources/lang/vi/admin/users/general.php
#	resources/lang/zh-CN/admin/settings/general.php
#	resources/views/importer/import.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/partials/forms/edit/image-upload.blade.php
#	resources/views/users/edit.blade.php
#	resources/views/users/view.blade.php
#	tests/unit/ImporterTest.php
 2019-02-13 06:42:52 -08:00
snipe 89a2ce1c6c Add @jackka as a contributor 2019-01-23 14:12:15 -08:00
snipe c6ad7f80a8 Add @omyno as a contributor 2019-01-23 14:12:03 -08:00
snipe 7e6a59bdcc Add @KeenRivals as a contributor 2019-01-23 14:11:37 -08:00
snipe 8ebd9afd15 Add @reuser as a contributor 2019-01-23 14:11:23 -08:00
snipe d1b9eddb34 Add @shinayoshi as a contributor 2019-01-23 14:11:11 -08:00
snipe 0394dd7ee5 Add @andreybolonin as a contributor 2019-01-23 14:10:59 -08:00
snipe 53c6c74a43 Add @fanta8897 as a contributor 2019-01-23 14:10:46 -08:00
snipe 65c5378a10 Add @Sxderp as a contributor 2019-01-23 14:10:35 -08:00
snipe 1c6cbbf8ee Add @smb as a contributor 2019-01-23 14:10:21 -08:00
snipe 10cb4ec401 Add @NMathar as a contributor 2019-01-23 14:10:06 -08:00
snipe 71f2440ddf Moved contributors to the bottom of the README 2018-12-12 18:52:45 -08:00
snipe 886b6dd265 Add @benrubson as a contributor 2018-12-06 15:19:16 -08:00
Nenad Ticaric bf6703c2e8 fixing double word typo (#6292) 
Thanks!
 2018-10-04 09:41:50 -07:00
snipe a8b5fbde91 Add @inietov as a contributor 2018-08-28 13:31:36 -07:00
snipe 652548957d Add @Seldaek as a contributor 2018-08-28 13:15:21 -07:00
snipe 761ea4e581 Add @liquidhorse as a contributor 2018-08-28 13:15:08 -07:00
snipe 9c24d4300c Add @VELIKII-DIVAN as a contributor 2018-08-28 13:14:55 -07:00
snipe 39ab488d90 Add @patrict as a contributor 2018-08-28 13:14:41 -07:00
snipe ec67d03a7c Add @jwhulette as a contributor 2018-08-28 13:14:26 -07:00
snipe 152d985ebc Add @Azerothian as a contributor 2018-07-24 12:10:02 -07:00
snipe 5c2b1a3b70 Add @Azerothian as a contributor 2018-07-23 20:29:15 -07:00
snipe 6db096c336 Add @takuy as a contributor 2018-07-18 20:04:09 -07:00
snipe 7dc070ec2c Add @engrzhou as a contributor 2018-07-18 07:39:46 -07:00
snipe 2ecdf19569 Add @GodUseVPN as a contributor 2018-07-18 07:39:23 -07:00
snipe c56f2625b7 Add @grayhoax as a contributor 2018-07-18 07:38:57 -07:00
snipe 3dc154991a Add @wira-sandy as a contributor 2018-07-18 07:37:56 -07:00
snipe a5f57c050f Add @vipsystem as a contributor 2018-07-18 07:37:30 -07:00
snipe 36c4cd98e0 Add @vinzruzell as a contributor 2018-07-18 07:36:31 -07:00
snipe f6ef6039f4 Add @fraccie as a contributor 2018-07-18 07:35:55 -07:00
snipe 6867563e4a Add @dheche as a contributor 2018-07-18 07:33:19 -07:00
snipe 21820262ce Add @reinvanhaaren as a contributor 2018-07-18 07:29:12 -07:00
snipe bae1203b64 Add @ragnarcx as a contributor 2018-07-18 07:28:41 -07:00
snipe 0f2ff7aba2 Add @ProfFan as a contributor 2018-07-18 07:28:03 -07:00
snipe 0ce90834f6 Add @priatna as a contributor 2018-07-18 07:27:42 -07:00
snipe 0e182bb2b9 Add @bodrovics as a contributor 2018-07-18 07:26:54 -07:00
snipe 7afff69fab Add @pawel1615 as a contributor 2018-07-18 07:26:12 -07:00
snipe 136d59e4b9 Add @drcryo as a contributor 2018-07-18 07:25:49 -07:00
snipe 6d9cbac928 Add @pooot as a contributor 2018-07-18 07:25:25 -07:00
snipe efcd8d339b Add @saymd as a contributor 2018-07-18 07:24:51 -07:00
snipe 7e09ce468b Add @omego as a contributor 2018-07-18 07:24:08 -07:00
snipe baf714b41f Add @MohammedFota as a contributor 2018-07-18 07:22:56 -07:00
snipe b0808e846d Add @IxFail as a contributor 2018-07-18 07:22:15 -07:00