Commit Graph

1885 Commits

Author SHA1 Message Date
github-actions a2ab1ec68c Merge branch '5' into 6.1 2024-03-04 02:51:55 +00:00
github-actions 81ace076fd Merge branch '5.15' into 5 2024-03-04 02:51:54 +00:00
Sabina Talipova e7b3c9795d
Merge pull request #1269 from creative-commoners/pulls/5.15/fix-behat
MNT Fix behat test that was relying on a bug
2024-02-29 12:41:12 +13:00
Guy Sartorelli d2bad6a39e
MNT Fix behat test that was relying on a bug 2024-02-27 16:38:47 +13:00
github-actions ac2c7f3186 Merge branch '5' into 6.1 2024-02-07 12:38:57 +00:00
github-actions 1410b29e44 Merge branch '5.15' into 5 2024-02-07 12:37:44 +00:00
Guy Sartorelli d070e7dcf9
TLN Update translations (#1265) 2024-02-07 16:13:56 +13:00
Guy Sartorelli c893194775
DOC Update syntax for callout blocks (#1263) 2024-02-02 09:41:31 +13:00
Guy Sartorelli 5e6281534c
Merge pull request #1257 from creative-commoners/pulls/6.1/docblock
MNT Update @methods on class docblocks
2023-12-18 09:05:46 +13:00
Steve Boyd 70d9cd27b2 MNT Update @methods on class docblocks 2023-12-15 17:04:35 +13:00
Steve Boyd 8cf7f90745 Merge branch '5' into 6.1 2023-12-07 09:37:39 +13:00
github-actions 92c83d2dfa Merge branch '5.15' into 5 2023-12-06 12:38:57 +00:00
Guy Sartorelli ea6a8c88f7
Merge pull request #1255 from creative-commoners/pulls/5.15/behat
MNT Fix behat test
2023-12-06 19:00:35 +13:00
Steve Boyd eae7c5dedd MNT Fix behat test 2023-12-06 17:02:03 +13:00
github-actions 1e2c4e8ab1 Merge branch '5' into 6.1 2023-11-29 12:39:02 +00:00
github-actions 3c979039a1 Merge branch '5.15' into 5 2023-11-29 12:39:00 +00:00
Sabina Talipova 95531e78d0
MNT Fix broken build (#1253) 2023-11-29 15:17:08 +13:00
Steve Boyd 9e4c37e036 Merge branch '5' into 6.1 2023-11-13 17:32:44 +13:00
github-actions d012198334 Merge branch '5.15' into 5 2023-11-08 12:39:28 +00:00
Guy Sartorelli 62b4a59c14
Merge pull request #1250 from creative-commoners/pulls/5.15/test-toast-message
MNT Update behat tests to support toast messages
2023-11-07 15:59:17 +13:00
Guy Sartorelli 19c6d61a7a
Merge pull request #1251 from creative-commoners/pulls/5.15/tx-1699241406
TLN Update translations
2023-11-07 11:15:39 +13:00
Steve Boyd b9df907abf TLN Update translations 2023-11-06 16:30:06 +13:00
Sabina Talipova 29dddf217f MNT Update behat tests to support toast messages 2023-11-03 15:39:59 +13:00
Guy Sartorelli 18aa93d74a
Merge pull request #1247 from creative-commoners/pulls/6.1/remove-todo
MNT Remove TODO comments
2023-10-20 11:54:21 +13:00
Sabina Talipova 7c1ca456ba MNT Remove TODO 2023-10-19 14:54:35 +13: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 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