tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,184 Commits 29 Branches 403 Tags 28 MiB
ef0f633f46
Commit Graph

4184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
64608ea622 Merge pull request #860 from ajshort/virtual-page-test-cache 
Fix test sometimes using cached relationship object.
 2013-10-02 02:44:28 -07:00
Andrew Short
1f4cdfced8 Fix test sometimes using cached relationship object. 
In some circumstances, the CopyContentFrom page will be cached, so when
it is accessed the incorrect value was returned, meaning the test
would fail.
 2013-10-02 15:03:50 +10:00
Ingo Schommer
956b6de05c Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-01 11:19:14 +02:00
Ingo Schommer
daf92e6ce0 FIX ReportAdmin report links regression 
Regression from 79996a76fe,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
 2013-10-01 11:17:36 +02:00
Ingo Schommer
e991b44994 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-10-01 01:45:33 +02:00
Ingo Schommer
c2a34ff4a7 Updated translations 2013-10-01 00:05:08 +02:00
Ingo Schommer
7ec9596b99 CMSMain assertion fail due to escaping 
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
 2013-09-30 22:44:44 +02:00
Ingo Schommer
cc2dcb2c4f Merge remote-tracking branch 'origin/3.1' 2013-09-27 19:44:03 +02:00
Ingo Schommer
1a48afd499 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 19:39:23 +02:00
Ingo Schommer
30cf08b27e CMSMain assertion fail due to escaping 
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
 2013-09-27 19:38:12 +02:00
Ingo Schommer
32478ab512 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
 2013-09-27 19:07:13 +02:00
Ingo Schommer
0ee7a9ba38 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-09-27 18:52:44 +02:00
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
dc1ae03fec Tagged 3.1.0-rc3 2013-09-26 01:42:31 +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
Simon Welsh
dde9ce20f1 Merge pull request #853 from chillu/pulls/escape-3.1.0 
Escaping 3.1
 2013-09-24 12:40:30 -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
f477983bff Clearer escaping in CMSMain 
No direct security issue, but makes intent clearer
 2013-09-24 21:35:03 +02:00
Ingo Schommer
ec9c15917d FIX Escaping in "dependent pages" (SS-2013-009) 2013-09-24 21:35:00 +02:00
Ingo Schommer
a5d9958f8c Clearer escaping in ReportAdmin 
No direct security issue since report titles can't be set by the user
 2013-09-24 21:34:58 +02:00
Ingo Schommer
aee0381663 Hints for SiteTree.TreeTitle casting 
Relates to SS-2013-009
 2013-09-24 14:03:25 +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
Ingo Schommer
ef21906063 "add page" behaviour fixed to work with new FormField IDs (#786) 2013-08-28 11:10:32 +02: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
c62f992dc3 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:28 +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