DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
3890 commits 95 branches 267 tags 295 MiB
Commit graph

3890 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d0f14d7a3c Fixed #5186 - email being sent to admin as well as user on checkout 
This should be introduced as a setting, but not arbitrarily send
 2018-03-22 20:30:45 -07:00
snipe 795c2cf540 Merge branch 'develop' 2018-03-22 20:27:40 -07:00
snipe bcd02ce718 Inelegantly fixed #5186 - placeholder notification being sent 
This needs work
 2018-03-22 20:27:14 -07:00
snipe 469efc923b Merge branch 'develop' 
# Conflicts:
#	README.md
#	config/version.php
 2018-03-22 20:08:55 -07:00
snipe dcd74f6922 Bumped version 2018-03-22 20:07:06 -07:00
snipe 4b7eaf6dae Updated translations 2018-03-22 20:01:45 -07:00
Brady Wetherington 085f909f35 Change duplicate header check to return 1-based header indices 2018-03-22 19:40:12 -07:00
snipe 4f394b683d Added test CSV with blank column headers 2018-03-22 19:35:43 -07:00
snipe 7096ebedbc Sample CSV with duplicated headers 2018-03-22 19:22:28 -07:00
Brady Wetherington 0b0243a5e0 Hoist file-reading before file-renaming, catch duplicate headers (#5244) 2018-03-22 19:16:15 -07:00
snipe 5c9f9b1685 Add @cepacs as a contributor 2018-03-22 15:49:46 -07:00
snipe bf74bb196d Merge branch 'develop' 2018-03-22 14:57:15 -07:00
snipe c6e14caa31 Removed e() from array_smart_custom_field_fetch 2018-03-22 14:36:36 -07:00
snipe 506602b257 Remove escaping on import value checker 2018-03-22 14:25:52 -07:00
snipe a79ec0d408 Merge branch 'develop' 2018-03-22 14:18:30 -07:00
snipe 140724be2e Fixed #5217 - permissions error with importer for non-admins 2018-03-22 14:17:44 -07:00
snipe 04af1f3c97 Moved remote user stuff below password security stuff 2018-03-22 14:00:35 -07:00
snipe cb4f1daac1 Fix for a bad merge - the migration was changed between master and develop :( 2018-03-22 13:45:55 -07:00
snipe 96bab5697d Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
#	database/migrations/2018_02_22_160436_add_remote_user_settings.php
 2018-03-22 09:46:50 -07:00
snipe abac3e7758 Bumped hash 2018-03-22 09:44:54 -07:00
snipe 8557cb5305 Added - make accessory manufacturer field searchable 2018-03-22 09:43:53 -07:00
tiagom62 735840aafd Revert removing setting hostname (#5208) 2018-03-21 19:09:37 -07:00
David Kaatz 1c777888d5 Authentication via REMOTE_USER (clean repull) (#5204) 
- Implementation in Login
- Configuration
- Database migration
 2018-03-21 19:09:37 -07:00
Brady Wetherington 625810cd8a Support \r-terminated files better from the Importer (#5184) 
* Hoist the ini_get/ini_set auto-detect line endings code higher

* Placate the irascible Codacy
 2018-03-21 19:08:06 -07:00
Anh DAO-DUY cd63abd72e Add default_label field missing in status_labels table (Travis CI) (#5180) 2018-03-21 19:08:06 -07:00
snipe d911b776bf Check for associated maintenance asset 
This should probably never happen, but triggers on the demo sometimes because of fluctuating data seeding
 2018-03-21 19:08:06 -07:00
tiagom62 9e7d1b3ed8 Revert removing setting hostname (#5208) 2018-03-15 10:20:42 -07:00
David Kaatz 53735f2026 Authentication via REMOTE_USER (clean repull) (#5204) 
- Implementation in Login
- Configuration
- Database migration
 2018-03-14 12:48:07 -07:00
David Kaatz a43b31400f Authentication via REMOTE_USER (#5142) 
* Added authentication via Remote User

* - Removed nullable from remote_user settings fileds and used just default values instead
- Removed german translations
- Removed 401 error page and replaced usage with 403 error page as 401 was actual a duplicate of 403
- Replaced usage of $_SERVER['REMOTE_USER'] with Laravels API Request::server('REMOVE_USER')

* - Fixed request usage
 2018-03-13 20:07:52 -07:00
Brady Wetherington e15f2ac8ab Support \r-terminated files better from the Importer (#5184) 
* Hoist the ini_get/ini_set auto-detect line endings code higher

* Placate the irascible Codacy
 2018-03-13 20:06:53 -07:00
Anh DAO-DUY 06e760081c Add default_label field missing in status_labels table (Travis CI) (#5180) 2018-03-09 13:05:14 -08:00
snipe fc8637c81a Check for associated maintenance asset 
This should probably never happen, but triggers on the demo sometimes because of fluctuating data seeding
 2018-03-07 22:22:36 -08:00
snipe 01eaf48471 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-07 18:25:12 -08:00
snipe 238a075c6a Bumped hash 2018-03-07 18:24:09 -08:00
snipe 1d130b4a89 Fixed asset model permission not granted for edit 2018-03-07 18:22:49 -08:00
snipe 95d935d917 Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
snipe c4db8d37c2 Fixed #5168 - users without superadmin could not see custom fields UI even if granted 2018-03-07 13:37:37 -08:00
snipe 17e0154995 Fixed #5160 - make field_values readable via custom fields API 2018-03-06 13:11:45 -08:00
snipe d60c9800c2 Check that the id key exists to prevent any weird edge cases for location 2018-03-05 22:44:05 -08:00
snipe 04d2542b81 Fixed #5078 - check for object or array as location in LDAP sync 2018-03-05 22:42:40 -08:00
snipe 9a25cb3ee7 Set default labels in seeders 2018-03-05 22:16:36 -08:00
snipe 1e22b8e567 Fixed #5138 - added default_label flag to status labels 2018-03-05 22:04:16 -08:00
snipe d05dfb18a7 Fixed #5150 - added lastname first initial as username format 2018-03-05 21:39:05 -08:00
snipe a5c6ddb8ac Change gate for updating assets via the API to edit 2018-03-05 21:27:17 -08:00
snipe 90bff709a4 Merge branch 'develop' 2018-03-05 20:58:08 -08:00
snipe 052132ec37 Remove pyrchase cost from accessory search 2018-03-05 20:57:50 -08:00
snipe d42361bac1 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-03-05 20:27:50 -08:00
snipe 2df19bcbb4 Only pull category matches for accessory category 2018-03-05 20:22:44 -08:00
snipe 0ef4251462 Include new icons in stalebot 2018-03-05 19:06:39 -08:00
snipe a4af81563a Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-03-05 16:26:49 -08:00