summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--app/Api/Comment.php3
-rw-r--r--app/Locale/pt_PT/translations.php96
-rw-r--r--app/Model/Comment.php1
-rw-r--r--app/Schema/Sql/mysql.sql4
-rw-r--r--app/Schema/Sql/postgres.sql6
6 files changed, 57 insertions, 55 deletions
diff --git a/Makefile b/Makefile
index 54e65f2e..f7b25a45 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ sql:
@ mysqldump -uroot --quote-names --no-create-info --skip-comments --no-set-names kanboard settings >> app/Schema/Sql/mysql.sql
@ mysqldump -uroot --quote-names --no-create-info --skip-comments --no-set-names kanboard links >> app/Schema/Sql/mysql.sql
- @ php -r "echo 'INSERT INTO users (username, password, is_admin) VALUES (\'admin\', \''.password_hash('admin', PASSWORD_DEFAULT).'\', \'1\');';" | \
+ @ php -r "echo 'INSERT INTO users (username, password, role) VALUES (\'admin\', \''.password_hash('admin', PASSWORD_DEFAULT).'\', \'app-admin\');';" | \
tee -a app/Schema/Sql/postgres.sql app/Schema/Sql/mysql.sql >/dev/null
@ let mysql_version=`echo 'select version from schema_version;' | mysql -N -uroot kanboard` ;\
diff --git a/app/Api/Comment.php b/app/Api/Comment.php
index 26b632e9..4c4027c0 100644
--- a/app/Api/Comment.php
+++ b/app/Api/Comment.php
@@ -25,12 +25,13 @@ class Comment extends \Kanboard\Core\Base
return $this->comment->remove($comment_id);
}
- public function createComment($task_id, $user_id, $content)
+ public function createComment($task_id, $user_id, $content, $reference = '')
{
$values = array(
'task_id' => $task_id,
'user_id' => $user_id,
'comment' => $content,
+ 'reference' => $reference,
);
list($valid, ) = $this->comment->validateCreation($values);
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 5f5e9c8a..0608bd4b 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -929,7 +929,7 @@ return array(
'There is no task in your project.' => 'Não existe tarefa no seu projecto.',
'Gantt chart' => 'Gráfico de Gantt',
'People who are project managers' => 'Pessoas que são gestores do projecto',
- 'People who are project members' => 'Pessoas que são membors do projecto',
+ 'People who are project members' => 'Pessoas que são membros do projecto',
'NOK - Norwegian Krone' => 'NOK - Coroa Norueguesa',
'Show this column' => 'Mostrar esta coluna',
'Hide this column' => 'Esconder esta coluna',
@@ -1051,52 +1051,52 @@ return array(
'BAM - Konvertible Mark' => 'BAM - Marca Conversível',
'Assignee Username' => 'Utilizador do Assignado',
'Assignee Name' => 'Nome do Assignado',
- // 'Groups' => '',
- // 'Members of %s' => '',
- // 'New group' => '',
- // 'Group created successfully.' => '',
- // 'Unable to create your group.' => '',
- // 'Edit group' => '',
- // 'Group updated successfully.' => '',
- // 'Unable to update your group.' => '',
- // 'Add group member to "%s"' => '',
- // 'Group member added successfully.' => '',
- // 'Unable to add group member.' => '',
- // 'Remove user from group "%s"' => '',
- // 'User removed successfully from this group.' => '',
- // 'Unable to remove this user from the group.' => '',
- // 'Remove group' => '',
- // 'Group removed successfully.' => '',
- // 'Unable to remove this group.' => '',
- // 'Project Permissions' => '',
- // 'Manager' => '',
- // 'Project Manager' => '',
- // 'Project Member' => '',
- // 'Project Viewer' => '',
- // 'Gitlab issue reopened' => '',
- // 'Your account is locked for %d minutes' => '',
- // 'Invalid captcha' => '',
- // 'The name must be unique' => '',
- // 'View all groups' => '',
- // 'View group members' => '',
- // 'There is no user available.' => '',
- // 'Do you really want to remove the user "%s" from the group "%s"?' => '',
- // 'There is no group.' => '',
- // 'External Id' => '',
- // 'Add group member' => '',
- // 'Do you really want to remove this group: "%s"?' => '',
- // 'There is no user in this group.' => '',
- // 'Remove this user' => '',
- // 'Permissions' => '',
- // 'Allowed Users' => '',
- // 'No user have been allowed specifically.' => '',
- // 'Role' => '',
- // 'Enter user name...' => '',
- // 'Allowed Groups' => '',
- // 'No group have been allowed specifically.' => '',
- // 'Group' => '',
- // 'Group Name' => '',
- // 'Enter group name...' => '',
- // 'Role:' => '',
+ 'Groups' => 'Grupos',
+ 'Members of %s' => 'Membros de %s',
+ 'New group' => 'Novo grupo',
+ 'Group created successfully.' => 'Grupo criado com sucesso.',
+ 'Unable to create your group.' => 'Não foi possivel criar o seu grupo.',
+ 'Edit group' => 'Editar grupo',
+ 'Group updated successfully.' => 'Grupo actualizado com sucesso.',
+ 'Unable to update your group.' => 'Não foi possivel actualizar o seu grupo.',
+ 'Add group member to "%s"' => 'Adicionar membro do grupo a "%s"',
+ 'Group member added successfully.' => 'Membro de grupo adicionado com sucesso.',
+ 'Unable to add group member.' => 'Não foi possivel adicionar membro de grupo.',
+ 'Remove user from group "%s"' => 'Remover utilizador do grupo "%s"',
+ 'User removed successfully from this group.' => 'Utilizador removido com sucesso deste grupo.',
+ 'Unable to remove this user from the group.' => 'Não foi possivel remover este utilizador do grupo.',
+ 'Remove group' => 'Remover grupo.',
+ 'Group removed successfully.' => 'Grupo removido com sucesso.',
+ 'Unable to remove this group.' => 'Não foi possivel remover este grupo.',
+ 'Project Permissions' => 'Permissões de Projecto',
+ 'Manager' => 'Gestor',
+ 'Project Manager' => 'Gestor de Projecto',
+ 'Project Member' => 'Membro de Projecto',
+ 'Project Viewer' => 'Visualizador de Projecto',
+ 'Gitlab issue reopened' => 'Problema Gitlab reaberto',
+ 'Your account is locked for %d minutes' => 'A sua conta está bloqueada por %d minutos',
+ 'Invalid captcha' => 'Captcha inválido',
+ 'The name must be unique' => 'O nome deve ser único',
+ 'View all groups' => 'Ver todos os grupos',
+ 'View group members' => 'Ver membros do grupo',
+ 'There is no user available.' => 'Não existe utilizador disponivel.',
+ 'Do you really want to remove the user "%s" from the group "%s"?' => 'Tem a certeza que quer remover o utilizador "%s" do grupo "%s"?',
+ 'There is no group.' => 'Não existe grupo.',
+ 'External Id' => 'Id externo',
+ 'Add group member' => 'Adicionar membro de grupo',
+ 'Do you really want to remove this group: "%s"?' => 'Tem a certeza que quer remover este grupo: "%s"?',
+ 'There is no user in this group.' => 'Não existe utilizadores neste grupo.',
+ 'Remove this user' => 'Remover este utilizador',
+ 'Permissions' => 'Permissões',
+ 'Allowed Users' => 'Utilizadores Permitidos',
+ 'No user have been allowed specifically.' => 'Nenhum utilizador foi especificamente permitido.',
+ 'Role' => 'Função',
+ 'Enter user name...' => 'Escreva o nome do utilizador...',
+ 'Allowed Groups' => 'Grupos Permitidos',
+ 'No group have been allowed specifically.' => 'Nenhum grupo foi especificamente permitido.',
+ 'Group' => 'Grupo',
+ 'Group Name' => 'Nome do Grupo',
+ 'Enter group name...' => 'Escreva o nome do Grupo',
+ 'Role:' => 'Função:',
'Project members' => 'Membros do projecto',
);
diff --git a/app/Model/Comment.php b/app/Model/Comment.php
index c7125a25..f60a96e3 100644
--- a/app/Model/Comment.php
+++ b/app/Model/Comment.php
@@ -203,6 +203,7 @@ class Comment extends Base
new Validators\Integer('id', t('This value must be an integer')),
new Validators\Integer('task_id', t('This value must be an integer')),
new Validators\Integer('user_id', t('This value must be an integer')),
+ new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50),
new Validators\Required('comment', t('Comment is required'))
);
}
diff --git a/app/Schema/Sql/mysql.sql b/app/Schema/Sql/mysql.sql
index b2c3ef94..4b26aec7 100644
--- a/app/Schema/Sql/mysql.sql
+++ b/app/Schema/Sql/mysql.sql
@@ -581,7 +581,7 @@ CREATE TABLE `users` (
LOCK TABLES `settings` WRITE;
/*!40000 ALTER TABLE `settings` DISABLE KEYS */;
-INSERT INTO `settings` VALUES ('api_token','af33e30de765b4eb6ac9eea6243e8edac9acfe7afb9df3c3d7e6eff696f9'),('application_currency','USD'),('application_date_format','m/d/Y'),('application_language','en_US'),('application_stylesheet',''),('application_timezone','UTC'),('application_url',''),('board_columns',''),('board_highlight_period','172800'),('board_private_refresh_interval','10'),('board_public_refresh_interval','60'),('calendar_project_tasks','date_started'),('calendar_user_subtasks_time_tracking','0'),('calendar_user_tasks','date_started'),('cfd_include_closed_tasks','1'),('default_color','yellow'),('integration_gravatar','0'),('project_categories',''),('subtask_restriction','0'),('subtask_time_tracking','1'),('webhook_token','280c9d5ea16323d0edb1bbf9409ffbc7c23bfd65ae0a1a00fe7236d11536'),('webhook_url','');
+INSERT INTO `settings` VALUES ('api_token','a5ee9b5e8a97d1da2b725d5f3d66caec8b5fe195968c33f8081badd17c35'),('application_currency','USD'),('application_date_format','m/d/Y'),('application_language','en_US'),('application_stylesheet',''),('application_timezone','UTC'),('application_url',''),('board_columns',''),('board_highlight_period','172800'),('board_private_refresh_interval','10'),('board_public_refresh_interval','60'),('calendar_project_tasks','date_started'),('calendar_user_subtasks_time_tracking','0'),('calendar_user_tasks','date_started'),('cfd_include_closed_tasks','1'),('default_color','yellow'),('integration_gravatar','0'),('project_categories',''),('subtask_restriction','0'),('subtask_time_tracking','1'),('webhook_token','bb74b2b3d79f562520d1f495b6c0c1f9ff1d996d1d60374fd67b47637239'),('webhook_url','');
/*!40000 ALTER TABLE `settings` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -610,4 +610,4 @@ UNLOCK TABLES;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-INSERT INTO users (username, password, is_admin) VALUES ('admin', '$2y$10$/kXBPSpWZHnF6potELbOmuih3XlwgWHQr7dAVDHpIo96wVB22OtkO', '1');INSERT INTO schema_version VALUES ('98');
+INSERT INTO users (username, password, role) VALUES ('admin', '$2y$10$EIYcgiDba33chGTqlP4cYeXSF7WC5RJPr8eMGsx.8gVT1Q4OUgkay', 'app-admin');INSERT INTO schema_version VALUES ('98');
diff --git a/app/Schema/Sql/postgres.sql b/app/Schema/Sql/postgres.sql
index 800b620b..bca9dd73 100644
--- a/app/Schema/Sql/postgres.sql
+++ b/app/Schema/Sql/postgres.sql
@@ -2001,7 +2001,8 @@ INSERT INTO settings (option, value) VALUES ('board_highlight_period', '172800')
INSERT INTO settings (option, value) VALUES ('board_public_refresh_interval', '60');
INSERT INTO settings (option, value) VALUES ('board_private_refresh_interval', '10');
INSERT INTO settings (option, value) VALUES ('board_columns', '');
-INSERT INTO settings (option, value) VALUES ('webhook_token', '2e3e9c804be85c221394727a142e6e45f1f3bfaa3ab85576d5d555ea661a');
+INSERT INTO settings (option, value) VALUES ('webhook_token', '686b427497298001641d9d300d53b0b23da6a4a2cc0ce17d24d346219fca');
+INSERT INTO settings (option, value) VALUES ('api_token', '3387e930ebe3984d59eac1fb07bb112916c846cfe2f01b513349c24fc045');
INSERT INTO settings (option, value) VALUES ('application_language', 'en_US');
INSERT INTO settings (option, value) VALUES ('application_timezone', 'UTC');
INSERT INTO settings (option, value) VALUES ('application_url', '');
@@ -2018,7 +2019,6 @@ INSERT INTO settings (option, value) VALUES ('webhook_url', '');
INSERT INTO settings (option, value) VALUES ('default_color', 'yellow');
INSERT INTO settings (option, value) VALUES ('subtask_time_tracking', '1');
INSERT INTO settings (option, value) VALUES ('cfd_include_closed_tasks', '1');
-INSERT INTO settings (option, value) VALUES ('api_token', '19ffd9709d03ce50675c3a43d1c49c1ac207f4bc45f06c5b2701fbdf8929');
--
@@ -2066,4 +2066,4 @@ SELECT pg_catalog.setval('links_id_seq', 11, true);
-- PostgreSQL database dump complete
--
-INSERT INTO users (username, password, is_admin) VALUES ('admin', '$2y$10$/kXBPSpWZHnF6potELbOmuih3XlwgWHQr7dAVDHpIo96wVB22OtkO', '1');INSERT INTO schema_version VALUES ('78');
+INSERT INTO users (username, password, role) VALUES ('admin', '$2y$10$EIYcgiDba33chGTqlP4cYeXSF7WC5RJPr8eMGsx.8gVT1Q4OUgkay', 'app-admin');INSERT INTO schema_version VALUES ('78');
generated by cgit v1.2.3 (git 2.46.0) at 2025-02-17 10:43:11 +0000