Skip to content
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

Merge development to master : AgroPortal release 2.4.5 #196

Merged
merged 300 commits into from
Feb 16, 2023

Conversation

haddadzineddine and others added 30 commits December 28, 2022 11:47
…sion-form

Refactor: Update the submission form
Bilelkihal and others added 3 commits February 7, 2023 10:52
* [ontoportal-bot] Gemfile.lock update

* add newrelic configs for ui app

* remove unused stages

* fix typo issue of writing '=' in the statement end where it's not needed

---------

Co-authored-by: OntoPortal Bot <ontoportal.bot.lirmm@gmail.com>
Co-authored-by: HADDAD Zineddine <hz_haddad@esi.dz>
end
end
out = []
params.require(:submission).permit!.tap do |x|

Check warning

Code scanning / Brakeman

Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys.

Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys.
= xmldatetime_to_date(sub.creationDate) unless sub.creationDate.nil?
- unless @ont_restricted
%td
= raw download_link(sub, @ontology)

Check notice

Code scanning / Brakeman

Unescaped parameter value.

Unescaped parameter value.
syphax-bouazzouni and others added 21 commits February 7, 2023 11:52
* create chips component file

* Add a function to turn spaces into underscores

* Create chips component design file

* CSS for the chips component

* Change the meaningless argument "text" by "name" & "value"

* Add a component folder for component styles in the styelsheets folder
* create chips component file

* Add a function to turn spaces into underscores

* Create chips component design file

* CSS for the chips component

* Add recaptcha tags

* Change the meaningless argument "text" by "name" & "value"

* Use the chips component on the feedback page

* Add a component folder for component styles in the styelsheets folder

* Remove chips component style from feedback page css file
* update login page design

* update the design of lost password page

* update sucess message for password reset

* update register page design

* Delete login.scss

* Delete lostpassword.scss

* Update index.html.erb

* Delete lost_password_success.html.erb

* Update index.html.erb

* Update lost_password.html.erb

* Update routes.rb

* Update index.html.erb

* Update register.scss

* Delete _form.html.erb

* Update _form.html.haml

* Update login_controller.rb

* Add code to remove auto added arrows from number_text_field

* Add the two fields (OrcidID & github)

* Add subscription to mailing list

* Update index.html.erb

* Update _form.html.haml

* Add captacha tag

* Update _form.html.haml

* Add github icon

* Add orcide icon

* Fix recaptacha tags (add "=")

* replace "ORCIDE" by "ORCID"

* Change ORCID ID  input type from 'number' to ‘text’

* Extract orcidId & githubId from URLs

* Extract arrow-back.svg file

* Fix extract id from link

* Resolve conflicts with developement branch

* remove import browse

---------

Co-authored-by: Syphax bouazzouni <gs_bouazzouni@esi.dz>
Copy link
Collaborator Author

@syphax-bouazzouni syphax-bouazzouni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed

@syphax-bouazzouni syphax-bouazzouni changed the title Merge development to master : AgroPortal release 2.4.1 Merge development to master : AgroPortal release 2.4.5 Feb 16, 2023
@syphax-bouazzouni syphax-bouazzouni merged commit b0b17e1 into master Feb 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants