Commit Graph

199 Commits

Author SHA1 Message Date
UndefinedOffset
5571e99506 BUGFIX: Fixed issue where the $id variable would be overridden in subsequent iterations of the derived fields loop 2016-04-18 09:40:43 -03:00
Daniel Hensby
2067786e7f Merge pull request #114 from tractorcow/pulls/fix-versioned-writes
BUG Fix versioned writes where subtables have no fields key
2016-04-15 12:26:01 +01:00
Damian Mooyman
ec5e4f4581 BUG Fix versioned writes where subtables have no fields key
BUG Remove unnecessary config nesting in tests which are now handled via core
Fixes some regressions in recent framework fixes to versioned
2016-04-15 15:46:19 +12:00
Damian Mooyman
aa77e2b63a Merge pull request #109 from dhensby/pulls/fix-aliased-index
FIX Indexes with custom index names that dont match the classname wer…
2016-04-12 12:18:29 +12:00
Daniel Hensby
a94ddbce76 FIX Indexes with custom index names that dont match the classname were breaking 2016-02-23 02:05:00 +00:00
Damian Mooyman
a9eda33db7 Add changelog for 2.1.1 2016-02-04 14:08:29 +13:00
Damian Mooyman
100d2f3d7e Merge pull request #106 from helpfulrobot/update-license-year
Updated license year
2016-01-05 11:20:01 +13:00
helpfulrobot
e6de7c6d8a Updated license year 2016-01-01 06:45:22 +13:00
Damian Mooyman
db4d73a5b1 Merge pull request #105 from helpfulrobot/convert-to-psr-2
Converted to PSR-2
2015-12-18 10:05:41 +13:00
helpfulrobot
f87690ef22 Converted to PSR-2 2015-12-18 07:16:09 +13:00
Damian Mooyman
a2db7298cd Merge pull request #104 from torleif/patch-2
FIX: remove parameters from function calls
2015-12-08 16:47:32 +13:00
torleif
84a79995d9 FIX: remove parameters from function calls 2015-12-03 14:49:26 +13:00
Damian Mooyman
e14464f574 Merge pull request #102 from madmatt/pulls/fix-hamcrest
MINOR: Don't include Hamcrest globally so it doesn't conflict with PHPUnit
2015-11-27 12:57:25 +13:00
madmatt
665490dfde MINOR: Don't include Hamcrest globally so it doesn't conflict with PHPUnit
PHPUnit now includes matching functions like `any()` and `anything()` outside of a namespace, which conflicts with `Phockito` that does the same thing when calling `Phockito::include_hamcrest(true)`.

This test in particular breaks Behat, because the file includes a class (`SolrReindexTest_Item`) that extends `DataObject`, meaning that this file gets included very early in the initialisation process.

Instead, we can just set `Phockito::include_hamcrest(false)` and use the full path to the Hamcrest matching functions instead (e.g. `\Hamcrest_Matchers::anything()`).
2015-11-27 12:43:33 +13:00
Damian Mooyman
896f795539 Merge pull request #91 from helpfulrobot/convert-to-psr-2
Converted to PSR-2
2015-11-26 14:39:37 +13:00
Daniel Hensby
30c01e8590 Merge pull request #100 from helpfulrobot/add-standard-code-of-conduct
Added standard code of conduct
2015-11-22 20:33:11 +00:00
helpfulrobot
773ab89bf6 Added standard code of conduct 2015-11-21 20:13:42 +13:00
helpfulrobot
314feddd48 Converted to PSR-2 2015-11-21 19:19:20 +13:00
Daniel Hensby
c96d4bf749 Merge pull request #93 from helpfulrobot/add-standard-editor-config
Added standard editor config
2015-11-19 17:32:29 +00:00
Daniel Hensby
36fdeb3ee2 Merge pull request #94 from helpfulrobot/add-standard-travis-config
Added standard Travis config
2015-11-19 17:32:17 +00:00
Daniel Hensby
34074bba1b Merge pull request #97 from helpfulrobot/add-standard-license
Added standard license
2015-11-19 17:24:36 +00:00
Daniel Hensby
635865a2c3 Merge pull request #98 from helpfulrobot/add-license-to-composer
Added license to composer.json
2015-11-19 11:25:17 +00:00
Daniel Hensby
2d8ee1d653 Merge pull request #99 from helpfulrobot/add-standard-git-attributes
Added standard git attributes
2015-11-19 10:41:03 +00:00
helpfulrobot
14b5376ba8 Added standard git attributes 2015-11-19 19:11:54 +13:00
helpfulrobot
05d8127c52 Added license to composer.json 2015-11-19 18:52:29 +13:00
helpfulrobot
775a14fe9f Added standard license 2015-11-19 18:30:33 +13:00
Scott Hutchinson
997ecfef16 Merge pull request #96 from tractorcow/pulls/release-210
Add changelog for 2.1.0 release
2015-11-19 17:08:45 +13:00
Damian Mooyman
bc83546f24 Add changelog for 2.1.0 release 2015-11-19 16:59:18 +13:00
helpfulrobot
43d9a20e43 Added standard Travis config 2015-11-19 14:19:18 +13:00
helpfulrobot
c131aba63e Added standard editor config 2015-11-19 13:25:25 +13:00
Daniel Hensby
bd93f4b9ae Merge pull request #92 from helpfulrobot/add-standard-travis-config
Added standard Travis config
2015-11-18 23:39:25 +00:00
Daniel Hensby
5519b71242 Merge pull request #90 from helpfulrobot/add-standard-scrutinizer-config
Added standard Scrutinizer config
2015-11-18 23:37:45 +00:00
helpfulrobot
39b1ec2095 Added standard Travis config 2015-11-18 17:21:44 +13:00
helpfulrobot
0a39937697 Added standard Scrutinizer config 2015-11-18 15:14:01 +13:00
Ingo Schommer
4d4e56672d Merge pull request #88 from tractorcow/pulls/travis
Add ss 3.2 and PHP 5.6 to CI
2015-11-02 09:59:05 +13:00
Damian Mooyman
17a84cde50 Add ss 3.2 and PHP 5.6 to CI 2015-10-30 15:02:41 +13:00
Damian Mooyman
c3cc3f999b Merge pull request #83 from assertchris/3.2-compat
3.2 compat
2015-08-28 11:46:23 +12:00
Christopher Pitt
3ad9369b0a 3.2 compat 2015-08-28 08:43:03 +12:00
Damian Mooyman
10787bc310 Alias master as 2.0 2015-08-19 11:28:10 +12:00
Christopher Pitt
ea8de7da15 Merge pull request #82 from tractorcow/pulls/reindex-task
API QueuedJob support for Solr_Reindex
2015-07-29 09:12:12 +12:00
Damian Mooyman
1683f776bd API QueuedJob support for Solr_Reindex
API Incremental clear and re-index of records rather than clearing all records from SolrIndex up front
2015-07-28 12:46:23 +12:00
Damian Mooyman
259bd033f1 Merge pull request #81 from dhensby/patch-1
Move to new travis containerised infrastructure
2015-07-23 09:22:54 +12:00
Daniel Hensby
2595e2e8f0 Move to new travis containerised infrastructure 2015-07-20 16:06:37 +01:00
Damian Mooyman
9706135fa5 Merge pull request #73 from dhensby/patch-1
Updating travis provisioner
2015-07-20 12:59:41 +12:00
Ingo Schommer
b13857dd5f Merge pull request #74 from chillu/pulls/template-docs
Added docs about controller and template usage
2015-07-18 12:46:53 +12:00
Hamish Friedlander
9936922409 Merge pull request #79 from tractorcow/solr-api-v2
API Additional support for custom copy_fields
2015-07-07 10:54:39 +12:00
Damian Mooyman
ddb0b2520a API Additional support for custom copy_fields
API Additional textSpellHtml type for html-safe spelling database generation
2015-07-06 17:49:06 +12:00
Hamish Friedlander
931a1105a9 Merge pull request #75 from tractorcow/spelling-suggestions
API Support custom files / spelling correction
2015-07-01 14:52:37 +12:00
Damian Mooyman
94b5d7b85d Enable indexes to upload custom config
Robust parsing of collation suggestions
Support spelling suggestions
Include default optional dictionary for _spellcheckText column
2015-07-01 14:32:20 +12:00
Hamish Friedlander
c73766b163 Merge pull request #78 from tractorcow/fix-tests
BUG Prevent subsites breaking travis tests
2015-06-30 21:29:17 +12:00