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
3,846 Commits 29 Branches 403 Tags 28 MiB
a96dbff3db
Commit Graph

3846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
a96dbff3db Explicitly added routes (following removal of auto-routing controllers) 2013-01-29 14:59:54 +01:00
Ingo Schommer
a7d7975a64 Merge remote-tracking branch 'origin/translation-staging' 2013-01-21 11:41:06 +01:00
Ingo Schommer
8ab66c93b6 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	code/reports/Report.php
	composer.json
 2013-01-21 11:24:05 +01:00
Ingo Schommer
61f2ab7519 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-21 10:03:30 +01:00
Ingo Schommer
e2247fa520 MINOR Updated translations 2013-01-21 10:03:10 +01:00
Kirk Mayo
1571d3542d BUG Only use $.button in onunmatch if init'ed (fixes #8181) 2013-01-21 08:43:29 +01:00
Will Rossiter
06e8499070 Remove outdated ReportAdmin assets 2013-01-21 16:53:19 +13:00
Sean Harvey
4999e5d886 Merge pull request #274 from unclecheese/patch-2 
MINOR: Grammar error
 2013-01-17 11:57:48 -08:00
unclecheese
cfc976bff8 MINOR: Grammar error 2013-01-17 14:31:35 -05:00
Ingo Schommer
8a9acaa5ba Fixed "add page" type icons (fixes #8190) 2013-01-17 19:59:54 +01:00
Ingo Schommer
b035c45dc9 Merge pull request #273 from dnadesign/reports-stripout 
API: moved reports API to separate module
 2013-01-17 01:41:08 -08:00
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
Ingo Schommer
0dd6dedab2 Moving "edit tree" button next to "add new" (fixes #8119) 2013-01-16 00:19:56 +01:00
Ingo Schommer
93bee9422a Don't duplicate SS_Report title in GridField 2013-01-14 17:12:27 +01:00
Ingo Schommer
76aeec70e7 NEW SiteTree->PreviewLink() for fine grained URL control 2013-01-14 17:12:23 +01:00
Andrew O'Neil
f9504ee983 ENHANCEMENT Writing caching metadata as HTML comments in FilesystemPublisher (through StaticPublisher::$include_caching_metadata) (ischommer) 2013-01-14 17:08:12 +01:00
Normann Lou
f674af0c73 BUG: dependentPages grid field not showing necessary columns and their values. 2013-01-09 22:35:54 +01:00
Ingo Schommer
ffc6d6ffad BUGFIX Disable CMS preview for RedirectorPage (fixes #7127) 
If the redirect is to an internal page, the preview iframe
will automatically load this new URL, causing the CMS edit
form to switch as well - effectively making it impossible
to edit a redirector page in the CMS as soon as it is saved
with an internal redirection target.
 2013-01-09 21:44:52 +01:00
Ingo Schommer
caca15034b Merge pull request #266 from silverstripe-rebelalliance/8151 
BUG SiteTree_Information.ss was not making use if i18n translations
 2013-01-07 09:45:36 -08:00
Kirk Mayo
383ae8f8b5 BUG SiteTree_Information.ss was not making use if i18n translations 2013-01-07 15:37:04 +13:00
Ingo Schommer
fa78370ac4 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-21 11:48:48 +01:00
Ingo Schommer
cb96255e80 Removed direct sprintf() usage from _t() calls 
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
 2012-12-21 11:18:18 +01:00
Ingo Schommer
e53257b01a Relaxing composer dependencies 
You currently can't install 3.1.0-beta1 through modifying your composer.json, because dependency checks will fail.
 2012-12-18 14:01:30 +01:00
Ingo Schommer
6cb77108f5 Remove "changed" style from buttons if fields are reset 2012-12-17 23:02:32 +01:00
Ingo Schommer
8dd9bf3a1e Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-17 17:34:20 +01:00
Ingo Schommer
894d48789c String casting in SimpleXML tests for older phpunit versions 2012-12-17 17:32:46 +01:00
Ingo Schommer
58d316e985 Moving "edit tree" button next to "add new" (fixes #8119) 2012-12-17 15:35:52 +01:00
Ingo Schommer
cc536f644e Fixed "last edited" display in CMS actions 2012-12-17 12:31:28 +01:00
Ingo Schommer
8db69243c6 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-17 11:54:33 +01:00
Ingo Schommer
83febeff12 Updated translations 2012-12-17 11:54:22 +01:00
Ingo Schommer
c2d31e55dd BUG Hiding group selections in "Settings" 
JS functionality was only applied to page-specific settings
with similar fields, but not to SiteConfig settings.
 2012-12-15 20:01:05 +01:00
Ingo Schommer
5b2cc19704 Added placeholder text to group listboxes 2012-12-15 19:57:14 +01:00
Ingo Schommer
75e2567a05 Merge remote-tracking branch 'origin/3.1' 2012-12-14 11:08:10 +01:00
Ingo Schommer
bb0633fffc Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	composer.json
 2012-12-14 11:06:01 +01:00
Ingo Schommer
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +01:00
Sam Minnée
a0d04e8843 Merge pull request #258 from creamarketing/assetadmin-root-pagination 
BUG: Fixed pagination functionality on root assets folder
 2012-12-13 18:07:49 -08:00
Sam Minnée
c600257e64 Merge pull request #256 from silverstripe-rebelalliance/open/7673 
FIX use of DataList#innerJoin expecting it to be mutable
 2012-12-13 16:39:36 -08:00
Ingo Schommer
74d63791b7 Fixed regression in SiteTree->getCMSActions() 
Caused by toolbar recent changes
 2012-12-14 01:21:54 +01:00
Ingo Schommer
1d470fe718 Removed duplciate success status feedback on CMS save/publish 
We now have the CMS actions with two states for communicating
that they've saved correctly.
 2012-12-13 23:29:17 +01:00
Hamish Friedlander
546762ec5c FIX use of DataList#innerJoin expecting it to be mutable 2012-12-14 08:58:07 +13:00
Mateusz Uzdowski
26cc14a930 API Rework the CMS actions to use alternating buttons and drop-ups. 
Utilise the new features provided by the framework to get richer
interface:
* save buttons that highlight the current state of the page
* minor actions in a drop-up
* embed last publishing and saving information
 2012-12-13 19:10:39 +01:00
Niklas Forsdahl
d42c0041d2 BUG: Fixed pagination functionality on root assets folder 
Moving to another page in the GridField for the root assets folder in AssetAdmin
caused all files to be displayed. This was caused by the functionality that tries
to fix some edge cases for detail view kicked in and didn't filter the list properly.

Fixed by making the edge case detection a little more specific (i.e. checking if
a numeric ID was sent as a request variable).
 2012-12-13 16:31:19 +02:00
Ingo Schommer
2e164eae51 API Report::get_reports() returns native array (fixes #8096) 
Used to return ArrayList, but since 9d74c99e08 its no
longer using keys, which they functionality using these return
values rely on. Hence the breakage of ReportAdmin,
since no report was being detected as "current" by looking
through the array keys.
 2012-12-13 00:46:17 +01:00
Ingo Schommer
f4128a0839 Revert "BUG removed class cms-panel-link as it was calling loadPanel to be called twice trac 8041" 
This reverts commit a63a9f0e74.
Broken by merging in 0be51a93213, which works on 3.0,
but failed once we put those two patches together in 3.1.
They fix the same problem on different ends, and assume
the respective other behaviour still exists.
 2012-12-13 00:28:39 +01:00
Ingo Schommer
611c3f1b2e Added travis environment info output 2012-12-12 15:14:11 +01:00
Ingo Schommer
343f2512d3 Updated composer.json 2012-12-11 18:02:44 +01:00
Ingo Schommer
4cd166a111 Updated composer.json 2012-12-11 17:59:19 +01:00
Ingo Schommer
df41fcdce4 Skip SearchFormTest if DB driver doesn't support fulltext 
For now, the only case are specific SQL Server setups.
 2012-12-11 15:18:58 +01:00
Ingo Schommer
8cd29b627c Merge branch 'pulls/selectiongroup' 2012-12-11 11:08:30 +01:00
Ingo Schommer
084acc0fbd Fixed Behat tests for preview feature 2012-12-10 18:09:55 +01:00