Commit Graph

1863 Commits

Author SHA1 Message Date
github-actions
0a33a7e5df DEP Update JS dependencies 2023-10-01 01:36:44 +00:00
github-actions
2143c59c1d Merge branch '6.1' into 6 2023-09-27 12:39:05 +00:00
github-actions
071fba1b25 Merge branch '6.0' into 6.1 2023-09-27 12:39:03 +00:00
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
github-actions
da62736d04 Merge branch '6.1' into 6 2023-09-17 22:59:42 +00:00
github-actions
b1274c9c53 Merge branch '6.0' into 6.1 2023-09-17 22:59:41 +00: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
github-actions[bot]
16c3c5122d
DEP Update JS dependencies (#1235)
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-31 12:00:53 +12:00
Guy Sartorelli
cd1fdd3708
Merge branch '6.0' into 6 2023-08-30 11:59:21 +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
3576db9ec2 Merge branch '6.0' into 6 2023-08-23 12:38:13 +00: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
39932fe302 Merge branch '6.0' into 6 2023-08-22 15:38:33 +12: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
4e86fcdbef
Merge pull request #1227 from creative-commoners/pulls/6/module-standardiser-1691550465
MNT Run module-standardiser
2023-08-15 12:27:09 +12:00
Steve Boyd
f385459f9b MNT Run module-standardiser 2023-08-14 15:49:54 +12:00
Guy Sartorelli
60717e5c04
FIX Use absolute URL for submitted file links in emails (#1226) 2023-08-08 14:53:14 +12:00
Sabina Talipova
2d89d1baaa
DEP Update eslint module (#1222) 2023-07-12 11:05:15 +12:00
Steve Boyd
b8b24e444f Merge branch '6.0' into 6 2023-06-16 12:13:16 +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
Guy Sartorelli
77548a2cf2
Merge pull request #1215 from creative-commoners/pulls/6/tx-1686703601
ENH Update translations
2023-06-14 15:17:55 +12:00
Steve Boyd
95d3ceec3b ENH Update translations 2023-06-14 12:46:41 +12:00
Steve Boyd
183cd0838b Merge branch '6.0' into 6 2023-06-07 16:04:30 +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
4210189108 Merge branch '6.0' into 6 2023-06-01 16:06:06 +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
7e370a9eae Merge branch '6.0' into 6 2023-05-31 14:33:16 +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