소스 검색

Merge branch 'master' of https://github.com/wekan/wekan into search

John Supplee 4 년 전
부모
커밋
2930e9cadb
9개의 변경된 파일22개의 추가작업 그리고 13개의 파일을 삭제
  1. 9 0
      CHANGELOG.md
  2. 1 1
      Stackerfile.yml
  3. 4 4
      i18n/pt-BR.i18n.json
  4. 1 1
      models/activities.js
  5. 1 1
      package-lock.json
  6. 1 1
      package.json
  7. 2 2
      public/api/wekan.html
  8. 1 1
      public/api/wekan.yml
  9. 2 2
      sandstorm-pkgdef.capnp

+ 9 - 0
CHANGELOG.md

@@ -1,3 +1,12 @@
+# v5.01 2021-02-26 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix typo in activities code](https://github.com/wekan/wekan/pull/3610).
+  Thanks to n8ores.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v5.00 2021-02-25 Wekan release
 
 This release fixes the following bugs:

+ 1 - 1
Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v5.00.0"
+appVersion: "v5.01.0"
 files:
   userUploads:
     - README.md

+ 4 - 4
i18n/pt-BR.i18n.json

@@ -926,7 +926,7 @@
   "operator-number-expected": "operador __operator__ esperava um número, obteve '__value__'",
   "operator-sort-invalid": "ordenar de '%s' é inválido",
   "operator-status-invalid": "'%s' não é um status válido",
-  "operator-has-invalid": "%s is not a valid existence check",
+  "operator-has-invalid": "%s não é uma verificação de existência válida",
   "next-page": "Próxima página",
   "previous-page": "Página anterior",
   "heading-notes": "Notas",
@@ -949,9 +949,9 @@
   "globalSearch-instructions-status-archived": "`__operator_status__:__predicate_archived__` - cartões que estão arquivados.",
   "globalSearch-instructions-status-all": "`__operator_status__:__predicate_all__` - todos os cartões arquivados e não arquivados.",
   "globalSearch-instructions-status-ended": "`__operator_status__:__predicate_ended__` - cartões com uma data de conclusão.",
-  "globalSearch-instructions-status-public": "`__operator_status__:__predicate_public__` - cards only in public boards.",
-  "globalSearch-instructions-status-private": "`__operator_status__:__predicate_private__` - cards only in private boards.",
-  "globalSearch-instructions-operator-has": "`__operator_has__:field` - where *field* is one of `__predicate_attachment__`, `__predicate_checklist__` or `__predicate_description__`",
+  "globalSearch-instructions-status-public": "`__operator_status__:__predicate_public__` - cartões apenas em quadros públicos.",
+  "globalSearch-instructions-status-private": "`__operator_status__:__predicate_private__` - cartões apenas em quadros privados.",
+  "globalSearch-instructions-operator-has": "`__operator_has__:field` - onde *campo* é um dos `__predicate_attachment__`, `__predicate_checklist__` ou `__predicate_description__`",
   "globalSearch-instructions-notes-1": "Operadores múltiplos podem ser especificados",
   "globalSearch-instructions-notes-2": "Operadores similares são *OR*, ou seja, do tipo \"Ou\". Cartões que correspondam a qualquer uma das condições será retornado.\n`__operator_list__:Available __operator_list__:Blocked` poderá retornar cartões que contém uma lista chamada *Blocked* or *Available*.",
   "globalSearch-instructions-notes-3": "Operadores de diferenciação são *AND*, ou seja, to tipo \"E. Apenas cartões que correspondam a todos os operadores de diferenciação são retornados.  `__operator_list__:Available __operator_label__:red` retorna apenas os cartões na lista *Available* com uma etiqueta *red*.",

+ 1 - 1
models/activities.js

@@ -250,7 +250,7 @@ if (Meteor.isServer) {
         if (customField.name) {
           params.customField = customField.name;
         }
-        if (actitivy.value) {
+        if (activity.value) {
           params.customFieldValue = activity.value;
         }
       }

+ 1 - 1
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.00.0",
+  "version": "v5.01.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.00.0",
+  "version": "v5.01.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

+ 2 - 2
public/api/wekan.html

@@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.00">Wekan REST API v5.00</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.01">Wekan REST API v5.01</a>
             
           </li>
         
@@ -2047,7 +2047,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v5.00</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v5.01</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

+ 1 - 1
public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v5.00
+  version: v5.01
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

+ 2 - 2
sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 500,
+    appVersion = 501,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "5.00.0~2021-02-25"),
+    appMarketingVersion = (defaultText = "5.01.0~2021-02-26"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,