diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000..96fa40aee5 Binary files /dev/null and b/.DS_Store differ diff --git a/.dockerignore b/.dockerignore index d1dd66a33a..2616f99e73 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,25 @@ .git +.dockerignore .bundle .env* +.buildpacks +.*.yml +*.swp +.*ignore +*.md +*.log +Vagrantfile +Dockerfile +Guardfile +docker-compose.* +browserslist +docs +extra +features +help +log/*.log +spec +spec_legacy tmp frontend/node_modules # travis diff --git a/Dockerfile b/Dockerfile index 0d7ef1f1e3..bb3c231bd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,14 @@ +FROM ruby:2.6-stretch AS pgloader +RUN apt-get update -qq && apt-get install -y libsqlite3-dev make curl gawk freetds-dev libzip-dev +COPY docker/mysql-to-postgres/bin/build /tmp/build-pgloader +RUN /tmp/build-pgloader && rm /tmp/build-pgloader + FROM ruby:2.6-stretch MAINTAINER operations@openproject.com ENV NODE_VERSION "10.15.0" ENV BUNDLER_VERSION "2.0.2" +ENV BUNDLE_PATH__SYSTEM=false ENV APP_USER app ENV APP_PATH /app ENV APP_DATA_PATH /var/openproject/assets @@ -17,20 +23,17 @@ ENV RAILS_CACHE_STORE memcache ENV OPENPROJECT_INSTALLATION__TYPE docker ENV NEW_RELIC_AGENT_ENABLED false ENV ATTACHMENTS_STORAGE_PATH $APP_DATA_PATH/files -ENV BUNDLE_PATH__SYSTEM=false - -ENV PGLOADER_DEPENDENCIES "libsqlite3-dev make curl gawk freetds-dev libzip-dev" - # Set a default key base, ensure to provide a secure value in production environments! ENV SECRET_KEY_BASE OVERWRITE_ME +COPY --from=pgloader /usr/local/bin/pgloader-ccl /usr/local/bin/ + # install node + npm RUN curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz | tar xzf - -C /usr/local --strip-components=1 RUN apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ postgresql-client \ - mysql-client \ poppler-utils \ unrtf \ tesseract-ocr \ @@ -38,18 +41,10 @@ RUN apt-get update -qq && \ memcached \ postfix \ postgresql \ - $PGLOADER_DEPENDENCIES \ apache2 \ supervisor && \ apt-get clean && rm -rf /var/lib/apt/lists/* -# pgloader -ENV CCL_DEFAULT_DIRECTORY /opt/ccl -COPY docker/mysql-to-postgres/bin/build /tmp/build-pgloader -RUN /tmp/build-pgloader && rm /tmp/build-pgloader -# Add MySQL-to-Postgres migration script to path (used in entrypoint.sh) -COPY docker/mysql-to-postgres/bin/migrate-mysql-to-postgres /usr/local/bin/ - # Set up pg defaults RUN echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/9.6/main/pg_hba.conf RUN echo "listen_addresses='*'" >> /etc/postgresql/9.6/main/postgresql.conf @@ -70,27 +65,33 @@ COPY modules ./modules # OpenProject::Version is required by module versions in gemspecs RUN mkdir -p lib/open_project COPY lib/open_project/version.rb ./lib/open_project/ -RUN bundle install --deployment --path vendor/bundle --with="docker opf_plugins" --without="test development" --jobs=8 --retry=3 +RUN bundle install --deployment --path vendor/bundle --no-cache \ + --with="docker opf_plugins" --without="test development" --jobs=8 --retry=3 && \ + rm -rf vendor/bundle/ruby/*/cache && rm -rf vendor/bundle/ruby/*/gems/*/spec && rm -rf vendor/bundle/ruby/*/gems/*/test # Finally, copy over the whole thing -COPY . $APP_PATH +COPY . . +# Re-use packager database.yml +RUN cp ./packaging/conf/database.yml ./config/database.yml +# Add MySQL-to-Postgres migration script to path (used in entrypoint.sh) +RUN cp ./docker/mysql-to-postgres/bin/migrate-mysql-to-postgres /usr/local/bin/ +# Ensure OpenProject starts with the docker group of gems RUN sed -i "s|Rails.groups(:opf_plugins)|Rails.groups(:opf_plugins, :docker)|" config/application.rb - # Ensure we can write in /tmp/op_uploaded_files (cf. #29112) RUN mkdir -p /tmp/op_uploaded_files/ && chown -R $APP_USER:$APP_USER /tmp/op_uploaded_files/ -# Re-use packager database.yml -COPY packaging/conf/database.yml ./config/database.yml - -# Run the npm postinstall manually after it was copied -# Then, npm install node modules +# Handle the assets precompilation RUN bash docker/precompile-assets.sh -# ports +# Expose ports for apache and postgres EXPOSE 80 5432 -# volumes to export +# Expose the postgres data directory and OpenProject data directory as volumes VOLUME ["$PGDATA", "$APP_DATA_PATH"] + +# Set a custom entrypoint to allow for privilege dropping and one-off commands ENTRYPOINT ["./docker/entrypoint.sh"] + +# Set default command to launch the all-in-one configuration supervised by supervisord CMD ["./docker/supervisord"] diff --git a/Gemfile b/Gemfile index 838d838e0b..a11bcecd0a 100644 --- a/Gemfile +++ b/Gemfile @@ -234,6 +234,8 @@ group :ldap do end group :development do + gem 'listen', '~> 3.2.1' # Use for event-based reloaders + gem 'faker' gem 'letter_opener' gem 'livingstyleguide', '~> 2.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index ef57e99441..38cae09aa5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -598,6 +598,9 @@ GEM addressable (~> 2.3) letter_opener (1.7.0) launchy (~> 2.2) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) livingstyleguide (2.1.0) minisyntax (>= 0.2.5) redcarpet @@ -777,6 +780,9 @@ GEM rainbow (3.0.0) raindrops (0.19.0) rake (13.0.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) rbtree3 (0.5.0) rdoc (6.1.1) recaptcha (5.1.0) @@ -1022,6 +1028,7 @@ DEPENDENCIES ladle launchy (~> 2.4.3) letter_opener + listen (~> 3.2.1) livingstyleguide (~> 2.1.0) lograge (~> 0.10.0) meta-tags (~> 2.11.0) diff --git a/app/assets/stylesheets/content/_attributes_key_value.sass b/app/assets/stylesheets/content/_attributes_key_value.sass index 574db17e31..a09581b3d6 100644 --- a/app/assets/stylesheets/content/_attributes_key_value.sass +++ b/app/assets/stylesheets/content/_attributes_key_value.sass @@ -88,6 +88,9 @@ font-weight: bold line-height: 27px + &.-required:after + @extend %required-star + .attributes-map.-minimal-keys & max-width: 200px diff --git a/app/services/work_packages/set_attributes_service.rb b/app/services/work_packages/set_attributes_service.rb index 8ef2c91991..fd43c3c61f 100644 --- a/app/services/work_packages/set_attributes_service.rb +++ b/app/services/work_packages/set_attributes_service.rb @@ -150,8 +150,9 @@ class WorkPackages::SetAttributesService < ::BaseServices::SetAttributes end def set_fixed_version_to_nil - unless work_package.fixed_version && - work_package.project.shared_versions.include?(work_package.fixed_version) + if work_package.fixed_version && + !(work_package.project && + work_package.project.shared_versions.include?(work_package.fixed_version)) work_package.fixed_version = nil end end diff --git a/config/environments/development.rb b/config/environments/development.rb index 0f0ca6fa56..b2f8b11b55 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -41,11 +41,8 @@ OpenProject::Application.configure do # Do not eager load code on boot. config.eager_load = false - # File watcher - # using ActiveSupport::EventedFileUpdateChecker depends on listen which depends on fsevent - # which seems to be prone to creating zombie process (+200 of them) which can cause - # the process limit (on mac) to be reached which causes the system to need a reboot. - config.file_watcher = ActiveSupport::FileUpdateChecker + # Asynchronous file watcher + config.file_watcher = ActiveSupport::EventedFileUpdateChecker # Store uploaded files on the local file system (see config/storage.yml for options) config.active_storage.service = :local diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml index 3878ad2c11..10e54e43c9 100644 --- a/config/locales/crowdin/ar.yml +++ b/config/locales/crowdin/ar.yml @@ -2625,6 +2625,17 @@ ar: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "عناصر القائمة" menu_item_setting: "الظهور" wiki_menu_item_for: "عنصر القائمة \"%{title}\"" diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml index 5be080abc5..2c463fe2f4 100644 --- a/config/locales/crowdin/bg.yml +++ b/config/locales/crowdin/bg.yml @@ -2535,6 +2535,17 @@ bg: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menu item" menu_item_setting: "Видимост" wiki_menu_item_for: "Menu item for wikipage \"%{title}\"" diff --git a/config/locales/crowdin/ca.yml b/config/locales/crowdin/ca.yml index bd362f3d21..e06e1db883 100644 --- a/config/locales/crowdin/ca.yml +++ b/config/locales/crowdin/ca.yml @@ -2533,6 +2533,17 @@ ca: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Element de menú" menu_item_setting: "Visibilitat" wiki_menu_item_for: "Element de menú per a la pàgina wiki \"%{title}\"" diff --git a/config/locales/crowdin/cs.yml b/config/locales/crowdin/cs.yml index bc4c34170a..696520fd3e 100644 --- a/config/locales/crowdin/cs.yml +++ b/config/locales/crowdin/cs.yml @@ -2579,6 +2579,17 @@ cs: Váš limit počtu uživatelů byl dosažen. Nelze aktivovat více uživatelů. Prosím upgradujte váš cenový plán nebo zablokujte některé stávající členy pro přidání dalších uživatelů. warning_user_limit_reached_instructions: > Limit počtu uživatelů (%{current}/%{max} aktivních uživatelů) dosažen. Prosím kontaktujte sales@openproject.com a upgradujte vaši Enterprise Edition a přidejte další uživatele. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Položka nabídky" menu_item_setting: "Viditelnost" wiki_menu_item_for: "Položka nabídky pro stránku wiki \"%{title}\"" diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml index 3d4ebac193..ae808537b3 100644 --- a/config/locales/crowdin/da.yml +++ b/config/locales/crowdin/da.yml @@ -2533,6 +2533,17 @@ da: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menupunkt" menu_item_setting: "Synlighed" wiki_menu_item_for: "Menupunkt for wikipage \"%{title}\"" diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml index 0b39e6be6e..2aed17423f 100644 --- a/config/locales/crowdin/de.yml +++ b/config/locales/crowdin/de.yml @@ -2532,6 +2532,17 @@ de: Nutzerlimit erreicht. Sie können keine weiteren Nutzer aktivieren. Bitte upgraden Sie Ihren Tarif oder blockieren Sie Mitglieder, um Platz für weitere Nutzer zu schaffen. warning_user_limit_reached_instructions: > Du hast dein Nutzerlimit erreicht (%{current}/%{max} active users). Bitte kontaktiere sales@openproject.com um deinen Enterprise Edition Plan upzugraden und weitere Nutzer hinzuzufügen. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menüpunkt" menu_item_setting: "Sichtbarkeit" wiki_menu_item_for: "Menüpunkt für die Wikiseite \"%{title}\"" diff --git a/config/locales/crowdin/el.yml b/config/locales/crowdin/el.yml index 5036280001..44a6220d13 100644 --- a/config/locales/crowdin/el.yml +++ b/config/locales/crowdin/el.yml @@ -1032,7 +1032,7 @@ el: rename_groups: "Μετονομασία ομάδων χαρακτηριστικών" project_filters: description_html: "Το φιλτράρισμα και η ταξινόμηση σε προσαρμοσμένα πεδία είναι μια λειτουργία έκδοσης για επιχειρήσεις." - enumeration_activities: "Time tracking activities" + enumeration_activities: "Δραστηριότητες καταγραφής χρόνου" enumeration_work_package_priorities: "Προτεραιότητες πακέτου εργασίας" enumeration_reported_project_statuses: "Αναφερόμενη κατάσταση έργου" error_auth_source_sso_failed: "Το Single Sign-On (SSO) για το χρήση '%{value}' απέτυχε" @@ -1060,7 +1060,7 @@ el: error_journal_attribute_not_present: "Το ημερολόγιο δεν περιέχει το χαρακτηριστικό %{attribute}." error_pdf_export_too_many_columns: "Επιλέχθηκαν πάρα πολλές στήλες για εξαγωγή σε PDF. Παρακαλούμε μειώστε τον αριθμό των στηλών." error_pdf_failed_to_export: "Η εξαγωγή σε PDF δεν ήταν δυνατό να αποθηκευτεί: %{error}" - error_token_authenticity: 'Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again.' + error_token_authenticity: 'Δεν ήταν δυνατή η επαλήθευση του Cross-Site Request Forgery token. Προσπαθήσατε να υποβάλετε δεδομένα σε πολλαπλούς περιηγητές ή καρτέλες; Παρακαλούμε κλείστε όλες τις καρτέλες και δοκιμάστε ξανά.' error_work_package_done_ratios_not_updated: "Η αναλογίες ολοκληρωμένων πακέτων εργασίας δεν έχουν ενημερωθεί." error_work_package_not_found_in_project: "Το πακέτο εργασίας δεν βρέθηκε ή δεν ανοίκει σε αυτό το έργο" error_must_be_project_member: "πρέπει να είναι μέλος έργου" @@ -1104,7 +1104,7 @@ el: pdf_with_descriptions_and_attachments: "PDF με περιγραφές και συνημμένα" pdf_with_attachments: "PDF με συνημμένα" image: - omitted: "Image not exported." + omitted: "Η εικόνα δεν εξήχθη." extraction: available: pdftotext: "Το Pdftotext είναι διαθέσιμο (προαιρετικό)" @@ -2035,7 +2035,7 @@ el: path_encoding: "Κωδικοποίηση μονοπατιού" go_to_revision: "Πηγαίνετε στην αναθεώρηση" managed_remote: "Τα διαχειριζόμενα αποθετήρια για αυτό τον προμηθευτή χειρίζονται απομακρυσμένα." - managed_remote_note: "Οι πληροφορίες για το URL και το μονοπάτι αυτού του αποθετηρίου δεν είναι διαθέσιμες πριν την δημιουργία του." + managed_remote_note: "Οι πληροφορίες για το URL και το μονοπάτι αυτού του αποθετηρίου δεν είναι διαθέσιμα πριν την δημιουργία του." managed_url: "Διαχειριζόμενο URL" settings: automatic_managed_repos_disabled: "Απενεργοποίηση αυτόματης δημιουργίας" @@ -2206,7 +2206,7 @@ el: array: sentence_connector: "και" skip_last_comma: "ψευδές" - text_accessibility_hint: "The accessibility mode is designed for users who are blind, motorically handicaped or have a bad eyesight. For the latter focused elements are specially highlighted. Please notice, that the Backlogs module is not available in this mode." + text_accessibility_hint: "Ο τρόπος προσβασιμότητας έχει σχεδιαστεί για χρήστες τυφλούς, με κινητικά προβλήματα ή με κακή όραση. Για τα τελευταία αυτά τα στοιχεία είναι ειδικά επισημασμένα. Σημειώστε ότι η ενότητα Backlogs δεν είναι διαθέσιμη σε αυτή τη λειτουργία." text_access_token_hint: "Τα tokens πρόσβασης σας επιτρέπουν να δώσετε πρόσβαση σε εξωτερικές εφαρμογές σε πόρους μέσα στο OpenProject." text_analyze: "Περαιτέρω ανάλυση: %{subject}" text_are_you_sure: "Είστε σίγουρος/η;" @@ -2237,7 +2237,7 @@ el: text_destroy: "Διαγραφή" text_destroy_with_associated: "Υπάρχουν επιπλέον αντικείμενα μαζί με το πακέτο εργασίας που πρόκειται να διαγραφεί. Τα αντικείμενα αυτά είναι των παρακάτω τύπων:" text_destroy_what_to_do: "Τι θέλετε να κάνετε;" - text_diff_truncated: "... This diff was truncated because it exceeds the maximum size that can be displayed." + text_diff_truncated: "... Αυτό το diff περικόπηκε επειδή υπερβαίνει το μέγιστο μέγεθος που μπορεί να εμφανιστεί." text_email_delivery_not_configured: "Η παράδοσης email δεν έχει διαμορφωθεί και οι ειδοποιήσεις είναι απενεργοποιημένες. Διαμορφώστε τον SMTP διακομιστή στο config/configuration.yml και επανεκκινήστε την εφαρμογή για να τα ενεργοποιήσετε." text_enumeration_category_reassign_to: "Επανεκχώρηση τους σε αυτή την τιμή:" text_enumeration_destroy_question: "%{count} αντικείμενα έχουν ανατεθεί σε αυτή την τιμή." @@ -2346,7 +2346,7 @@ el: end: "Λήξη" errors: not_implemented: "Το χρονοδιάγραμμα δεν μπόρεσε να επεξεργαστεί γιατί χρησιμοποιεί μια λειτουργία που δεν μπορεί να εφαρμοστεί ακόμη." - report_comparison: "The timeline could not render the configured comparisons. Please check the appropriate section in the configuration, resetting it can help solve this problem." + report_comparison: "Το χρονοδιάγραμμα δεν θα μπορούσε να αποδώσει τις διαμορφωμένες συγκρίσεις. Ελέγξτε την κατάλληλη ενότητα στη διαμόρφωση, επαναφέροντας την μπορεί να βοηθήσει στην επίλυση αυτού του προβλήματος." report_epicfail: "Το χρονοδιάγραμμα δεν ήταν δυνατό να φορτωθεί λόγω απροσδόκητου σφάλματος." report_timeout: "Το χρονοδιάγραμμα δεν ήταν δυνατό να φορτωθεί μέσα σε ένα λογικό χρονικό πλαίσιο." filter: @@ -2531,6 +2531,17 @@ el: Επετεύχθη το όριο χρηστών. Δεν μπορείτε να ενεργοποιήσετε άλλους χρήστες. Παρακαλούμε αναβαθμίστε το πλάνο σας ή αποκλείστε μέλη για να επιτρέψετε περισσότερους χρήστες. warning_user_limit_reached_instructions: > Έχετε φτάσει το όριο χρηστών (%{current}/%{max} ενεργοί χρήστες). Παρακαλούμε επικοινωνήστε με το sales@openproject.com για να αναβαθμίσετε σε Έκδοση για Επιχειρήσεις και να προσθέσετε επιπλέον χρήστες. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Δεν ταιριάζουν οι ρυθμίσεις πρωτοκόλλου' + text_html: > + Οι εφαρμογή τρέχει με τη ρύθμιση πρωτοκόλλου ορισμένη σε %{set_protocol}, αλλά το αίτημα είναι ένα %{actual_protocol} αίτημα. Αυτό θα έχει ως αποτέλεσμα σφάλματα! Πηγαίνετε στις Ρυθμίσεις Συστήματος και αλλάξτε τη ρύθμιση "Πρωτόκολλο" για να το διορθώσετε. + hostname_mismatch: + title: 'Δεν ταιριάζουν οι ρυθμίσεις ονόματος εξυπηρετητή' + text_html: > + Οι εφαρμογή τρέχει με τη ρύθμιση ονόματος εξυπηρετητή ορισμένη σε %{set_hostname}, αλλά το αίτημα είναι ένα %{actual_hostname} όνομα εξυπηρετητή. Αυτό θα έχει ως αποτέλεσμα σφάλματα! Πηγαίνετε στις Ρυθμίσεις Συστήματος και αλλάξτε τη ρύθμιση "Όνομα Εξυπηρετητή" για να το διορθώσετε. menu_item: "Αντικείμενο μενού" menu_item_setting: "Ορατότητα" wiki_menu_item_for: "Αντικείμενο μενού για την σελίδα wiki \"%{title}\"" @@ -2578,7 +2589,7 @@ el: unsupported_context: "Ο πόρος που δόθηκε δεν υποστηρίζεται ως πλαίσιο αναφοράς." context_object_not_found: "Δεν ήταν δυνατή η εύρεση του πόρου που δόθηκε ως πλαίσιο αναφοράς." validation: - done_ratio: "Done ratio cannot be set on parent work packages, when it is inferred by status or when it is disabled." + done_ratio: "Η αναλογία ολοκληρωμένων δεν μπορεί να οριστεί σε πακέτα εργασίας-γονείς, όταν καλείται με την κατάσταση ή όταν είναι απενεργοποιημένο." due_date: "Η ημερομηνία λήξης δεν μπορεί να οριστεί σε πακέτα εργασίας-γονείς." estimated_hours: "Οι εκτιμώμενες ώρες δεν μπορούν να οριστούν σε πακέτα εργασίας-γονείς." invalid_user_assigned_to_work_package: "Ο επιλεγμένος χρήστης δεν επιτρέπεται να είναι '%{property}' για αυτό το πακέτο εργασίας." @@ -2603,14 +2614,14 @@ el: server_error: 'Ο διακομιστής ταυτοποίησης συνάντησε μια απροσδόκητη κατάσταση η οποία τον απέτρεψε από την ολοκλήρωση του αιτήματος.' temporarily_unavailable: 'Ο διακομιστής ταυτοποίησης δεν μπορεί να διαχειριστεί το αίτημα αυτή τη στιγμή λόγω προσωρινής υπερφόρτωσης ή συντήρησης του διακομιστή.' #Configuration error messages - credential_flow_not_configured: 'Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.' - resource_owner_authenticator_not_configured: 'Resource Owner find failed due to Doorkeeper.configure.resource_owner_authenticator being unconfigured.' + credential_flow_not_configured: 'Ο κάτοχος του πόρου πιστοποιητικών κωδικών πρόσβασης απέτυχε λόγω της μη ρύθμισης του Doorkeeper.configure.resource_owner_from_credentials.' + resource_owner_authenticator_not_configured: 'Ο κάτοχος του πόρου απέτυχε εξαιτίας της μη ρύθμισης του Doorkeeper.configure.resource_owner_authenticator.' admin_authenticator_not_configured: 'Η πρόσβαση στον πίνακα διαχείρισης απαγορεύεται επειδή το Doorkeeper.configure.admin_authenticator δεν είναι διαμορφωμένο.' #Access grant errors unsupported_response_type: 'Ο διακομιστής ταυτοποίησης δεν υποστηρίζει αυτό τον τύπο απόκρισης.' #Access token errors - invalid_client: 'Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.' - invalid_grant: 'The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.' + invalid_client: 'Ο έλεγχος ταυτότητας με τον πελάτη απέτυχε λόγω άγνωστου πελάτη, χωρίς έλεγχο ταυτότητας πελάτη ή με μη υποστηριζόμενη μέθοδο ελέγχου ταυτότητας.' + invalid_grant: 'Η χορηγούμενη επιχορήγηση εξουσιοδότησης είναι άκυρη, έχει λήξει, ανακληθεί, δεν αντιστοιχεί στο URI ανακατεύθυνσης που χρησιμοποιήθηκε στην αίτηση εξουσιοδότησης ή έχει εκδοθεί σε άλλο πελάτη.' unsupported_grant_type: 'Ο τύπος χορήγησης ταυτοποίησης δεν υποστηρίζεται από τον εξυπηρετητή ταυτοποίησης.' invalid_token: revoked: "Το token πρόσβασης ανακλήθηκε" @@ -2632,7 +2643,7 @@ el: name: "Το όνομα τις εφαρμογής. Αυτό θα εμφανίζεται στους υπόλοιπους χρήστες μόλις γίνει η εξουσιοδότηση." redirect_uri_html: > Τα επιτρεπόμενα URLs στα οποία ανακατευθύνονται οι ταυτοποιημένοι χρήστες.
Αν εγγράφεστε από την εφαρμογή υπολογιστή, χρησιμοποιείστε το ακόλουθο URL. - confidential: "Check if the application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are assumed non-confidential." + confidential: "Ελέγξτε εάν η εφαρμογή θα χρησιμοποιηθεί όταν το μυστικό πελάτη μπορεί να παραμείνει εμπιστευτικό. Οι εγγενείς εφαρμογές για κινητά και οι εφαρμογές μιας σελίδας θεωρούνται μη εμπιστευτικές." scopes: "Επιλέξτε τα φυσικά αντικείμενα στα οποία θέλετε να δώσει πρόσβαση η εφαρμογή. Αν δεν επιλεγεί κανένα φυσικό αντικείμενο, θα υποτεθεί api_v3." client_credential_user_id: "Προαιρετική ταυτότητα χρήστη για να υποδυθεί όταν οι πελάτες χρησιμοποιούν αυτή την εφαρμογή. Αφήστε κενό για να επιτρέψετε μόνο δημόσια πρόσβαση" register_intro: "Αν αναπτύσσετε μια εφαρμογή πελάτη OAuth API για το OpenProject, μπορείτε να την καταχωρήσετε χρησιμοποιώντας αυτή τη φόρμα για να μπορούν να τη χρησιμοποιήσουν όλοι οι χρήστες." diff --git a/config/locales/crowdin/es.yml b/config/locales/crowdin/es.yml index 6ae24d4c64..1eba22a0db 100644 --- a/config/locales/crowdin/es.yml +++ b/config/locales/crowdin/es.yml @@ -2531,6 +2531,17 @@ es: Alcanzado el límite de usuarios. No se puede activar ningún usuario más. actualice su plan o bloquee miembros para permitir usuarios adicionales. warning_user_limit_reached_instructions: > Has alcanzado el límite de usuarios (%{current}/%{max} usuarios activos). Por favor, contacta con sales@openproject.com para mejorar tu plan a la edición Enterprise y añadir usuarios adicionales. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Elemento de menú" menu_item_setting: "Visibilidad" wiki_menu_item_for: "Elemento de menú para wiki '%{title}'" diff --git a/config/locales/crowdin/fi.yml b/config/locales/crowdin/fi.yml index f0c2c5dbc8..0754efe156 100644 --- a/config/locales/crowdin/fi.yml +++ b/config/locales/crowdin/fi.yml @@ -2535,6 +2535,17 @@ fi: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menu item" menu_item_setting: "Visibility" wiki_menu_item_for: "Menu item for wikipage \"%{title}\"" diff --git a/config/locales/crowdin/fil.yml b/config/locales/crowdin/fil.yml index 01d87f348a..35076f3b8b 100644 --- a/config/locales/crowdin/fil.yml +++ b/config/locales/crowdin/fil.yml @@ -2533,6 +2533,17 @@ fil: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Pagpipilian sa mga aytem" menu_item_setting: "Nakikita" wiki_menu_item_for: "Aytem na pagpipilian sa wikipage na \"%{title}\"" diff --git a/config/locales/crowdin/fr.yml b/config/locales/crowdin/fr.yml index 0506957fef..71c744f6e8 100644 --- a/config/locales/crowdin/fr.yml +++ b/config/locales/crowdin/fr.yml @@ -2533,6 +2533,17 @@ fr: Limite d'utilisateur atteinte. Vous ne pouvez plus activer d'autres utilisateurs. Veuillez mettre à jour votre plan ou bloquez des membres pour permettre d'autres utilisateurs. warning_user_limit_reached_instructions: > Vous avez atteint votre limite d'utilisateurs (%{current}/%{max} utilisateurs actifs). Veuillez contacter sales@openproject.com pour mettre à jour votre plan Enterprise Edition et ajouter des utilisateurs supplémentaires. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Éléments de menu" menu_item_setting: "Visibilité" wiki_menu_item_for: "Élément de menu pour wikipage « %{title} »" diff --git a/config/locales/crowdin/hr.yml b/config/locales/crowdin/hr.yml index a4f4f764d5..b8e6d26b41 100644 --- a/config/locales/crowdin/hr.yml +++ b/config/locales/crowdin/hr.yml @@ -2558,6 +2558,17 @@ hr: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Stavka izbornika" menu_item_setting: "Vidljivost" wiki_menu_item_for: "Stavka izbornika za wiki stranicu \"%{title}\"" diff --git a/config/locales/crowdin/hu.yml b/config/locales/crowdin/hu.yml index c8186055e9..5e2c4c407a 100644 --- a/config/locales/crowdin/hu.yml +++ b/config/locales/crowdin/hu.yml @@ -339,7 +339,7 @@ hu: account: "Felhasználói fiók" attr_firstname: "Keresztnév attribútum" attr_lastname: "Vezetéknév attribútum" - attr_login: "Username attribute" + attr_login: "Felhasználónév attribútum" attr_mail: "Email attribútum" base_dn: "Base DN" host: "Host" @@ -729,7 +729,7 @@ hu: #kept for backwards compatibility issue: "Feladatcsoport" lastname: "Vezetéknév" - login: "Username" + login: "Felhasználónév" mail: "Email" name: "Név" password: "Jelszó" @@ -2532,6 +2532,17 @@ hu: Elérte a felhasználói korlátot. Nem aktiválhat további felhasználókat. Kérjük, frissítse a licencét , vagy blokkolja a további tagokat a felhasználók engedélyezéséhez. warning_user_limit_reached_instructions: > Elérte a felhasználói limitet (%{current}/%{max} aktív felhasználók). Kérjük, forduljon a sales@openproject.com címhez az Enterprise Edition licenc frissítésért és további felhasználók hozzáadásához. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menüpont" menu_item_setting: "Látható" wiki_menu_item_for: "Wikipage \"%{title}\" menüeleme" diff --git a/config/locales/crowdin/id.yml b/config/locales/crowdin/id.yml index 532939595d..360520bdd9 100644 --- a/config/locales/crowdin/id.yml +++ b/config/locales/crowdin/id.yml @@ -2509,6 +2509,17 @@ id: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menu item" menu_item_setting: "Visibilitas" wiki_menu_item_for: "Menu untuk Halaman Wiki \"%{title}\"" diff --git a/config/locales/crowdin/it.yml b/config/locales/crowdin/it.yml index 5ff4622d16..a7fc8affa2 100644 --- a/config/locales/crowdin/it.yml +++ b/config/locales/crowdin/it.yml @@ -2531,6 +2531,17 @@ it: Raggiunto il limite di utente. Non puoi attivare altri utenti. Per favoreaggiorna il tuo piano o blocca i membri per consentire altri utenti. warning_user_limit_reached_instructions: > Raggiunto il limite di utenti (%{current}/%{max} utenti attivi). Si prega di contattare sales@openproject.com per aggiornare il tuo piano Enterprise Edition e aggiungere ulteriori utenti. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Voce di menu" menu_item_setting: "Visibilità" wiki_menu_item_for: "Voce di menù per la pagina wiki \"%{title}\"" diff --git a/config/locales/crowdin/ja.yml b/config/locales/crowdin/ja.yml index b02cfa2afe..4d64213903 100644 --- a/config/locales/crowdin/ja.yml +++ b/config/locales/crowdin/ja.yml @@ -2510,6 +2510,17 @@ ja: ユーザー制限に達しました。 これ以上ユーザーをアクティブにすることはできません。 追加のユーザーが参加できるようにプランをアップグレードするか、メンバーをブロックしてください。 warning_user_limit_reached_instructions: > ユーザー制限（%{current}/%{max} アクティブユーザー）に達しました。 sales@openproject.com に連絡してEnterprise Editionプランをアップグレードし、ユーザーを追加してください。 + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "メニュー項目" menu_item_setting: "可視性" wiki_menu_item_for: "Wikiページ\"%{title}\"のメニュー項目" diff --git a/config/locales/crowdin/js-el.yml b/config/locales/crowdin/js-el.yml index 87660f4a6e..8f66b2c151 100644 --- a/config/locales/crowdin/js-el.yml +++ b/config/locales/crowdin/js-el.yml @@ -573,7 +573,7 @@ el: error: "Παρουσιάστηκε σφάλμα." errors: not_implemented: "Το χρονοδιάγραμμα δεν μπόρεσε να επεξεργαστεί γιατί χρησιμοποιεί μια λειτουργία που δεν μπορεί να εφαρμοστεί ακόμη." - report_comparison: "The timeline could not render the configured comparisons. Please check the appropriate section in the configuration, resetting it can help solve this problem." + report_comparison: "Το χρονοδιάγραμμα δεν θα μπορούσε να αποδώσει τις διαμορφωμένες συγκρίσεις. Ελέγξτε την κατάλληλη ενότητα στη διαμόρφωση, επαναφέροντας την μπορεί να βοηθήσει στην επίλυση αυτού του προβλήματος." report_epicfail: "Το χρονοδιάγραμμα δεν ήταν δυνατό να φορτωθεί λόγω απροσδόκητου σφάλματος." report_timeout: "Το χρονοδιάγραμμα δεν ήταν δυνατό να φορτωθεί μέσα σε ένα λογικό χρονικό πλαίσιο." filter: @@ -745,7 +745,7 @@ el: rename_query_placeholder: "Το όνομα αυτής της προβολής" star_text: "Σήμανση αυτής της προβολής ως αγαπημένη και προσθήκη στην πλάγια μπάρα αποθηκευμένων προβολών στα αριστερά." public_text: > - Publish this view, allowing other users to access your view. Users with the 'Manage public views' permission can modify or remove public query. This does not affect the visibility of work package results in that view and depending on their permissions, users may see different results. + Δημοσιεύστε αυτή την προβολή, επιτρέποντας σε άλλους χρήστες να έχουν πρόσβαση στην προβολή σας. Οι χρήστες με δικαίωμα 'Διαχείρισης δημόσιων προβολών' μπορούν να τροποποιήσουν ή να αφαιρέσουν τις δημόσιες αναζητήσεις. Αυτό δεν επηρεάζει την ορατότητα των αποτελεσμάτων πακέτων εργασίας σε αυτή την προβολή και ανάλογα με τα δικαιώματα τους, οι χρήστες μπορεί να βλέπουν διαφορετικά αποτελέσματα. errors: unretrievable_query: "Δεν ήταν δυνατή η ανάκτηση της προβολής από τον σύνδεσμο URL" not_found: "Δεν υπάρχει τέτοια προβολή" diff --git a/config/locales/crowdin/js-hu.yml b/config/locales/crowdin/js-hu.yml index 0dc3c095b0..091e2ac403 100644 --- a/config/locales/crowdin/js-hu.yml +++ b/config/locales/crowdin/js-hu.yml @@ -878,7 +878,7 @@ hu: other: "%{count} gyermek feladatcsoport" hour: one: "1 h" - other: "%{count} h" + other: "%{count} ó" zen_mode: button_activate: 'Zen mód aktiválása' button_deactivate: 'Zen mód kikapcsolása' diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml index a66611a528..e0e00ebcee 100644 --- a/config/locales/crowdin/ko.yml +++ b/config/locales/crowdin/ko.yml @@ -2509,6 +2509,17 @@ ko: 사용자 제한에 도달했습니다. 더 이상 사용자를 활성화할 수 없습니다. 플랜을 업그레이드하거나 멤버를 차단하여 추가 사용자를 허용하세요. warning_user_limit_reached_instructions: > 사용자 제한(활성 사용자 %{current}/%{max}명)에 도달했습니다. sales@openproject.com으로 연락하여 Enterprise Edition 플랜을 업그레이드하고 사용자를 더 추가하세요. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "메뉴 항목" menu_item_setting: "표시 여부" wiki_menu_item_for: "위키 페이지 \"%{title}\"에 대한 메뉴 항목" diff --git a/config/locales/crowdin/lt.yml b/config/locales/crowdin/lt.yml index bdcf3d3114..4fe7e6f3c5 100644 --- a/config/locales/crowdin/lt.yml +++ b/config/locales/crowdin/lt.yml @@ -2577,6 +2577,17 @@ lt: Pasiektas vartotojų limitas. Jūs negalite aktyvuoti daugiau vartotojų. Prašome atnaujinti planą arba blokuokite esamus vartotojus norėdami aktyvuoti naujus vartotojus. warning_user_limit_reached_instructions: > Jūs pasiekėte vartotojų ribą (%{current}/%{max} aktyvūs vartotojai). Susisiekite su sales@openproject.com norėdami atnaujinti savo Enterprise Edition planą arba pridėti papildomų vartotojų. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Meniu punktas" menu_item_setting: "Matomumas" wiki_menu_item_for: "Meniu punktas wiki puslapiui „%{title}“" diff --git a/config/locales/crowdin/nl.yml b/config/locales/crowdin/nl.yml index a70a653eac..ce412e132f 100644 --- a/config/locales/crowdin/nl.yml +++ b/config/locales/crowdin/nl.yml @@ -2533,6 +2533,17 @@ nl: Gebruikerslimiet bereikt. U kunt geen gebruikers meer activeren. upgrade uw abbonement of blokkeer gebruikers om extra gebruikers toegang te geven. warning_user_limit_reached_instructions: > U bereikt uw gebruikerslimiet (%{current}/%{max} actieve gebruikers). Neem contact op met sales@openproject.com om te upgraden van uw Enterprise Edition-abonnement en extra gebruikers toevoegen. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menu-item" menu_item_setting: "Zichtbaarheid" wiki_menu_item_for: "Menu-item voor wiki pagina \"%{title}\"" diff --git a/config/locales/crowdin/no.yml b/config/locales/crowdin/no.yml index 27445d6e6d..54a7abf968 100644 --- a/config/locales/crowdin/no.yml +++ b/config/locales/crowdin/no.yml @@ -2535,6 +2535,17 @@ User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menyelement" menu_item_setting: "Synlighet" wiki_menu_item_for: "Menyelement for wiki-siden \"%{title}\"" diff --git a/config/locales/crowdin/pl.yml b/config/locales/crowdin/pl.yml index b081055746..1c542dfaf5 100644 --- a/config/locales/crowdin/pl.yml +++ b/config/locales/crowdin/pl.yml @@ -2578,6 +2578,17 @@ pl: Osiągnięto limit użytkowników. Nie możesz aktywować kolejnych użytkowników. uaktualnij swój plan lub zablokuj członków, aby umożliwić korzystanie z dodatkowych użytkowników. warning_user_limit_reached_instructions: > Osiągnięto limit użytkownika (%{current}/%{max} aktywnych użytkowników). Skontaktuj się z sales@openproject.com do uaktualnienia planu Enterprise Edition i dodać więcej kont użytkowników. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Element menu" menu_item_setting: "Widoczność" wiki_menu_item_for: "Element menu dla strony wiki \"%{title}\"" diff --git a/config/locales/crowdin/pt-BR.yml b/config/locales/crowdin/pt-BR.yml index bb1c62e3ad..897a992d9f 100644 --- a/config/locales/crowdin/pt-BR.yml +++ b/config/locales/crowdin/pt-BR.yml @@ -2533,6 +2533,17 @@ pt-BR: Atingido o limite de usuários. Você não pode ativar mais nenhum usuário. Atualize seus plano ou bloqueie a adição de novos usuários. warning_user_limit_reached_instructions: > Você atingiu seu limite de usuários (%{current}/%{max} usuários ativos). Entre em contato com sales@openproject.com para atualizar seu plano Enterprise Edition e adicionar novos usuários. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Item de menu" menu_item_setting: "Visibilidade" wiki_menu_item_for: "Item de menu para página wiki \"%{title}\"" diff --git a/config/locales/crowdin/pt.yml b/config/locales/crowdin/pt.yml index 0fa5ec2af4..eaa080e690 100644 --- a/config/locales/crowdin/pt.yml +++ b/config/locales/crowdin/pt.yml @@ -2533,6 +2533,17 @@ pt: Atingido o limite de utilizadores. Não pode ativar mais nenhum utilizador. Atualize o seu plano ou bloqueie a adição de novos utilizadores. warning_user_limit_reached_instructions: > Atingiu o seu limite de utilizadores (%{current}/%{max} utilizadores ativos). Entre em contato com sales@openproject.com para atualizar o seu plano Enterprise Edition e adicionar novos utilizadores. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Item de menu" menu_item_setting: "Visibilidade" wiki_menu_item_for: "Item de menu para página wiki \"%{title}\"" diff --git a/config/locales/crowdin/ro.yml b/config/locales/crowdin/ro.yml index 0981052be7..55c927b4b0 100644 --- a/config/locales/crowdin/ro.yml +++ b/config/locales/crowdin/ro.yml @@ -2557,6 +2557,17 @@ ro: User limit reached. You cannot activate any more users. Please upgrade your plan or block members to allow for additional users. warning_user_limit_reached_instructions: > You reached your user limit (%{current}/%{max} active users). Please contact sales@openproject.com to upgrade your Enterprise Edition plan and add additional users. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Element de meniu" menu_item_setting: "Vizibilitate" wiki_menu_item_for: "Meniu pentru pagina wiki \"%{title}\"" diff --git a/config/locales/crowdin/ru.yml b/config/locales/crowdin/ru.yml index a28e5104b1..f73f712b4b 100644 --- a/config/locales/crowdin/ru.yml +++ b/config/locales/crowdin/ru.yml @@ -2576,6 +2576,17 @@ ru: Достигнут предел пользователя. Вы более не можете активировать пользователей. , обновите ваш план или блок участников для дополнительных пользователей. warning_user_limit_reached_instructions: > Вы достигли вашего пользовательского предела (%{current}/%{max} активных пользователей). Пожалуйста, свяжитесь с sales@openproject.com для обновления своего плана до Корпоративной версии и добавьте дополнительных пользователей. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Пункт меню" menu_item_setting: "Видимость" wiki_menu_item_for: "Пункт меню для wiki-страницы «%{title}»" diff --git a/config/locales/crowdin/sk.yml b/config/locales/crowdin/sk.yml index 350c86af38..14f4cccd7f 100644 --- a/config/locales/crowdin/sk.yml +++ b/config/locales/crowdin/sk.yml @@ -2580,6 +2580,17 @@ sk: Váš limit počtu užívateľov bol dosiahnutý. Nie je možné aktivovať viac užívateľov. Prosím upgradujte váš cenový plán alebo zablokujte niektorých stávajúcich členov aby bolo možné pridanie ďalších užívateľov. warning_user_limit_reached_instructions: > Limit počtu užívateľov (%{current}/%{max} aktívnych užívateľov) dosiahnutý. Prosím kontaktujte sales@openproject.com a upgradujte Vašu Enterprise Edition a pridajte ďalších užívateľov. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Položka menu" menu_item_setting: "Viditeľnosť" wiki_menu_item_for: "Položka menu pre wiki \"%{title}\"" diff --git a/config/locales/crowdin/sv.yml b/config/locales/crowdin/sv.yml index efdeabfecb..fbf16abe19 100644 --- a/config/locales/crowdin/sv.yml +++ b/config/locales/crowdin/sv.yml @@ -2531,6 +2531,17 @@ sv: Användargränsen har uppnåtts. Du kan inte aktivera fler användare. Vänligen uppgradera din plan eller blockera medlemmar för att tillåta ytterligare användare. warning_user_limit_reached_instructions: > Du har nått din användargräns (%{current}/%{max} aktiva användare). Kontakta sales@openproject.com för att uppgradera din Enterprise Edition-plan och lägga till ytterligare användare. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Menyalternativ" menu_item_setting: "Synlighet" wiki_menu_item_for: "Menyobjekt för wiki-sida \"%{title}\"" diff --git a/config/locales/crowdin/tr.yml b/config/locales/crowdin/tr.yml index d60fa31834..78366592d2 100644 --- a/config/locales/crowdin/tr.yml +++ b/config/locales/crowdin/tr.yml @@ -1035,7 +1035,7 @@ tr: rename_groups: "Öznitelik grubunun adını değiştirin" project_filters: description_html: "Özel alanlara filtre uygulama ve sıralama, kurumsal sürüm özelliğidir." - enumeration_activities: "Time tracking activities" + enumeration_activities: "Zaman izleme faaliyetleri" enumeration_work_package_priorities: "İş paketi öncelikleri" enumeration_reported_project_statuses: "Bildirilen proje durumları" error_auth_source_sso_failed: "Çoklu oturum açma (SSO) için kullanıcı '%{value}' başarısız oldu" @@ -1107,7 +1107,7 @@ tr: pdf_with_descriptions_and_attachments: "Ekler ve açıklamalarla birlikte PDF" pdf_with_attachments: "Eklerle birlikte PDF" image: - omitted: "Image not exported." + omitted: "Görüntü dışa aktarılmadı." extraction: available: pdftotext: "Pdftotext kullanılabilir (isteğe bağlı)" @@ -2534,6 +2534,17 @@ tr: Kullanıcı limitine ulaşıldı. Daha fazla kullanıcıyı etkinleştiremezsiniz. Lütfen planınızı yükseltin veya ek kullanıcılara izin vermek için üyeleri engelleyin. warning_user_limit_reached_instructions: > Kullanıcı sınırınıza ulaştınız (%{current}/%{max} aktif kullanıcılar). Enterprise Edition planınızı yükseltmek ve ek kullanıcılar eklemek için lütfen sales@openproject.com adresine başvurun. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protokol ayarı uyuşmazlığı' + text_html: > + Uygulamanız, protokol ayarı %{set_protocol},olarak ayarlanmış şekilde çalışıyor, ancak istek bir %{actual_protocol} isteğidir. Bu hatalarla sonuçlanacaktır! Sistem ayarları 'na gidin ve bunu düzeltmek için "Protokol" ayarını değiştirin. + hostname_mismatch: + title: 'Ana bilgisayar adı ayar uyuşmazlığı' + text_html: > + Uygulamanız, ana makine adı ayarı %{set_hostname} olarak ayarlanmış, ancak istek bir %{actual_hostname} ana bilgisayar adı. Bu hatalarla sonuçlanacaktır! Sistem ayarları 'na gidin ve bunu düzeltmek için "Ana makine adı" ayarını değiştirin. menu_item: "Menü seçeneği" menu_item_setting: "Görünürlük" wiki_menu_item_for: "Wikipage için menü öğesi \" %{title} \"" diff --git a/config/locales/crowdin/uk.yml b/config/locales/crowdin/uk.yml index 33b4f56f9e..5d8856f513 100644 --- a/config/locales/crowdin/uk.yml +++ b/config/locales/crowdin/uk.yml @@ -2580,6 +2580,17 @@ uk: Досягнуто обмеження користувача. Не можна активувати більше користувачів. Будь ласка оновіть свій план або заблокувати учасників для додаткових користувачів. warning_user_limit_reached_instructions: > Ви досягли обмеження користувача (%{current}/%{max} активних користувачів). Зверніться до sales@openproject.com, щоб оновити план Enterprise Edition і додати додаткових користувачів. + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "Пункт меню" menu_item_setting: "Видимість" wiki_menu_item_for: "Пункт меню для вікі-сторінки %{title}" diff --git a/config/locales/crowdin/zh-CN.yml b/config/locales/crowdin/zh-CN.yml index cdda5eaba4..d968bc94f4 100644 --- a/config/locales/crowdin/zh-CN.yml +++ b/config/locales/crowdin/zh-CN.yml @@ -2507,6 +2507,17 @@ zh-CN: 达到用户限制。 您无法再激活任何用户。 请升级您的计划或阻止会员以允许其他用户。 warning_user_limit_reached_instructions: > 您达到了用户限制（%{current}/%{max}活跃用户）。 请联系sales@openproject.com以升级您的Enterprise Edition计划并添加其他用户。 + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "菜单项" menu_item_setting: "可见性" wiki_menu_item_for: "wiki页面” %{title} “的菜单项" diff --git a/config/locales/crowdin/zh-TW.yml b/config/locales/crowdin/zh-TW.yml index 83dcd7f81e..0261fdc1af 100644 --- a/config/locales/crowdin/zh-TW.yml +++ b/config/locales/crowdin/zh-TW.yml @@ -2511,6 +2511,17 @@ zh-TW: 達到用戶限制。 您無法再激活任何用戶。 請升級您的計劃或阻止會員以允許其他用戶。 warning_user_limit_reached_instructions: > 您達到了用戶限制（%{current}/%{max}活躍用戶）。 請聯係sales@openproject.com以升級Enterprise Edition計劃並添加其他用戶。 + 0: > + + warning_bar: + protocol_mismatch: + title: 'Protocol setting mismatch' + text_html: > + Your application is running with its protocol setting set to %{set_protocol}, but the request is an %{actual_protocol} request. This will result in errors! Go to System settings and change the "Protocol" setting to correct this. + hostname_mismatch: + title: 'Hostname setting mismatch' + text_html: > + Your application is running with its host name setting set to %{set_hostname}, but the request is a %{actual_hostname} hostname. This will result in errors! Go to System settings and change the "Host name" setting to correct this. menu_item: "選單項目" menu_item_setting: "可見度" wiki_menu_item_for: "Wikipage \"%{title}\" 的功能表項目" diff --git a/docker-compose.yml b/docker-compose.yml index c950416e1f..79384cb612 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,90 @@ -db: - image: mysql - volumes: - - ~/.docker-volumes/openproject/db:/var/lib/mysql - expose: - - "3306" - environment: - - MYSQL_ALLOW_EMPTY_PASSWORD=true +version: "3.7" + +networks: + frontend: + backend: + +volumes: + pgdata: + opdata: -worker: &ruby +x-op-restart-policy: &restart_policy + restart: unless-stopped +x-op-image: &image build: . + image: openproject/community:${TAG:-10-test} +x-op-app: &app + <<: *image + <<: *restart_policy + environment: + - "RAILS_CACHE_STORE=memcache" + - "OPENPROJECT_CACHE__MEMCACHE__SERVER=cache:11211" + - "OPENPROJECT_RAILS__RELATIVE__URL__ROOT=${OPENPROJECT_RAILS__RELATIVE__URL__ROOT:-}" + - "DATABASE_URL=postgres://postgres:p4ssw0rd@db/openproject" + - "USE_PUMA=true" + # set to true to enable the email receiving feature. See ./docker/cron for more options + - "IMAP_ENABLED=false" volumes: - - .:/usr/src/app - links: + - "opdata:/var/openproject/assets" + depends_on: - db - environment: - - "RAILS_CACHE_STORE=file_store" - command: "./docker/worker" + - cache -web: - <<: *ruby - ports: - - "8080:8080" - command: "./docker/web" +services: + db: + image: postgres:10 + <<: *restart_policy + stop_grace_period: "3s" + volumes: + - "pgdata:/var/lib/postgresql/data" + environment: + - POSTGRES_PASSWORD=p4ssw0rd + - POSTGRES_DB=openproject + networks: + - backend -frontend: - build: . - volumes: - - .:/usr/src/app - command: "./docker/webpack-watch" + cache: + image: memcached + <<: *restart_policy + networks: + - backend + + proxy: + <<: *image + <<: *restart_policy + command: "./docker/proxy" + ports: + - "8080:80" + environment: + - APP_HOST=web + - "OPENPROJECT_RAILS__RELATIVE__URL__ROOT=${OPENPROJECT_RAILS__RELATIVE__URL__ROOT:-}" + depends_on: + - web + networks: + - frontend + + web: + <<: *app + command: "./docker/web" + networks: + - frontend + - backend + + worker: + <<: *app + command: "./docker/worker" + networks: + - backend + + cron: + <<: *app + command: "./docker/cron" + networks: + - backend + + seeder: + <<: *app + command: "./docker/seeder" + restart: on-failure + networks: + - backend diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index a9f23a5b62..cbfa57e9c5 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -39,13 +39,27 @@ fi if [ "$(id -u)" = '0' ]; then mkdir -p $APP_DATA_PATH/{files,git,svn} - chown -R $APP_USER:$APP_USER $APP_DATA_PATH + chown -R $APP_USER:$APP_USER $APP_DATA_PATH /etc/apache2/sites-enabled/ + + # Clean up any dangling PID file + rm -f $APP_PATH/tmp/pids/* # Clean up a dangling PID file of apache if [ -e "$APACHE_PIDFILE" ]; then rm -f $APACHE_PIDFILE || true fi + # Fix assets path if relative URL is used + relative_url_root_without_trailing_slash="$(echo $OPENPROJECT_RAILS__RELATIVE__URL__ROOT | sed 's:/*$::')" + if [ "$relative_url_root_without_trailing_slash" != "" ]; then + for file in $(egrep -lR "/assets/" "$APP_PATH/public"); do + # only the font paths in the CSSs need updating + sed -i "s|/assets/|${relative_url_root_without_trailing_slash}/assets/|g" $file + # the .gz is the one served by puma, so rebuild it + gzip --force --keep $file + done + fi + if [ ! -z "$ATTACHMENTS_STORAGE_PATH" ]; then mkdir -p "$ATTACHMENTS_STORAGE_PATH" chown -R "$APP_USER:$APP_USER" "$ATTACHMENTS_STORAGE_PATH" @@ -53,7 +67,7 @@ if [ "$(id -u)" = '0' ]; then mkdir -p "$APP_PATH/log" "$APP_PATH/tmp/pids" "$APP_PATH/files" chown "$APP_USER:$APP_USER" "$APP_PATH" chown -R "$APP_USER:$APP_USER" "$APP_PATH/log" "$APP_PATH/tmp" "$APP_PATH/files" "$APP_PATH/public" - if [ "$1" = "./docker/supervisord" ]; then + if [ "$1" = "./docker/supervisord" ] || [ "$1" = "./docker/proxy" ]; then exec "$@" else exec $APP_PATH/docker/gosu $APP_USER "$BASH_SOURCE" "$@" diff --git a/docker/mysql-to-postgres/bin/build b/docker/mysql-to-postgres/bin/build index e2cb14c021..1a73ee776e 100755 --- a/docker/mysql-to-postgres/bin/build +++ b/docker/mysql-to-postgres/bin/build @@ -1,21 +1,19 @@ #!/bin/bash - set -e +set -o pipefail cd /opt # install Clozure CL to avoid memory issues with the standard SBCL -wget -q https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-linuxx86.tar.gz -tar -xzf ccl-1.11.5-linuxx86.tar.gz -rm ccl-1.11.5-linuxx86.tar.gz +curl -sL https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-linuxx86.tar.gz -o - | tar xzf - -C /opt/ ln -s /opt/ccl/scripts/ccl64 /usr/local/bin/ccl export CCL_DEFAULT_DIRECTORY=/opt/ccl # build pgloader from source using CCL as the lisp runtime -git clone https://github.com/dimitri/pgloader.git +git clone -q https://github.com/dimitri/pgloader.git --branch v3.6.1 --depth 1 cd pgloader -git checkout v3.6.1 make CL=ccl pgloader >& /tmp/pgloader-compile.log || (cat /tmp/pgloader-compile.log && exit 1) mv /opt/pgloader/build/bin/pgloader /usr/local/bin/pgloader-ccl -rm -rf /opt/pgloader + +rm -rf /opt/pgloader /tmp/pgloader-compile.log /usr/local/bin/ccl /opt/ccl diff --git a/docker/precompile-assets.sh b/docker/precompile-assets.sh index 4f12938ad4..07d9aa72bf 100644 --- a/docker/precompile-assets.sh +++ b/docker/precompile-assets.sh @@ -13,6 +13,9 @@ popd # Bundle assets DATABASE_URL='nulldb://nohost' RAILS_ENV=production bundle exec rake assets:precompile +# Remove sprockets cache +rm -rf "$APP_PATH/tmp/cache/assets" + # Remove node_modules and entire frontend rm -rf "$APP_PATH/node_modules/" "$APP_PATH/frontend/node_modules/" diff --git a/docker/proxy.conf.erb b/docker/proxy.conf.erb index 1376257b67..e8b44a9922 100644 --- a/docker/proxy.conf.erb +++ b/docker/proxy.conf.erb @@ -3,9 +3,11 @@ DocumentRoot <%= ENV.fetch('APP_PATH') %>/public ProxyRequests off + ProxyPreserveHost On - - ProxyPass http://127.0.0.1:8080/ retry=0 - ProxyPassReverse http://127.0.0.1:8080/ + <% location = ENV.fetch("OPENPROJECT_RAILS__RELATIVE__URL__ROOT", "").chomp("/") %> + > + ProxyPass http://<%= ENV.fetch("APP_HOST", "127.0.0.1") %>:8080<%= location %>/ retry=0 + ProxyPassReverse http://<%= ENV.fetch("APP_HOST", "127.0.0.1") %>:8080<%= location %>/ diff --git a/docker/seeder b/docker/seeder new file mode 100755 index 0000000000..215c5434c4 --- /dev/null +++ b/docker/seeder @@ -0,0 +1,11 @@ +#!/bin/bash -e + +echo "Executing database migration and database seed..." +bundle exec rake db:migrate db:seed +if [ "$1" = "--set" ]; then + shift + echo "Update application settings..." + bundle exec rake setting:set["$@"] +fi + +exit 0 diff --git a/docker/supervisord b/docker/supervisord index 9adf4b3a9b..b6d5cd8b4d 100755 --- a/docker/supervisord +++ b/docker/supervisord @@ -110,13 +110,5 @@ fi echo "-----> Database setup finished." echo " On first installation, the default admin credentials are login: admin, password: admin" -if [ -n "$OPENPROJECT_RAILS__RELATIVE__URL__ROOT" ]; then - echo - echo "-----> Precompiling assets since RAILS_RELATIVE_URL_ROOT is set. This may take a minute." - RAILS_RELATIVE_URL_ROOT=$OPENPROJECT_RAILS__RELATIVE__URL__ROOT bash /app/docker/precompile-assets.sh - echo "-----> Asset precompilation finished." - echo -fi - echo "-----> Launching supervisord..." exec /usr/bin/supervisord -c $APP_PATH/docker/supervisord.conf -e ${SUPERVISORD_LOG_LEVEL} diff --git a/docker/worker b/docker/worker index 3a1014c4a4..7f7b674535 100755 --- a/docker/worker +++ b/docker/worker @@ -2,12 +2,6 @@ if [ "$1" = "--seed" ]; then shift - echo "Executing database migration and database seed..." - bundle exec rake db:migrate db:seed - if [ "$1" = "--set" ]; then - shift - echo "Update application settings..." - bundle exec rake setting:set["$@"] - fi + $APP_PATH/docker/seeder "$@" fi exec bundle exec rake jobs:work diff --git a/docs/.DS_Store b/docs/.DS_Store new file mode 100644 index 0000000000..3e83407e7a Binary files /dev/null and b/docs/.DS_Store differ diff --git a/docs/cloud-edition-guide/manage-subscription/README.md b/docs/cloud-edition-guide/manage-subscription/README.md index 6eccf7d7bf..d321d54e7a 100644 --- a/docs/cloud-edition-guide/manage-subscription/README.md +++ b/docs/cloud-edition-guide/manage-subscription/README.md @@ -20,10 +20,10 @@ In the overlay window, you can choose between several topics: | Popular Topics | Description | | ------------------------------------------------------------ | :----------------------------------------------------- | | [Upgrade, downgrade or cancel](#update-existing-subscriptions) | How to upgrade, downgrade or cancel a subscription? | -| Edit Account information | | -| Edit Billing Addresses | | -| Edit or add payment methods | | -| Edit or add payment methods | | +| Edit Account information | How to edit account information? | +| Edit Billing Addresses | How to edit the billing addresses? | +| Edit or add payment methods | How to edit or add the payment method? | +| | | | [View billing history and dowload invoices](../invoices-and-billing-history) | How to view the billing history and download invoices? | ## Update existing subscriptions diff --git a/docs/enterprise-edition-guide/enterprise-trial/README.md b/docs/enterprise-edition-guide/enterprise-trial/README.md index 8d8fce5885..f639a9c88f 100644 --- a/docs/enterprise-edition-guide/enterprise-trial/README.md +++ b/docs/enterprise-edition-guide/enterprise-trial/README.md @@ -16,7 +16,7 @@ Please go to https://www.openproject.org/enterprise-edition/ and press the green A window will appear which explains that you will receive a 14 days free trial license with that you can temporarily upgrade your Community Edition. -There is no need to cancel the trial license. The license will run out automatically and will bring you back to the Community version. +There is no need to cancel the trial license. The license will run out automatically and will bring you back to the Community version. Click the blue **Proceed To Checkout** button. diff --git a/docs/getting-started/.DS_Store b/docs/getting-started/.DS_Store new file mode 100644 index 0000000000..f0a7344c0d Binary files /dev/null and b/docs/getting-started/.DS_Store differ diff --git a/docs/getting-started/README.md b/docs/getting-started/README.md index efb1de722d..c64c657468 100644 --- a/docs/getting-started/README.md +++ b/docs/getting-started/README.md @@ -29,7 +29,7 @@ Here you will learn about the **first steps with OpenProject**. If you need more ## 5 steps to get started -Watch a short 3 minute introduction video to get started with OpenProject in 5 easy steps: +Watch a short 3-minute introduction video to get started with OpenProject in 5 easy steps: 1. Create a project 2. Add team members diff --git a/docs/getting-started/boards-introduction/README.md b/docs/getting-started/boards-introduction/README.md index 4f8b258293..9974c1ef70 100644 --- a/docs/getting-started/boards-introduction/README.md +++ b/docs/getting-started/boards-introduction/README.md @@ -1,31 +1,26 @@ ---- -sidebar_navigation: - title: Boards introduction - priority: 500 -description: Introduction to boards in OpenProject. -robots: index, follow -keywords: boards introduction ---- - -# Introduction to agile Boards (Premium feature) +# Introduction to agile Boards (premium feature available in cloud and enterprise edition) In this document you will get a first introduction to the Boards in OpenProject, i.e. how to use a Kanban board to manage your tasks in an agile way. +
+**Boards** in OpenProject consist of cards and columns. They help to visualize work, limit work-in-progress, and maximize efficiency (or flow). +
+ To find out more about the functionalities of Boards, please visit our [user guide for boards](../../user-guide/agile-boards). -Agile board is a premium feature and only available for [OpenProject Cloud Edition](https://www.openproject.org/hosting/) and [Enterprise Edition](https://www.openproject.org/enterprise-edition/) customers. +The Agile Board is a premium feature and only available for [OpenProject Cloud Edition](https://www.openproject.org/hosting/) and [Enterprise Edition](https://www.openproject.org/enterprise-edition/) customers. -| Feature | Documentation for | -| ---------------------------------------------------------- | ------------------------------------------ | -| [What is a Board?](#what-is-a-board?) | Find out what is a Board in OpenProject. | +| Feature | Documentation for | +| ----------------------------------------------------------- | ------------------------------------------ | +| [What is a Board?](#what-is-a-board?) | Find out what a Board in OpenProject is. | | [Manage your work in a Board](#manage-your-work-in-a-board) | How to manage your work in an agile Board? | ## What is a Board? Agile Boards in OpenProject support teams in their agile project management methodology, e.g. Scrum or Kanban. -You can create as many flexible boards as you want with both lists and cards on it. A list usually represents a workflow, e.g. status or versions of a work package. The cards are work packages, e.g. tasks, on this list. +You can create as many flexible boards as you want with both lists and cards on it. A list usually represents a workflow, e.g. status or version of a work package. The cards are work packages, e.g. tasks, on this list. ## Manage your work in a Board @@ -34,7 +29,7 @@ To manage your work in an agile board, open the Boards module in the project men 1. Choose a board from the list where you want to work on. Open it by double clicking on the board's titel. 2. You can prioritize cards within a list via drag and drop. -3. You can add a card to a new list in the sae way. +3. You can add a card to a new list in the same way. 4. You can edit the details of a card by **double click**ing on the card. 5. Finally the arrow brings you back to the boards view. diff --git a/docs/getting-started/gantt-chart-introduction/README.md b/docs/getting-started/gantt-chart-introduction/README.md index cc94389077..c47d4d2d40 100644 --- a/docs/getting-started/gantt-chart-introduction/README.md +++ b/docs/getting-started/gantt-chart-introduction/README.md @@ -11,6 +11,10 @@ keywords: Gantt charts introduction In this document you will get a first introduction to the Gantt charts in OpenProject, i.e. to create and manage a project plan. +
+**Gantt charts** in OpenProject are definded as a type of bar chart that shows all the tasks constituting a project. Tasks are listed vertically, with the horizontal axis marking time. The lengths of task bars are to scale with tasks’ durations. +
+ To find out more about the functionalities for Gantt charts, please visit our [user guide for Gantt charts](../../user-guide/#gantt-chart). | Feature | Documentation for | diff --git a/docs/getting-started/invite-members/README.md b/docs/getting-started/invite-members/README.md index 15aa555454..dde381662a 100644 --- a/docs/getting-started/invite-members/README.md +++ b/docs/getting-started/invite-members/README.md @@ -11,6 +11,10 @@ keywords: invite members In order to see a project and work in it, you have to be a member of a project. Therefore, you have to **add team members to a project**. +
+**Member** is defined as a project member in a project. Project members are added in the members tab in the project settings. +
+