Skip to content

Commit

Permalink
Merge pull request #165 from ONLYOFFICE/release/3.1.0
Browse files Browse the repository at this point in the history
Release/3.1.0
  • Loading branch information
LinneyS authored Mar 5, 2024
2 parents b7922e4 + a8ef5e1 commit 689c2f7
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Update Submodules
run: make submodule
Expand All @@ -20,7 +20,7 @@ jobs:
run: make build

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: onlyoffice_redmine
path: .build
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 3.1.0
## Features
- Filling pdf instead of oform

## Bug Fixes
- Manually check versions of dependencies

## 3.0.1
## Bug Fixes

Expand Down
8 changes: 4 additions & 4 deletions Gemfile.prod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source "https://rubygems.org"

gem "jwt", "~> 2.7.1"
gem "mustache", "~> 1.1.1"
gem "render_parent", "~> 0.1.0"
gem "sorbet-runtime", "~> 0.5.10969"
gem "jwt"
gem "mustache"
gem "render_parent"
gem "sorbet-runtime"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This plugin enables users to edit attachments from [Redmine](https://www.redmine
| |djvu|doc|docm|docx|docxf|dot|dotm|dotx|epub*|fb2*|fodt|htm|html*|mht|mhtml|odt*|oform|ott*|oxps|pdf|rtf*|stw|sxw|txt*|wps|wpt|xml|xps|csv*|et|ett|fods|ods*|ots*|sxc|xls|xlsb|xlsm|xlsx|xlt|xltm|xltx|dps|dpt|fodp|odp*|otp*|pot|potm|potx|pps|ppsm|ppsx|ppt|pptm|pptx|sxi|
|:-|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
|View|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|+|
|Edit|-|-|+|+|+|-|+|+|+|+|-|-|+|-|-|+|+|+|-|-|+|-|-|+|-|-|-|-|+|-|-|-|+|+|-|-|-|+|+|-|+|+|-|-|-|+|+|-|+|+|-|+|+|-|+|+|-|
|Edit|-|-|+|+|+|-|+|+|+|+|-|-|+|-|-|+|-|+|-|+|+|-|-|+|-|-|-|-|+|-|-|-|+|+|-|-|-|+|+|-|+|+|-|-|-|+|+|-|+|+|-|+|+|-|+|+|-|
|Create|-|-|-|+|+|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|+|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|+|-|
<!-- end-formats -->

Expand Down
1 change: 0 additions & 1 deletion config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ de:
onlyoffice_create_docx: "Dokument"
onlyoffice_create_xlsx: "Arbeitsmappe"
onlyoffice_create_pptx: "Präsentation"
onlyoffice_create_docxf: "Formularvorlage"
onlyoffice_attachment_create_error: "Fehler beim Erstellen"
onlyoffice_editor_demo_enabled: "Du verwendest den öffentlichen Demo ONLYOFFICE Docs Server. Bitte benutze ihn nicht zum Speichern von Deinen privaten sensiblen Daten."
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ en:
onlyoffice_create_docx: "Document"
onlyoffice_create_xlsx: "Spreadsheet"
onlyoffice_create_pptx: "Presentation"
onlyoffice_create_docxf: "Form template"
onlyoffice_create_docxf: "PDF form"
onlyoffice_attachment_create_error: "Error while creating"
onlyoffice_editor_demo_enabled: "You are using public demo ONLYOFFICE Document Server. Please do not store private sensitive data."
1 change: 0 additions & 1 deletion config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ es:
onlyoffice_create_docx: "Documento"
onlyoffice_create_xlsx: "Libro de Excel"
onlyoffice_create_pptx: "Presentación"
onlyoffice_create_docxf: "Plantilla de formulario"
onlyoffice_attachment_create_error: "Error al crear"
onlyoffice_editor_demo_enabled: "Estás usando el servidor de ONLYOFFICE Docs de demostración. Por favor, no almacenes tus datos confidenciales aquí."
1 change: 0 additions & 1 deletion config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ fr:
onlyoffice_create_docx: "Document"
onlyoffice_create_xlsx: "Feuille de calcul"
onlyoffice_create_pptx: "Présentation"
onlyoffice_create_docxf: "Modèle de formulaire"
onlyoffice_attachment_create_error: "Une erreur lors de la création"
onlyoffice_editor_demo_enabled: "Vous utilisez la version démo de ONLYOFFICE Docs, proposée à des fins de tests. Veuillez ne pas stocker vos données confidentielles."
1 change: 0 additions & 1 deletion config/locales/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ it:
onlyoffice_create_docx: "Documento"
onlyoffice_create_xlsx: "Foglio di calcolo"
onlyoffice_create_pptx: "Presentazione"
onlyoffice_create_docxf: "Modello di modulo"
onlyoffice_attachment_create_error: "Errore durante la creazione"
onlyoffice_editor_demo_enabled: "Stai utilizzando la versione demo pubblica di ONLYOFFICE Docs. Non memorizzare dati sensibili privati."
2 changes: 1 addition & 1 deletion config/locales/ru.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ ru:
onlyoffice_create_docx: "Документ"
onlyoffice_create_xlsx: "Таблица"
onlyoffice_create_pptx: "Презентация"
onlyoffice_create_docxf: "Шаблон формы"
onlyoffice_create_docxf: "PDF форма"
onlyoffice_attachment_create_error: "Ошибка при создании"
onlyoffice_editor_demo_enabled: "Вы используете публичный демонстрационный сервер ONLYOFFICE Docs. Пожалуйста, не храните конфиденциальные данные."
1 change: 0 additions & 1 deletion config/locales/zh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@ zh:
onlyoffice_create_docx: "文档"
onlyoffice_create_xlsx: "电子表格"
onlyoffice_create_pptx: "演示文稿"
onlyoffice_create_docxf: "表单模板"
onlyoffice_attachment_create_error: "创建时发生错误"
onlyoffice_editor_demo_enabled: "您正在使用公开ONLYOFFICE Docs服务器的演示,请勿存储隐私数据。"
15 changes: 15 additions & 0 deletions init.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# frozen_string_literal: true

require "redmine"
require "rubygems"
require_relative "lib2/onlyoffice"
require_relative "lib2/only_office"
require_relative "app/views/views"
Expand All @@ -42,6 +43,20 @@
logger.progname = OnlyOfficeRedmine.logger.progname.dup
OnlyOfficeRedmine.logger = logger

def check_gem(name, version)
Gem::Specification.find_by_name(name, version)
rescue Gem::MissingSpecVersionError
spec = Gem::Specification.find_by_name(name)
OnlyOfficeRedmine.logger.error("Gem '#{name}' version '#{version}' not found, found version '#{spec.version}'")
rescue Gem::MissingSpecError
OnlyOfficeRedmine.logger.error("Gem '#{name}' version '#{version}' not found")
end

check_gem("jwt", "~> 2.7.1")
check_gem("mustache", "~> 1.1.1")
check_gem("render_parent", "~> 0.1.0")
check_gem("sorbet-runtime", "~> 0.5.10969")

Redmine::Plugin.register(OnlyOfficeRedmine::NAME.to_sym) do
# rubocop:disable Layout/LineLength
name "Redmine ONLYOFFICE integration plugin"
Expand Down
2 changes: 1 addition & 1 deletion lib/only_office_redmine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

module OnlyOfficeRedmine
NAME = "onlyoffice_redmine"
VERSION = "3.0.1"
VERSION = "3.1.0"

class << self
extend T::Sig
Expand Down
7 changes: 0 additions & 7 deletions lib2/onlyoffice/resources/formats.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,6 @@ def self.read
all.add(format)
end

# TODO: it should be in `formats.json`.
zip = OnlyOffice::Resources::Format.new(
name: "zip",
mime: ["application/zip"]
)
all.add(zip)

new(all: all)
end

Expand Down
2 changes: 1 addition & 1 deletion lib2/resources/document-formats

0 comments on commit 689c2f7

Please sign in to comment.