conflit resolution

This commit is contained in:
Emile NDAGIJIMANA 2021-10-29 18:41:28 +02:00
parent 89a7bb8bc8
commit 344094ec18
12 changed files with 39957 additions and 4721 deletions

8764
CHANGELOG.md.orig Normal file

File diff suppressed because it is too large Load diff

13
Stackerfile.yml.orig Normal file
View file

@ -0,0 +1,13 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
<<<<<<< HEAD
appVersion: "v5.71.0"
=======
appVersion: "v5.69.0"
>>>>>>> 23d403f8... v5.69
files:
userUploads:
- README.md
userScripts:
build: stacksmith/user-scripts/build.sh
boot: stacksmith/user-scripts/boot.sh
run: stacksmith/user-scripts/run.sh

View file

@ -0,0 +1,28 @@
apiVersion: v2
<<<<<<< HEAD
appVersion: "5.71"
=======
appVersion: "5.69"
>>>>>>> 23d403f8... v5.69
dependencies:
- condition: mongodb.enabled
name: mongodb
repository: https://charts.bitnami.com/bitnami
version: 10.0.x
description: Open Source kanban
home: https://wekan.github.io
icon: https://wekan.github.io/wekan-logo.svg
keywords:
- kanban
maintainers:
- email: github@randall.cc
name: technotaff
- email: jiangyt.cn@gmail.com
name: jiangytcn
- email: varac@varac.net
name: varac
name: wekan
sources:
- https://github.com/wekan/wekan
type: application
version: 1.1.0

126
helm/wekan/values.yaml.orig Normal file
View file

@ -0,0 +1,126 @@
# ------------------------------------------------------------------------------
# Wekan:
# ------------------------------------------------------------------------------
## Define serviceAccount names to create or use. Defaults to component's fully
## qualified name.
##
serviceAccounts:
create: true
name: ""
annotations: ""
## Wekan image configuration
##
image:
repository: quay.io/wekan/wekan
<<<<<<< HEAD
tag: v5.71
=======
tag: v5.69
>>>>>>> 23d403f8... v5.69
pullPolicy: IfNotPresent
## Configuration for wekan component
##
replicaCount: 1
dbname: wekan
## Specify additional environmental variables for the Deployment
##
env:
- name: ""
value: ""
## Specify additional secret environmental variables for the
## Deployment. These can e.g. be provided by a Secret and allow
## to store passwords separately
##
secretEnv: {}
# - name: ""
# value: ""
service:
type: NodePort
port: 8080
annotations: {}
# prometheus.io/scrape: "true"
# prometheus.io/port: "8000"
# prometheus.io/path: "/_/monitoring/metrics"
## Comma-separated string of allowed virtual hosts for external access.
## This should match the ingress hosts
##
endpoint: wekan.local
ingress:
enabled: true
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
path: /*
# This must match 'endpoint', unless your client supports different
# hostnames.
hosts: [ wekan.local ]
# - wekan.local
tls: []
# - secretName: wekan-example-tls
# hosts:
# - wekan-example.local
route:
enabled: false
resources:
requests:
memory: 128Mi
cpu: 300m
limits:
memory: 1Gi
cpu: 500m
## Node labels for pod assignment
## ref: https://kubernetes.io/docs/user-guide/node-selection/
##
nodeSelector: {}
## Tolerations for pod assignment
## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
##
tolerations: []
## Affinity for pod assignment
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
##
affinity: {}
## Configure an horizontal pod autoscaler
##
autoscaling:
enabled: true
config:
minReplicas: 1
maxReplicas: 16
## Note: when setting this, a `resources.request.cpu` is required. You
## likely want to set it to `1` or some lower value.
##
targetCPUUtilizationPercentage: 80
# Optional custom labels for the deployment resource.
deploymentLabels: {}
# Optional custom labels for the pods created by the deployment.
podLabels: {}
# ------------------------------------------------------------------------------
# MongoDB:
# ------------------------------------------------------------------------------
mongodb:
enabled: true
architecture: replicaset
replicaCount: 3
replicaSetName: rs0
auth:
enabled: false

4697
package-lock.json generated

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

56
package.json.orig Normal file
View file

@ -0,0 +1,56 @@
{
"name": "wekan",
<<<<<<< HEAD
"version": "v5.71.0",
=======
"version": "v5.69.0",
>>>>>>> 23d403f8... v5.69
"description": "Open-Source kanban",
"private": true,
"repository": {
"type": "git",
"url": "git+https://github.com/wekan/wekan.git"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/wekan/wekan/issues"
},
"homepage": "https://wekan.github.io",
"devDependencies": {
"babel-plugin-istanbul": "^6.1.1",
"chai": "^4.3.4",
"flatted": "^3.2.2",
"puppeteer": "^10.2.0",
"sinon": "^11.1.2"
},
"dependencies": {
"@babel/core": "^7.15.0",
"@babel/runtime": "^7.15.3",
"@wekanteam/markdown-it-mermaid": "^0.5.0",
"ajv": "^6.12.6",
"babel-runtime": "^6.26.0",
"bcryptjs": "^2.4.3",
"bson": "^4.4.1",
"bunyan": "^1.8.15",
"core-js": "^2.6.12",
"dompurify": "^2.3.0",
"es6-promise": "^4.2.4",
"exceljs": "^4.2.1",
"fibers": "^5.0.0",
"gridfs-stream": "https://github.com/wekan/gridfs-stream/tarball/master",
"jszip": "^3.7.1",
"ldapjs": "^2.3.1",
"markdown-it": "^12.2.0",
"markdown-it-emoji": "^2.0.0",
"meteor-node-stubs": "^1.1.0",
"mongodb": "^3.6.11",
"os": "^0.1.2",
"page": "^1.11.5",
"papaparse": "^5.3.1",
"qs": "^6.10.1",
"source-map-support": "^0.5.19"
},
"meteor": {
"testModule": "tests/main.js"
}
}

View file

@ -1555,7 +1555,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.71">Wekan REST API v5.71</a>
<a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.68">Wekan REST API v5.68</a>
</li>
@ -2128,7 +2128,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.71</h1>
<h1 id="wekan-rest-api">Wekan REST API v5.68</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>

21694
public/api/wekan.html.orig Normal file

File diff suppressed because one or more lines are too long

4097
public/api/wekan.yml.orig Normal file

File diff suppressed because it is too large Load diff

274
sandstorm-pkgdef.capnp.orig Normal file
View file

@ -0,0 +1,274 @@
# Use use the meteor-spk tool to generate a sandstorm package (spk) from this
# meteor application source code. https://github.com/sandstorm-io/meteor-spk
@0xa5275bd3ad124e12;
using Spk = import "/sandstorm/package.capnp";
# This imports:
# $SANDSTORM_HOME/latest/usr/include/sandstorm/package.capnp
# Check out that file to see the full, documented package definition format.
const pkgdef :Spk.PackageDefinition = (
# The package definition. Note that the spk tool looks specifically for the
# "pkgdef" constant.
id = "m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h",
# The app ID is actually its public key. The private key was placed in your
# keyring. All updates must be signed with the same key.
manifest = (
# This manifest is included in our app package to tell Sandstorm about our
# app.
appTitle = (defaultText = "Wekan"),
# The name of the app as it is displayed to the user.
<<<<<<< HEAD
appVersion = 571,
# Increment this for every release.
appMarketingVersion = (defaultText = "5.71.0~2021-10-29"),
=======
appVersion = 569,
# Increment this for every release.
appMarketingVersion = (defaultText = "5.69.0~2021-10-28"),
>>>>>>> 23d403f8... v5.69
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
# The minimum version of the app which can be safely replaced by this app
# package without data loss. This might be non-zero if the app's data store
# format changed drastically in the past and the app is no longer able to
# read the old format.
actions = [
# Define your "new document" handlers here.
(
title = (defaultText = "New board"),
command = .myCommand,
# The command to run when starting for the first time. (".myCommand" is
# just a constant defined at the bottom of the file.)
)
],
continueCommand = .myCommand,
# This is the command called to start your app back up after it has been
# shut down for inactivity. Here we're using the same command as for
# starting a new instance, but you could use different commands for each
# case.
metadata = (
icons = (
appGrid = (svg = embed "meta/icons/wekan-128.svg"),
grain = (svg = embed "meta/icons/wekan-24.svg"),
market = (svg = embed "meta/icons/wekan-150.svg"),
),
website = "https://wekan.github.io",
codeUrl = "https://github.com/wekan/wekan",
license = (openSource = mit),
categories = [productivity, office],
author = (
contactEmail = "x@xet7.org",
pgpSignature = embed "meta/wekanteam-pgp-sig",
),
pgpKeyring = embed "meta/keyring",
description = (defaultText = embed "meta/description.md"),
shortDescription = (defaultText = "Kanban board"),
screenshots = [
(
width = 1920,
height = 1133,
png = embed "meta/screenshots/board_view_01.png"
),
(
width = 1920,
height = 1133,
png = embed "meta/screenshots/board_view_02.png"
),
],
changeLog = (
defaultText = embed "CHANGELOG.md",
localizations = [
(locale = "fr", text = embed "meta/t9n-changelog/fr.md"),
(locale = "fi", text = embed "meta/t9n-changelog/fi.md"),
],
)
)
),
sourceMap = (
# The following directories will be copied into your package.
searchPath = [
(sourcePath = ".meteor-spk/deps"),
(sourcePath = ".meteor-spk/bundle"),
]
),
alwaysInclude = [ "." ],
# This says that we always want to include all files from the source map. (An
# alternative is to automatically detect dependencies by watching what the app
# opens while running in dev mode. To see what that looks like, run `spk init`
# without the -A option.)
bridgeConfig = (
viewInfo = (
permissions = [(
name = "participate",
title = (
defaultText = "participate",
localizations = [
(locale = "fr", text = "participer"),
(locale = "fi", text = "osallistu"),
],
),
description = (
defaultText = "allows participating in the board",
localizations = [
(locale = "fr", text = "permet de participer dans le tableau"),
(locale = "fi", text = "mahdollistaa taululle osallistumisen"),
],
)
), (
name = "configure",
title = (
defaultText = "configure",
localizations = [
(locale = "fr", text = "configurer"),
(locale = "fi", text = "asetukset"),
],
),
description = (
defaultText = "allows configuring the board",
localizations = [
(locale = "fr", text = "permet de configurer le tableau"),
(locale = "fi", text = "mahdollistaa taulun asetusten määrittämisen"),
],
)
)],
roles = [(
title = (
defaultText = "observer",
localizations = [
(locale = "fr", text = "observateur"),
(locale = "fi", text = "tarkkailija"),
],
),
permissions = [false, false],
verbPhrase = (
defaultText = "can read",
localizations = [
(locale = "fr", text = "peut lire"),
(locale = "fi", text = "voi lukea"),
],
)
), (
title = (
defaultText = "member",
localizations = [
(locale = "fr", text = "membre"),
(locale = "fi", text = "jäsen"),
],
),
permissions = [true, false],
verbPhrase = (
defaultText = "can edit",
localizations = [
(locale = "fr", text = "peut éditer"),
(locale = "fi", text = "voi muokata"),
],
),
default = true,
# ), (
# title = (defaultText = "administrator"),
# permissions = [true, true],
# verbPhrase = (defaultText = "can configure")
#
# XXX Administrators configuration options arent implemented yet, so this
# role is currently useless.
)],
eventTypes = [(
name = "addBoardMember",
verbPhrase = (defaultText = "added to board"),
), (
name = "createList",
verbPhrase = (defaultText = "created new list"),
), (
name = "archivedList",
verbPhrase = (defaultText = "archived list"),
), (
name = "restoredList",
verbPhrase = (defaultText = "restored list"),
), (
name = "createCard",
verbPhrase = (defaultText = "created new card"),
), (
name = "moveCard",
verbPhrase = (defaultText = "moved card"),
), (
name = "archivedCard",
verbPhrase = (defaultText = "archived card"),
), (
name = "restoredCard",
verbPhrase = (defaultText = "restored card"),
), (
name = "addComment",
verbPhrase = (defaultText = "added comment"),
), (
name = "addAttachement",
verbPhrase = (defaultText = "added attachment"),
), (
name = "joinMember",
verbPhrase = (defaultText = "added to card"),
), (
name = "unjoinMember",
verbPhrase = (defaultText = "removed from card"),
), ],
),
apiPath = "/",
saveIdentityCaps = true,
),
);
const myCommand :Spk.Manifest.Command = (
# Here we define the command used to start up your server.
argv = ["/sandstorm-http-bridge", "4000", "--", "node", "start.js"],
environ = [
# Note that this defines the *entire* environment seen by your app.
(key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
(key = "RESULTS_PER_PAGE", value = ""),
(key = "WITH_API", value = "true"),
(key = "RICHER_CARD_COMMENT_EDITOR", value="false"),
(key = "CARD_OPENED_WEBHOOK_ENABLED", value="false"),
(key = "NOTIFICATION_TRAY_AFTER_READ_DAYS_BEFORE_REMOVE", value=""),
(key = "BIGEVENTS_PATTERN", value="NONE"),
(key = "MATOMO_ADDRESS", value=""),
(key = "MATOMO_SITE_ID", value=""),
(key = "MATOMO_DO_NOT_TRACK", value="true"),
(key = "MATOMO_WITH_USERNAME", value="false"),
(key = "BROWSER_POLICY_ENABLED", value="true"),
(key = "TRUSTED_URL", value=""),
(key = "WEBHOOKS_ATTRIBUTES", value=""),
(key = "OAUTH2_ENABLED", value="false"),
(key = "OAUTH2_CA_CERT", value=""),
(key = "OAUTH2_ADFS_ENABLED", value="false"),
(key = "OAUTH2_CLIENT_ID", value="false"),
(key = "OAUTH2_SECRET", value=""),
(key = "OAUTH2_SERVER_URL", value=""),
(key = "OAUTH2_AUTH_ENDPOINT", value=""),
(key = "OAUTH2_USERINFO_ENDPOINT", value=""),
(key = "OAUTH2_TOKEN_ENDPOINT", value=""),
(key = "LDAP_ENABLE", value="false"),
(key = "PASSWORD_LOGIN_ENABLED", value="true"),
(key = "SANDSTORM", value="1"),
(key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}")
]
);

185
snapcraft.yaml.orig Normal file
View file

@ -0,0 +1,185 @@
name: wekan
<<<<<<< HEAD
version: '5.71'
=======
version: '5.69'
>>>>>>> 23d403f8... v5.69
summary: Open Source kanban
description: |
WeKan ® is an Open Source and collaborative kanban board application.
Whether youre maintaining a personal todo list, planning your holidays with some friends, or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool to keep your things organized. They give you a visual overview of the current state of your project, and make you productive by allowing you to focus on the few items that matter the most.
Depending on target environment, some configuration settings might need to be adjusted.
For full list of configuration options call:
$ wekan.help
confinement: strict
grade: stable
architectures:
- amd64
plugs:
mongodb-plug:
interface: content
target: $SNAP_DATA/shared
hooks:
configure:
plugs:
- network
- network-bind
slots:
mongodb-slot:
interface: content
write:
- $SNAP_DATA/share
apps:
wekan:
command: wekan-control
daemon: simple
plugs: [network, network-bind]
mongodb:
command: mongodb-control
daemon: simple
plugs: [network, network-bind]
caddy:
command: caddy-control
daemon: simple
plugs: [network, network-bind]
help:
command: wekan-help
database-backup:
command: mongodb-backup
plugs: [network, network-bind]
database-list-backups:
command: ls -al $SNAP_COMMON/db-backups/
database-restore:
command: mongodb-restore
plugs: [network, network-bind]
parts:
mongodb:
source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz
plugin: dump
stage-packages: [libssl1.0.0]
filesets:
mongo:
- usr
- bin
- lib
stage:
- $mongo
prime:
- $mongo
wekan:
source: .
plugin: nodejs
node-engine: 12.22.7
node-packages:
- node-gyp
- node-pre-gyp
- fibers
build-packages:
- ca-certificates
- apt-utils
- python
# - python3
- g++
- capnproto
- curl
- execstack
- nodejs
- npm
# - p7zip-full
stage-packages:
- libfontconfig1
override-build: |
echo "Cleaning environment first"
rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
rm -rf .build
echo "Installing meteor"
curl https://install.meteor.com/ -o install_meteor.sh
chmod +x install_meteor.sh
sh install_meteor.sh
rm install_meteor.sh
rm -rf .build
chmod u+w *.json
npm install
meteor build .build --directory --allow-superuser
# Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
rm -rf .build/bundle/programs/web.browser.legacy
# Change to directory .build/bundle/programs/server
cd .build/bundle/programs/server
chmod u+w *.json
npm install
cd ../../../..
# Cleanup
cd .build/bundle
find . -type d -name '*-garbage*' | xargs rm -rf
find . -name '*phantom*' | xargs rm -rf
find . -name '.*.swp' | xargs rm -f
find . -name '*.swp' | xargs rm -f
cd ../..
# Add fibers multi arch
#cd .build/bundle/programs/server/node_modules/fibers/bin
#curl https://releases.wekan.team/fibers-multi.7z -o fibers-multi.7z
#7z x fibers-multi.7z
#rm fibers-multi.7z
#cd ../../../../../../..
# Copy to Snap
cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/
rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan
#rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
# Delete phantomjs that is in accounts-lockout
#rm -rf $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/lucasantoniassi_accounts-lockout/node_modules/phantomjs-prebuilt
# Delete temporary files
#rm -f $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/tar/lib/.mkdir.js.swp
#rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp
#rm -f $SNAPCRAFT_PART_INSTALL/lib/node_modules/node-gyp/node_modules/tar/lib/.mkdir.js.swp
# Meteor 1.8.x additional .swp remove
#rm -f $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/node-pre-gyp/node_modules/tar/lib/.mkdir.js.swp
# Delete fibers for other archs
#rm -rf $SNAPCRAFT_PART_INSTALL/programs/server/node_modules/fibers/bin/linux-ia32*
# ostrio tmp remove
#rm -rf $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/ostrio_files/node_modules/request-libcurl/.node_modules-garbage*
organize:
README: README.wekan
prime:
- -lib/node_modules/node-pre-gyp/node_modules/tar/lib/.unpack.js.swp
- -lib/node_modules/weka*
helpers:
source: snap-src
plugin: dump
caddy:
plugin: dump
## Caddy v1 is not developed anymore. TODO: Sometime migrate to Caddy v2.
## https://caddy.community/t/caddyfile-v1-adapter/9129
## https://github.com/caddyserver/caddy/tree/v1
#source: https://caddyserver.com/download/linux/amd64?license=personal&telemetry=off
#source-type: tar
# Using last working binary that was downloaded from above URL to Wekan Snap,
# and .txt files from https://github.com/caddyserver/caddy/tree/v1/dist
source: https://releases.wekan.team/caddy/caddy-v1-linux-amd64.7z
source-type: 7z
organize:
caddy: bin/caddy
CHANGES.txt: CADDY_CHANGES.txt
EULA.txt: CADDY_EULA.txt
LICENSES.txt: CADDY_LICENSES.txt
README.txt: CADDY_README.txt
stage:
- -init