Commit graph

297 commits

Author SHA1 Message Date
snipe ab1f34604e Add @Mezzle as a contributor 2019-03-06 18:46:36 -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 886b6dd265 Add @benrubson as a contributor 2018-12-06 15:19:16 -08: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
snipe 0e3e10a707 Add @mikaelssen as a contributor 2018-07-18 07:21:32 -07:00
snipe cbf3d5d071 Add @micaelrodrigues as a contributor 2018-07-18 07:20:20 -07:00
snipe 68d355a33d Add @meyerf99 as a contributor 2018-07-18 07:19:59 -07:00
snipe 853923013a Add @stubben as a contributor 2018-07-18 07:19:00 -07:00
snipe 737061a983 Add @msjohansen as a contributor 2018-07-18 07:17:34 -07:00
snipe 0438d55284 Add @mariejoyacajes as a contributor 2018-07-18 07:17:08 -07:00
snipe 924962c156 Add @MarcosBL as a contributor 2018-07-18 07:16:30 -07:00
snipe a8c42843f6 Add @lstrojny as a contributor 2018-07-18 07:15:10 -07:00
snipe 63c4b7b6b6 Add @laopangzi as a contributor 2018-07-18 07:14:47 -07:00
snipe ff06387d90 Add @joxelito94 as a contributor 2018-07-18 07:11:31 -07:00
snipe fa46622bad Add @JohnWillker as a contributor 2018-07-18 07:07:13 -07:00
snipe fd65780287 Add @jarby1211 as a contributor 2018-07-18 07:05:34 -07:00
snipe 6478ec86ac Add @itangiang as a contributor 2018-07-18 07:04:23 -07:00
snipe 748e0eb44f Add @igolman as a contributor 2018-07-18 07:03:30 -07:00
snipe 507c07e9eb Add @abaalkh as a contributor 2018-07-18 07:03:09 -07:00
snipe 5185a9e590 Add @husnulyaqien as a contributor 2018-07-18 07:02:34 -07:00
snipe 1ade088a8f Add @Kentsson as a contributor 2018-07-18 07:00:50 -07:00
snipe 5c087181be Add @fofwisdom as a contributor 2018-07-18 07:00:21 -07:00
snipe 08bb314bbc Add @Hafidzi as a contributor 2018-07-18 06:59:43 -07:00
snipe 7ddb9becd4 Add @AdnanAbuShahad as a contributor 2018-07-18 06:59:03 -07:00
snipe 7d96709ee2 Add @mrgluek as a contributor 2018-07-18 06:58:28 -07:00
snipe 4413a9f0b6 Add @jgroblesr85 as a contributor 2018-07-18 06:58:10 -07:00
snipe 9611b55fb9 Add @georgwallisch as a contributor 2018-07-18 06:57:39 -07:00
snipe dffd535f68 Add @gdraque as a contributor 2018-07-18 06:57:17 -07:00
snipe 4aaf2da651 Add @possebon as a contributor 2018-07-18 06:55:47 -07:00
snipe 80ac46af78 Add @fgbs as a contributor 2018-07-18 06:55:12 -07:00
snipe 13c58b54fa Add @frapposelli as a contributor 2018-07-18 06:54:39 -07:00
snipe 355119187a Add @Erlpil as a contributor 2018-07-18 06:54:03 -07:00
snipe 0d96587b04 Add @EpixFr as a contributor 2018-07-18 06:53:30 -07:00
snipe be806def91 Add @dominiksenti as a contributor 2018-07-18 06:50:59 -07:00
snipe 8acf8027e9 Add @danielcb as a contributor 2018-07-18 06:49:25 -07:00
snipe 893a1fec57 Add @danielheene as a contributor 2018-07-18 06:48:58 -07:00
snipe d182e40aef Add @da-friedl as a contributor 2018-07-18 06:48:34 -07:00
snipe 6118aca949 Add @dpyroc as a contributor 2018-07-18 06:48:11 -07:00
snipe f0ac83179f Add @Wxcafe as a contributor 2018-07-18 06:47:18 -07:00
snipe 8969ffc14b Update @CronKz as a contributor 2018-07-18 06:46:45 -07:00
snipe 9fb130146a Add @kopi-item as a contributor 2018-07-18 06:46:24 -07:00
snipe d285ff673a Add @Againstreality as a contributor 2018-07-18 06:46:00 -07:00
snipe 7f586da856 Add @cwlin0416 as a contributor 2018-07-18 06:45:24 -07:00
snipe c35f5b3116 Add @chibacityblues as a contributor 2018-07-18 06:44:40 -07:00
snipe 12927d2d54 Add @rudashi as a contributor 2018-07-18 06:43:43 -07:00
snipe 6b06b87547 Add @benunter as a contributor 2018-07-18 06:42:30 -07:00
snipe 058f8ae3b8 Add @aschiavon91 as a contributor 2018-07-18 06:40:14 -07:00
snipe 1faedac04b Add @angeldeejay as a contributor 2018-07-18 06:39:39 -07:00
snipe 666c7321af Add @xelan as a contributor 2018-07-18 06:39:05 -07:00
snipe 6cbaf7396a Add @sirrus as a contributor 2018-07-18 06:38:25 -07:00
snipe b706acaa9f Add @RealEnder as a contributor 2018-07-18 06:36:42 -07:00
snipe 5870acb193 Add @albertoaldrigo as a contributor 2018-07-18 06:36:04 -07:00
snipe c00b633312 Add @a-royal as a contributor 2018-07-18 06:33:05 -07:00
snipe 0272e58868 Add @DeusMaximus as a contributor 2018-07-17 01:11:39 -07:00
snipe 4bfd7a7e4e Add @chemfy as a contributor 2018-07-12 18:28:43 -07:00
snipe 3fe1562b92 Add @jasonlshelton as a contributor 2018-07-12 18:28:43 -07:00
snipe 980dccf31c Add @5quirrel as a contributor 2018-07-12 18:19:35 -07:00
snipe bb2193d481 Add @tilldeeke as a contributor 2018-07-12 18:19:14 -07:00
snipe e559879f91 Add @plexorama as a contributor 2018-07-05 15:35:37 -07:00
snipe 5975c9fac7 Add @ParadoxGuitarist as a contributor 2018-06-21 07:52:24 -07:00
snipe 7b0e392ecd Add @thelamer as a contributor 2018-06-21 07:52:04 -07:00
snipe b51a10b46b Add @RichardRay as a contributor 2018-06-21 07:51:39 -07:00
snipe 6c58f59d72 Add @EarlRamirez as a contributor 2018-06-21 07:51:24 -07:00
snipe cd9caa24ad Add @SjamonDaal as a contributor 2018-06-21 07:51:13 -07:00
snipe abbb94239d Add @doekman as a contributor 2018-05-18 16:05:12 -07:00
snipe a326adc863 Add @hannahtinkler as a contributor 2018-04-13 14:55:11 -07:00
snipe 7d1200c434 Add @lea-mink as a contributor 2018-03-29 05:32:52 -07:00
snipe 5c9f9b1685 Add @cepacs as a contributor 2018-03-22 15:49:46 -07:00
snipe 36234cc0e8 Add @seanmcilvenna as a contributor 2018-02-08 09:29:12 -08:00
snipe e19ab329bd Add @tdb as a contributor 2018-01-24 07:13:24 -08:00
snipe 922cb90cb3 Add @CronKz as a contributor 2018-01-24 07:12:59 -08:00
snipe b383ebee48 Add @fordster78 as a contributor 2018-01-17 10:59:00 -08:00
snipe 9ab05e7037 Add @vcordes79 as a contributor 2018-01-17 05:36:15 -08:00
snipe 2e0c2bd190 Add @Gelob as a contributor 2017-12-07 19:20:08 -08:00
snipe c0293a7c1c Add @uknzaeinozpas as a contributor 2017-11-20 19:39:04 -08:00
snipe bfefa10462 Add @TheVakman as a contributor 2017-11-20 18:54:43 -08:00
snipe 1fa6228fb7 Add @techincolor as a contributor 2017-10-26 16:32:32 -07:00
snipe 471d665408 Add @thakilla as a contributor 2017-10-19 06:07:42 -07:00
snipe 081a64223a Add @TonisOrmisson as a contributor 2017-10-18 05:45:14 -07:00
snipe f7626404b7 Add @BlueHatbRit as a contributor 2017-10-17 15:18:27 -07:00
snipe 10c13baf2b Add @GeoffYoung as a contributor 2017-10-05 00:40:32 -07:00
snipe adddc5324b Add @imjennyli as a contributor 2017-10-05 00:34:50 -07:00
snipe d442feb687 Add @gizzmojr as a contributor 2017-09-25 22:18:25 -07:00
snipe 43ec959385 Add @richardhofman6 as a contributor 2017-09-25 16:58:47 -07:00
snipe 1b76880b0e Add @imanghafoori1 as a contributor 2017-09-12 12:30:21 -07:00
snipe 0f7b7d8e6a Add @zwerch as a contributor 2017-08-23 13:13:50 -07:00
snipe 1fda4593c1 Update @gibsonjoshua55 as a contributor 2017-07-12 20:41:20 -07:00
snipe 4062228092 Updated contribs 2017-06-05 23:54:13 -07:00
snipe be42a0add1 Add @steveelwood as a contributor 2017-06-01 21:03:05 -07:00
snipe 6cadde23d7 Add @manassesferreira as a contributor 2017-06-01 21:00:47 -07:00
snipe a6c1f7b30b Add @n8felton as a contributor 2017-06-01 20:59:15 -07:00
snipe 1b5b0e9d19 Add @jasonspriggs as a contributor 2017-06-01 20:58:50 -07:00
snipe 2a226fd3f9 Update @pakkua80 as a contributor 2017-06-01 20:58:26 -07:00
snipe 043182593d Add @BrettFagerlund as a contributor 2017-06-01 20:57:55 -07:00
snipe b2e122c1e9 Add @HinchK as a contributor 2017-03-31 15:46:42 -07:00
snipe 2c3b9426fe Update @uberbrady as a contributor 2017-03-11 08:21:37 -08:00
snipe 35705813b3 Add @rashivkp as a contributor 2017-03-11 07:53:03 -08:00
snipe 5e3daee212 Add @abrahamvegh as a contributor 2017-03-11 07:52:39 -08:00
snipe 25d7345bbd Add @peelman as a contributor 2017-03-11 07:52:20 -08:00
snipe 76f5b6c0f0 Add @desmondmorris as a contributor 2017-03-11 07:52:03 -08:00
snipe 9da84a1d4d Add @flashingcursor as a contributor 2017-03-11 07:51:46 -08:00
snipe 2523072b1d Add @feeva as a contributor 2017-03-11 07:51:32 -08:00
snipe f38ef8db7f Add @FleischKarussel as a contributor 2017-03-11 07:51:03 -08:00
snipe d2b79ce39e Add @jakemcgraw as a contributor 2017-03-11 07:50:53 -08:00
snipe 6b47b0480e Add @archpoint as a contributor 2017-03-11 07:45:40 -08:00
snipe a916cbb0d0 Add @buzzedword as a contributor 2017-03-11 07:45:25 -08:00
snipe 5f7c7503ec Add @leostat as a contributor 2017-03-11 07:45:05 -08:00
snipe e6b88fa565 Add @technogenus as a contributor 2017-03-11 07:44:50 -08:00
snipe db1730ae06 Add @burlito as a contributor 2017-03-11 07:44:34 -08:00
snipe 1366d0bfb9 Add @rrdial as a contributor 2017-03-11 07:44:21 -08:00
snipe cf4698d2ed Add @mizar1616 as a contributor 2017-03-11 07:43:58 -08:00