diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 7300f16dce..fef4f26d0b 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -38,52 +38,93 @@ class GroupsController < ApplicationController before_action :find_group, only: %i[destroy show create_memberships destroy_membership edit_membership add_users] + # GET /groups + # GET /groups.xml def index @groups = Group.order(Arel.sql('lastname ASC')) + + respond_to do |format| + format.html # index.html.erb + format.xml { render xml: @groups } + end end + # GET /groups/1 + # GET /groups/1.xml def show - @group_users = group_members - render layout: 'no_menu' + respond_to do |format| + format.html do + @group_users = group_members + render layout: 'no_menu' + end + format.xml { render xml: @group } + end end + # GET /groups/new + # GET /groups/new.xml def new @group = Group.new + + respond_to do |format| + format.html # new.html.erb + format.xml { render xml: @group } + end end + # GET /groups/1/edit def edit @group = Group.includes(:members, :users).find(params[:id]) set_filters_for_user_autocompleter end + # POST /groups + # POST /groups.xml def create @group = Group.new permitted_params.group - if @group.save - flash[:notice] = I18n.t(:notice_successful_create) - redirect_to(groups_path) - else - render action: :new + respond_to do |format| + if @group.save + flash[:notice] = I18n.t(:notice_successful_create) + format.html { redirect_to(groups_path) } + format.xml { render xml: @group, status: :created, location: @group } + else + format.html { render action: :new } + format.xml { render xml: @group.errors, status: :unprocessable_entity } + end end end + # PUT /groups/1 + # PUT /groups/1.xml def update @group = Group.includes(:users).find(params[:id]) - if @group.update(permitted_params.group) - flash[:notice] = I18n.t(:notice_successful_update) - redirect_to action: :index - else - render action: :edit + respond_to do |format| + if @group.update(permitted_params.group) + flash[:notice] = I18n.t(:notice_successful_update) + format.html { redirect_to(groups_path) } + format.xml { head :ok } + else + format.html { render action: 'edit' } + format.xml { render xml: @group.errors, status: :unprocessable_entity } + end end end + # DELETE /groups/1 + # DELETE /groups/1.xml def destroy ::Principals::DeleteJob.perform_later(@group) - flash[:info] = I18n.t(:notice_deletion_scheduled) - redirect_to action: :index + respond_to do |format| + format.html do + flash[:info] = I18n.t(:notice_deletion_scheduled) + redirect_to(action: :index) + end + format.xml { head 202 } + end end def add_users diff --git a/app/models/principals/scopes/ordered_by_name.rb b/app/models/principals/scopes/ordered_by_name.rb index 94c48faac6..97eff3aedc 100644 --- a/app/models/principals/scopes/ordered_by_name.rb +++ b/app/models/principals/scopes/ordered_by_name.rb @@ -61,7 +61,7 @@ module Principals::Scopes 'users.firstname' when :lastname_firstname, :lastname_coma_firstname "concat_ws(' ', users.lastname, users.firstname)" - when :login + when :username "users.login" else raise ArgumentError, "Invalid user format" diff --git a/config/locales/crowdin/js-ar.yml b/config/locales/crowdin/js-ar.yml index e32a7f445d..f6f22c1606 100644 --- a/config/locales/crowdin/js-ar.yml +++ b/config/locales/crowdin/js-ar.yml @@ -845,7 +845,7 @@ ar: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-bg.yml b/config/locales/crowdin/js-bg.yml index 15b834cced..747fe5eb19 100644 --- a/config/locales/crowdin/js-bg.yml +++ b/config/locales/crowdin/js-bg.yml @@ -845,7 +845,7 @@ bg: automatic: 'Автоматично' manually: 'Ръчно' warning: 'Ще загубите предишното си сортиране, когато активирате автоматичния режим на сортиране.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-ca.yml b/config/locales/crowdin/js-ca.yml index 01f0bb12e2..d9a438ac0c 100644 --- a/config/locales/crowdin/js-ca.yml +++ b/config/locales/crowdin/js-ca.yml @@ -845,7 +845,7 @@ ca: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-cs.yml b/config/locales/crowdin/js-cs.yml index aec9d44cdb..e6c93046a2 100644 --- a/config/locales/crowdin/js-cs.yml +++ b/config/locales/crowdin/js-cs.yml @@ -845,7 +845,7 @@ cs: automatic: 'Automaticky' manually: 'Ručně' warning: 'Při aktivaci režimu automatického řazení ztratíte své předchozí řazení.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Potřebujete určité pracovní balíčky, aby vyšly z celkového objemu?' relation_columns: 'Potřebujete vidět vztahy v seznamu pracovních balíčků?' diff --git a/config/locales/crowdin/js-da.yml b/config/locales/crowdin/js-da.yml index 51ff182122..f40e9e2a36 100644 --- a/config/locales/crowdin/js-da.yml +++ b/config/locales/crowdin/js-da.yml @@ -844,7 +844,7 @@ da: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-de.yml b/config/locales/crowdin/js-de.yml index 7579742267..5a81d78124 100644 --- a/config/locales/crowdin/js-de.yml +++ b/config/locales/crowdin/js-de.yml @@ -86,7 +86,7 @@ de: caption_rate_history: "Stundensatz-Historie" clipboard: browser_error: "Ihr Browser unterstützt das Kopieren in die Zwischenablage nicht nativ. Bitte selektieren und kopieren Sie den Text händisch." - copied_successful: "Successfully copied to clipboard!" + copied_successful: "Erfolgreich in die Zwischenablage kopiert!" chart: type: 'Art des Diagramms' axis_criteria: 'Achsen-Kriterien' @@ -844,7 +844,7 @@ de: automatic: 'Automatisch' manually: 'Manuell' warning: 'Sie verlieren Ihre vorherige Sortierung beim Aktivieren des automatischen Sortiermodus.' - columns_help_text: "Verwenden Sie die obige Eingabe, um Spalten zur Tabellenansicht hinzuzufügen. Sie können die Spalten per Drag & Drop verschieben, um sie neu anzuordnen." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Sollen bestimmte Arbeitspakete aus der Menge herausstechen?' relation_columns: 'Möchten Sie Zusammenhänge in der Arbeitspaketliste anzeigen?' diff --git a/config/locales/crowdin/js-el.yml b/config/locales/crowdin/js-el.yml index 8e9797d798..f6eac7abcc 100644 --- a/config/locales/crowdin/js-el.yml +++ b/config/locales/crowdin/js-el.yml @@ -844,7 +844,7 @@ el: automatic: 'Αυτόματα' manually: 'Χειροκίνητα' warning: 'Θα χάσετε την προηγούμενη ταξινόμηση όταν ενεργοποιήσετε την λειτουργία αυτόματης ταξινόμησης.' - columns_help_text: "Χρησιμοποιήστε την παραπάνω είσοδο για να προσθέσετε στήλες στην προβολή του πίνακα σας. Μπορείτε να σύρετε και να αποθέσετε τις στήλες για να τις αναδιατάξετε." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Χρειάζεστε συγκεκριμένα πακέτα εργασίας για να ξεχωρίσετε από την μάζα;' relation_columns: 'Χρειάζεστε να βλέπετε συσχετίσεις στη λίστα πακέτων εργασίας;' diff --git a/config/locales/crowdin/js-es.yml b/config/locales/crowdin/js-es.yml index 8e68005afe..06e9dee3cc 100644 --- a/config/locales/crowdin/js-es.yml +++ b/config/locales/crowdin/js-es.yml @@ -845,7 +845,7 @@ es: automatic: 'Automático' manually: 'Manual' warning: 'Al activar el modo de ordenación automática, se perderá la ordenación actual.' - columns_help_text: "Use los datos anteriores para añadir columnas a la vista de tabla. Puede arrastrar y colocar las columnas para cambiar el orden." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: '¿Necesita que algunos paquetes de trabajo destaquen del resto?' relation_columns: '¿Necesita ver las relaciones en la lista del paquete de trabajo?' diff --git a/config/locales/crowdin/js-fi.yml b/config/locales/crowdin/js-fi.yml index da2cc8a198..b218bc17c1 100644 --- a/config/locales/crowdin/js-fi.yml +++ b/config/locales/crowdin/js-fi.yml @@ -845,7 +845,7 @@ fi: automatic: 'Automaattinen' manually: 'Manuaalinen' warning: 'Automaattinen lajittelutapa korvaa nykyiset asetukset' - columns_help_text: "Käytä yläpuolella olevaa kenttää taulunäkymän sarakkeiden valintaan. Voit järjestää sarakkeita raahaamalla niitä." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Täytyy nähdä riippuvuudet tehtävälistassa?' diff --git a/config/locales/crowdin/js-fil.yml b/config/locales/crowdin/js-fil.yml index c00bf59150..9e043f097d 100644 --- a/config/locales/crowdin/js-fil.yml +++ b/config/locales/crowdin/js-fil.yml @@ -845,7 +845,7 @@ fil: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Kailangan tingnan ang mga relasyon sa listahan ng work package?' diff --git a/config/locales/crowdin/js-fr.yml b/config/locales/crowdin/js-fr.yml index 305929a782..94babc971c 100644 --- a/config/locales/crowdin/js-fr.yml +++ b/config/locales/crowdin/js-fr.yml @@ -845,7 +845,7 @@ fr: automatic: 'Automatique' manually: 'Manuellement' warning: 'Vous perdrez votre tri précédent lors de l''activation du mode de tri automatique.' - columns_help_text: "Utilisez l’entrée ci-dessus pour ajouter des colonnes à votre vue tableau. Vous pouvez déplacer les colonnes par glisser/déposer pour les réorganiser." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Vous avez besoin de lots de travaux qui sortent du lot ?' relation_columns: 'Besoin de voir les relations sur la liste des lots de travaux ?' diff --git a/config/locales/crowdin/js-hr.yml b/config/locales/crowdin/js-hr.yml index 8ec3ccb788..8fe8d65515 100644 --- a/config/locales/crowdin/js-hr.yml +++ b/config/locales/crowdin/js-hr.yml @@ -845,7 +845,7 @@ hr: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-hu.yml b/config/locales/crowdin/js-hu.yml index d005e64556..e1129ce4b0 100644 --- a/config/locales/crowdin/js-hu.yml +++ b/config/locales/crowdin/js-hu.yml @@ -844,7 +844,7 @@ hu: automatic: 'Automatikus' manually: 'Kézi' warning: 'Az automatikus válogatás üzemmód aktiválásakor elveszíti korábbi rendezését.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Szeretné látni a munkacsomag kapcsolatait?' diff --git a/config/locales/crowdin/js-id.yml b/config/locales/crowdin/js-id.yml index b56ce76382..49acbeac2e 100644 --- a/config/locales/crowdin/js-id.yml +++ b/config/locales/crowdin/js-id.yml @@ -845,7 +845,7 @@ id: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Apakah perlu untuk melihat hubungan dalam daftar paker kerja?' diff --git a/config/locales/crowdin/js-it.yml b/config/locales/crowdin/js-it.yml index e120380f2a..1053ed62b8 100644 --- a/config/locales/crowdin/js-it.yml +++ b/config/locales/crowdin/js-it.yml @@ -845,7 +845,7 @@ it: automatic: 'Automatico' manually: 'Manuale' warning: 'Perderai il tuo ordinamento precedente quando attivi la modalità di ordinamento automatico.' - columns_help_text: "Utilizza l'input sopra per aggiungere colonne alla visualizzazione della tabella. È possibile trascinare e rilasciare le colonne per riordinarle." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Vuoi che alcune macro-attività si distinguano dalla massa?' relation_columns: 'Vuoi visualizzare le relazioni nell''elenco di macro-attività?' diff --git a/config/locales/crowdin/js-ko.yml b/config/locales/crowdin/js-ko.yml index 356ec9072c..f460afd8d5 100644 --- a/config/locales/crowdin/js-ko.yml +++ b/config/locales/crowdin/js-ko.yml @@ -845,7 +845,7 @@ ko: automatic: '자동' manually: '수동' warning: '자동 정렬 모드를 활성화하면 이전 정렬이 손실됩니다.' - columns_help_text: "위 입력을 사용하여 테이블 보기에 열을 추가하세요. 열을 끌어다 놓아 순서를 바꿀 수 있습니다." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: '나머지 작업 중에 확연히 두드러지는 특정 작업 패키지가 필요합니까?' relation_columns: '작업 패키지 목록에서 관계를 표시해야 합니까?' diff --git a/config/locales/crowdin/js-lt.yml b/config/locales/crowdin/js-lt.yml index 7ef408d4da..22049ad2f2 100644 --- a/config/locales/crowdin/js-lt.yml +++ b/config/locales/crowdin/js-lt.yml @@ -845,7 +845,7 @@ lt: automatic: 'Automatinis' manually: 'Rankinis' warning: 'Aktyvuojant automatinį rikiavimo režimą jūs prarasite savo ankstesnį rikiavimą.' - columns_help_text: "Aukščiau esančioje įvedimo eilutėje pridėkite stulpelius į lentelės vaizdą. Galite pele perkelti stulpelius, jei reikalinga kita jų tvarka." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Reikia išskirti tam tikrus darbo paketus iš didelės masės?' relation_columns: 'Ar reikia matyti ryšius darbų paketų sąraše?' diff --git a/config/locales/crowdin/js-nl.yml b/config/locales/crowdin/js-nl.yml index ff427a1c13..e30a6da003 100644 --- a/config/locales/crowdin/js-nl.yml +++ b/config/locales/crowdin/js-nl.yml @@ -845,7 +845,7 @@ nl: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Moeten bepaalde werkpakketten te onderscheiden zijn van de massa?' relation_columns: 'Nodig om te zien van betrekkingen in de pakketlijst werk?' diff --git a/config/locales/crowdin/js-no.yml b/config/locales/crowdin/js-no.yml index 92ec576d87..28c1cba403 100644 --- a/config/locales/crowdin/js-no.yml +++ b/config/locales/crowdin/js-no.yml @@ -845,7 +845,7 @@ automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-pl.yml b/config/locales/crowdin/js-pl.yml index 670f792604..d5e4f6bffb 100644 --- a/config/locales/crowdin/js-pl.yml +++ b/config/locales/crowdin/js-pl.yml @@ -845,7 +845,7 @@ pl: automatic: 'Automatycznie' manually: 'Ręcznie' warning: 'Wskutek aktywacji trybu automatycznego sortowania utracisz poprzednie sortowanie.' - columns_help_text: "Użyj powyższych danych wejściowych, aby dodać kolumny do widoku tabeli. Możesz przeciągać i upuszczać kolumny, aby zmienić ich kolejność." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Czy określone pakiety robocze trzeba wyróżnić?' relation_columns: 'Chcesz zobaczyć relacje w tej liście pakietów roboczych?' diff --git a/config/locales/crowdin/js-pt.yml b/config/locales/crowdin/js-pt.yml index f269b70eeb..33cbd1a57d 100644 --- a/config/locales/crowdin/js-pt.yml +++ b/config/locales/crowdin/js-pt.yml @@ -844,7 +844,7 @@ pt: automatic: 'Automático' manually: 'Manualmente' warning: 'Você perderá sua ordenação anterior quando ativar o modo de ordenação automática.' - columns_help_text: "Utilize a entrada acima para adicionar colunas à sua visualização de tabela. Você pode arrastar e soltar as colunas para reorganizá-las." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Precisa de certos pacotes de trabalho para se destacar da massa?' relation_columns: 'Necessário ver as relações na lista de pacote de trabalho?' diff --git a/config/locales/crowdin/js-ro.yml b/config/locales/crowdin/js-ro.yml index 4525f7e22b..22740a553d 100644 --- a/config/locales/crowdin/js-ro.yml +++ b/config/locales/crowdin/js-ro.yml @@ -844,7 +844,7 @@ ro: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-ru.yml b/config/locales/crowdin/js-ru.yml index de0da41cd1..9676b9e11e 100644 --- a/config/locales/crowdin/js-ru.yml +++ b/config/locales/crowdin/js-ru.yml @@ -844,7 +844,7 @@ ru: automatic: 'Автоматически' manually: 'Вручную' warning: 'При активации режима автоматического упорядования вы потеряете свою предыдущую сортировку.' - columns_help_text: "С помощью поля ввода выше можно добавлять столбцы в табличное представление. Для изменения порядка столбцов перетаскивайте их мышью." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Хотите выделить некоторые пакеты работ из общей массы?' relation_columns: 'Нужно видеть отношения в списке пакетов работ?' diff --git a/config/locales/crowdin/js-sk.yml b/config/locales/crowdin/js-sk.yml index 517e94795d..3ca178e95b 100644 --- a/config/locales/crowdin/js-sk.yml +++ b/config/locales/crowdin/js-sk.yml @@ -845,7 +845,7 @@ sk: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Mali by sa rozlišovať osobitné pracovné balíčky?' relation_columns: 'Potrebujete vidieť vzťahy v zozname pracovných balíčkov?' diff --git a/config/locales/crowdin/js-sl.yml b/config/locales/crowdin/js-sl.yml index 50ebe025a7..d3d0332128 100644 --- a/config/locales/crowdin/js-sl.yml +++ b/config/locales/crowdin/js-sl.yml @@ -844,7 +844,7 @@ sl: automatic: 'Avtomatično' manually: 'Ročno' warning: 'Ko aktivirate način samodejnega razvrščanja, boste izgubili prejšnje razvrščanje.' - columns_help_text: "Uporabite zgornje vnosno polje za dodajanje stolpcev v tabelo. Vrstni red lahko spremenite tako da stolpce povlečete in spustite." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Potrebujete določene delovne pakete da izstopajo iz nereda?' relation_columns: 'Potrebujete videti povezave v seznamu delovnega paketa?' diff --git a/config/locales/crowdin/js-sv.yml b/config/locales/crowdin/js-sv.yml index 9246fe5bf8..57d0a9b038 100644 --- a/config/locales/crowdin/js-sv.yml +++ b/config/locales/crowdin/js-sv.yml @@ -844,7 +844,7 @@ sv: automatic: 'Automatisk' manually: 'Manuellt' warning: 'Du förlorar din tidigare sortering när du aktiverar det automatiska sorteringsläget.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Behöver vissa arbetspaket sticka ut från massan?' relation_columns: 'Behöver du se relationer i listan på arbetspaket?' diff --git a/config/locales/crowdin/js-tr.yml b/config/locales/crowdin/js-tr.yml index a627e8eaf3..9ff4ef199c 100644 --- a/config/locales/crowdin/js-tr.yml +++ b/config/locales/crowdin/js-tr.yml @@ -845,7 +845,7 @@ tr: automatic: 'Otomatik' manually: 'el ile' warning: 'Otomatik sıralama modunu etkinleştirirken önceki sıralamanızı kaybedeceksiniz.' - columns_help_text: "Tablo görünümünüze sütun eklemek için yukarıdaki girişi kullanın. Sütunları yeniden sıralamak için sürükleyip bırakabilirsiniz." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Kitleden sıyrılmak için bazı iş paketlerine mi ihtiyacınız var?' relation_columns: 'İş paketleri listesindeki ilişkileri görmek ister misiniz?' diff --git a/config/locales/crowdin/js-uk.yml b/config/locales/crowdin/js-uk.yml index ca79ce463f..c38c3420d1 100644 --- a/config/locales/crowdin/js-uk.yml +++ b/config/locales/crowdin/js-uk.yml @@ -845,7 +845,7 @@ uk: automatic: 'Автоматично' manually: 'Вручну' warning: 'Ви втратите попереднє сортування при активації автоматичного сортування.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Потрібні певні робочі пакети, щоб виділитися зі скупчення?' relation_columns: 'Потрібно бачити відносини у списку робочих пакетів?' diff --git a/config/locales/crowdin/js-vi.yml b/config/locales/crowdin/js-vi.yml index 76688a873c..045a9a0dc4 100644 --- a/config/locales/crowdin/js-vi.yml +++ b/config/locales/crowdin/js-vi.yml @@ -844,7 +844,7 @@ vi: automatic: 'Automatic' manually: 'Manually' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: 'Need certain work packages to stand out from the mass?' relation_columns: 'Need to see relations in the work package list?' diff --git a/config/locales/crowdin/js-zh-CN.yml b/config/locales/crowdin/js-zh-CN.yml index bb2c98fff6..c936c8ff53 100644 --- a/config/locales/crowdin/js-zh-CN.yml +++ b/config/locales/crowdin/js-zh-CN.yml @@ -845,7 +845,7 @@ zh-CN: automatic: '自动' manually: '手动' warning: '激活自动排序模式时,您将丢失以前的排序结果。' - columns_help_text: "使用上面的输入向表视图添加列。 您可以拖放列来为它们重新排序。" + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: '需要特定的工作包以脱颖而出?' relation_columns: '需要查看工作包列表中的关系吗?' diff --git a/config/locales/crowdin/js-zh-TW.yml b/config/locales/crowdin/js-zh-TW.yml index c2ce9c1c7c..f38b674c30 100644 --- a/config/locales/crowdin/js-zh-TW.yml +++ b/config/locales/crowdin/js-zh-TW.yml @@ -844,7 +844,7 @@ zh-TW: automatic: '自動' manually: '手動' warning: 'You will lose your previous sorting when activating the automatic sorting mode.' - columns_help_text: "Use the input above to add columns to your table view. You can drag and drop the columns to reorder them." + columns_help_text: "Use the input field above to add columns to your table view. You can drag and drop the columns to reorder them." upsale: attribute_highlighting: '需要某些工作包才能從大眾中脫穎而出?' relation_columns: '需要檢視工作項目清單的關係嗎' diff --git a/docs/installation-and-operations/installation/docker/README.md b/docs/installation-and-operations/installation/docker/README.md index 880a9087b1..7dbbd6d1f1 100644 --- a/docs/installation-and-operations/installation/docker/README.md +++ b/docs/installation-and-operations/installation/docker/README.md @@ -327,6 +327,43 @@ docker run -p 8080:80 --rm -it openproject-with-slack After which you can access OpenProject under http://localhost:8080. +## Offline/air-gapped installation + +It's possible to run the docker image on an a system with no internet access using `docker save` and `docker load`. +The installation works the same as described above. The only difference is that you don't download the image the usual way. + +**1) Save the image** + +On a system that has access to the internet run the following. + +``` +docker pull openproject/community:11 && docker save openproject/community:11 | gzip > openproject-11.tar.gz +``` + +This creates a compressed archive containing the latest OpenProject docker image. +The file will have a size of around 700mb. + +**2) Transfer the file onto the system** + +Copy the file onto the target system by any means that works. +This could be sftp, scp or even via a USB stick in case of a truly air-gapped system. + +**3) Load the image** + +Once the file is on the system you can load it like this: + +``` +gunzip openproject-11.tar.gz && docker load -i openproject-11.tar +``` + +This extracts the archive and loads the contained image layers into docker. +The .tar file can be deleted after this. + +**4) Proceed with the installation** + +After this both installation and later upgrades work just as usual. +You only replaced `docker-compose pull` or the normal, implicit download of the image with the steps described here. + ## Docker Swarm If you need to serve a very large number of users it's time to scale up horizontally. diff --git a/docs/system-admin-guide/authentication/authentication-settings/README.md b/docs/system-admin-guide/authentication/authentication-settings/README.md index 8cfa86b679..5add5d40d5 100644 --- a/docs/system-admin-guide/authentication/authentication-settings/README.md +++ b/docs/system-admin-guide/authentication/authentication-settings/README.md @@ -14,7 +14,7 @@ You can adapt the following under the authentication settings: ## General authentication settings -1. Select if the **authentication is required** to access OpenProject. +1. Select if the **authentication is required** to access OpenProject. **Watch out**: If you un-tick this box your OpenProject instance will be visible to the general public without logging in. The visibility of individual projects depends on [this setting](../../../user-guide/projects/#set-a-project-to-public). 2. Select an option for **self-registration**. Self-registration can either be **disabled**, or it can be allowed with the following criteria: diff --git a/docs/user-guide/projects/README.md b/docs/user-guide/projects/README.md index 42f41c9f76..03881f7baa 100644 --- a/docs/user-guide/projects/README.md +++ b/docs/user-guide/projects/README.md @@ -79,8 +79,6 @@ OpenProject, for example, uses the projects to structure the different modules/p