Commit Graph

4003 Commits

Author SHA1 Message Date
Ingo Schommer
8a96bab70d Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 18:50:52 +02:00
Ingo Schommer
0b073d2d0f Merge tag '3.0.6' into 3.0 2013-09-27 00:20:35 +02:00
Ingo Schommer
fbb9a4449d Removed stale salad tests, got behat now 2013-09-26 10:53:19 +02:00
Ingo Schommer
9a4a5d909d Merge pull request #816 from kinglozzer/798-custom-page-icons
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798)
2013-09-25 12:54:01 -07:00
Simon Welsh
cec5aa5ff1 Merge pull request #854 from chillu/pulls/escape-3.0
Escaping 3.0
2013-09-24 12:40:40 -07:00
Ingo Schommer
86339a551d Clearer escaping in CMSMain
No direct security issue, but makes intent clearer
2013-09-24 21:37:26 +02:00
Ingo Schommer
e170f4c21b FIX Escaping in "dependent pages" (SS-2013-009) 2013-09-24 21:37:26 +02:00
Ingo Schommer
79996a76fe Clearer escaping in ReportAdmin
No direct security issue since report titles can't be set by the user
2013-09-24 21:37:26 +02:00
Ingo Schommer
29e502a63a Hints for SiteTree.TreeTitle casting
Relates to SS-2013-009
2013-09-24 21:37:26 +02:00
Ingo Schommer
16c802f7e1 More specific behat tree assertions 2013-09-14 00:21:29 +02:00
Ingo Schommer
7ec7a263c0 Behat scenarios for page permissions and search (steps only)
Actual step implementation not done yet
2013-09-13 18:46:23 +02:00
Ingo Schommer
5203cd2075 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-09-12 17:16:36 +02:00
Ingo Schommer
201f4881e6 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-12 17:16:29 +02:00
Ingo Schommer
553f32576d Updated translations 2013-09-12 16:53:44 +02:00
Ingo Schommer
65939e1ede Tagged 3.0.6-rc2 2013-09-12 16:48:20 +02:00
Ingo Schommer
a2342ce1ff Updated translations 2013-09-12 16:37:43 +02:00
Ingo Schommer
4e031076be Search callback for "add page" selector
Necessary since we now default $showSearch=true in TreeDropdownField.
See https://github.com/silverstripe/silverstripe-framework/pull/2364
2013-08-29 17:08:42 +02:00
Ingo Schommer
cdb4ab4fbc Merge pull request #843 from nedmas/patch-1
FIX: GridField button styling in reports
2013-08-29 06:02:31 -07:00
Tom Densham
4f30fedafd FIX: GridField button styling in reports 2013-08-29 13:56:29 +01:00
Ingo Schommer
9b15c8c16d Merge pull request #842 from ARNHOE/3.1-siteconfigfix
FIX SiteConfig scrollbars visible
2013-08-29 04:52:31 -07:00
Ingo Schommer
23c9afa25c Merge pull request #802 from tractorcow/3.1-condition-fix
BUG Fixed up SQL table.column identifiers, SQL encoding issue
2013-08-29 03:07:12 -07:00
Damian Mooyman
5f828149c3 BUG Fixed instances of loosely defined SQL predicates not qualified by table name
Fixed duplicate SQL escaping on SiteTree::get_by_link
2013-08-29 13:59:45 +12:00
Arno Poot
9ba92a7bc5 FIX SiteConfig scrollbars visible 2013-08-28 20:54:06 +02:00
Ingo Schommer
2b20a02735 Merge pull request #840 from halkyon/compositefield_assetadmin_warning
AssetAdmin: PHP warning trying to add empty values into CompositeField
2013-08-28 06:44:09 -07:00
Ingo Schommer
6d694a550a Merge pull request #837 from ARNHOE/3.1-siteconfigfix
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-28 02:20:47 -07:00
Sean Harvey
27749fdb7a AssetAdmin: PHP warning trying to add empty values into CompositeField
If the logged in user doesn't have permission to add a Folder record,
AssetAdmin::getEditForm() tries to enter an empty value into the
children of a ComposteField. This breaks SSViewer with a
call_user_func invalid args PHP warning.

Only include these buttons when they're available to the user.
2013-08-27 14:30:39 +12:00
Arno Poot
920da0d120 SiteConfig updated to modeladmin style and fixed ajax switching 2013-08-24 12:33:38 +02:00
Ingo Schommer
010869a9b5 Merge pull request #828 from sheadawson/827-treescroll
CMS tree pane to scroll to the page being edited. Fixes #827
2013-08-20 13:32:22 -07:00
Ingo Schommer
f38d46224a Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-08-20 22:28:54 +02:00
Ingo Schommer
3dc86f98a3 Fixed merge error 2013-08-20 22:25:24 +02:00
Ingo Schommer
d4e9471820 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-08-20 21:00:00 +02:00
Ingo Schommer
ba57d42349 Merge remote-tracking branch 'origin/3.0' into 3.1.0
Conflicts:
	code/controllers/ContentController.php
	code/model/SiteTree.php
	tests/search/SearchFormTest.php
2013-08-20 20:59:44 +02:00
Ingo Schommer
5757f22952 Merge branch '3.1.0' into 3.1 2013-08-20 16:56:46 +02:00
Ingo Schommer
1628cd130c Skip html entity SearchFormTest for PostgreSQL
Should be fixed, but its not trivial.
2013-08-20 16:56:24 +02:00
Ingo Schommer
c4e54fd7eb Fixed fromDocument usage in .cms-tree
See https://github.com/silverstripe/silverstripe-cms/pull/823
2013-08-20 15:37:17 +02:00
Ingo Schommer
26bca388e8 Revert "Updated siteconfig layout to be more like modeladmin"
This reverts commit afd9f28279.
See https://github.com/silverstripe/silverstripe-cms/issues/830
2013-08-20 15:20:44 +02:00
Ingo Schommer
88081d5333 Merge branch 'context-menu' of https://github.com/adrexia/silverstripe-cms into adrexia-context-menu 2013-08-20 14:47:40 +02:00
Shea Dawson
bb86373ab9 CMS tree pane to scroll to the page being edited. Fixes #827 2013-08-19 11:18:37 +10:00
Ingo Schommer
44fdf66834 Merge pull request #809 from ARNHOE/3.1-siteconfig
Updated siteconfig layout to be more like modeladmin
2013-08-15 13:45:50 -07:00
Ingo Schommer
004dfa76b1 Updated translations 2013-08-09 14:53:17 +02:00
Hamish Friedlander
71608f0d4a FIX Add SiteTree link tracking as an extension, and apply to SiteTree itself 2013-08-09 11:46:32 +02:00
Sam Minnee
8ad00a1004 Updated translation master file 2013-08-09 14:14:35 +12:00
Sam Minnée
d7d0cb45ae Merge pull request #824 from hafriedlander/fix/archivedate
FIX ArchiveDate enforcement
2013-08-08 17:38:53 -07:00
Sam Minnée
e922717b42 Merge pull request #825 from simonwelsh/canview
FIX Check for stage and drafts in SiteTree::canView()
2013-08-08 17:38:27 -07:00
Simon Welsh
b1664f86a4 FIX Check for stage and drafts in SiteTree::canView() 2013-08-09 10:45:09 +12:00
Hamish Friedlander
2fae9280e5 FIX ArchiveDate enforcement 2013-08-08 17:17:35 +12:00
Ingo Schommer
99ba7bdb4e Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	lang/en.yml
	templates/CMSPageHistoryController_versions.ss
2013-08-07 17:15:17 +02:00
Ingo Schommer
a54c51c586 Merge pull request #821 from chillu/pulls/transifex-3.1
Translations: Switch to Transifex format (3.1)
2013-08-07 08:09:26 -07:00
Ingo Schommer
d01728675d Merge pull request #820 from chillu/pulls/transifex-3.0
Translations: Switch to Transifex format (3.0)
2013-08-07 08:09:11 -07:00
Naomi Guyer
a2a4957fa5 BUG: Context menu too long (Fixes #811)
Added javascript to add and remove classes on context sub menus, to
allow for multi column layout.
2013-08-07 13:46:40 +12:00