DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
13676 commits 95 branches 267 tags 294 MiB
Commit graph

397 commits

Author SHA1 Message Date
snipe cca531f8ca Add @sunflowerbofh as a contributor 2022-08-22 16:32:30 -07:00
snipe 15af4ea56e Add @kylegordon as a contributor 2022-08-22 16:21:20 -07:00
snipe 41be3f7208 Add @julian-piehl as a contributor 2022-08-22 16:17:24 -07:00
snipe f374f231d4 Added ERD link 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 11:37:17 -07:00
snipe 254ce72415 Add @vickyjaura183 as a contributor 2022-08-02 17:20:51 -07:00
snipe 211bbeda5b Added link to SEDC / perl-www-snipe 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-25 18:53:17 -07:00
snipe 5cb5ef249b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 19:16:54 -07:00
snipe 4808185b5c Added link to MosyleSnipeSync 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 19:15:19 -07:00
snipe b44f27dafa Add @mikeroq as a contributor 2022-07-01 14:31:07 -07:00
snipe 4f07e77bf9 Add @naveensrinivasan as a contributor 2022-06-30 17:35:02 -07:00
snipe f8fd87b896 Add @ntbutler-nbcs as a contributor 2022-06-29 05:04:07 -07:00
snipe 9d3aed42b7 Add @denzfarid as a contributor 2022-06-05 17:16:58 -07:00
snipe 747b58cb59 Bumped laravel version in readme 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 16:09:00 -07:00
snipe 91e6acbfd9 Add @veenone as a contributor 2022-04-05 18:52:17 +01:00
snipe a937bd34f6 Merge master back down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:28:43 +01:00
snipe a5c16c6a9c Update @insert-waffle as a contributor 2022-02-24 14:47:48 -08:00
snipe dd5f812d88 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Console/Commands/FixDoubleEscape.php
#	app/Console/Commands/LdapSync.php
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/CategoriesController.php
#	app/Http/Controllers/Api/CompaniesController.php
#	app/Http/Controllers/Api/DepartmentsController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Models/Loggable.php
#	app/Providers/AuthServiceProvider.php
#	config/version.php
#	database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
#	database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
#	package-lock.json
#	package.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
#	resources/views/hardware/view.blade.php
 2022-02-20 13:29:12 -08:00
snipe 21a6bdabc6 Add @insert-waffle as a contributor 2022-02-20 11:12:52 -08:00
snipe ee3166cdc2 Add @savornicesei as a contributor 2022-02-08 15:38:20 -08:00
snipe 2e998b110f Add @TenOfTens as a contributor 2022-02-01 13:40:31 -08:00
snipe 181dc5127f Add @UniversalSuperBox as a contributor 2022-01-11 15:03:08 -08:00
snipe dcc199835b Add @nuraeil as a contributor 2022-01-10 14:56:22 -08:00
snipe fde5c6c226 Add @adagioajanes as a contributor 2021-12-24 11:21:46 -08:00
snipe c3d55ee27e Merge master down into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Models/Setting.php
#	config/version.php
#	resources/lang/af/button.php
#	resources/lang/ar/button.php
#	resources/lang/bg/button.php
#	resources/lang/cs/button.php
#	resources/lang/cy/button.php
#	resources/lang/da/button.php
#	resources/lang/de/button.php
#	resources/lang/el/button.php
#	resources/lang/en-GB/button.php
#	resources/lang/en-ID/button.php
#	resources/lang/es-CO/admin/groups/message.php
#	resources/lang/es-MX/button.php
#	resources/lang/et/admin/custom_fields/general.php
#	resources/lang/et/admin/hardware/table.php
#	resources/lang/et/admin/kits/general.php
#	resources/lang/et/admin/manufacturers/message.php
#	resources/lang/et/admin/models/general.php
#	resources/lang/et/admin/settings/general.php
#	resources/lang/et/button.php
#	resources/lang/et/mail.php
#	resources/lang/fa/button.php
#	resources/lang/fa/help.php
#	resources/lang/fi/button.php
#	resources/lang/fil/button.php
#	resources/lang/fr/button.php
#	resources/lang/ga-IE/button.php
#	resources/lang/he/button.php
#	resources/lang/hr/button.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/auth/message.php
#	resources/lang/hu/button.php
#	resources/lang/hu/mail.php
#	resources/lang/id/admin/hardware/table.php
#	resources/lang/id/button.php
#	resources/lang/it/button.php
#	resources/lang/iu/button.php
#	resources/lang/ja/button.php
#	resources/lang/ko/button.php
#	resources/lang/lt/button.php
#	resources/lang/lv/button.php
#	resources/lang/mi/button.php
#	resources/lang/mk/button.php
#	resources/lang/ml-IN/button.php
#	resources/lang/mn/button.php
#	resources/lang/ms/admin/hardware/table.php
#	resources/lang/ms/admin/kits/general.php
#	resources/lang/ms/admin/models/general.php
#	resources/lang/ms/admin/models/message.php
#	resources/lang/ms/admin/settings/general.php
#	resources/lang/ms/button.php
#	resources/lang/nl/button.php
#	resources/lang/no/admin/hardware/table.php
#	resources/lang/no/admin/kits/general.php
#	resources/lang/no/admin/settings/general.php
#	resources/lang/no/auth/message.php
#	resources/lang/no/button.php
#	resources/lang/no/help.php
#	resources/lang/no/mail.php
#	resources/lang/pl/button.php
#	resources/lang/pt-BR/button.php
#	resources/lang/pt-PT/auth/message.php
#	resources/lang/pt-PT/button.php
#	resources/lang/pt-PT/mail.php
#	resources/lang/ro/button.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/button.php
#	resources/lang/ru/help.php
#	resources/lang/sl/admin/custom_fields/general.php
#	resources/lang/sl/admin/hardware/table.php
#	resources/lang/sl/admin/kits/general.php
#	resources/lang/sl/admin/manufacturers/message.php
#	resources/lang/sl/admin/models/general.php
#	resources/lang/sl/admin/settings/general.php
#	resources/lang/sl/admin/users/general.php
#	resources/lang/sl/auth/message.php
#	resources/lang/sl/button.php
#	resources/lang/sl/help.php
#	resources/lang/sr-CS/button.php
#	resources/lang/ta/button.php
#	resources/lang/th/button.php
#	resources/lang/th/mail.php
#	resources/lang/tl/button.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/auth/message.php
#	resources/lang/tr/button.php
#	resources/lang/uk/button.php
#	resources/lang/ur-PK/button.php
#	resources/lang/vi/button.php
#	resources/lang/zh-CN/button.php
#	resources/lang/zh-HK/button.php
#	resources/lang/zh-TW/admin/hardware/table.php
#	resources/lang/zh-TW/button.php
#	resources/lang/zu/button.php
#	resources/views/models/custom_fields_form.blade.php
#	resources/views/reports/custom.blade.php
#	resources/views/settings/slack.blade.php
 2021-12-16 14:26:24 -08:00
snipe a05fe9c1f7 Add @exula as a contributor 2021-12-15 09:30:36 -08:00
snipe e20a10a6a1 Add @Haxatron as a contributor 2021-12-10 15:17:26 -08:00
snipe a579353198 Add @bestlong as a contributor 2021-11-24 20:04:26 -08:00
snipe 7360e15d4e Add @sneak-it as a contributor 2021-11-24 20:04:05 -08:00
snipe 9dc2fa61b8 Add @adamboutcher as a contributor 2021-11-24 20:03:52 -08:00
snipe 80fd49a59e Add @leitwerk-ag as a contributor 2021-11-24 20:03:40 -08:00
snipe d3d199efc3 Add @PlaneNuts as a contributor 2021-10-28 16:39:28 -07:00
snipe f41ec640fe Added Huntr.dev badge 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 12:49:30 -07:00
snipe fa1cf3073b Add @alwism as a contributor 2021-10-04 15:04:58 -07:00
snipe 71badee78a Add @Robert-Azelis as a contributor 2021-10-04 15:04:47 -07:00
snipe cb0d1add8d Add @01ste02 as a contributor 2021-10-04 15:04:22 -07:00
snipe 1b0d11a572 Add @jethron as a contributor 2021-10-04 15:03:50 -07:00
snipe 9e522b6a4d Add @Computroniks as a contributor 2021-10-04 15:03:35 -07:00
snipe a773e70936 Add @Toreg87 as a contributor 2021-10-04 15:03:23 -07:00
snipe 92a38f2a23 Add @jerm as a contributor 2021-10-04 15:03:05 -07:00
snipe 542f774c68 Add @FliegenKLATSCH as a contributor 2021-10-04 15:02:56 -07:00
snipe 67e106c7fa Add @AL4AL as a contributor 2021-10-04 15:02:51 -07:00
snipe f232579e2b Added Discord badge 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-28 20:02:46 -07:00
snipe 81f1f4ce6f Add @vapier as a contributor 2021-09-20 15:07:37 -07:00
Jason Spriggs bae3c9ce93 Add Deploy to Heroku button to README 2021-09-05 10:34:48 -04:00
JJ Asghar 07a2ef2234
Update README.md 
Typo.
 2021-08-31 11:11:19 -05:00
Gage K. Holland 63a5c70e8e
Update README.md 2021-08-10 09:16:51 +01:00
snipe 7b4cc5044b Add @derdeagle as a contributor 2021-06-23 14:31:48 -07:00
snipe c684e5f481 Add @PetriAsi as a contributor 2021-06-23 14:31:16 -07:00
snipe c567ad0617 Add @travismiller as a contributor 2021-06-10 15:18:02 -07:00
snipe 11f1b29db9 Add @kcoyo as a contributor 2021-05-26 13:04:51 -07:00
snipe 3f559c4a50 Add @tbrconnect as a contributor 2021-05-12 13:38:56 -07:00
snipe ed98683496 Add @mikecmpbll as a contributor 2021-05-04 22:40:04 -07:00
snipe c1a8b609ea Add @markbrule as a contributor 2021-05-04 22:27:35 -07:00
snipe 6c0af3c6e1 Add @JohnnyPicnic as a contributor 2021-05-04 22:21:18 -07:00
snipe 36c2edb278 Add @nepella as a contributor 2021-04-21 11:40:38 -07:00
snipe dd1a5681da Add @psarossy as a contributor 2021-04-20 14:53:10 -07:00
snipe e92f69dcda Add @zybersup as a contributor 2021-04-20 14:52:29 -07:00
snipe 3e471a6587 Add @sh1hab as a contributor 2021-04-20 14:49:31 -07:00
snipe 415ae5854f Add @Skywalker-11 as a contributor 2021-04-14 15:15:57 -07:00
snipe 252b2ee1b4 Add @Jelle-S as a contributor 2021-04-14 15:07:40 -07:00
snipe 2c0438bdcb Add @andreaci as a contributor 2021-04-14 11:18:13 -07:00
snipe f19595f525 Add @deivishome as a contributor 2021-04-14 10:27:08 -07:00
snipe 465ec054d3 Add @limeless as a contributor 2021-04-14 10:22:58 -07:00
snipe ab8f7e7b84 Add @Joly0 as a contributor 2021-04-14 10:21:18 -07:00
snipe abddda2ab8 Add @kajes as a contributor 2021-04-05 21:56:45 -07:00
snipe 55692bfe98 Add @Tetrachloromethane250 as a contributor 2021-04-05 21:52:14 -07:00
snipe f147c43dd4 Add @t3easy as a contributor 2021-04-05 21:04:39 -07:00
snipe c9ec15101c Add @ajsy as a contributor 2021-04-05 20:56:39 -07:00
snipe 298bfa73c8 Add @ocelotsloth as a contributor 2021-04-05 20:35:28 -07:00
snipe 26b97d2b0b Add @JuustoMestari as a contributor 2021-04-05 20:16:35 -07:00
snipe 53651ba3df Add @misilot as a contributor 2021-03-24 14:09:02 -07:00
snipe d527f23ec8 Add @raelldottin as a contributor 2021-03-24 14:08:56 -07:00
snipe ca882e2b3d Add @elyscape as a contributor 2021-03-15 16:42:52 -07:00
snipe 52bf050c4f Add @joelpittet as a contributor 2021-02-26 15:59:17 -08:00
snipe f636aac2dd Add @sw-mreyes as a contributor 2021-02-19 10:11:52 -08:00
snipe bfadb2cea6 Add @koelle25 as a contributor 2021-02-17 12:58:57 -08:00
snipe 2a88781cd5 Add @Kurokat as a contributor 2021-02-03 16:07:25 -08:00
snipe f96c867bd3 Update @ghost as a contributor 2021-02-03 16:07:06 -08:00
snipe 06f8e8620a Add @EDVLeer as a contributor 2021-02-03 16:06:28 -08:00
snipe 95d907c9e9 Add @sean-borg as a contributor 2021-02-03 16:06:14 -08:00
snipe d990152856 Add @andres-baller as a contributor 2021-02-03 16:05:45 -08:00
snipe 05609230b2 Add @ncareau as a contributor 2021-02-03 16:05:21 -08:00
snipe 220c254093 Add @benwa as a contributor 2021-02-03 16:05:06 -08:00
snipe 02313ce361 Add @fashberg as a contributor 2021-02-03 16:04:47 -08:00
snipe e70f7c610a Add @winstan as a contributor 2021-02-03 16:03:20 -08:00
snipe 32f77c3285 Add @alek13 as a contributor 2021-02-03 16:02:49 -08:00
snipe 0a639f4fcc Add @ThoBur as a contributor 2021-02-03 16:02:38 -08:00
snipe f2b55fb641 Add @PauloLuna as a contributor 2021-02-03 16:02:27 -08:00
snipe 0e443356f0 Add @iansltx as a contributor 2021-02-03 16:02:00 -08:00
snipe 76f7f01398 Add @derlucas as a contributor 2021-02-03 16:01:42 -08:00
snipe 992de0156b Add @phenixdotnet as a contributor 2021-02-03 16:01:27 -08:00
snipe c96b5f5a85 Add @sigmoidal as a contributor 2021-02-03 16:01:12 -08:00
snipe 8d2685f0f0 Add @PeterDaveHello as a contributor 2021-02-03 16:01:00 -08:00
snipe eb14cc7f43 Add @giannello as a contributor 2021-02-03 15:59:48 -08:00
snipe 6e068ec339 Add @chamilton-ccn as a contributor 2020-11-16 22:15:59 -08:00
snipe 6eb860ca24 Swapped travis build badge for chipper build badge 2020-11-16 21:49:57 -08:00
snipe 686ab681e5 Removed duplicate badge 2020-11-13 13:54:27 -08:00
snipe 5026177161 Added link to bricelabelle/snipe-it-bulkedit 2020-11-12 18:55:02 -08:00
snipe d2805442ad Updated Laravel version 2020-11-12 18:54:49 -08:00
snipe 7432e3fb2d Add @dampfklon as a contributor 2020-11-12 15:28:29 -08:00