2
0
Lauri Ojansivu 4 жил өмнө
parent
commit
d08b208bc6

+ 1 - 1
CHANGELOG.md

@@ -1,6 +1,6 @@
 [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac)
 
-# Upcoming Wekan release
+# v5.33 2021-06-10 Wekan release
 
 This release adds the following new features:
 

+ 1 - 1
Stackerfile.yml

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

+ 1 - 1
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.32.0",
+  "version": "v5.33.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.32.0",
+  "version": "v5.33.0",
   "description": "Open-Source kanban",
   "private": true,
   "repository": {

+ 149 - 18
public/api/wekan.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v5.32</title>
+    <title>Wekan REST API v5.33</title>
 
     <style>
     </style>
@@ -1488,6 +1488,8 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
+<!-- backwards compatibility -->
+<!-- backwards compatibility -->
 <!-- backwards compatibility -->
   </head>
 
@@ -1551,7 +1553,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.32">Wekan REST API v5.32</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.33">Wekan REST API v5.33</a>
             
           </li>
         
@@ -2079,6 +2081,16 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
                     
                   </li>
                 
+                  <li>
+                    <a href="#tocs_usersorgs" class="toc-h2 toc-link" data-title="">UsersOrgs</a>
+                    
+                  </li>
+                
+                  <li>
+                    <a href="#tocs_usersteams" class="toc-h2 toc-link" data-title="">UsersTeams</a>
+                    
+                  </li>
+                
                   <li>
                     <a href="#tocs_usersemails" class="toc-h2 toc-link" data-title="">UsersEmails</a>
                     
@@ -2104,7 +2116,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.32</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v5.33</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>
@@ -15959,6 +15971,18 @@ System.out.println(response.toString());
 </blockquote>
 <pre class="highlight tab tab-json"><code>{
   <span class="hljs-attr">&quot;username&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;orgs&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;orgId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;orgDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+    }
+  ],
+  <span class="hljs-attr">&quot;teams&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;teamId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;teamDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+    }
+  ],
   <span class="hljs-attr">&quot;emails&quot;</span>: [
     {
       <span class="hljs-attr">&quot;address&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
@@ -16008,8 +16032,7 @@ System.out.println(response.toString());
   <span class="hljs-attr">&quot;loginDisabled&quot;</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">&quot;authenticationMethod&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
   <span class="hljs-attr">&quot;sessionData&quot;</span>: {
-    <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>,
-    <span class="hljs-attr">&quot;lastHit&quot;</span>: <span class="hljs-number">0</span>
+    <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>
   },
   <span class="hljs-attr">&quot;importUsernames&quot;</span>: [
     <span class="hljs-string">&quot;string&quot;</span>
@@ -16700,6 +16723,18 @@ System.out.println(response.toString());
 </blockquote>
 <pre class="highlight tab tab-json"><code>{
   <span class="hljs-attr">&quot;username&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;orgs&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;orgId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;orgDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+    }
+  ],
+  <span class="hljs-attr">&quot;teams&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;teamId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;teamDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+    }
+  ],
   <span class="hljs-attr">&quot;emails&quot;</span>: [
     {
       <span class="hljs-attr">&quot;address&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
@@ -16749,8 +16784,7 @@ System.out.println(response.toString());
   <span class="hljs-attr">&quot;loginDisabled&quot;</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">&quot;authenticationMethod&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
   <span class="hljs-attr">&quot;sessionData&quot;</span>: {
-    <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>,
-    <span class="hljs-attr">&quot;lastHit&quot;</span>: <span class="hljs-number">0</span>
+    <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>
   },
   <span class="hljs-attr">&quot;importUsernames&quot;</span>: [
     <span class="hljs-string">&quot;string&quot;</span>
@@ -20712,6 +20746,18 @@ UserSecurity
 <a id="tocsusers"></a></p>
 <pre class="highlight tab tab-json"><code>{
   <span class="hljs-attr">&quot;username&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;orgs&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;orgId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;orgDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+    }
+  ],
+  <span class="hljs-attr">&quot;teams&quot;</span>: [
+    {
+      <span class="hljs-attr">&quot;teamId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+      <span class="hljs-attr">&quot;teamDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+    }
+  ],
   <span class="hljs-attr">&quot;emails&quot;</span>: [
     {
       <span class="hljs-attr">&quot;address&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
@@ -20761,8 +20807,7 @@ UserSecurity
   <span class="hljs-attr">&quot;loginDisabled&quot;</span>: <span class="hljs-literal">true</span>,
   <span class="hljs-attr">&quot;authenticationMethod&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
   <span class="hljs-attr">&quot;sessionData&quot;</span>: {
-    <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>,
-    <span class="hljs-attr">&quot;lastHit&quot;</span>: <span class="hljs-number">0</span>
+    <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>
   },
   <span class="hljs-attr">&quot;importUsernames&quot;</span>: [
     <span class="hljs-string">&quot;string&quot;</span>
@@ -20791,6 +20836,20 @@ UserSecurity
 <td>the username of the user</td>
 </tr>
 <tr>
+<td>orgs</td>
+<td>[<a href="#schemausersorgs">UsersOrgs</a>]¦null</td>
+<td>false</td>
+<td>none</td>
+<td>the list of organizations that a user belongs to</td>
+</tr>
+<tr>
+<td>teams</td>
+<td>[<a href="#schemausersteams">UsersTeams</a>]¦null</td>
+<td>false</td>
+<td>none</td>
+<td>the list of teams that a user belongs to</td>
+</tr>
+<tr>
 <td>emails</td>
 <td>[<a href="#schemausersemails">UsersEmails</a>]¦null</td>
 <td>false</td>
@@ -21131,8 +21190,7 @@ UserSecurity
 <a id="tocSuserssessiondata"></a>
 <a id="tocsuserssessiondata"></a></p>
 <pre class="highlight tab tab-json"><code>{
-  <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>,
-  <span class="hljs-attr">&quot;lastHit&quot;</span>: <span class="hljs-number">0</span>
+  <span class="hljs-attr">&quot;totalHits&quot;</span>: <span class="hljs-number">0</span>
 }
 
 </code></pre>
@@ -21153,14 +21211,85 @@ UserSecurity
 <td>number</td>
 <td>false</td>
 <td>none</td>
-<td>Total hits from last search</td>
+<td>Total hits from last searchquery['members.userId'] = Meteor.userId();<br />last hit that was returned</td>
 </tr>
+</tbody>
+</table>
+<h2 id="tocs_usersorgs">UsersOrgs</h2>
+<p><a id="schemausersorgs"></a>
+<a id="schema_UsersOrgs"></a>
+<a id="tocSusersorgs"></a>
+<a id="tocsusersorgs"></a></p>
+<pre class="highlight tab tab-json"><code>{
+  <span class="hljs-attr">&quot;orgId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;orgDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+}
+
+</code></pre>
+<h3 id="properties-21">Properties</h3>
+<table>
+<thead>
 <tr>
-<td>lastHit</td>
-<td>number</td>
-<td>false</td>
+<th>Name</th>
+<th>Type</th>
+<th>Required</th>
+<th>Restrictions</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>orgId</td>
+<td>string</td>
+<td>true</td>
+<td>none</td>
+<td>The uniq ID of the organization</td>
+</tr>
+<tr>
+<td>orgDisplayName</td>
+<td>string</td>
+<td>true</td>
 <td>none</td>
-<td>last hit that was returned</td>
+<td>The display name of the organization</td>
+</tr>
+</tbody>
+</table>
+<h2 id="tocs_usersteams">UsersTeams</h2>
+<p><a id="schemausersteams"></a>
+<a id="schema_UsersTeams"></a>
+<a id="tocSusersteams"></a>
+<a id="tocsusersteams"></a></p>
+<pre class="highlight tab tab-json"><code>{
+  <span class="hljs-attr">&quot;teamId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
+  <span class="hljs-attr">&quot;teamDisplayName&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>
+}
+
+</code></pre>
+<h3 id="properties-22">Properties</h3>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Type</th>
+<th>Required</th>
+<th>Restrictions</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>teamId</td>
+<td>string</td>
+<td>true</td>
+<td>none</td>
+<td>The uniq ID of the team</td>
+</tr>
+<tr>
+<td>teamDisplayName</td>
+<td>string</td>
+<td>true</td>
+<td>none</td>
+<td>The display name of the team</td>
 </tr>
 </tbody>
 </table>
@@ -21175,7 +21304,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-21">Properties</h3>
+<h3 id="properties-23">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21214,7 +21343,7 @@ UserSecurity
 }
 
 </code></pre>
-<h3 id="properties-22">Properties</h3>
+<h3 id="properties-24">Properties</h3>
 <table>
 <thead>
 <tr>
@@ -21265,6 +21394,8 @@ UserSecurity
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
 <!-- backwards compatibility -->
+<!-- backwards compatibility -->
+<!-- backwards compatibility -->
 <!-- backwards compatibility -->
       </div>
       <div class="dark-box">

+ 44 - 5
public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v5.32
+  version: v5.33
   description: |
     The REST API allows you to control and extend Wekan with ease.
 
@@ -3738,6 +3738,20 @@ definitions:
            the username of the user
         type: string
         x-nullable: true
+      orgs:
+        description: |
+           the list of organizations that a user belongs to
+        type: array
+        items:
+          $ref: "#/definitions/UsersOrgs"
+        x-nullable: true
+      teams:
+        description: |
+           the list of teams that a user belongs to
+        type: array
+        items:
+          $ref: "#/definitions/UsersTeams"
+        x-nullable: true
       emails:
         description: |
            the list of emails attached to a user
@@ -3921,12 +3935,37 @@ definitions:
     properties:
       totalHits:
         description: |
-           Total hits from last search
-        type: number
-      lastHit:
-        description: |
+           Total hits from last searchquery['members.userId'] = Meteor.userId();
            last hit that was returned
         type: number
+  UsersOrgs:
+    type: object
+    properties:
+      orgId:
+        description: |
+           The uniq ID of the organization
+        type: string
+      orgDisplayName:
+        description: |
+           The display name of the organization
+        type: string
+    required:
+      - orgId
+      - orgDisplayName
+  UsersTeams:
+    type: object
+    properties:
+      teamId:
+        description: |
+           The uniq ID of the team
+        type: string
+      teamDisplayName:
+        description: |
+           The display name of the team
+        type: string
+    required:
+      - teamId
+      - teamDisplayName
   UsersEmails:
     type: object
     properties:

+ 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 = 532,
+    appVersion = 533,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "5.32.0~2021-06-09"),
+    appMarketingVersion = (defaultText = "5.33.0~2021-06-10"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

+ 1 - 1
snapcraft.yaml

@@ -1,5 +1,5 @@
 name: wekan
-version: '5.32'
+version: '5.33'
 summary: The open-source kanban
 description: |
    Wekan is an open-source and collaborative kanban board application.