Commit Graph

1840 Commits

Author SHA1 Message Date
github-actions f3bf16a065 Merge branch '5' into 6.0 2023-09-27 12:39:01 +00:00
github-actions d1e322b74b Merge branch '5.15' into 5 2023-09-27 12:38:59 +00:00
Michal Kleiner f7d2d47f94
Merge pull request #1241 from hamaka/fix_translation_key
Fix typo in translation key
2023-09-21 06:03:20 +12:00
Bauke Zwaan a7625eb674 fix typo in translation key 2023-09-20 09:06:04 +02:00
Guy Sartorelli ca449db3da
Merge branch '5' into 6.0
# Conflicts:
#	tests/php/Model/SubmittedFileFieldTest.php
2023-09-18 10:51:19 +12:00
github-actions 830e539086 Merge branch '5.15' into 5 2023-09-06 12:38:49 +00:00
Sabina Talipova c8bf90c425
Merge pull request #1236 from creative-commoners/pulls/5.15/you-must-log-in
FIX Renable email link to submitted file
2023-09-06 11:10:17 +12:00
Steve Boyd f1510dca9e FIX Renable email link to submitted file 2023-09-06 10:54:20 +12:00
Guy Sartorelli 8330681a16
Merge pull request #1233 from creative-commoners/pulls/6.0/module-standardiser-1693279088
MNT Run module-standardiser
2023-08-29 17:12:12 +12:00
Steve Boyd 2b68b0e36b MNT Run module-standardiser 2023-08-29 15:18:08 +12:00
github-actions 0e66e78de7 Merge branch '5' into 6.0 2023-08-23 12:38:11 +00:00
github-actions 79dda2f34e Merge branch '5.15' into 5 2023-08-23 12:38:10 +00:00
Steve Boyd 127955197d Merge branch '5' into 6.0 2023-08-22 15:38:22 +12:00
Guy Sartorelli c0eb6d61e8
ENH Update translations (#1231) 2023-08-21 13:17:45 +12:00
Tyler Trout cf9a109d38
FIX Tighten routing rule for userforms ping action (#1224) 2023-08-17 18:28:29 +12:00
github-actions 1fb7c8ab83 Merge branch '5.15' into 5 2023-08-16 12:37:55 +00:00
Guy Sartorelli 60717e5c04
FIX Use absolute URL for submitted file links in emails (#1226) 2023-08-08 14:53:14 +12:00
Steve Boyd cd30814cba Merge branch '5' into 6.0 2023-06-16 12:12:29 +12:00
Steve Boyd 98cfb163dd Merge branch '5.15' into 5 2023-06-16 12:12:18 +12:00
Guy Sartorelli 495ca85ea4
Merge pull request #1216 from creative-commoners/pulls/5.15/tx-1686724920
ENH Update translations
2023-06-15 10:06:16 +12:00
Steve Boyd c562d138df ENH Update translations 2023-06-14 18:42:00 +12:00
Steve Boyd 3c7fb05cb4 Merge branch '5' into 6.0 2023-06-07 16:03:46 +12:00
Steve Boyd 94fe703b62 Merge branch '5.15' into 5 2023-06-07 15:41:02 +12:00
Steve Boyd 70052b2f89 Merge branch '5.14' into 5.15 2023-06-07 15:38:22 +12:00
Steve Boyd a06b3ca9cb Merge branch '5.13' into 5.14 2023-06-07 15:37:24 +12:00
Michal Kleiner 0dfd2990dd
Use window.ss.config provided adminUrl (#1211)
Co-authored-by: Michal Kleiner <michal.kleiner@cub3.com>
2023-06-07 15:27:20 +12:00
Steve Boyd 6f699d05da Merge branch '5.15' into 6.0 2023-06-01 16:05:11 +12:00
Sabina Talipova 3c836ebe0b
Merge pull request #1214 from creative-commoners/pulls/5.15/recursion-protection
FIX Prevent infinite recursion when field display rules are co-dependent
2023-06-01 15:31:01 +12:00
Steve Boyd bf49cab678 FIX Prevent infinite recursion when field display rules are co-dependent 2023-05-31 17:33:35 +12:00
Steve Boyd 8a40ba9254 Merge branch '5' into 6.0 2023-05-31 14:32:58 +12:00
Steve Boyd a5e5afcb8a Merge branch '5.15' into 5 2023-05-31 14:32:48 +12:00
Sabina Talipova f2a3b074ee
Merge pull request #1213 from creative-commoners/pulls/5.15/tx-1685417547
ENH Update translations
2023-05-31 11:29:22 +12:00
Steve Boyd 5e08252cfb Merge branch '5' into 6.0 2023-05-31 11:21:12 +12:00
Steve Boyd 1ccb587f6b Merge branch '5.15' into 5 2023-05-31 11:20:14 +12:00
Steve Boyd ae34301f6a ENH Update translations 2023-05-30 15:32:27 +12:00
Sabina Talipova 7af0009321
FIX Passing array to setReplyTo method instead of string (#1208) 2023-05-17 15:54:29 +12:00
Sabina Talipova 1001989a21
Merge pull request #1206 from lerni/translatable-submission-tab
Submission tab translatable
2023-04-28 10:56:53 +12:00
Guy Sartorelli 86f703ffbf
Merge branch '5' into 6.0 2023-04-27 14:29:45 +12:00
Lukas Erni 0b61d1a3bb not remove Submissions, use setTitle 2023-04-26 07:26:33 +02:00
Guy Sartorelli c57050e090
Merge branch '5.15' into 5 2023-04-26 12:46:51 +12:00
Sabina Talipova 82fb0d4ff5
Merge pull request #1204 from creative-commoners/pulls/6.0/cms5-readme
DOC Update README.md for CMS 5
2023-04-24 14:52:02 +12:00
Lukas Erni 0d7f7ed6d0 Submission tab translatable 2023-04-19 15:48:24 +02:00
Guy Sartorelli c021ac1bb6
DOC Update README.md for CMS 5 2023-04-19 16:27:53 +12:00
Maxime Rainville d651c12200
Merge pull request #1202 from creative-commoners/pulls/6.0/devjs
MNT Update dev JS
2023-04-03 15:32:41 +12:00
Steve Boyd 046527e65a MNT Update dev JS 2023-04-03 14:39:42 +12:00
Steve Boyd 2edc35ef50 Merge branch '5' into 6.0 2023-03-30 12:53:05 +13:00
Guy Sartorelli c58fd8e0e5
MNT Revert erroneous dependency changes (#1200) 2023-03-28 17:08:13 +13:00
Maxime Rainville d60b97a9eb
Merge pull request #1196 from creative-commoners/pulls/5/dispatch-ci
MNT Use gha-dispatch-ci
2023-03-23 14:19:30 +13:00
Steve Boyd 6ff2d0d8c2 MNT Use gha-dispatch-ci 2023-03-21 13:42:43 +13:00
Guy Sartorelli 118079df72
MNT Update development dependencies 2023-03-10 16:34:13 +13:00