DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-20 04:24:23 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
11341 commits 97 branches 267 tags 296 MiB
Commit graph

11341 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe f7449921e9
Merge pull request #11253 from snipe/features/nicer_locations_ui 
Nicer locations UI
 2022-06-06 10:23:04 -07:00
snipe 5f79534f4a Merge remote-tracking branch 'origin/develop' 2022-06-05 22:44:53 -07:00
snipe 3bcd5d94d6
Merge pull request #11254 from snipe/fixes/11224_only_show_possible_options_in_bulk_menu 
Fixed  #11224 - only show menu options if the user is allowed
 2022-06-05 22:44:26 -07:00
snipe 01348187c8 Fixed #11224 - only show menu options if the user is allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 22:41:53 -07:00
snipe b26a4ad333 Added missing headers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:35:57 -07:00
snipe 89f45d3d05 Removed extra console logs and unused variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:16:29 -07:00
snipe e83a062eda Use translation string for model editing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:11:50 -07:00
snipe 1ea667e709 Update views with additional data fields 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:56 -07:00
snipe 5326ebd136 Removed toolbar div we weren’t using 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:45 -07:00
snipe 4db9892f8c Use partial in overdue audit screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:03:12 -07:00
snipe 880828379e Update bulki partials with new values 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:51 -07:00
snipe 9b54077409 Additional tweaks to BS tables partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 21:02:19 -07:00
snipe 9f478b51e2 Additional JS tweaking 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 20:13:51 -07:00
snipe 7c77e03c5a Initial rework of locations display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 18:08:15 -07:00
snipe 9d3aed42b7 Add @denzfarid as a contributor 2022-06-05 17:16:58 -07:00
snipe 3dedd51b84 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-06-05 17:16:21 -07:00
snipe 711c713ab8 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 17:15:29 -07:00
snipe 5bc5e9f108 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/lang/en/admin/locations/general.php
 2022-06-05 17:14:31 -07:00
snipe 9770692d07
Merge pull request #11251 from denzfarid/fixes/docker-php-redis-extension 
Fixed #10910  : Add php-redis extension
 2022-06-05 17:09:39 -07:00
snipe 133da6569b
Merge pull request #11252 from snipe/fixes/locations_improvements 
Fixes/locations improvements
 2022-06-05 17:05:25 -07:00
snipe 985e683896 Small display improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-05 16:59:53 -07:00
Raden Farid Nugraha c3698053ea Fixed ( #10910 ) : Add php redis extension 2022-06-06 06:58:07 +07:00
snipe dba06a3a9e Check for valid location before trying to print 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 16:56:15 -07:00
snipe 07b1062fb2 Better handle API calls to nonexistent users 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 16:55:23 -07:00
snipe be0933a708
Merge pull request #11249 from snipe/fixes/better_handle_bad_date_values 
Fixed crashing on date formatting helper when value is not actually a date
 2022-06-03 16:46:09 -07:00
snipe d31f185cce Display the actual value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:36:52 -07:00
snipe 5901182885 Removed stray character 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:30:34 -07:00
snipe f033aeda83 Fixed typo in comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:28:00 -07:00
snipe 53f9e2bc7a Wrap the Carbon method in a try/catch to prevent crashing on bad data 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 15:25:39 -07:00
snipe 514db05770 Merge remote-tracking branch 'origin/develop' 2022-06-03 13:29:04 -07:00
snipe 7ca617f077
Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap 
Added explicit “Example:” text in placeholders
 2022-06-03 13:28:40 -07:00
snipe 8f5ac5fb55 Removed quotes around filter query 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 13:01:53 -07:00
snipe 54f828743e Merge remote-tracking branch 'origin/develop' 2022-06-03 12:54:13 -07:00
snipe f519fb747f
Merge pull request #11248 from snipe/fixes/corrected_gate_on_assetmodels 
Updated Asset Model gate to correctly display the button on view
 2022-06-03 12:53:52 -07:00
snipe 36f714e414 Updated Asset Model gate to correctly display the button on view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 12:52:53 -07:00
snipe 773c773773
Merge pull request #11247 from snipe/fixes/added_missing_validation_translations 
Added the validation strings for user creation password options
 2022-06-03 12:03:47 -07:00
snipe 3071a83ae0 Added the validation strings for user creation password options 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 12:00:56 -07:00
snipe 1c4864a3cc Added explicit “Example:” text in placeholders 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 11:25:18 -07:00
snipe 50c92d4730 Merge remote-tracking branch 'origin/develop' 2022-06-02 17:09:52 -07:00
snipe f8a0bf6a4b
Merge pull request #11244 from snipe/fixes/drop_log_level_to_warn_on_SAML 
Dropped log level to warn on SAML error
 2022-06-02 17:09:32 -07:00
snipe 910fc08406 Dropped log level to warn on SAML error 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-02 17:07:49 -07:00
snipe eebc56d54b Merge remote-tracking branch 'origin/develop' 2022-06-02 16:33:04 -07:00
snipe b5ddc2c85b
Merge pull request #11243 from snipe/fixes/fix_diff_time_in_audit_report 
Don’t use the formatted date for diff days in audit report
 2022-06-02 16:32:46 -07:00
snipe 4e03ebe284 Don’t use the formatted date for diff days in audit report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-02 16:30:26 -07:00
snipe 7577fc61e4
Merge pull request #11235 from Godmartinz/gh_5644-checkout_history_for_accessories 
fixed issue with misplaced div
 2022-06-01 17:03:23 -07:00
Godfrey M d302675056 fixed a div placement 2022-06-01 16:58:29 -07:00
Godfrey M 5316f41eba fixed a div placement 2022-06-01 16:56:01 -07:00
snipe fa6c463d46
Merge pull request #11046 from Godmartinz/gh_5644-checkout_history_for_accessories 
Added history tab to accessories
 2022-06-01 12:46:38 -07:00
snipe 23a441e7c8 Merge remote-tracking branch 'origin/develop' 2022-06-01 10:27:50 -07:00
snipe ac993184ee
Merge pull request #11233 from snipe/fixes/11232_depreciation_layout 
Fixed #11232 - missing closing div
 2022-06-01 10:27:25 -07:00