Skip to content

Commit 77dd8b8

Browse files
committed
Version 5.3.1
1 parent 8384a76 commit 77dd8b8

27 files changed

Lines changed: 159 additions & 388 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ For more information, go to https://www.luigifab.fr/apijs and https://www.luigif
66

77
This repository is a releases mirror. To install the plugin, please read the documentation.
88

9-
- Current version: 5.3.0 (01/01/2017) (archive regenerated on 02/07/2021)
9+
- Current version: 5.3.1 (10/10/2018) (archive regenerated on 02/07/2021)
1010
- Compatibility: Redmine 1.4 / 2.x / 3.x / 4.0 / 4.1 / 4.2, Python 3.3 / 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9
1111
- Client compatibility: Firefox 36+, Chrome 32+, Opera 19+, Edge 16+, Safari 9+
1212
- Translations: English (en), French (fr-FR/fr-CA), German (de), Italian (it), Portuguese (pt-PT/pt-BR), Spanish (es)

src/app/controllers/apijs_controller.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# encoding: utf-8
22
# Created J/12/12/2013
3-
# Updated J/29/12/2016
3+
# Updated M/22/08/2017
44
#
5-
# Copyright 2008-2017 | Fabrice Creuzot (luigifab) <code~luigifab~info>
6-
# https://redmine.luigifab.info/projects/redmine/wiki/apijs
5+
# Copyright 2008-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
6+
# https://www.luigifab.info/redmine/apijs
77
#
88
# This program is free software, you can redistribute it or modify
99
# it under the terms of the GNU General Public License (GPL) as published
@@ -194,7 +194,7 @@ def download
194194
# vérification d'accès
195195
if !User.current.allowed_to?({:controller => 'projects', :action => 'show'}, @project)
196196
deny_access
197-
# ou télachargement d'une vidéo en 206 Partial Content (http://stackoverflow.com/a/7604330 + http://stackoverflow.com/a/16593030)
197+
# ou télachargement d'une vidéo en 206 Partial Content (https://stackoverflow.com/a/7604330 + https://stackoverflow.com/a/16593030)
198198
# téléchargement d'une image avec mise en cache
199199
# ou téléchargement d'un fichier
200200
elsif !params[:filename] || params[:inline] || params[:stream]

src/app/views/attachments/_form.html.erb

Lines changed: 0 additions & 87 deletions
This file was deleted.

src/app/views/attachments/_links.html.erb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<% #<?
1+
<%
22
# Created L/21/05/2012
3-
# Updated S/24/12/2016
3+
# Updated S/29/09/2018
44
#
5-
# Copyright 2008-2017 | Fabrice Creuzot (luigifab) <code~luigifab~info>
6-
# https://redmine.luigifab.info/projects/redmine/wiki/apijs
5+
# Copyright 2008-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
6+
# https://www.luigifab.info/redmine/apijs
77
#
88
# This program is free software, you can redistribute it or modify
99
# it under the terms of the GNU General Public License (GPL) as published
@@ -15,7 +15,7 @@
1515
# merchantability or fitness for a particular purpose. See the
1616
# GNU General Public License (GPL) for more details.
1717

18-
attachments.sort! { |a,b| a.filename.downcase <=> b.filename.downcase } if Setting.plugin_redmine_apijs['sort_attachments'] == '1'
18+
attachments = attachments.to_a.sort! { |a,b| a.filename.downcase <=> b.filename.downcase } if Setting.plugin_redmine_apijs['sort_attachments'] == '1'
1919

2020
settingShowAlbum = (Setting.plugin_redmine_apijs['show_album'] == '1') ? true : false
2121
settingShowAlbumInfos = (Setting.plugin_redmine_apijs['show_album_infos'] == '1') ? true : false

src/app/views/settings/_apijs.html.erb

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<% #<?
1+
<%
22
# Created J/12/12/2013
3-
# Updated V/30/12/2016
3+
# Updated S/29/09/2018
44
#
5-
# Copyright 2008-2017 | Fabrice Creuzot (luigifab) <code~luigifab~info>
6-
# https://redmine.luigifab.info/projects/redmine/wiki/apijs
5+
# Copyright 2008-2018 | Fabrice Creuzot (luigifab) <code~luigifab~info>
6+
# https://www.luigifab.info/redmine/apijs
77
#
88
# This program is free software, you can redistribute it or modify
99
# it under the terms of the GNU General Public License (GPL) as published
@@ -48,28 +48,20 @@ if File.directory?(APIJS_ROOT + '/show/')
4848
end
4949

5050
check = 'checked="checked"'
51-
link1 = 'href="https://www.luigifab.info/apijs/index.php" onclick="window.open(this.href); return false;"';
52-
link2 = 'href="https://redmine.luigifab.info/projects/redmine/wiki/apijs" onclick="window.open(this.href); return false;"';
53-
link3 = 'href="https://redmine.luigifab.info/projects/apijs/wiki" onclick="window.open(this.href); return false;"';
5451
%>
5552

56-
<fieldset class="apijs tabular settings info">
57-
<ul>
58-
<li><%= raw l(:apijs_documentation, link1: link1, link2: link2, link3: link3) %></li>
59-
<li><%= raw l(:apijs_version) %> <strong><%= Redmine::Plugin.find(:redmine_apijs).version %></strong></li>
60-
<li><%= raw l(:apijs_status) %> <strong><%= raw l(settings['enabled'] == '1' ? :apijs_status_enabled : :apijs_status_disabled) %></strong></li>
61-
<% if settings['enabled'] == '1' %>
62-
<li>
63-
<%= raw l(:apijs_samples) %>
64-
<button onclick="apijs.dialog.dialogInformation('<%= raw l(:apijs_sample1_title) %>','<%= raw l(:apijs_sample1_text1).gsub(/['"\\\x0]/,'\\\\\0') %>');" type="button">1</button>
65-
<button onclick="apijs.dialog.dialogInformation('<%= raw l(:apijs_sample2_title) %>','[p]<%= raw l(:apijs_sample2_text1).gsub(/['"\\\x0]/,'\\\\\0') %>[/p][p]<%= raw l(:apijs_sample2_text2, value: '[a href=\'https://www.luigifab.info/\' class=\'popup\']www.luigifab.info[/a]').gsub(/['"\\\x0]/,'\\\\\0') %>[/p]');" type="button">2</button>
66-
</li>
67-
<% end %>
68-
</ul>
69-
</fieldset>
53+
<p style="margin:0.5em 1em; padding:0.5em;">
54+
Luigifab/Apijs <%= Redmine::Plugin.find(:redmine_apijs).version %>
55+
<a href="https://www.luigifab.info/redmine/apijs" style="float:right;">luigifab.info/redmine/apijs</a>
56+
<a href="https://www.luigifab.info/apijs" style="float:right; margin:0 0.6em;">luigifab.info/apijs</a>
57+
</p>
7058

7159
<fieldset class="box apijs tabular settings">
7260
<legend><%= raw l(:apijs_config_apijs) %></legend>
61+
<% if settings['enabled'] == '1' %>
62+
<button onclick="apijs.dialog.dialogInformation('<%= raw l(:apijs_sample1_title) %>','<%= raw l(:apijs_sample1_text1).gsub(/['"\\\x0]/,'\\\\\0') %>');" type="button">1</button>
63+
<button onclick="apijs.dialog.dialogInformation('<%= raw l(:apijs_sample2_title) %>','[p]<%= raw l(:apijs_sample2_text1).gsub(/['"\\\x0]/,'\\\\\0') %>[/p][p]<%= raw l(:apijs_sample2_text2, value: '[a href=\'https://www.luigifab.info/\' class=\'popup\']www.luigifab.info[/a]').gsub(/['"\\\x0]/,'\\\\\0') %>[/p]');" type="button">2</button>
64+
<% end %>
7365
<p>
7466
<label for="apijsEnabled"><%= raw l(:apijs_config_enable) %></label>
7567
<select name="settings[enabled]" id="apijsEnabled">
@@ -86,7 +78,7 @@ link3 = 'href="https://redmine.luigifab.info/projects/apijs/wiki" onclick="windo
8678
</p>
8779
<p>
8880
<label><%= raw l(:label_role_and_permissions) %></label>
89-
<a href="<%= url_for({:controller => 'roles', :action => 'permissions'}) %>" onclick="window.open(this.href); return false;"><%= raw l(:label_role_and_permissions) %></a>
81+
<a href="<%= url_for({:controller => 'roles', :action => 'permissions'}) %>"><%= raw l(:label_role_and_permissions) %></a>
9082
<em class="info"><%= raw l(:permission_edit_attachments) %>, <%= raw l(:permission_delete_attachments) %></em>
9183
</p>
9284
</fieldset>

src/assets/fonts/apijs/config.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,24 +113,6 @@
113113
"css": "paper-plane",
114114
"code": 61912,
115115
"src": "fontawesome"
116-
},
117-
{
118-
"uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
119-
"css": "trash-empty",
120-
"code": 59407,
121-
"src": "fontawesome"
122-
},
123-
{
124-
"uid": "41087bc74d4b20b55059c60a33bf4008",
125-
"css": "edit",
126-
"code": 59408,
127-
"src": "fontawesome"
128-
},
129-
{
130-
"uid": "0b2b66e526028a6972d51a6f10281b4b",
131-
"css": "zoom-in",
132-
"code": 59409,
133-
"src": "fontawesome"
134116
}
135117
]
136118
}
-792 Bytes
Binary file not shown.
-680 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)