DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8822 commits 97 branches 266 tags 291 MiB
Commit graph

8822 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M d359bcb88d adds proper spacing 2022-10-17 13:15:10 -07:00
Godfrey M 28059c878a gets the proper amount of months and fixes typo of the word depreciation 2022-10-17 11:16:29 -07:00
snipe b7bcfaccc9
Merge pull request #11834 from uberbrady/try_catch_notifications 
try/catch wrap notifications on checkin/checkout
 2022-10-13 14:20:22 -07:00
snipe 0303df4b25 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 13:19:51 -07:00
snipe 8c6aaec9ce
Merge pull request #11971 from snipe/localization/new_translations 
Added new translations
 2022-10-13 13:06:16 -07:00
snipe fb228d6ded Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:57:10 -07:00
snipe 1360ce90a5 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:52:45 -07:00
snipe 3549afe157 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:43:24 -07:00
snipe cfb780b20b Remove unused files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:39:10 -07:00
snipe eb9f17122e Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:21:09 -07:00
snipe 2ef45afb2b Removed extraneous files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:18:57 -07:00
snipe ecc6bd8a24 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:24:31 -07:00
snipe 80279a95ae
Merge pull request #11964 from snipe/fixes/audit_admin_presenting 
Use admin ID for audit log notification
 2022-10-12 16:00:50 -07:00
snipe ac055c01dc Use admin ID for audit log notification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 15:59:43 -07:00
snipe 5ff72420a6 Set branch back to develop 
I hads to switch branches because the automated GH action script always targets masterb

Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 11:00:06 -07:00
snipe 55b33c1042
Merge pull request #11944 from snipe/dependabot/github_actions/actions/checkout-3.1.0 
Bump actions/checkout from 2 to 3.1.0
 2022-10-12 10:59:21 -07:00
snipe a499a92bb7 Added @nh314 as a contributor 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 10:57:50 -07:00
snipe e7ae7742b0
Merge pull request #11949 from nh314/Remove-required-mark 
Remove required mark
 2022-10-12 10:55:49 -07:00
snipe 98f2e0271b
Merge pull request #11942 from nh314/develop 
Correct comparison logic
 2022-10-12 10:55:29 -07:00
snipe cd43fc50fb
Merge pull request #11960 from snipe/fixes/better_validation_for_ldap_filter 
Sets nullable attribute on validation
 2022-10-12 10:53:08 -07:00
snipe 06803092c5
Merge pull request #11952 from snipe/features/clearer_activated_helptext 
Added clearer LDAP activated helptext
 2022-10-12 10:52:56 -07:00
snipe 0312ecf09d Sets nullable attribute on validation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 10:30:47 -07:00
snipe 3f105cd3b2
Merge pull request #11959 from inietov/fixes/depreciation_date 
Fixed Depreciation date diff readable precision
 2022-10-12 10:21:37 -07:00
Ivan Nieto Vivanco ab0c5bcd9d Add precision parameter to the diffForHumans() Carbon function to report 2022-10-12 12:16:13 -05:00
snipe 5ba01728d9 More text tweaking 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-11 12:51:25 -07:00
snipe ae0eb378e4 Additional clarification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-11 12:43:54 -07:00
snipe ad8a2387f0 Updated help text to be more clear 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-11 12:38:37 -07:00
Phan Nguyen d3161fad02
Remove required mark 
Because it actually not required by model.
 2022-10-11 15:49:56 +07:00
dependabot[bot] 36eb51b52f
Bump actions/checkout from 2 to 3.1.0 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-10 08:36:34 +00:00
Phan Nguyen 8ff109e9da
Correct comparison logic 
Comparison operator should be greater than or equal
 2022-10-08 12:54:15 +07:00
snipe 15da3b831d
Merge pull request #11937 from Godmartinz/gh11868_sidebar_unclickable 
Fixes the margin top adjustment for desktop
 2022-10-06 10:43:27 -07:00
Godfrey M 0c6441ebed removes the margin top adjustment for desktop 2022-10-06 10:35:28 -07:00
snipe fbfc9d123c Merge remote-tracking branch 'origin/develop' 2022-10-06 09:26:07 -07:00
snipe cd942196cc
Merge pull request #11933 from inietov/fixes/500_creating_new_user_undefined_variable_item 
Fixed Error 500 undefined variable item creating a new user.
 2022-10-06 09:07:18 -07:00
Ivan Nieto Vivanco f1edbc9810 Send item variable that the datepicker needs 2022-10-06 09:15:00 -05:00
snipe 1ef3eb94db Merge remote-tracking branch 'origin/develop' 2022-10-05 17:55:33 -07:00
snipe 25e4b7d59d
Merge pull request #11927 from uberbrady/use_improved_scim 
Use the new scim-trace feature from our fork of laravel-scim-server lib
 2022-10-05 17:53:20 -07:00
Brady Wetherington 9605dec22a Use the new scim-trace feature from our fork of laravel-scim-server lib 2022-10-05 17:43:59 -07:00
snipe ca937667b4 Indented divs per @uberbrady 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:21:39 -07:00
snipe e9c61903f1
Merge pull request #11926 from snipe/features/add_start_and_term_dates_to_users 
Added start and end dates to users
 2022-10-05 17:20:37 -07:00
snipe 14b7319b63 Added start/end to sortable columns 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:07:07 -07:00
snipe 9d641573b5 Make the APU return null instead of blank 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:01:04 -07:00
snipe 3605aa8f5a Added clear button to generic datepicker and made it wider 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:59:06 -07:00
snipe 0817308822 Added start/end to edit/view screens 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:49 -07:00
snipe bdfac1a345 Added start/end to the users API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:37 -07:00
snipe f7a9be92ca Store data for start and end 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:26 -07:00
snipe 56ba8a7e24 Added API select fields and filters 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:16 -07:00
snipe cf62761d18 Added date casting and fillable to models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:57:59 -07:00
snipe d23e178c62 Adde language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:56:10 -07:00
snipe 7353ecd388 Added start_date and end_date migration to users table 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:55:59 -07:00