Commit Graph

1828 Commits

Author SHA1 Message Date
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
Steve Boyd
8e59783356 Merge branch '6.0' into 6 2023-05-31 11:21:26 +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
Steve Boyd
d222fa6d39 Merge branch '6.0' into 6 2023-05-04 13:28:24 +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
00746666cf Merge branch '6.0' into 6 2023-03-30 12:53:14 +13: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
Guy Sartorelli
7618704a7a
MNT Update release dependencies 2023-03-10 16:34:10 +13:00
Guy Sartorelli
5214da76e9
MNT Update development dependencies 2023-03-10 12:21:29 +13:00
Steve Boyd
f03b754d59 Merge branch '6.0' into 6 2023-03-08 12:00:16 +13:00
Steve Boyd
2b9c2c33be Merge branch '5' into 6.0 2023-03-08 12:00:02 +13:00
Guy Sartorelli
39701166f5
Merge pull request #1195 from creative-commoners/pulls/5/tx-1678080205
ENH Update translations
2023-03-08 10:32:26 +13:00
Steve Boyd
3d73a71b9c ENH Update translations 2023-03-06 18:23:25 +13:00
Steve Boyd
a8b45f35eb Merge branch '6.0' into 6 2023-03-02 17:57:43 +13:00
Steve Boyd
22696bdb65 Merge branch '5' into 6.0 2023-03-02 17:56:44 +13:00
Guy Sartorelli
59d007f4e9
Merge branch '5.14' into 5 2023-03-01 13:00:17 +13:00
Guy Sartorelli
7677f15fda
Merge pull request #1192 from creative-commoners/pulls/5.14/bump-jquery-validiation
DEP Bump jQuery validiation install
2023-02-28 16:44:30 +13:00
Maxime Rainville
d5ce6239ea DEP Bump jQuery validiation install 2023-02-28 15:02:09 +13:00
Steve Boyd
77af08139c Merge branch '5' into 6 2023-02-02 16:04:16 +13:00
Steve Boyd
10fc452c8d Merge branch '5.14' into 5 2023-02-02 16:03:12 +13:00
Steve Boyd
58583ded8d Merge branch '5.13' into 5.14 2023-02-02 16:02:49 +13:00