Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into feature/CONNEC…
Browse files Browse the repository at this point in the history
…TOR-136/up-download-endpoints
  • Loading branch information
WilcoLouwerse committed Dec 16, 2024
2 parents c9efb3f + 772fe63 commit 493cf50
Show file tree
Hide file tree
Showing 38 changed files with 1,835 additions and 303 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/pull-request-from-branch-check.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: Main Branch Protection

on:
pull_request:
branches:
- main
#on:
# pull_request:
# branches:
# - main

jobs:
check-branch:
runs-on: ubuntu-latest
steps:
- name: Check branch
run: |
if [[ ${GITHUB_HEAD_REF} != development ]] && [[ ${GITHUB_HEAD_REF} != documentation ]] && ! [[ ${GITHUB_HEAD_REF} =~ ^hotfix/ ]];
then
echo "Error: Pull request must come from 'development', 'documentation' or 'hotfix/' branch"
exit 1
fi
#jobs:
# check-branch:
# runs-on: ubuntu-latest
# steps:
# - name: Check branch
# run: |
# if [[ ${GITHUB_HEAD_REF} != development ]] && [[ ${GITHUB_HEAD_REF} != documentation ]] && ! [[ ${GITHUB_HEAD_REF} =~ ^hotfix/ ]];
# then
# echo "Error: Pull request must come from 'development', 'documentation' or 'hotfix/' branch"
# exit 1
# fi
10 changes: 7 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
The OpenConnector Nextcloud app provides a ESB-framework to work together in an (open) data ecosystem
- 📲 Synchronize your data sources
- 📲 Synchronize your data sources
- 📰 Send cloud events
- 🆓 Map and translate API calls
]]></description>
<version>0.1.16</version>
<version>0.1.26</version>
<licence>agpl</licence>
<category>integration</category>
<author mail="[email protected]" homepage="https://www.conduction.nl/">Conduction</author>
Expand All @@ -27,12 +27,16 @@ The OpenConnector Nextcloud app provides a ESB-framework to work together in an
<database min-version="10">pgsql</database>
<database>sqlite</database>
<database min-version="8.0">mysql</database>

<lib>curl</lib>

<owncloud max-version="0" min-version="0"/>
</dependencies>

<background-jobs>
<job>OCA\OpenConnector\Cron\LogCleanUpTask</job>
</background-jobs>

<navigations>
<navigation>
<id>openconnector</id>
Expand Down
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"bamarni/composer-bin-plugin": "^1.8",
"elasticsearch/elasticsearch": "^v8.14.0",
"guzzlehttp/guzzle": "^7.0",
"jwadhams/json-logic-php": "^1.5",
"symfony/console": "^5.4",
"symfony/uid": "^6.4",
"symfony/yaml": "^6.4",
"twig/twig": "^3.14",
Expand Down
Loading

0 comments on commit 493cf50

Please sign in to comment.