mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-01-19 08:52:25 +01:00
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
This commit is contained in:
Nicolas Florentin
commit
d9edb142b9
11
CHANGELOG.md
11
CHANGELOG.md
@ -1,8 +1,15 @@
|
||||
# Changelog Fab-manager
|
||||
|
||||
## v5.3.5 2022 March 02
|
||||
|
||||
- Added [an option](doc/environment.md#OPENLAB_SSL_VERIFY) to allow set verify ssl option for OpenLab
|
||||
|
||||
## v5.3.4 2022 March 01
|
||||
|
||||
- Fix line break on home events' cards
|
||||
- fix typo "projets" => "projects"
|
||||
- removes dead code about OpenAPI (open_api_calls_count_tracings)
|
||||
- Fix typo "projets" => "projects"
|
||||
- Removes dead code about OpenAPI (open_api_calls_count_tracings)
|
||||
- Fix a bug: unable to modify OpenLab url for production
|
||||
|
||||
## v5.3.3 2022 February 08
|
||||
|
||||
|
||||
12
Gemfile.lock
12
Gemfile.lock
@ -157,7 +157,7 @@ GEM
|
||||
hashery (2.1.2)
|
||||
hashie (4.1.0)
|
||||
htmlentities (4.3.4)
|
||||
httparty (0.18.1)
|
||||
httparty (0.20.0)
|
||||
mime-types (~> 3.0)
|
||||
multi_xml (>= 0.5.2)
|
||||
i18n (1.8.10)
|
||||
@ -202,9 +202,9 @@ GEM
|
||||
message_format (0.0.6)
|
||||
twitter_cldr (~> 5.0)
|
||||
method_source (1.0.0)
|
||||
mime-types (3.3.1)
|
||||
mime-types (3.4.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2021.0225)
|
||||
mime-types-data (3.2022.0105)
|
||||
mimemagic (0.4.3)
|
||||
nokogiri (~> 1)
|
||||
rake
|
||||
@ -245,8 +245,8 @@ GEM
|
||||
omniauth-rails_csrf_protection (0.1.2)
|
||||
actionpack (>= 4.2)
|
||||
omniauth (>= 1.3.1)
|
||||
openlab_ruby (0.0.5)
|
||||
httparty (~> 0.13)
|
||||
openlab_ruby (0.0.7)
|
||||
httparty (~> 0.20)
|
||||
orm_adapter (0.5.0)
|
||||
parallel (1.19.1)
|
||||
parser (2.7.0.4)
|
||||
@ -506,4 +506,4 @@ DEPENDENCIES
|
||||
webpacker (~> 5.x)
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.19
|
||||
2.2.21
|
||||
|
||||
@ -1,25 +1,28 @@
|
||||
.cookies-consent {
|
||||
display: flex;
|
||||
position: fixed;
|
||||
bottom: 3rem;
|
||||
left: 3rem;
|
||||
width: 40rem;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
background-color: #f5f5f5;
|
||||
padding: 3rem;
|
||||
flex-direction: column;
|
||||
z-index: 100;
|
||||
-webkit-box-shadow: 0 4px 10px 2px rgba(224, 224, 224, 0.43);
|
||||
-moz-box-shadow: 0 4px 10px 2px rgba(224, 224, 224, 0.43);
|
||||
box-shadow: 0 4px 10px 2px rgba(224, 224, 224, 0.43);
|
||||
-webkit-box-shadow: 0 4px 10px 2px rgba(0, 0, 0, 0.25);
|
||||
-moz-box-shadow: 0 4px 10px 2px rgba(0, 0, 0, 0.25);
|
||||
box-shadow: 0 4px 10px 2px rgba(0, 0, 0, 0.25);
|
||||
|
||||
.cookies-actions {
|
||||
flex-wrap: wrap;
|
||||
display: flex;
|
||||
height: 45px;
|
||||
justify-content: space-between;
|
||||
gap: 1rem;
|
||||
margin-top: 1rem;
|
||||
|
||||
button {
|
||||
flex-basis: 50%;
|
||||
@extend .fab-button;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
button.decline {
|
||||
background-color: transparent;
|
||||
border: 0;
|
||||
@ -31,4 +34,10 @@
|
||||
font-size: 17px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 480px) {
|
||||
bottom: 3rem;
|
||||
left: 3rem;
|
||||
width: 40rem;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
Openlab.configure do |config|
|
||||
config.base_uri = Rails.application.secrets.openlab_base_uri unless Rails.env.production?
|
||||
config.base_uri = Rails.application.secrets.openlab_base_uri if Rails.application.secrets.openlab_base_uri
|
||||
config.httparty_verify = Rails.application.secrets.openlab_ssl_verify
|
||||
config.httparty_verify_peer = Rails.application.secrets.openlab_ssl_verify_peer
|
||||
end
|
||||
|
||||
@ -31,6 +31,8 @@ development:
|
||||
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
||||
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
||||
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
||||
openlab_ssl_verify: <%= ENV.fetch("OPENLAB_SSL_VERIFY", true) %>
|
||||
openlab_ssl_verify_peer: <%= ENV.fetch("OPENLAB_SSL_VERIFY_PEER", true) %>
|
||||
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
||||
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||
@ -61,6 +63,8 @@ test:
|
||||
fullcalendar_locale: en
|
||||
postgresql_language_analyzer: french
|
||||
openlab_base_uri:
|
||||
openlab_ssl_verify:
|
||||
openlab_ssl_verify_peer:
|
||||
navinum_api_login:
|
||||
navinum_api_password:
|
||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||
@ -99,6 +103,8 @@ staging:
|
||||
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
||||
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
||||
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
||||
openlab_ssl_verify: <%= ENV.fetch("OPENLAB_SSL_VERIFY", true) %>
|
||||
openlab_ssl_verify_peer: <%= ENV.fetch("OPENLAB_SSL_VERIFY_PEER", true) %>
|
||||
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
||||
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||
@ -140,6 +146,8 @@ production:
|
||||
fullcalendar_locale: <%= ENV["FULLCALENDAR_LOCALE"] %>
|
||||
postgresql_language_analyzer: <%= ENV.fetch("POSTGRESQL_LANGUAGE_ANALYZER", 'simple') %>
|
||||
openlab_base_uri: <%= ENV["OPENLAB_BASE_URI"] %>
|
||||
openlab_ssl_verify: <%= ENV.fetch("OPENLAB_SSL_VERIFY", true) %>
|
||||
openlab_ssl_verify_peer: <%= ENV.fetch("OPENLAB_SSL_VERIFY_PEER", true) %>
|
||||
navinum_api_login: <%= ENV["NAVINUM_API_LOGIN"] %>
|
||||
navinum_api_password: <%= ENV["NAVINUM_API_PASSWORD"] %>
|
||||
elaticsearch_host: <%= ENV["ELASTICSEARCH_HOST"] %>
|
||||
|
||||
@ -275,6 +275,15 @@ Accordingly, `RAILS_LOCALE` and `APP_LOCALE` must be configured to `zu`.
|
||||
OPENLAB_BASE_URI
|
||||
|
||||
Set this variable to `https://openprojects.fab-manager.com` if you want to use the common projects repository or set it to your own OpenLab server.
|
||||
Typically, `DEFAULT_PROTOCOL` will be `https` (`http` if you are in development, or if you set `ALLOW_INSECURE_HTTP`).
|
||||
The variable `DEFAULT_HOST` should be your domain name (eg. fabmanager.example.com), and is also used for visits statistics (configuration of Google Analytics).
|
||||
These two variables are also used for SSO authentication.
|
||||
|
||||
<a name="OPENLAB_SSL_VERIFY"></a>
|
||||
|
||||
OPENLAB_SSL_VERIFY, OPENLAB_SSL_VERIFY_PEER
|
||||
|
||||
Set this variable to `false` if you want to disable verify ssl certs.
|
||||
|
||||
<a name="other-settings"></a>
|
||||
## Other settings
|
||||
|
||||
@ -54,6 +54,7 @@ EXCEL_DATE_FORMAT=dd/mm/yyyy
|
||||
# OpenLab Projects
|
||||
# do not change this URL
|
||||
OPENLAB_BASE_URI=https://openprojects.fab-manager.com
|
||||
OPENLAB_SSL_VERIFY=true
|
||||
|
||||
# System settings
|
||||
LOG_LEVEL=debug
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "fab-manager",
|
||||
"version": "5.3.3",
|
||||
"version": "5.3.5",
|
||||
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
|
||||
"keywords": [
|
||||
"fablab",
|
||||
|
||||
@ -39,6 +39,7 @@ UIB_DATE_FORMAT=dd/MM/yyyy
|
||||
EXCEL_DATE_FORMAT=dd/mm/yyyy
|
||||
|
||||
OPENLAB_BASE_URI=https://openprojects.fab-manager.com
|
||||
OPENLAB_SSL_VERIFY=true
|
||||
|
||||
LOG_LEVEL=debug
|
||||
DISK_SPACE_MB_ALERT=1024
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user