Commit Graph

486 Commits

Author SHA1 Message Date
Daniel Hensby
b444db1af8
Merge branch '2' 2017-07-20 10:33:52 +01:00
Daniel Hensby
c110b4e2e1
Merge branch '2.4' into 2 2017-07-20 10:33:28 +01:00
Daniel Hensby
0b6a2d710a
Merge branch '2.3' into 2.4 2017-07-20 10:33:06 +01:00
Daniel Hensby
df68e34398
Merge branch '2.2' into 2.3 2017-07-20 10:31:55 +01:00
Daniel Hensby
7bfe622909
Merge branch '2.1' into 2.2 2017-07-20 10:30:12 +01:00
Daniel Hensby
3a62155f66
Merge branch '2.0' into 2.1 2017-07-20 10:29:50 +01:00
Daniel Hensby
bc741fb8b8 Merge pull request #447 from andrewandante/BUGFIX/owns_featuredimage
give BlogPost ownership of FeaturedImage
2017-07-20 10:28:17 +01:00
Andrew Aitken-Fincham
409b4190a3 give BlogPost ownership of FeaturedImage 2017-07-20 10:03:53 +01:00
Daniel Hensby
a28861c352 Merge pull request #459 from robbieaverill/pulls/3.0/fix-travis
FIX Update Travis configuration and coverage whitelist
2017-07-20 09:48:13 +01:00
Loz Calver
6f5d4bd658 Merge pull request #458 from dhensby/pulls/2.0/fix-url-segment-generation
FIX Dont generate urlsegments if we dont need to
2017-07-20 09:07:06 +01:00
Robbie Averill
563e33c772 Add phpcs ruleset and fix violations 2017-07-20 10:05:29 +12:00
Robbie Averill
ba51a8e8e1 FIX Update Travis configuration and coverage whitelist 2017-07-20 10:05:29 +12:00
Daniel Hensby
34b6191666
Remove HHVM from test builds 2017-07-19 17:47:04 +01:00
Daniel Hensby
c29438fd1a
FIX Dont generate urlsegments if we dont need to 2017-07-19 17:42:46 +01:00
Daniel Hensby
84ac94f818
Merge branch '2' 2017-07-05 14:49:34 +01:00
Daniel Hensby
ca59af43e8
Merge branch '2.4' into 2 2017-07-05 14:42:23 +01:00
Daniel Hensby
91d9e42ba0 Merge pull request #450 from camfindlay/feature/config-spam-notifications
Config spam notifications
2017-07-05 14:30:24 +01:00
Daniel Hensby
6c1e6a98c4 Merge pull request #451 from andrewandante/FIX/tests
total refactor of blog.yml for tests, use classes properly
2017-07-05 14:09:55 +01:00
Andrew Aitken-Fincham
ffc12f53bc total refactor of blog.yml for tests, use classes properly 2017-07-04 18:01:39 +01:00
Cam Findlay
d5340a87dc
FEATURE config to disable sending spam notifications 2017-07-03 11:17:30 +01:00
Daniel Hensby
e737cd818b Merge pull request #445 from creative-commoners/pulls/2.4/travis-php7
Add PHP7 + SS3.6 build to Travis configuration
2017-06-18 01:03:00 +01:00
Robbie Averill
e5415b1ea8 Remove hhvm from Travis build matrix 2017-06-16 09:11:22 +12:00
Daniel Hensby
deb0a098e8 Merge pull request #435 from rasstislav/patch-1
FIX Add translation to some areas of BlogMemberExtension that were missing them
2017-06-15 16:56:31 +01:00
Rastislav Brandobur
abe6015a34 added BlogMemberExtension definitions to lang subfolder 2017-06-15 02:00:40 +02:00
Robbie Averill
16d684dcfa Add PHP7 + SS3.6 build to Travis configuration 2017-06-15 09:58:30 +12:00
Daniel Hensby
ef67447ad5 Merge pull request #444 from alex-dna/2.4
Prevent user_error when querying object from Solr
2017-06-14 13:05:27 +01:00
Alexandre Saelens
bd23bb2f0a Prevent user_error when querying object from Solr 2017-06-14 14:05:40 +12:00
Daniel Hensby
a62ce1081a Merge pull request #443 from 3Dgoo/patch-1
Updated license year
2017-06-07 16:35:27 +01:00
3Dgoo
277aa2d222 Updated license year 2017-06-07 21:33:21 +09:30
Daniel Hensby
0132a02cf0 Adding .codecov.yml file 2017-05-25 08:57:47 +01:00
Ingo Schommer
30cac31a78 Merge pull request #438 from sminnee/drop-php55
FIX: updated test suite to cover supported versions
2017-05-11 14:22:55 +12:00
Sam Minnee
f5c2537c03 MINOR: Add test to for blog tag urlsegment generation
This behaviour confused me so adding a test to clarify that it’s
intentional.
2017-05-11 12:29:44 +12:00
Sam Minnee
50d928101c FIX: Speed up tests by simplifying fixture
Requires https://github.com/silverstripe/silverstripe-framework/pull/6872
2017-05-11 12:29:41 +12:00
Sam Minnee
ff66ad791d FIX: updated test suite to cover supported versions 2017-05-04 18:09:44 +12:00
Daniel Hensby
81c8e6b939 Merge pull request #436 from sol1/ss4-alpha6-fixes
ss4 alpha6 fixes
2017-04-18 16:02:38 +01:00
Andrew Foster
d1eb591ea5 setShowCalendar is no longer a method 2017-04-18 17:02:27 +10:00
Andrew Foster
3b45728ff3 Fix reference to re-namespaced Versioned 2017-04-18 17:02:04 +10:00
Rastislav Brandobur
2cd7db9beb FIX Add translation to some areas of BlogMemberExtension that were missing them 2017-04-12 10:33:29 +02:00
Daniel Hensby
1bb7874e7e Merge pull request #433 from andrewandante/patch-2
Update UploadField to one that exists
2017-04-03 14:10:53 +01:00
Andrew Aitken-Fincham
1779fe1f39 Update UploadField to one that exists 2017-04-02 13:16:56 +01:00
Daniel Hensby
a5dee40fcb Merge pull request #431 from christopherdarling/patch-1
BlogMigrationTask missing title and description
2017-03-16 11:45:27 +13:00
Christopher Darling
fef1462f56 BlogMigrationTask missing title and description
Otherwise shows up in dev/tasks/ as "Database Migrations"
2017-03-15 14:31:18 +00:00
Daniel Hensby
b73b20731d Merge pull request #430 from andrewandante/FIX/i18n-nesting-errors
Update i18n nesting for ss4
2017-02-21 14:57:47 +00:00
Andrew Aitken-Fincham
246e51fada Update i18n nesting for ss4 2017-02-20 10:08:47 +00:00
Daniel Hensby
288a669e49 Merge pull request #428 from andrewandante/FIX/datepicker
showcalendar config method change
2017-02-19 15:34:35 +00:00
Andrew Aitken-Fincham
141db8d472 showcalendar config method change 2017-02-17 11:22:39 +00:00
Damian Mooyman
92004f803c Merge pull request #425 from robbieaverill/bugfix/short-class-name-for-translation
FIX Use short class name for translation key, not fully qualified name
2017-01-27 12:17:00 +13:00
Robbie Averill
7362be4015 FIX Use short class name for translation key, not fully qualified name 2017-01-27 11:47:53 +13:00
Daniel Hensby
d5a8761acf Merge pull request #421 from robbieaverill/ss4
SilverStripe 4 compatibility
2017-01-26 12:29:33 +00:00
Robbie Averill
8fa9207693 TEST Move coverage build to the start of the matrix, and only post coverage on success 2017-01-27 00:20:25 +13:00