Ivan Nieto Vivanco
e03a8cc721
Delete an extra entry for Departments when importing Users via GUI
2021-12-21 14:42:51 -06:00
Alex Janes
2e5820e29d
small phrase change
2021-12-20 23:31:10 -05:00
Alex Janes
b01a4468c7
refactored from bulkcheckin to quickscancheckin
2021-12-20 23:27:36 -05:00
snipe
48d3bfef03
Merge pull request #10421 from Robert-Azelis/patch-5
...
Create new user account from asset form - additional fields
2021-12-20 17:05:38 -08:00
Alex Janes
7acb559069
corrected issue with asset not found errors
2021-12-20 19:55:00 -05:00
Alex Janes
55b8d080b9
more lang changes
2021-12-20 19:39:06 -05:00
Alex Janes
fcc9815c6e
Revert "Added phrase to all language files to prevent errors (translation still needs to happen)"
...
This reverts commit 87ef37b0b4
2021-12-20 18:05:21 -05:00
Alex Janes
cb14abfc54
Revert "fixed zh-CN file format"
...
This reverts commit 20f66a1b55
2021-12-20 18:05:09 -05:00
Alex Janes
3841c3560b
changed a page title
2021-12-20 16:52:00 -05:00
Alex Janes
20f66a1b55
fixed zh-CN file format
2021-12-20 14:05:13 -05:00
Alex Janes
2b5aca183c
removed unnecessary additional data call from api method
2021-12-19 19:21:58 -05:00
Alex Janes
14b21a6e95
removed some whitespace
2021-12-19 19:17:32 -05:00
Alex Janes
08cb8c354b
more cleanup to fit formatting convention
2021-12-19 19:11:24 -05:00
Alex Janes
87ef37b0b4
Added phrase to all language files to prevent errors (translation still needs to happen)
2021-12-19 18:50:55 -05:00
Alex Janes
29da4f4325
Removed a bunch of redundant code I created from the API
2021-12-19 18:39:57 -05:00
Alex Janes
bc4fe88ac0
First version of bulk checkin
2021-12-19 16:53:31 -05:00
Alex Janes
ead142cdf7
Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR)
2021-12-18 12:00:07 -05:00
Alex Janes
9d4a6b85ed
Merge remote-tracking branch 'origin/features/lock_logins_to_saml' into features/lock_logins_to_saml
2021-12-18 11:56:57 -05:00
Alex Janes
227ca61301
Changed phrasing of "SAML Force Login" to "SAML Default Login" (English only at this point)
2021-12-18 11:56:36 -05:00
Alex Janes
a68ec8bb57
Update LoginController.php
...
Updated if statements to match convention exactly.
2021-12-17 18:52:42 -05:00
Alex Janes
74de91c31a
Merge pull request #1 from snipe/develop
...
Develop
2021-12-17 14:51:03 -05:00
snipe
04f4bb83e9
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:37:22 -08:00
snipe
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:36:08 -08:00
snipe
4ca2252e3b
Switches GET to POST for request assset
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:32:29 -08:00
Alex Janes
d99db5c63b
bug fix and formatting fix
2021-12-16 19:04:37 -05:00
Wächtler, Yannick
2901525194
Merge branch 'snipe-develop' into added-localized-strings
2021-12-17 00:22:08 +01:00
Wächtler, Yannick
279fced877
merge
2021-12-17 00:14:36 +01:00
snipe
8c5dce5dcf
Merge pull request #10450 from snipe/master_into_develop
...
Master into develop
2021-12-16 14:45:53 -08:00
snipe
398180dc59
Small merge unmagling
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 14:38:04 -08:00
snipe
6be98638ed
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 14:29:38 -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
Alex Janes
6898119891
Replaced env() with config() to check environment variables
...
Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.
2021-12-16 16:56:39 -05:00
Alex Janes
a6116a1b15
If SAML required, don't accept login form post.
2021-12-16 14:33:25 -05:00
Alex Janes
696943b04b
Add option to environment to require SAML for a more secure installation.
2021-12-16 11:44:34 -05:00
Alex Janes
3c8d70c5fb
Add option to environment to require SAML for a more secure installation.
2021-12-16 11:44:07 -05:00
snipe
a05fe9c1f7
Add @exula as a contributor
2021-12-15 09:30:36 -08:00
snipe
395401e9db
Merge pull request #10439 from exula/exula-fix-slack-settings
...
Update SettingsController.php to save Slack Settings
2021-12-15 08:36:18 -08:00
Bradley Coudriet
dbdc1c7f3f
Update SettingsController.php to save Slack Settings
...
This goes with #10438 that I just submitted about Slack Settings not saving.
This adds the necessary code to actually save the Slack Settings,
As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.
2021-12-15 10:38:51 -05:00
Nuraeil
c3b7576d99
Merge pull request #7 from snipe/develop
...
Develop
2021-12-14 19:51:40 +01:00
Wächtler, Yannick
484b996879
fixed merge conflicts
2021-12-14 19:48:59 +01:00
snipe
52322806fa
Merge pull request #10434 from inietov/fixes/v6_components_error
...
Fix route to checkout components from the details page
2021-12-14 10:41:24 -08:00
Wächtler, Yannick
4397a12efc
Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop
2021-12-14 19:37:27 +01:00
Ivan Nieto Vivanco
d083f89f30
Delete extra character remaining from previous tests :(
2021-12-14 12:32:30 -06:00
snipe
ace4a00e29
Merge pull request #10433 from inietov/features/adding_title_to_custom_report_master
...
Add title column to custom reports on master branch
2021-12-14 10:28:18 -08:00
snipe
59555483f3
Merge pull request #10432 from inietov/features/adding_title_to_custom_report
...
Add title column to custom reports
2021-12-14 10:28:02 -08:00
Ivan Nieto Vivanco
2402f00a2e
Fix route to checkout components from the details page
2021-12-14 12:26:46 -06:00
Ivan Nieto Vivanco
c80aa2a289
Add title column to custom reports
2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco
0037cdb00c
Add title column to custom reports
2021-12-13 20:27:23 -06:00
snipe
25e2e7ecc6
Merge pull request #10418 from inietov/fixes/bulk_edit_count_more_users_than_selected
...
Fixes bulk edit message counts more users than the actual selected users number
2021-12-13 14:13:14 -08:00
snipe
02be4773de
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-13 12:07:34 -08:00
