-
Notifications
You must be signed in to change notification settings - Fork 3
Added support for os2web_key #101
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Changes from all commits
92c0ec4
b07e536
0f6900d
ae2c683
801cae9
b5fba51
a8dc3c8
fea276d
d0cff5e
1f3a49e
2447c98
2308816
1ff2132
d566ee0
8d831d3
1820f12
34ec714
33d0c3b
d5d476b
8189cdf
fa892f9
6f0d1c2
984bb8e
75d8ad2
d315e88
1b0c85d
ba5dd00
a32eaae
cd3e855
7749375
8b3e642
4c60162
1e60744
1964c27
c58ec55
0404c5c
d8c7c2e
b0b898d
25f35ce
3bde9cc
e1e38ab
8539452
c6e6cb1
d8424d0
243e1e8
5e19aa5
c0c053e
3ffd55b
44d0d3a
1ccb382
6ba43e9
9f1015e
fc5fc87
f9f68e4
6565068
b182805
dabb887
3d44c34
1543425
2ecaa82
0d7a456
266d5de
b672b58
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updates of the packages - are they related with the new module, or that is part of refactoring? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. idea was to remove refactoring to another PR (https://github.com/OS2Forms/os2forms/pull/168/files). I see it was done, but this is still marked as change for this PR can you comment what is the idea here? Thanks There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @stankut, as mentioned under “Caution” in the pull request description, the branch for this pull request has feature/code-cleanup as base (to benefit from the code cleanup). Therefore we (you or I) should merge #168 to get a more clean view on what's actually changed on in this pull request. I don't remember if I'm allowed to merge my own pull requests when approved or if you have to do it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,7 +58,8 @@ | |
"itk-dev/serviceplatformen": "^1.5", | ||
"mglaman/composer-drupal-lenient": "^1.0", | ||
"os2web/os2web_audit": "^1.0", | ||
"os2web/os2web_datalookup": "^2.0", | ||
"os2web/os2web_datalookup": "dev-feature/os2web_key as 2.1.0", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. shall we maybe merge os2web_datalookup before merging this PR? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, we should do that. This PR depends on many other PRs. I've requested a review from you on OS2web/os2web_datalookup#13. |
||
"os2web/os2web_key": "^1.0", | ||
"os2web/os2web_nemlogin": "^1.0", | ||
"os2web/os2web_simplesaml": "dev-master", | ||
"php-http/guzzle7-adapter": "^1.0", | ||
|
@@ -79,6 +80,10 @@ | |
"wsdltophp/packagegenerator": "^4.0" | ||
}, | ||
"repositories": { | ||
"os2web/os2web_datalookup": { | ||
"type": "vcs", | ||
"url": "https://github.com/itk-dev/os2web_datalookup" | ||
}, | ||
"drupal": { | ||
"type": "composer", | ||
"url": "https://packages.drupal.org/8" | ||
|
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We are updating/refactoring general files in repository.
In my opinion it would clearer to make it as part of the separate/dedicated PR, not to mix it with new functionality.