Skip to content

Commit d0fd28a

Browse files
committed
Merge branch 'develop' into bugfix/FOUR-30819
2 parents 809d566 + 9967e26 commit d0fd28a

5 files changed

Lines changed: 18 additions & 56 deletions

File tree

composer.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "processmaker/processmaker",
3-
"version": "2026.7.2",
3+
"version": "2026.7.3",
44
"description": "BPM PHP Software",
55
"keywords": [
66
"php bpm processmaker"
@@ -54,7 +54,6 @@
5454
"processmaker/docker-executor-php": "1.4.3",
5555
"processmaker/laravel-i18next": "dev-master",
5656
"processmaker/nayra": "1.12.4",
57-
"processmaker/package-accessibility": "1.0.1",
5857
"processmaker/pmql": "1.13.3",
5958
"promphp/prometheus_client_php": "^2.12",
6059
"psr/http-message": "^2.0",
@@ -114,7 +113,7 @@
114113
"Gmail"
115114
],
116115
"processmaker": {
117-
"build": "24a3d6bf",
116+
"build": "871804b1",
118117
"cicd-enabled": true,
119118
"custom": {
120119
"package-ellucian-ethos": "1.19.10",
@@ -125,7 +124,6 @@
125124
"package-pinnacle": "1.0.9",
126125
"package-esign": "dev-fall",
127126
"package-thermofisher": "dev-fall",
128-
"package-zj-adoa": "dev-fall",
129127
"pps-file-storage": "dev-fall",
130128
"package-csi": "dev-fall",
131129
"package-jxchange": "dev-fall",
@@ -142,13 +140,14 @@
142140
"package-zj-sonymusic": "dev-fall",
143141
"pm-platform": "dev-fall",
144142
"package-zj-nas": "dev-fall",
145-
"package-plg": "0.14.0",
143+
"package-plg": "0.16.11",
146144
"package-zj-birmingham": "dev-main",
147145
"package-tce": "dev-master",
148146
"package-case-overview": "dev-main",
149-
"package-sis-integration": "1.0.0"
147+
"package-sis-integration": "dev-develop"
150148
},
151149
"enterprise": {
150+
"package-accessibility": "1.0.1",
152151
"connector-docusign": "1.11.2",
153152
"connector-idp": "1.14.2",
154153
"connector-pdf-print": "1.23.3",
@@ -231,6 +230,10 @@
231230
{
232231
"type": "vcs",
233232
"url": "https://github.com/ProcessMaker/SocialiteProviders"
233+
},
234+
{
235+
"type": "vcs",
236+
"url": "https://github.com/ProcessMaker/docusign-esign-php-client.git"
234237
}
235238
],
236239
"config": {

composer.lock

Lines changed: 1 addition & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

database/migrations/2026_04_16_000000_add_updated_by_to_process_templates_table.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
return new class extends Migration {
99
public function up()
1010
{
11-
Schema::table('process_templates', function (Blueprint $table) {
12-
$table->unsignedInteger('updated_by')->nullable()->after('user_id');
13-
$table->foreign('updated_by')->references('id')->on('users')->onDelete('set null');
14-
});
11+
if (!Schema::hasColumn('process_templates', 'updated_by')) {
12+
Schema::table('process_templates', function (Blueprint $table) {
13+
$table->unsignedInteger('updated_by')->nullable()->after('user_id');
14+
});
15+
}
1516

1617
// Seed updated_by with the existing user_id value
1718
DB::table('process_templates')->update([
@@ -22,7 +23,6 @@ public function up()
2223
public function down()
2324
{
2425
Schema::table('process_templates', function (Blueprint $table) {
25-
$table->dropForeign(['updated_by']);
2626
$table->dropColumn('updated_by');
2727
});
2828
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@processmaker/processmaker",
3-
"version": "2026.7.2",
3+
"version": "2026.7.3",
44
"description": "ProcessMaker 4",
55
"author": "DevOps <devops@processmaker.com>",
66
"license": "ISC",

0 commit comments

Comments
 (0)