Commit Graph

144 Commits

Author SHA1 Message Date
Steve Boyd
baee472c9f Merge branch '2.1' into 2 2021-09-04 18:09:12 +12:00
Maxime Rainville
25ff52c1fc MNT Remove obsolete branch-alias 2021-08-27 12:06:28 +12:00
Maxime Rainville
b4ce6caead Update translations 2021-08-27 11:27:35 +12:00
Steve Boyd
42ea538f0f
Update build status badge 2021-01-21 16:45:17 +13:00
Steve Boyd
a7251dba0f Merge branch '2.0' into 2 2020-11-11 17:56:18 +13:00
Serge Latyntsev
c4ba8bf3a9
Merge pull request #66 from creative-commoners/pulls/2.0/shared-config
FIX Quote yml, use shared travis config, sminnee/phpunit
2020-11-10 16:18:37 +13:00
Steve Boyd
5cc58a1269 FIX Quote yml, use shared travis config, sminnee/phpunit 2020-11-09 17:14:48 +13:00
Robbie Averill
747cf4d68d
Merge pull request #65 from creative-commoners/pulls/2.0/travis
Update travis 2.0
2020-06-23 09:40:16 -07:00
Steve Boyd
f473126c9f Update travis 2020-06-23 16:41:21 +12:00
Garion Herman
952c7c3592
Merge pull request #64 from creative-commoners/pulls/2/merge-up
Merge up from 2.0
2020-06-12 14:58:46 +12:00
Maxime Rainville
1f832bcdc4 Merge branch '2.0' into 2 2020-06-12 14:47:54 +12:00
Serge Latyntsev
4d499524cd
Merge pull request #63 from creative-commoners/pulls/2.0/update-travis
Update travis matrix
2020-02-18 12:06:08 +13:00
Steve Boyd
ece9566bcb Update travis matrix 2020-02-18 11:59:52 +13:00
Aaron Carlino
8de3ec1dfc
META: Add github action to build docs 2019-12-19 13:55:11 +13:00
Garion Herman
5aef1bace1
Merge pull request #61 from creative-commoners/pulls/2/travis-ci
Travis config update
2019-11-26 14:46:42 +13:00
Serge Latyntcev
a56946b68b Travis config update 2019-11-26 14:38:45 +13:00
Robbie Averill
08539df0af Merge branch '2.0' 2019-05-10 10:16:35 +12:00
Robbie Averill
aae09ae51f Update translations 2019-05-10 10:16:23 +12:00
Robbie Averill
9260d8c744 Bump postgres version in Travis configuration to 2.1.x 2018-11-08 10:45:59 +02:00
Robbie Averill
831f03a2b8
Bump Postgres for Travis builds on SilverStripe 4.2+ 2018-08-17 23:45:25 +12:00
Robbie Averill
247039ff0e Merge branch '2.0' 2018-07-26 15:19:44 +12:00
Dylan Wagstaff
2986d7e0c3
Merge pull request #57 from creative-commoners/pulls/2.0/fix-cache-mode
FIX Separate tests, ensure versioned cache mode does not interfere
2018-06-19 10:51:28 +12:00
Robbie Averill
0be030efd1 Add various recipe versions to Travis matrix 2018-06-18 22:56:10 +12:00
Robbie Averill
bd59ce6200 FIX Separate tests, ensure versioned cache mode does not interfere 2018-06-18 22:54:33 +12:00
Robbie Averill
0356e1e0a2
Merge pull request #56 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:09:09 +12:00
Dylan Wagstaff
9065f82d79 Add supported module badge to readme 2018-06-15 17:52:36 +12:00
Robbie Averill
3b1c682a54 Merge branch '2.0' 2018-06-11 15:38:24 +12:00
Robbie Averill
d48fab6faa Remove obsolete branch alias 2018-06-11 15:38:06 +12:00
Dylan Wagstaff
5b38663322
Merge pull request #52 from silverstripe/docs/pulls/2.0/update-docs
Update docs to match rename of checkbox in CMS
2018-04-05 09:57:03 +12:00
Raissa North
205d077384 Update docs to match rename of checkbox in CMS 2018-04-05 09:47:06 +12:00
Dylan Wagstaff
3a6fe66e2f
Merge pull request #53 from silverstripe/pulls/2.0/update-developer-docs
DOCS Both version feeds are disabled by default
2018-03-27 21:01:21 +13:00
Raissa North
0c199bcae0
DOCS Both version feeds are disabled by default 2018-03-27 15:40:48 +13:00
Dylan Wagstaff
7b3d282802
Merge pull request #51 from creative-commoners/pulls/2.0/Content-with-Contents
FIX allow allchanges to handle removed Page types
2018-02-14 10:10:20 +13:00
Dylan Wagstaff
093af10c8a FIX allow allchanges to handle removed Page types
If a there exists at some point in the history a class that no longer
exists, Versioned will create it as a `DataObject` as opposed to some form
of the `SiteTree` superclass. This would break the absolute link
funcitonality, so we should make the version at least an instance of
SiteTree so we can generate the link accurately (without fatal errors).
2018-02-13 12:11:27 +13:00
Robbie Averill
29ef2a4920 FIX Update namespaces in Russian translation file 2017-12-18 18:09:39 +13:00
Robbie Averill
5c6b5f5e2c Merge branch '1' 2017-12-18 18:08:27 +13:00
Robbie Averill
f59ddb5578 Merge branch '1.2' into 1 2017-12-18 18:06:59 +13:00
Robbie Averill
ea21f4557f Exclude PHP 5.3 from Travis tests 2017-12-18 18:06:44 +13:00
Robbie Averill
a9a346a53d Merge branch '1.2' into 1 2017-12-18 18:06:14 +13:00
Robbie Averill
989911acb2 Remove Transifex configuration. Commit directly to lang files for SS3. 2017-12-18 18:03:51 +13:00
Robbie Averill
de70e59d80
Merge pull request #49 from creative-commoners/pulls/2.0/update-tests
FIX Use cached SiteTree object for history instead of creating a temporary object
2017-12-18 18:02:42 +13:00
Robbie Averill
5bde86198b FIX Do not use cached SiteTree object but ensure record ID is set before diff 2017-12-18 16:38:16 +13:00
Robbie Averill
6b6f4ec622 FIX Add warnings as descriptions to settings tabs, not literal fields. Remove duplicated translation 2017-12-18 15:59:11 +13:00
Robbie Averill
952b67a5cb Update documentation to include correct file paths 2017-12-18 15:45:07 +13:00
Robbie Averill
dd361929db FIX Use cached SiteTree object for history instead of creating a temporary object 2017-12-18 15:45:05 +13:00
Robbie Averill
921b7c7fb5
Merge pull request #48 from creative-commoners/pulls/2.0/new-version-feed-v4
FIX: update docs & language references
2017-12-13 16:11:36 +13:00
Robbie Averill
bfba519cc3 FIX Update translation class names and replace sprintf translations with parameters 2017-12-13 15:36:20 +13:00
Dylan Wagstaff
5096179825 FIX: update docs & language references 2017-12-12 16:55:08 +13:00
Robbie Averill
d536df0d32
Merge pull request #45 from creative-commoners/pulls/2.0/new-version-feed-v3
FIX: PSR-2 codebase. Formatting via phpcbf
2017-12-12 16:43:58 +13:00
Dylan Wagstaff
67e112fd12 FIX: Minor functional alterations and CI improvements
FIX: PSR-2 codebase. Formatting via phpcbf
FIX: rendering bug in allchanges
FIX: update .gitattributes to not export codecov's config file
FIX: Update SiteTree_versions to the ss4 equivalent SiteTree_Versions
2017-12-12 16:12:03 +13:00