Hamish Friedlander
8e2ed31453
Merge pull request #1176 from tractorcow/pulls/3.1.11/fix-page-create
...
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 16:36:39 +13:00
Damian Mooyman
a84361e4e8
Ensure SiteConfig::canView
2015-03-19 16:16:54 +13:00
Damian Mooyman
3df41e1176
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 15:29:38 +13:00
Loz Calver
e0afd2f772
Update use of DataObject methods (as per framework #3799 )
2015-03-13 22:11:51 +00:00
Damian Mooyman
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +13:00
Damian Mooyman
c0a44db56b
Merge pull request #1154 from uniun/missing-translations-entity
...
FIX. Missing translation entity
2015-03-10 22:50:26 +13:00
Damian Mooyman
c238e1e15b
Update translations
2015-03-09 17:11:50 +13:00
Damian Mooyman
cabd8bbab9
Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting
...
FIX: VirtualPages use correct casting for 'virtual' database fields
2015-03-06 11:29:18 +13:00
Damian Mooyman
6c92a86d2e
BUG Fix CMSMainTest attempting to render page on Security permission error
2015-02-24 17:27:48 +13:00
Damian Mooyman
2fdf9d7320
Fix CORE_RELEASE
2015-02-20 12:48:27 +13:00
Damian Mooyman
21e2bc7258
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/reports/Report.php
2015-02-20 10:16:37 +13:00
Damian Mooyman
c7814cffc9
Update translations
2015-02-16 11:54:06 +13:00
Damian Mooyman
0a8cb64a5c
Merge pull request #1165 from dhensby/pulls/fixes
...
Pulls/fixes
2015-02-13 11:54:26 +13:00
Daniel Hensby
fe8cbc89d4
Remove double escaping of report data
2015-02-08 02:11:17 +00:00
Daniel Hensby
a530085016
FIX External redirects shouldnt show in preview pane
2015-02-08 00:30:38 +00:00
Damian Mooyman
cfcbfea88e
Merge pull request #1159 from micmania1/patch-3
...
BUG Correctly sanitise Title
2015-01-22 22:23:26 +13:00
Michael Strong
7733c4335e
BUG Correctly sanitise Title
2015-01-22 17:54:05 +13:00
Damian Mooyman
475b6d18e5
Merge remote-tracking branch 'composer/3.1' into 3
2015-01-15 17:48:11 +13:00
Elvinas L.
9da7e90bf4
FIX. Missing translation entity
...
Missing translation entity on Update URL button.
2015-01-13 12:36:09 +02:00
Damian Mooyman
ee4639ed74
Update translations
2015-01-12 17:52:29 +13:00
Damian Mooyman
19f337b544
Merge pull request #1110 from stephenmcm/SearchFormPatch
...
BUG: Fixes #1107 SearchForm not calling getTemplate() in forTemplate()
2014-12-03 15:32:33 +13:00
Stephen McMahon
9d888d5dde
BUG: Fixed SearchForm not calling getTemplate() in forTemplate()
2014-12-02 15:13:42 +11:00
Damian Mooyman
e9e95b9dba
Fix alias for 3.2
2014-11-20 17:26:14 +13:00
Damian Mooyman
0c7da4bbd2
Update branch alias for 3
2014-11-20 17:14:18 +13:00
Damian Mooyman
638fb46407
Resolve merge regressions
2014-11-19 11:04:20 +13:00
Damian Mooyman
d01883a5f8
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/model/SiteConfig.php
2014-11-18 12:45:42 +13:00
Loz Calver
a142ffd465
FIX: VirtualPages use correct casting for 'virtual' database fields
2014-11-17 15:44:17 +00:00
Damian Mooyman
708e70624c
Update translations
2014-11-08 17:06:10 +13:00
Daniel Hensby
dd0332d66d
Merge branch 'guywatson-patch-1' into 3.1
2014-11-03 23:06:38 +00:00
guywatson
d2f0eafa27
Add an extension hook to the getIsModifiedOnStage method
2014-11-03 23:04:28 +00:00
Sam Minnée
93d09d4dbb
Merge pull request #1127 from halkyon/sprintf_missing
...
BUG sprintf missing on exception in SilverStripeNavigator
2014-11-03 14:40:12 +13:00
Sean Harvey
56142b8bba
BUG sprintf missing on exception in SilverStripeNavigator
2014-11-03 14:09:27 +13:00
Loz Calver
7fc5a29f35
Merge pull request #1119 from micmania1/fix-broken-links-dependent-pages
...
FIX Broken links on dependent pages tab
2014-10-23 23:24:11 +01:00
micmania1
8310135923
FIX Broken links on dependent pages tab
2014-10-23 21:53:12 +00:00
Ingo Schommer
286dfe4d86
Fixed duplicate CSS scoping in AssetAdmin.scss
2014-10-16 10:36:31 +13:00
Ingo Schommer
3b93310163
Recompiled CSS with compass 1.0
...
Minor syntactical changes, like alphabetical ordering of filters, uppercasing of hex colours. See http://compass-style.org/blog/2014/08/15/omg-compass-1-0/ .
Shouldn't include any user-visible changes, but helps to avoid confusion with the next person trying to modify the CSS (Luke is currently struggling with that)
2014-10-16 10:35:58 +13:00
Damian Mooyman
dd98317b67
Merge pull request #1113 from eimanavicius/master
...
Fixes #1112 protected method call
2014-10-08 08:45:25 +13:00
Nerijus Eimanavičius
7f3563cd72
Fixes #1112
...
Fixes #1112 $conn->fieldList('SiteTree') has protected access but is called from SiteTree
2014-10-07 10:11:49 +03:00
Sam Minnee
f486c3250b
MINOR: Fixed copyright year
2014-09-18 12:59:20 +12:00
Ingo Schommer
ae4601be54
Merge pull request #1096 from gander/3.1
...
Update pl.yml for ContentController.StartEditing
2014-09-01 08:19:41 +12:00
Will Rossiter
b838f8161f
Merge pull request #1092 from halkyon/removing_deprecated
...
Removing deprecated method
2014-08-31 17:34:55 +12:00
Gander
6d50b26757
Update pl.yml for ContentController.StartEditing
...
For over a year, here is an error, resulting in the display of the broken link to the Polish version of CMS, after installation.
2014-08-26 21:43:41 +02:00
Will Rossiter
3f902eb9fc
Merge pull request #1093 from dhensby/patch-1
...
Implement `TemplateGlobalProvider` on `SiteConfig`
2014-08-23 09:24:26 +12:00
Daniel Hensby
89184a8134
Implement TemplateGlobalProvider on SiteConfig
...
Seeing as the `SiteConfig` is a site wide and "global" object, it makes sense to have it universally available to the templates
2014-08-22 14:28:19 +01:00
Sean Harvey
195ef05c8d
Removing deprecated method
2014-08-22 18:16:03 +12:00
Damian Mooyman
fa90658b7c
Merge pull request #1090 from halkyon/travis_reformat
...
Reformat .travis.yml
2014-08-22 15:46:11 +12:00
Sean Harvey
4d0e4b78f4
Reformat .travis.yml
2014-08-22 14:04:50 +12:00
Sean Harvey
23e70009d8
Merge pull request #1083 from mateusz/fix-link-tracking
...
API Change broken link hihglighting to write to database.
2014-08-15 13:10:01 +12:00
Mateusz Uzdowski
2ba1c46bc8
API Change broken link hihglighting to write to database.
...
Before it would be applied on the fly during the rendering of the
HtmlEditorField, and only be written to the database during the
subsequent write.
We just shift the behaviour to apply just-in-time.
2014-08-15 12:29:26 +12:00
Sean Harvey
8baa126c1b
Merge pull request #1077 from mateusz/link-tracking
...
Refactor the link-tracking code and move it from framework.
2014-08-14 14:11:28 +12:00
