Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/RestyaPlatform/board into is…
Browse files Browse the repository at this point in the history 
…sue/4009
  • Loading branch information
@saravanan477
saravanan477 committed Sep 18, 2020
2 parents 921889d + eb0a789 commit c685927
Show file tree
Hide file tree
Showing 59 changed files with 8,586 additions and 3,006 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11 AS build
FROM alpine:3.12 AS build
RUN apk add -u --no-cache npm php7

WORKDIR /code
Expand Down Expand Up @@ -31,7 +31,7 @@ COPY Gruntfile.js .
RUN npm run docker:prebuild


FROM alpine:3.11
FROM alpine:3.12

# update & install package
RUN apk add -u --no-cache \
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ To upgrade, overwrite application files and apply respective DB script:
* v0.6.5 to v0.6.6 - [`/sql/upgrade-0.6.5-0.6.6.sql`](https://github.com/RestyaPlatform/board/blob/master/sql/upgrade-0.6.5-0.6.6.sql)
* v0.6.6 to v0.6.7 - [`/sql/upgrade-0.6.6-0.6.7.sql`](https://github.com/RestyaPlatform/board/blob/master/sql/upgrade-0.6.6-0.6.7.sql)
* v0.6.7 to v0.6.8 - [`/sql/upgrade-0.6.7-0.6.8.sql`](https://github.com/RestyaPlatform/board/blob/master/sql/upgrade-0.6.7-0.6.8.sql)
* v0.6.8 to v0.6.9 - [`/sql/upgrade-0.6.8-0.6.9.sql`](https://github.com/RestyaPlatform/board/blob/master/sql/upgrade-0.6.8-0.6.9.sql)

### Configuring Restyaboard

Expand Down
2 changes: 1 addition & 1 deletion api_explorer/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"name": "Dual License (OSL 3.0 & Commercial License)",
"url": "https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt"
},
"version": "0.6.8"
"version": "0.6.9"
},
"basePath": "/v1",
"consumes": [
Expand Down
1 change: 1 addition & 0 deletions client/js/models/board.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@ App.Board = Backbone.Model.extend({
this.checklist_items = new App.CheckListItemCollection();
this.boards_stars = new App.BoardStarCollection();
this.acl_links = new App.AclBoardLinksCollection();
this.attributes.is_card_filtered = false;
}
});
2 changes: 1 addition & 1 deletion client/js/templates/about_us.jst.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="about-block col-xs-pull-0 col-xs-push-0">
<h1><a title="<%- SITE_NAME %>" href="javascript:void(0);"><img src="img/logo.png" alt="[Image: <%- SITE_NAME %> ]" title="<%- SITE_NAME %>" class="img-responsive center-block"/></a> </h1>
<small class="show text-center">v 0.6.8 (2019-12-16)</small>
<small class="show text-center">v 0.6.9 (2020-08-26)</small>
<h3><%- i18next.t("Technologies and Components") %></h3>
<ul class="list-unstyled">
<li>Restya platform <a class="text-primary" target="_blank" title="http://restya.com/?utm_source=Restyaboard - <%- SITE_NAME %>&utm_medium=web&utm_campaign=about_us" href="http://restya.com/">http://restya.com/ </a></li>
Expand Down
11 changes: 6 additions & 5 deletions client/js/templates/activity.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
<i class="avatar avatar-color-194 img-rounded pull-left" title="<%-activity.attributes.full_name %>"></i>
<% } %>
<div class="media-body">
<% activity.attributes.organization_name = (activity.attributes.organization_name !== null) ? activity.attributes.organization_name : i18next.t("[deleted]");
<% activity.attributes.comment = filterXSS(activity.attributes.comment);
activity.attributes.organization_name = (activity.attributes.organization_name !== null) ? activity.attributes.organization_name : i18next.t("[deleted]");
activity.attributes.board_name = (activity.attributes.board_name !== null) ? activity.attributes.board_name : i18next.t("[deleted]");
activity.attributes.card_name = (activity.attributes.card_name !== null) ? activity.attributes.card_name : i18next.t("[deleted]");
var cardLink;
Expand Down Expand Up @@ -125,10 +126,10 @@
<div class="activities-list js-activity-<%- activity.attributes.id %>">
<% if(activity.attributes.type == 'add_comment') {
var originalComment;
if (!_.isUndefined(activity.attributes.revisions) && !_.isEmpty(activity.attributes.revisions) && activity.attributes.revisions !== null) {
originalComment = activity.attributes.revisions.old_value.comment;
} else {
originalComment = activity.attributes.comment;
if (!_.isUndefined(activity.attributes.revisions) && !_.isEmpty(activity.attributes.revisions) && activity.attributes.revisions !== null) {
originalComment = filterXSS(activity.attributes.revisions.old_value.comment);
} else {
originalComment = filterXSS(activity.attributes.comment);
}
if(!_.isUndefined(activity.from_footer)) { %>
<span><%= comment %></span>
Expand Down
1 change: 1 addition & 0 deletions client/js/templates/admin_activity_index.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
} else {
organizationLink = '<a href="javascript:void(0);">' + _.escape(activity.attributes.organization_name) + '</a>';
}
activity.attributes.comment = filterXSS(activity.attributes.comment);
if(activity.attributes.type != 'add_comment') {
if(activity.attributes.comment.indexOf('##ORGANIZATION_LINK##') != -1){
activity.attributes.comment = activity.attributes.comment.replace('##ORGANIZATION_LINK##', organizationLink);
Expand Down
9 changes: 9 additions & 0 deletions client/js/templates/board_additional_settings.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
<li class="clearfix js-enable-covers js-AdditionalSettings-enable list-group-item cur <% if(board.attributes.is_show_image_front_of_card) { %> hide <% } %>">
<%- i18next.t("Enable Card Cover Images") %>
</li>
<li class="js-expand-card-cover-image js-is_expand_image_front_of_card-enabled <% if(!board.attributes.is_expand_image_front_of_card) { %> hide <% } %>">
<div class="cur list-group-item well-sm">
<%- i18next.t("Expand Card Cover Image Enabled") %>
<i class="icon-ok"></i>
</div>
</li>
<li class="clearfix js-expand-card-cover-image js-is_expand_image_front_of_card-enable list-group-item cur <% if(board.attributes.is_expand_image_front_of_card) { %> hide <% } %>">
<%- i18next.t("Expand Card Cover Image") %>
</li>
<li class="js-enable-board-notification js-auto_subscribe_on_board-enabled <% if(!board.attributes.auto_subscribe_on_board) { %> hide <% } %>">
<div class="cur list-group-item well-sm">
<%- i18next.t("Automatically subscribe a member when he's added to a board") %>
Expand Down
106 changes: 3 additions & 103 deletions client/js/templates/card.jst.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% if (!_.isUndefined(card) && card !== null) { %>
<div class="panel-body">
<% if(!_.isUndefined(authuser.user) && (authuser.user.role_id == 1 || !_.isUndefined(card.list) && !_.isEmpty(card.list) && !_.isEmpty(card.list.board.acl_links.where({slug: "view_card_labels", board_user_role_id: parseInt(card.board_user_role_id)})))) { %>
<div class="clearfix js-card-label-section-<%- card.attributes.id %>">
<div class="clearfix js-card-label-section-<%- card.attributes.id %> <% if(!_.isEmpty(card.collection) && card.list.collection.board.attributes.is_expand_image_front_of_card){ %> hide <% } %>">
<%if(CheckFieldExists(card.board, 'labels' , null , 'boolean', 'r_gridview_configure')){
card.labels.each(function(label) {
if (!_.isUndefined(label) && label.attributes.name !== "") { %>
Expand Down Expand Up @@ -44,7 +44,7 @@
<% }%>
<a href="#/board/<%- card.attributes.board_id %>/card/<%- card.attributes.id %>" title="<%- card.attributes.name %>"><%= CheckFieldExists(card.board, 'name', card.attributes.name, 'Value', 'r_gridview_configure') %></a>
</div>
<div class="pull-left navbar-btn">
<div class="pull-left navbar-btn <% if(!_.isEmpty(card.collection) && card.list.collection.board.attributes.is_expand_image_front_of_card){ %> hide <% } %>">
<ul class="list-unstyled list-inline text-muted boardlistblk clearfix txt-aligns js-list-card-data">
<%
if(!_.isUndefined(authuser) && !_.isUndefined(authuser.user)){
Expand Down Expand Up @@ -109,106 +109,6 @@
</li>
<%}%>
<li id="js-card-customfields-list-<%- card.attributes.id %>" class="hide"></li>
<% if (!_.isUndefined(APPS) && APPS !== null && !_.isUndefined(APPS.permission_checked_apps) && APPS.permission_checked_apps.indexOf('r_custom_fields') !== -1) {
var card_customfield_list = '';
if (!_.isUndefined(App.current_board) && !_.isEmpty(App.current_board) && App.current_board !== null && !_.isUndefined(App.current_board.attributes) && !_.isEmpty(App.current_board.attributes) && App.current_board.attributes !== null && App.current_board.attributes.custom_fields && App.current_board.attributes.custom_fields.length > 0) {
_.each(App.current_board.attributes.custom_fields, function(custom_field) {
var custom_visibility = '';
if (custom_field.visibility != '1') {
custom_visibility = 'hide';
}
var card_customfield_value = '';
var labelClass = '';
if (_.isEmpty(custom_field.color) || _.isUndefined(custom_field.color)) {
labelClass = 'label-default';
}
if (!_.isEmpty(custom_field.cards_custom_fields) && custom_field.cards_custom_fields !== null) {
var custom_field_json = jQuery.parseJSON(custom_field.cards_custom_fields);
var filtered_cards_custom_fields = custom_field_json.filter(function(x) {
return x.card_id === card.id;
});
if (!_.isUndefined(filtered_cards_custom_fields) && !_.isEmpty(filtered_cards_custom_fields) && filtered_cards_custom_fields.length > 0) {
_.each(filtered_cards_custom_fields, function(value) {
card_customfield_value = value.value;
card_customfield_cardId = value.card_id;
if (card_customfield_value) {
var hours_mins;
if (custom_field.type === 'date') {
card_customfield_value = dateFormat(card_customfield_value, "mediumDate");
}
if (custom_field.type === 'time') {
var field_time = card_customfield_value.split(':');
var time_noon = '';
if (field_time[0] < 12) {
if (field_time[0] < 10 && field_time[0].indexOf('0') == -1) {
field_time[0] = '0' + field_time[0];
}
time_noon = 'AM';
} else {
time_noon = 'PM';
if (field_time[0] != 12) {
field_time[0] = field_time[0] - 12;
}
if (field_time[0] < 10) {
field_time[0] = '0' + field_time[0];
}
}
card_customfield_value = field_time[0] + ':' + field_time[1] + ' ' + time_noon;
}
if (custom_field.type === 'datetime') {
if (card_customfield_value.indexOf('T') > -1) {
card_customfield_value = card_customfield_value.replace('T', ' ');
var date = card_customfield_value.split(' ');
card_customfield_value = date['0'];
card_customfield_value = dateFormat(card_customfield_value, "mediumDate");
if (!_.isEmpty(date[1])) {
hours_mins = date[1].split(':');
var noon = '';
if (hours_mins[0] < 12) {
if (hours_mins[0] < 10 && hours_mins[0].indexOf('0') == -1) {
hours_mins[0] = '0' + hours_mins[0];
}
noon = 'AM';
} else {
noon = 'PM';
if (hours_mins[0] != 12) {
hours_mins[0] = hours_mins[0] - 12;
}
if (hours_mins[0] < 10) {
hours_mins[0] = '0' + hours_mins[0];
}
}
hours_mins = hours_mins[0] + ':' + hours_mins[1] + ' ' + noon;
}
card_customfield_list += '<li class=" js-custom-field-' + card.id + '-' + custom_field.id + ' card-listing-truncate">';
if (CheckFieldExists(App.current_board, custom_field.name, null, 'boolean', 'r_gridview_configure')) {
card_customfield_list += '<small title="' + custom_field.name + ': ' + card_customfield_value + ' at ' + hours_mins + '" ><span class="' + custom_visibility + ' label ' + labelClass + '" style="background:' + custom_field.color + ';">' + card_customfield_value + ' at ' + hours_mins + '</span></small>';
}
card_customfield_list += '</li>';
}
} else {
if (CheckFieldExists(App.current_board, custom_field.name, null, 'boolean', 'r_gridview_configure')) {
card_customfield_list += '<li class=" js-custom-field-' + card.id + '-' + custom_field.id + ' card-listing-truncate">';
}
if (CheckFieldExists(App.current_board, custom_field.name, null, 'boolean', 'r_gridview_configure')) {
card_customfield_list += '<small title="' + custom_field.name + ': ' + card_customfield_value + '" ><span class="' + custom_visibility + ' label ' + labelClass + '" style="background:' + custom_field.color + ';">' + card_customfield_value + '</span></small>';
}
if (CheckFieldExists(App.current_board, custom_field.name, null, 'boolean', 'r_gridview_configure')) {
card_customfield_list += '</li>';
}
}
}
});
} else {
card_customfield_list += '<li class=" js-custom-field-' + card.id + '-' + custom_field.id + ' card-listing-truncate hide"></li>';
}
} else {
card_customfield_list += '<li class=" js-custom-field-' + card.id + '-' + custom_field.id + ' card-listing-truncate hide"></li>';
}
}); %>
<%= card_customfield_list %>
<% }
} %>
<% if(!_.isUndefined(card.attributes.due_date) && !_.isEmpty(card.attributes.due_date) && card.attributes.due_date != 'NULL'){
var date_times = card.attributes.due_date.split('T'),hours_mins;
var date_time = date_times[0].split(' ');
Expand Down Expand Up @@ -273,7 +173,7 @@
<% } %>
</ul>
</div>
<div class="clearfix pull-right">
<div class="clearfix pull-right <% if(!_.isEmpty(card.collection) && card.list.collection.board.attributes.is_expand_image_front_of_card){ %> hide <% } %>">
<ul class="list-unstyled list-inline text-muted clearfix">
<% if(CheckFieldExists(card.board, 'cards_users' , null , 'boolean', 'r_gridview_configure')){
card.users.each(function(card_user) {
Expand Down
86 changes: 1 addition & 85 deletions client/js/templates/card_list_view.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,91 +149,7 @@
if (!_.isUndefined(card.board) && !_.isEmpty(card.board) && !_.isUndefined(card.board.attributes.custom_fields) && card.board.attributes.custom_fields !== null) {
_.each(card.board.attributes.custom_fields, function(customfield){ %>
<% if(CheckFieldExists(card.board, customfield.name , null , 'boolean', 'r_listview_configure')){ %>
<td class="js-list-view-card-<%- card.attributes.id %>-customfield-<%- customfield.id %> card-listing-truncate" data-title="<%- customfield.label %>" id="list_view_config_data-<%- customfield.name %>">
<% if (!_.isUndefined(APPS.permission_checked_apps) && APPS.permission_checked_apps.indexOf('r_custom_fields') !== -1) {
var card_customfield_list = '';
var custom_visibility = '';
if (customfield.visibility != '1') {
custom_visibility = 'hide';
}
var card_customfield_value = '';
var labelClass = '';
if (_.isEmpty(customfield.color) || _.isUndefined(customfield.color)) {
labelClass = 'label-default';
}
if (!_.isEmpty(customfield.cards_custom_fields) && customfield.cards_custom_fields !== null) {
var custom_field_json = jQuery.parseJSON(customfield.cards_custom_fields);
var filtered_cards_custom_fields = custom_field_json.filter(function(x) {
return x.card_id === card.id;
});
if (!_.isUndefined(filtered_cards_custom_fields) && !_.isEmpty(filtered_cards_custom_fields) && filtered_cards_custom_fields.length > 0) {
_.each(filtered_cards_custom_fields, function(value) {
card_customfield_value = value.value;
card_customfield_cardId = value.card_id;
if (card_customfield_value) {
var hours_mins;
if (customfield.type === 'date') {
card_customfield_value = dateFormat(card_customfield_value, "mediumDate");
}
if (customfield.type === 'time') {
var field_time = card_customfield_value.split(':');
var time_noon = '';
if (field_time[0] < 12) {
if (field_time[0] < 10 && field_time[0].indexOf('0') == -1) {
field_time[0] = '0' + field_time[0];
}
time_noon = 'AM';
} else {
time_noon = 'PM';
if (field_time[0] != 12) {
field_time[0] = field_time[0] - 12;
}
if (field_time[0] < 10) {
field_time[0] = '0' + field_time[0];
}
}
card_customfield_value = field_time[0] + ':' + field_time[1] + ' ' + time_noon;
}
if (customfield.type === 'datetime') {
if (card_customfield_value.indexOf('T') > -1) {
card_customfield_value = card_customfield_value.replace('T', ' ');
var date = card_customfield_value.split(' ');
card_customfield_value = date['0'];
card_customfield_value = dateFormat(card_customfield_value, "mediumDate");
if (!_.isEmpty(date[1])) {
hours_mins = date[1].split(':');
var noon = '';
if (hours_mins[0] < 12) {
if (hours_mins[0] < 10 && hours_mins[0].indexOf('0') == -1) {
hours_mins[0] = '0' + hours_mins[0];
}
noon = 'AM';
} else {
noon = 'PM';
if (hours_mins[0] != 12) {
hours_mins[0] = hours_mins[0] - 12;
}
if (hours_mins[0] < 10) {
hours_mins[0] = '0' + hours_mins[0];
}
}
hours_mins = hours_mins[0] + ':' + hours_mins[1] + ' ' + noon;
}
card_customfield_list += '<small title="' + customfield.name + ': ' + card_customfield_value + ' at ' + hours_mins + '" ><span class="' + custom_visibility + ' label ' + labelClass + '" style="background:' + customfield.color + ';">' + card_customfield_value + ' at ' + hours_mins + '</span></small>';
}
} else {
card_customfield_list += '<small title="' + customfield.name + ': ' + card_customfield_value + '" ><span class="' + custom_visibility + ' label ' + labelClass + '" style="background:' + customfield.color + ';">' + card_customfield_value + '</span></small>';
} %>
<%= card_customfield_list %>
<% }
});
} else { %>
<small>-</small>
<% } %>
<% } else { %>
<small>-</small>
<% }
} %>
<td class="js-list-view-card-<%- card.attributes.id %>-customfield-<%- customfield.id %> card-listing-truncate" data-title="<%- customfield.label %>" id="list_view_config_data-<%- customfield.name %>"><small>-</small></td>
</td>
<% } %>
<% });
Expand Down
2 changes: 1 addition & 1 deletion client/js/templates/intro_video.jst.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="row intro-video-block">
<div class="col-xs-12">
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/DnX2XHEn0-g?autoplay=1" frameborder="0" allowfullscreen></iframe>
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/DnX2XHEn0-g?autoplay=1" frameborder="0" allowfullscreen allow="autoplay"></iframe>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion client/js/templates/login.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<form class="form-horizontal clearfix col-xs-12" role="form" name="UserLoginForm" id="UserLoginForm">
<div class="form-group">
<label for="inputEmail" class="sr-only control-label"><%- i18next.t('Email or Username') %></label>
<input type="text" placeholder="<%- i18next.t('Email or Username') %>" class="form-control change-ldap" id="inputEmail" name="email" title="" autofocus required/>
<input type="text" placeholder="<%- i18next.t('Email or Username') %>" class="form-control change-ldap" id="inputEmail" name="email" title="" value="<%- android_user_name %>" autofocus required/>
</div>
<div class="form-group">
<label for="inputPassword" class="sr-only control-label"><%- i18next.t('Password') %></label>
Expand Down
4 changes: 3 additions & 1 deletion client/js/templates/user_activity.jst.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@
<% if(activity.attributes.type == 'add_comment' || activity.attributes.type == 'edit_comment') { %>
<span><%= comment %></span>
<% if(activity.attributes.type == 'add_comment' && !_.isUndefined(activity.attributes.revisions) && !_.isEmpty(activity.attributes.revisions) && activity.attributes.revisions !== null) {
activity.attributes.comment = activity.attributes.revisions.old_value.comment;
activity.attributes.comment = filterXSS(activity.attributes.revisions.old_value.comment);
} else {
activity.attributes.comment = filterXSS(activity.attributes.comment);
} %>
<% if(activity.attributes.type == 'add_comment') { %><div class="thumbnail media-body no-mar"><% } %>
<%= makeLink(converter.makeHtml((activity.attributes.comment)), activity.attributes.board_id) %>
Expand Down
Loading

0 comments on commit c685927

Please sign in to comment.