Commit Graph

766 Commits

Author SHA1 Message Date
Robbie Averill
06ce5ec589 Remove obsolete branch alias 2018-11-07 16:32:29 +02:00
stevevu
682e522565 update namespace for blog controllers
more specifically: Blog_Controller, BlogController, BlogPost_Controller, BlogPostController
2018-10-19 20:37:10 +02:00
Robbie Averill
24f832961e
Merge pull request #556 from jmfederico/patch-1
Fix PostedIn translation
2018-10-10 18:53:43 +02:00
Federico Jaramillo Martínez
ad217bceff
Fix PostedIn translation
"Publicado el" as it was written translated related to dates, "Publicado en" relates to belonging. We want the second translation, as it is used for example when PostedIn a category.
2018-10-10 11:14:05 -05:00
Guy Marriott
4b1f4b3606
Merge pull request #553 from creative-commoners/pulls/3.2/remove-obsolete-z-index
FIX Remove obsolete z-index values for CMS menus. Fixes fullscreen TinyMCE overlap
2018-09-11 09:48:34 +12:00
Robbie Averill
38a8b77c77 Add yarn lock file 2018-09-10 16:33:33 +02:00
Robbie Averill
b41d5c8da4 FIX Remove obsolete z-index values for CMS menus. Fixes fullscreen TinyMCE overlap 2018-09-10 16:33:28 +02:00
Dylan Wagstaff
9d568ecdca
Merge pull request #552 from creative-commoners/pulls/3.2/reorder-fields
FIX Blog profile summary field is always inserted before the profile image field
2018-09-06 09:51:51 +12:00
Robbie Averill
fb1b6929a9 FIX Blog profile summary field is always inserted before the profile image field 2018-09-05 14:56:05 +02:00
Will Dawber
da3a690871 Compatibility issues with core index (#550)
Making index function compatible with SilverStripe\CMS\Model\RedirectorPageController, this stops issues when module installed and also creating a custom index function in PageController
2018-08-27 11:20:42 +12:00
Robbie Averill
829d68211a Update branch alias for master to 4.x-dev 2018-08-27 10:57:37 +12:00
Robbie Averill
9806f47c54 Merge branch '3' 2018-08-27 10:57:13 +12:00
Robbie Averill
a0ef930549 Remove obsolete branch alias 2018-08-27 10:56:24 +12:00
Robbie Averill
7ebae00ad3 Merge branch '3.2' 2018-07-26 14:54:45 +12:00
Dylan Wagstaff
991000dddf
Merge pull request #545 from kinglozzer/removable-tab
FIX: Unable to remove 'Post Options' tab
2018-07-10 09:35:13 +12:00
Loz Calver
c3ac001a0a FIX: Unable to remove 'Post Options' tab 2018-07-09 10:58:10 +01:00
Robbie Averill
523bb31070 Rebuild dist files 2018-07-06 18:25:09 +12:00
Daniel Hensby
b06659e71a
Merge branch '3.2' 2018-06-19 21:56:22 +01:00
Daniel Hensby
69e39e94e6
Merge branch '3.1' into 3.2 2018-06-19 21:54:39 +01:00
Daniel Hensby
468e0530fd
Merge branch '3.0' into 3.1 2018-06-19 21:51:26 +01:00
Daniel Hensby
fcda48175c
Merge branch '2.5' into 3.0 2018-06-19 21:48:59 +01:00
Daniel Hensby
2da2c2927f
Merge branch '2.4' into 2.5 2018-06-19 21:40:41 +01:00
Robbie Averill
a4efb3409c
Merge pull request #540 from dhensby/pulls/2.4/fix-multibyte-urlfilter
FIX Make sure `setAllowMultibyte` is on when looking up by URLSegment
2018-06-20 08:24:01 +12:00
Daniel Hensby
3b14436304
TEST Fix regression in tests from new Versioned exceptions 2018-06-19 14:39:17 +01:00
Daniel Hensby
d392ca72f1
FIX Make sure setAllowMultibyte is on when looking up by URLSegment 2018-06-19 14:23:27 +01:00
Robbie Averill
81e2bfee4a
Merge pull request #538 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:49:47 +12:00
Dylan Wagstaff
c605d4cd68 Add supported module badge to readme 2018-06-15 17:31:09 +12:00
Robbie Averill
f93895cae1 Update branch alias for 3.x-dev 2018-06-11 12:06:25 +12:00
Robbie Averill
fe16afe7b0 Merge branch '3.2' 2018-06-11 12:06:08 +12:00
Robbie Averill
2e605d797c Remove obsolete branch alias 2018-06-11 12:05:46 +12:00
Robbie Averill
14eab5dc5a Merge branch '3.1' into 3.2 2018-06-11 12:02:23 +12:00
Robbie Averill
fcf7127f09
Merge pull request #536 from MarcioBarrientos/fix
Call the correct method ->isModifiedOnDraft()
2018-06-07 16:04:38 +12:00
Marcio Barrientos
4e5f25c5eb Call the correct method ->isModifiedOnDraft() 2018-06-07 15:53:39 +12:00
Robbie Averill
06dbb72432
Merge pull request #534 from creative-commoners/docs/new-UI-images
Update images to new SS4 UI
2018-05-31 16:46:12 +12:00
Sacha Judd
4be275a0df Update images to new SS4 UI 2018-05-31 16:45:26 +12:00
Dylan Wagstaff
e63c5d4482
Merge pull request #530 from creative-commoners/pulls/3.1/modified-state
FIX Use correct API for determining if record is modified on draft stage
2018-04-20 21:05:50 +12:00
Robbie Averill
dc26478e94 FIX Use correct API for determining if record is modified on draft stage 2018-04-20 17:05:29 +12:00
Robbie Averill
c83232bd6e Merge branch '3.1' 2018-04-10 15:53:48 +12:00
Robbie Averill
db0d4f0f98 Merge branch '3.0' into 3.1 2018-04-10 15:53:04 +12:00
Robbie Averill
ae953b9a3c
Update constraints for dependencies 2018-04-10 15:49:44 +12:00
Dylan Wagstaff
50612b4f4c Remove obsolete branch alias 2018-04-10 14:42:51 +12:00
Robbie Averill
c344575ef9
Merge pull request #527 from JorisDebonnet/urlsegment-on-main
Bring back BlogPost URLSegment to Main tab
2018-04-10 14:13:50 +12:00
Joris Debonnet
06bcd961ce Bring back BlogPost URLSegment to Main tab 2018-04-10 02:04:44 +02:00
Dylan Wagstaff
2d62251858
Merge pull request #524 from creative-commoners/pulls/3.2/tweaks
Minor tweaks, syntax, namespace imports, docblocks, test improvements
2018-04-09 12:06:34 +12:00
Robbie Averill
d520d9dd94 Merge branch '3.1' 2018-04-06 10:29:45 +12:00
Robbie Averill
4c1303bfb5 Remove obsolete branch alias, remove @dev constraints on assets and asset-admin 2018-04-06 10:29:02 +12:00
Robbie Averill
85b297140f Use FQCN in expectedException annotation 2018-04-06 10:27:18 +12:00
Robbie Averill
c0695224d6 Switch try/catch for exception to use expected exception and code 2018-04-06 10:24:22 +12:00
Robbie Averill
afc1a3dd25 Use SapphireTest::logOut over manually checking Security::getCurrentUser 2018-04-06 10:24:04 +12:00
Robbie Averill
9d26cff23d NEW Add translation support for blog post authors profile summary heading 2018-04-06 10:23:22 +12:00