Damian Mooyman
9230d41186
Include announcement links for security fixes
2014-04-01 17:40:39 +13:00
Ingo Schommer
f540e5bd18
Merge pull request #2999 from tractorcow/pulls/3.1-release-docs
...
3.1.4-rc1 release docs
2014-04-01 11:30:43 +13:00
Damian Mooyman
f2725523ae
3.1.4-rc1 release docs
2014-04-01 11:28:44 +13:00
Mateusz Uzdowski
38609c0762
Add Behat behaviours to click links and submit forms in preview.
2014-04-01 11:04:42 +13:00
Damian Mooyman
6ae7d43a5d
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-01 07:56:01 +13:00
Damian Mooyman
cf2a314a50
Added change log to upgrade docs
2014-03-31 16:31:25 +13:00
Ingo Schommer
7d0f03a454
Merge pull request #2993 from tractorcow/pulls/translation-update
...
Updated translation masters
2014-03-31 16:27:46 +13:00
Damian Mooyman
21f50f44e5
3.0.10-rc1 upgrading docs
2014-03-31 16:07:53 +13:00
Damian Mooyman
da1231a6e5
Updated translation masters
2014-03-31 14:13:15 +13:00
Simon Welsh
1d5706f15c
Correct line length and indentation
2014-03-30 21:11:56 +13:00
Simon Welsh
e07b14f5bc
Correct line length and endings
2014-03-30 20:59:28 +13:00
Simon Welsh
dde90dc346
Correct line length and endings
2014-03-30 19:51:38 +13:00
Simon Welsh
2566795b59
Merge branch '3.1'
...
Conflicts:
view/SSViewer.php
2014-03-30 19:39:18 +13:00
Simon Welsh
ac1546eb97
Correct line length and indentation
2014-03-30 19:37:54 +13:00
Simon Welsh
6db96eac8f
Correct errors from differening behaviour between 3.0 and 3.1
2014-03-30 19:29:18 +13:00
Simon Welsh
c59cf624df
Merge branch '3.0' into 3.1
2014-03-30 18:32:54 +13:00
Simon Welsh
241583858a
Correct line length
2014-03-30 18:32:40 +13:00
Simon Welsh
fe8dc50ffc
Merge branch '3.1'
...
Conflicts:
tests/view/SSViewerTest.php
2014-03-30 18:17:24 +13:00
Simon Welsh
f9c44e4ceb
Merge branch '3.0' into 3.1
...
Conflicts:
model/Versioned.php
view/SSTemplateParser.php
view/SSViewer.php
2014-03-30 18:15:12 +13:00
Damian Mooyman
cf5d524235
BUG Fix regressions from #2206 in hasValue and dbObject
...
Fixes #2982
2014-03-30 18:05:46 +13:00
Martin D
3e05ccb9b7
Fix link to the HtmlEditorField API page
...
Closes #2990
2014-03-30 18:04:17 +13:00
Nathan Glasl
398e5bc688
Cast TreeTitle to HTMLText
...
Closes #2989
2014-03-30 18:01:05 +13:00
Hamish Friedlander
b5c14150cc
Merge pull request #2987 from tractorcow/pulls/2981
...
FIX Escape the redirect URL before outputting (alternate implementation)
2014-03-27 14:46:18 +13:00
Damian Mooyman
f8e3bbe3ae
BUG Fix encoding of JS redirection script
2014-03-27 14:35:14 +13:00
Hamish Friedlander
475b41f11b
Merge pull request #2983 from tractorcow/pulls/3.0-fix-versioned-partialcache
...
BUG Fix issue with versioned dataobjects being cached between stages
2014-03-27 13:42:26 +13:00
Damian Mooyman
4415a75d93
BUG Fix issue with versioned dataobjects being cached between stages
2014-03-27 13:17:29 +13:00
Ingo Schommer
181d8e549a
Merge pull request #2914 from kinglozzer/uploadfield-attach-loader
...
NEW: Show loading indicator when attaching files to UploadField
2014-03-26 07:51:57 +13:00
Loz Calver
86a69f9118
NEW: Show loading indicator when attaching files to UploadField
2014-03-25 14:53:30 +00:00
Ingo Schommer
023641e263
Merge pull request #2776 from ryanwachtl/fix-get-candidate-template
...
FIX Overriding of theme templates in project folder
2014-03-25 23:08:36 +13:00
Nicolaas
005e8065b9
typo fix
...
upated should be spelled updated
2014-03-21 14:30:17 +13:00
Sean Harvey
7ecc563783
Merge pull request #2969 from mrsmuneton/3.1
...
Issue 1603, rewrote first sentence - uses the php curl lib
2014-03-20 16:13:22 +13:00
Ray
0b7d617875
Issue 1603, rewrote first sentence - uses the php curl lib
...
Issue 1603, rewrote first sentence - uses the php curl library, enabling connections to remote web services
2014-03-19 20:00:13 -07:00
Simon Welsh
ff9d40a60d
FIX Escape the redirect URL before outputting
...
Signed-off-by: Stephen Shkardoon <stephen@silverstripe.com>
2014-03-19 21:34:49 +13:00
Simon Welsh
451f9d383f
Merge pull request #2206 from tractorcow/3.2-polymorphic-relations
...
API Polymorphic has_one behaviour
2014-03-18 10:02:36 +13:00
Damian Mooyman
7c60c73dbb
API Polymorphic has_one behaviour
2014-03-18 09:18:04 +13:00
Will Rossiter
912cda9a1e
Close the mysqli connection when deleting the class.
2014-03-17 21:46:47 +13:00
Will Rossiter
2beb1631a5
Allow DB::connect() to specify the connection name.
2014-03-17 21:46:40 +13:00
Simon Welsh
804b942e8a
Merge pull request #2961 from phptek/cms-issue-965
...
NEW Added FormatFromSettings(). Formats dates as per user preferences.
2014-03-17 13:09:18 +13:00
Russell Michell
26f8341438
NEW Added FormatFromSettings(). Formats dates as per user preferences.
...
- Required for silverstripe-cms/issue/965.
- Separate implementations for Date and SS_Datetime.
2014-03-17 10:15:59 +13:00
Simon Welsh
cbbce430e1
Merge pull request #2297 from colymba/htmleditorconfig-mode-fix
...
HtmlEditorConfig default TinyMCE mode is now none
2014-03-17 08:22:14 +13:00
colymba
9b5e5e812e
HtmlEditorConfig default TinyMCE mode is now none
2014-03-16 13:48:01 +02:00
Simon Welsh
7feb225e7b
Merge pull request #2959 from Zauberfisch/patch-4
...
Improvements on GridField customisation docs
2014-03-16 21:43:55 +13:00
Zauberfisch
62537c5886
more docs for GridField & ModelAdmin customization
2014-03-16 08:40:50 +00:00
Simon Welsh
26f805fbb3
Merge remote-tracking branch 'origin/3.1'
2014-03-16 13:51:34 +13:00
Simon Welsh
7d24f0ed40
Merge pull request #2957 from camspiers/ssviewer-from-string-cache
...
Cache templates created from string SSViewer_FromString
2014-03-16 13:23:31 +13:00
Cam Spiers
145d78edca
Cache templates created from string SSViewer_FromString
2014-03-16 13:16:24 +13:00
Simon Welsh
16fe87e4aa
Merge pull request #2677 from chillu/pulls/zend-aggregate
...
Skip tags in Zend_Cache for Aggregate if not available, better docs
2014-03-16 12:39:33 +13:00
Ingo Schommer
78f74737b6
Improved SS_Cache docs, moved to /docs
...
We keep having trouble with extended PHPDoc formatting,
and have similar topics covered in Markdown already.
Moved docs, added some details about timeouts and
the theory of caching backends.
2014-03-16 11:55:55 +13:00
Ingo Schommer
cc51e0a889
Skip tags in Zend_Cache for Aggregate if not available
...
Allows usage of one consistent Zend_Cache backend
for all SilverStripe core storage, greatly simplifying
its configuration. This means a call to Aggregate::flushCache()
will indeed flush all caches if the backend doesn't support tags,
including any custom caches defined through SS_Cache.
Given caches are regarded transient that's an acceptable limitation.
2014-03-16 11:54:00 +13:00
Ingo Schommer
6b53368814
QA pointers in docs
2014-03-16 11:41:21 +13:00