Commit Graph

218 Commits

Author SHA1 Message Date
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
Robbie Averill
17cf3d7487
Merge pull request #42 from creative-commoners/pulls/2.0/new-version-feed-v2
Pulls/2.0/new version feed v2
2017-12-12 10:37:41 +13:00
Dylan Wagstaff
23f2f45705 FIX Capitalisation of trait usage 2017-12-12 10:31:47 +13:00
Dylan Wagstaff
fe2b6597b3 FIX update CI setting files 2017-12-12 09:43:12 +13:00
Dylan Wagstaff
229463547d Edit updated things until the tests pass 2017-12-11 17:20:00 +13:00
Dylan Wagstaff
17699f2b8a Update from SS_Cache to Symfony/Cache 2017-12-11 12:50:45 +13:00
Dylan Wagstaff
9a7651b017 run the upgrader tool over the codebase to namespace the classes 2017-12-11 12:10:56 +13:00
Robbie Averill
f4c7a4d737
Merge pull request #41 from creative-commoners/pulls/2.0/new-version-feed
Make it installable with vendor folder usage
2017-12-11 11:54:57 +13:00
Dylan Wagstaff
bfb7422981 Make it installable with vendor folder usage 2017-12-11 10:52:01 +13:00
Franco Springveldt
3845294dfe Update translations 2017-08-28 16:35:54 +12:00
Robbie Averill
b25d7d728e Merge pull request #39 from silverstripe/sminnee-patch-1
FIX: Don't assume SS4 compatibility
2017-07-12 13:52:56 +12:00
Sam Minnée
24b2d06424 FIX: Don't assume SS4 compatibility
Major versions won't automatically work, and so I've amended the composer requirements
not to allow SS4.

This will also ensure that addons.silverstripe.org correctly reports which modules
work with SS4.
2017-07-12 13:36:11 +12:00
Daniel Hensby
6dffbdaee7 Merge pull request #38 from creative-commoners/pulls/travis-php7
Add PHP7 + SS3.6 build to Travis configuration
2017-06-15 16:59:17 +01:00
Robbie Averill
82600b37c5 Add PHP7 + SS3.6 build to Travis configuration 2017-06-15 11:46:40 +12:00
Damian Mooyman
fbb2baad15 Merge pull request #37 from silverstripe/robbieaverill-fix-readme-badge
Update Travis URL in readme badge
2017-05-15 22:29:31 +12:00
Robbie Averill
e7861750b1 Update branch alias for 1.3.x-dev 2017-05-12 14:32:03 +12:00
Robbie Averill
937eb88242 Merge remote-tracking branch 'origin/master' into 1.2 2017-05-12 14:29:35 +12:00
Damian Mooyman
bbc4457f97 Merge pull request #36 from robbieaverill/pulls/fix-feed-functional-test-config
FIX Ensure that version feeds are enabled by default in tests
2017-05-12 11:54:23 +12:00
Robbie Averill
b87cfaadf8 Update README.md 2017-05-12 10:23:51 +12:00
Robbie Averill
33cc3a13e8 FIX Ensure that version feeds are enabled by default in tests 2017-05-12 10:20:27 +12:00
Damian Mooyman
9a6c655f54 Remove obsolete branch-alias 2016-11-17 10:16:02 +13:00
Damian Mooyman
dc03856ca1 Update translations 2016-08-17 11:08:01 +12:00
Damian Mooyman
f53f353ba6 Add changelog for 1.2.2 release 2016-05-20 12:58:31 +12:00
Daniel Hensby
898c281ef5 Merge pull request #35 from chillu/pulls/VersionFeedFunctionalTest-sort-fix
Consistent sorting for getDiffList()
2016-05-20 01:13:03 +01:00
Ingo Schommer
c64e7ad2d7 Consistent sorting for getDiffList()
If changes were applied in the same second (e.g. through tests), the results will have an indeterminate order.
This lead to stability issues in VersionFeedFunctionalTest::testContainsChangesForPageOnly.
Sort by ID in addition to LastEdited.
2016-05-20 09:56:33 +12:00
Damian Mooyman
73a033f22d Updated changelog for 1.2.1 2016-02-04 18:13:10 +13:00
Damian Mooyman
843fb43979 Update translations 2016-02-04 18:11:13 +13:00