TeamCity
59f9c9106a
Updated translations
2012-09-27 05:19:41 +12:00
TeamCity
0590774eda
Updated translations
2012-09-27 04:34:53 +12:00
TeamCity
302d1f7985
Updated translations
2012-09-27 03:19:26 +12:00
TeamCity
c37726f275
Updated translations
2012-09-27 02:54:22 +12:00
TeamCity
6a263eb98e
Merge remote branch 'origin/master' into translation-staging
2012-09-26 22:36:55 +12:00
Ingo Schommer
61148834f2
Merge pull request #824 from nyeholt/tab_null_pointer
...
BUG Fixed possible reference to null string
2012-09-26 02:31:13 -07:00
Ingo Schommer
33f67e1ad8
Fixed FulltextSearchable regression from 21a6390d
2012-09-26 11:28:25 +02:00
Howard Grigg
aa6f345d1d
API FormField::name_to_label() for unlabelled fields
...
Will convert camel case to spaces, e.g. "TotalAmount"
to "Total Amount".
2012-09-26 11:20:34 +02:00
Ingo Schommer
21a6390d7f
Merge pull request #817 from tractorcow/3.0-file-index-update
...
FIXED: Minor adjustment to order of file fulltext search fields.
2012-09-26 02:15:05 -07:00
Marcus Nyeholt
da70dc469c
BUG Fixed possible reference to null string
...
Hashlink for tabs in the backend didn't check the existence of
the href value before trying to .replace it.
2012-09-26 16:27:50 +10:00
Ingo Schommer
93c00ec80a
Merge pull request #819 from howardgrigg/patch-3
...
Correct brush name in template docs to avoid js popup
2012-09-25 05:33:04 -07:00
Howard Grigg
69e9876059
Correct brush name in template docs to avoid js popup
2012-09-25 22:27:30 +10:00
TeamCity
af89ecf139
Updated translations
2012-09-25 23:30:59 +12:00
TeamCity
06b5006e5b
Merge remote branch 'origin/master' into translation-staging
2012-09-25 17:43:20 +12:00
Sean Harvey
92e62ebb91
Merge pull request #812 from chillu/pull/sitetree-meta-removal
...
Removed SiteTree.MetaTitle and MetaKeywords usage
2012-09-24 21:15:20 -07:00
Sean Harvey
2654290848
Merge pull request #811 from wilr/removestatic
...
API: Remove static main and dev/buildcache
2012-09-24 19:12:35 -07:00
Sam Minnée
95005818c3
Merge pull request #818 from tractorcow/3.0-duplicate-field-description-fix
...
FIXED: Issue with duplicate help tips appearing on select fields in CMS
2012-09-24 18:42:25 -07:00
Damian Mooyman
495ffb033c
FIXED: Issue with duplicate help tips appearing on select fields in CMS. See Security / Groups / Edit Group form field for example.
2012-09-25 13:37:17 +12:00
Damian Mooyman
cd7ea01bd1
FIXED: Minor adjustment to order of file fulltext search fields. By matching the order of these index columns to the same as the fields on the table itself, this will prevent the unnecessary regeneration of fulltext indexes on some database connectors each dev/build, notably MS SQL Server.
2012-09-25 12:31:50 +12:00
TeamCity
8206b11ef4
Updated translations
2012-09-25 02:40:09 +12:00
Simon Welsh
2b172aa891
Merge branch 'patch-2' of https://github.com/anselmdk/sapphire into 3.0
2012-09-24 18:22:49 +12:00
Sean Harvey
8806fd18c5
MINOR Upgrading TinyMCE dependency from 3.5.6 to 3.5.7
2012-09-24 15:05:50 +12:00
TeamCity
f21af5d8c6
Merge remote branch 'origin/master' into translation-staging
2012-09-24 14:48:11 +12:00
Simon Welsh
0470219cb1
FIX Output the title of the task instead of Array when listing in the CLI
2012-09-24 13:37:48 +12:00
TeamCity
21b6e3d0ed
Merge remote branch 'origin/master' into translation-staging
2012-09-24 13:19:30 +12:00
Sam Minnée
200f184933
Merge pull request #808 from simonwelsh/stack-sqlquery
...
API Allow subgroups in the WHERE clause of a Data/SQLQuery
2012-09-23 18:08:23 -07:00
Anselm Christophersen
0df9b1c8a0
added CroppedImage
2012-09-23 19:46:06 +03:00
Sean Harvey
0b17e0036a
BUG Fixing percent encoding issues with saveHTML
2012-09-23 22:28:42 +12:00
TeamCity
b619bbd920
Updated translations
2012-09-22 21:19:22 +12:00
TeamCity
3cc742bb8d
Merge remote branch 'origin/master' into translation-staging
2012-09-22 21:15:15 +12:00
Ingo Schommer
cc702df8bb
Merge pull request #814 from Zauberfisch/master
...
HTTPRequest and HTTPResponse now return $this on all setters
2012-09-22 02:10:43 -07:00
Zauberfisch
7f1b6cfe26
MINOR: HTTPRequest and HTTPResponse now return $this on all setters
...
MINOR: also added some docs
2012-09-21 22:20:12 +00:00
TeamCity
430b0faac3
Updated translations
2012-09-22 07:29:05 +12:00
TeamCity
6a49d6947d
Merge remote branch 'origin/master' into translation-staging
2012-09-21 21:46:55 +12:00
Ingo Schommer
5df519c6b5
Removed SiteTree.MetaTitle and MetaKeywords usage
2012-09-21 11:31:24 +02:00
Ingo Schommer
039b40247e
Merge branch 'open/7875' of git://github.com/jbridson/sapphire into jbridson-open/7875
2012-09-21 10:49:36 +02:00
Will Rossiter
e72114dad7
API: Remove static main and dev/buildcache
...
Files moved to a separate module (silverstripe-static).
2012-09-21 19:56:56 +12:00
TeamCity
45452bacb0
Merge remote branch 'origin/master' into translation-staging
2012-09-21 15:54:23 +12:00
Simon Welsh
6d696d506f
API Allow subgroups in the WHERE clause of a Data/SQLQuery
...
Adds three extra methods to Data/SQLQuery query that allow for starting
a disjunctive subgroup, a conjunctive subgroup and for ending a subgroup.
Database::sqlWhereToString() now builds up the WHERE clause one by one
instead of with a straight implode. Uses a stack to know which conenctive
to use.
2012-09-21 14:59:47 +12:00
Simon Welsh
1e629f4585
Merge branch '3.0'
...
Conflicts:
control/Cookie.php
control/Director.php
dev/Profiler.php
view/Requirements.php
2012-09-21 14:56:56 +12:00
Ingo Schommer
e44a3558dd
Merge pull request #793 from halkyon/htmlvalue_parsing_fixes
...
BUG HtmlEditorField doesn't save HTML fragments in HTMLValue correctly
2012-09-20 02:09:36 -07:00
Simon Welsh
fe0e357be9
Merge pull request #807 from chillu/pulls/public-function
...
Method visibility according to coding conventions
2012-09-20 01:55:52 -07:00
Ingo Schommer
e2f073f38a
Method visibility according to coding conventions
2012-09-20 10:46:59 +02:00
Simon Welsh
d3112f7d20
Merge pull request #806 from halkyon/requirements_combined_fallback
...
BUG If combined files can't be written, fallback instantly to uncombined
2012-09-19 20:22:39 -07:00
Sean Harvey
954eb60983
BUG If combined files can't be written, fallback instantly to uncombined
2012-09-20 14:01:45 +12:00
Jeremy Bridson
a670e4ca40
ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen.
2012-09-20 13:25:57 +12:00
TeamCity
918558428e
Updated translations
2012-09-20 06:01:15 +12:00
TeamCity
a2977b2623
Updated translations
2012-09-20 01:29:36 +12:00
TeamCity
12bc2ba8ab
Updated translations
2012-09-19 22:22:22 +12:00
Simon Welsh
d0153f32cf
Write the test before ending it, so it still exists.
...
Also, switches to a constant instead of hardcoding the value.
2012-09-19 21:41:34 +12:00
