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

Ontoportal align: Reset Ecoportal to Ontoportal (Agroportal v2.4.7) #15

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d734c0b
Update the design of the page
Bilelkihal Feb 21, 2023
0c82652
Add user subscription, ontologies and update the design of edit profile
Bilelkihal Feb 23, 2023
4ea6612
Add subscribe email
Bilelkihal Feb 24, 2023
25b6d61
Extract svgs
Bilelkihal Feb 24, 2023
831d838
Add custom ontology set
Bilelkihal Feb 27, 2023
6cba099
Update the design of edit user's info
Bilelkihal Feb 27, 2023
15f0423
Fix a bug in the success message of selecting custom ontology set
Bilelkihal Feb 27, 2023
f2f83aa
Edit user info: text fields validation
Bilelkihal Feb 27, 2023
c0cfdd7
Add edit password
Bilelkihal Feb 27, 2023
26725c4
Validate orcidId
Bilelkihal Feb 27, 2023
02b572e
Fix alignement problem of notes unsubscribe button
Bilelkihal Feb 27, 2023
3c2c92a
turn orcidId field to optional
Bilelkihal Feb 27, 2023
1813e35
Fix the alignement problem when we click on grant admin prevelages
Bilelkihal Feb 27, 2023
cd9e8bb
Remove JQuerry inputs validation & move "a" style to bioportal.css
Bilelkihal Feb 28, 2023
fe015f3
Fix notes subscribe style button
Bilelkihal Feb 28, 2023
4c9eaeb
Remove /users
Bilelkihal Feb 28, 2023
2232eb4
Merge pull request #206 from ontoportal-lirmm/feature/update-account-…
syphax-bouazzouni Mar 1, 2023
3f2b528
Fix projects section error in the account page
Bilelkihal Mar 6, 2023
811ab56
Make the account page responsive
Bilelkihal Mar 6, 2023
20dc41a
add the subject and the receiver of the mailing list subscription ema…
Bilelkihal Mar 6, 2023
a3a3bed
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Mar 7, 2023
62e6911
Fix the link error in the projects section on the account page
Bilelkihal Mar 8, 2023
47e74d0
Merge pull request #208 from ontoportal-lirmm/fix/account-page-subscr…
syphax-bouazzouni Mar 9, 2023
4d7e30a
Fix the wrong email placeholder in the login page
Bilelkihal Mar 9, 2023
b18b0ed
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Mar 10, 2023
2f449f5
add monitoring links to admin page
haddadzineddine Mar 10, 2023
31c3ab9
Add orcidId validation in the signup page
Bilelkihal Mar 10, 2023
15058ac
Add the usename validation in the signup page
Bilelkihal Mar 10, 2023
be01df0
Merge pull request #212 from ontoportal-lirmm/fix/signup-fields-valid…
syphax-bouazzouni Mar 10, 2023
0ba46d8
make monitoring links opened on new tab
haddadzineddine Mar 10, 2023
b3e8c1f
Change the design of the submit ontologies and created projects secti…
Bilelkihal Mar 13, 2023
6381e41
Merge branch 'development' into feature/update-account-page-design
Bilelkihal Mar 13, 2023
49c291c
Merge pull request #214 from ontoportal-lirmm/feature/update-account-…
syphax-bouazzouni Mar 16, 2023
5ab6228
Merge pull request #213 from ontoportal-lirmm/feat/add-monitoring-link
syphax-bouazzouni Mar 16, 2023
2921f71
rescue get_fairness_json is the service is unreachable
syphax-bouazzouni Mar 21, 2023
17c589c
Merge pull request #218 from ontoportal-lirmm/fix/fair-services-down-…
syphax-bouazzouni Mar 21, 2023
2306d48
disable cache_refresh_all for submission save
syphax-bouazzouni Mar 23, 2023
4670516
Merge pull request #221 from ontoportal-lirmm/fix/submission-create-n…
syphax-bouazzouni Mar 23, 2023
8148e0b
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm Mar 23, 2023
727bcab
make the response succeed if nil
syphax-bouazzouni Mar 31, 2023
9987ad6
make the admin controller use the response_error? helper
syphax-bouazzouni Mar 31, 2023
877bf08
Merge pull request #229 from ontoportal-lirmm/fix/admin-errors-respon…
syphax-bouazzouni Mar 31, 2023
dc9dfeb
Merge branch 'master' into development
syphax-bouazzouni May 7, 2023
25959ff
Merge pull request #211 from ontoportal-lirmm/development
syphax-bouazzouni May 7, 2023
358160f
[ontoportal-bot] Gemfile.lock update
ontoportal-bot-lirmm May 9, 2023
314899b
Merge branch 'ecoportal-ontoportal-reset' into feature/ecoportal/rese…
syphax-bouazzouni May 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 53 additions & 57 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git
revision: 0c8cd2b377d88b66a979664d5b16e5068b6d4548
revision: ca20880499a737803120f18ce99c14d3f10bc071
branch: development
specs:
ontologies_api_client (2.2.0)
Expand Down Expand Up @@ -82,12 +82,12 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.4.1)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
autoprefixer-rails (10.4.7.0)
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
bcrypt_pbkdf (1.1.0)
bindex (0.8.1)
Expand All @@ -97,9 +97,9 @@ GEM
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
brakeman (5.4.0)
brakeman (5.4.1)
builder (3.2.4)
capistrano (3.17.1)
capistrano (3.17.2)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand All @@ -115,7 +115,7 @@ GEM
capistrano-bundler (>= 1.1, < 3)
capistrano-yarn (2.0.2)
capistrano (~> 3.0)
capybara (3.38.0)
capybara (3.39.0)
addressable
matrix
mini_mime (>= 0.1.3)
Expand All @@ -127,13 +127,13 @@ GEM
chart-js-rails (0.1.7)
railties (> 3.1)
coderay (1.1.3)
concurrent-ruby (1.2.0)
concurrent-ruby (1.2.2)
crass (1.0.6)
cube-ruby (0.0.3)
daemons (1.4.1)
dalli (3.2.4)
date (3.3.3)
debug (1.7.1)
debug (1.8.0)
irb (>= 1.5.0)
reline (>= 0.3.1)
diff-lcs (1.5.0)
Expand All @@ -158,7 +158,7 @@ GEM
flamegraph (0.9.5)
globalid (1.1.0)
activesupport (>= 5.0)
graphql (2.0.17)
graphql (2.0.21)
graphql-client (0.18.0)
activesupport (>= 3.0)
graphql
Expand All @@ -173,14 +173,14 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.5)
domain_name (~> 0.5)
i18n (1.12.0)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
iconv (1.0.8)
importmap-rails (1.1.5)
importmap-rails (1.1.6)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.6.0)
irb (1.6.2)
irb (1.6.4)
reline (>= 0.3.0)
jquery-rails (4.5.1)
rails-dom-testing (>= 1, < 3)
Expand All @@ -194,7 +194,7 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.19.1)
loofah (2.20.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lz4-ruby (0.3.3)
Expand All @@ -208,11 +208,10 @@ GEM
method_source (1.0.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mime-types-data (3.2023.0218.1)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
msgpack (1.6.0)
minitest (5.18.0)
msgpack (1.7.0)
multi_json (1.15.0)
multipart-post (2.3.0)
mysql2 (0.5.3)
Expand All @@ -232,19 +231,16 @@ GEM
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.3.3)
net-protocol
net-ssh (7.0.1)
net-ssh (7.1.0)
netrc (0.11.0)
newrelic_rpm (8.16.0)
nio4r (2.5.8)
nokogiri (1.14.2)
mini_portile2 (~> 2.8.0)
newrelic_rpm (9.2.2)
nio4r (2.5.9)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
nokogiri (1.14.2-x86_64-linux)
racc (~> 1.4)
oj (3.14.2)
oj (3.14.3)
open_uri_redirections (0.2.1)
parallel (1.22.1)
parser (3.2.1.0)
parallel (1.23.0)
parser (3.2.2.1)
ast (~> 2.4.1)
popper_js (1.16.1)
pry (0.14.2)
Expand All @@ -255,12 +251,12 @@ GEM
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.2)
rack (2.2.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-mini-profiler (3.0.0)
rack-mini-profiler (3.1.0)
rack (>= 1.2.0)
rack-test (2.0.2)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.3)
actioncable (= 7.0.3)
Expand Down Expand Up @@ -300,47 +296,47 @@ GEM
rdoc (6.3.3)
recaptcha (5.9.0)
json
regexp_parser (2.7.0)
reline (0.3.2)
regexp_parser (2.8.0)
reline (0.3.3)
io-console (~> 0.5)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rspec-core (3.12.1)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.2)
rspec-expectations (3.12.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.3)
rspec-mocks (3.12.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.1)
rspec-rails (6.0.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-core (~> 3.11)
rspec-expectations (~> 3.11)
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-core (~> 3.12)
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.0)
rubocop (1.45.1)
rubocop (1.50.2)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
rubocop-ast (>= 1.28.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.26.0)
rubocop-ast (1.28.1)
parser (>= 3.2.1.0)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_parser (3.19.2)
ruby_parser (3.20.0)
sexp_processor (~> 4.16)
rubyzip (2.3.2)
sassc (2.4.0)
Expand All @@ -352,11 +348,11 @@ GEM
sprockets-rails
tilt
select2-rails (4.0.13)
selenium-webdriver (4.8.0)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sexp_processor (4.16.1)
sexp_processor (4.17.0)
spawnling (2.1.5)
sprockets (4.2.0)
concurrent-ruby (~> 1.0)
Expand All @@ -365,25 +361,25 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sshkit (1.21.3)
sshkit (1.21.4)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stackprof (0.2.23)
stackprof (0.2.25)
stimulus-rails (1.2.1)
railties (>= 6.0.0)
temple (0.10.0)
terser (1.1.13)
terser (1.1.14)
execjs (>= 0.3.0, < 3)
thin (1.8.1)
thin (1.8.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.2.1)
tilt (2.0.11)
time (0.2.1)
tilt (2.1.0)
time (0.2.2)
date
timeout (0.3.2)
turbo-rails (1.3.3)
turbo-rails (1.4.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand All @@ -398,7 +394,7 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.4.2)
uri (0.12.0)
uri (0.12.1)
view_component (2.82.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
Expand All @@ -419,7 +415,7 @@ GEM
will_paginate (3.3.1)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.7)
zeitwerk (2.6.8)

PLATFORMS
x86_64-darwin-21
Expand Down Expand Up @@ -489,4 +485,4 @@ DEPENDENCIES
will_paginate (~> 3.0)

BUNDLED WITH
2.3.15
2.3.23
44 changes: 44 additions & 0 deletions app/assets/images/empty-box.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading