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,127 Commits 29 Branches 403 Tags 28 MiB
cc2dcb2c4f
Commit Graph

357 Commits

Author SHA1 Message Date
Ingo Schommer
c09bca6fac Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	lang/ja_JP.yml
	lang/lt.yml
	lang/pl.yml
 2013-02-18 14:18:27 +01:00
Ingo Schommer
92db313ce7 Hardcode travis branch on dependencies, otherwise breaks pull request builds 
Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
 2013-02-18 14:14:42 +01:00
Ingo Schommer
1ef155fc18 Hardcode travis branch on dependencies, otherwise breaks pull request builds 
Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
 2013-02-18 14:13:24 +01:00
Ingo Schommer
8c3f87bb8a Results returned from FSP->publishPages() 
Aids further processing and verbose display,
e.g. when the publication is triggered by a queuing mechanism.
 2013-02-06 10:47:41 +01:00
Ingo Schommer
eba4d205c3 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 12:44:40 +01:00
Ingo Schommer
b15b98345f Using new "Security.login_url" configuration value 2013-01-29 18:06:49 +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
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13: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
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +01:00
Ingo Schommer
74d63791b7 Fixed regression in SiteTree->getCMSActions() 
Caused by toolbar recent changes
 2012-12-14 01:21:54 +01:00
Ingo Schommer
611c3f1b2e Added travis environment info output 2012-12-12 15:14:11 +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
084acc0fbd Fixed Behat tests for preview feature 2012-12-10 18:09:55 +01:00
Ingo Schommer
1bf67fd942 Merge remote-tracking branch 'origin/3.0' 2012-12-10 18:09:34 +01:00
Ingo Schommer
4fa4ae726b Adjusted Behat steps to new definition format 2012-12-10 15:38:32 +01:00
Ingo Schommer
f9a5601fa3 BUG Enforce "add page" restrictions, improve UI (fixes #7879) 
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
 2012-12-03 16:52:17 +01:00
Ingo Schommer
3512ee82f4 Merge remote-tracking branch 'origin/3.0' 2012-11-28 16:36:30 +01:00
Ingo Schommer
e5f206065e Using $TRAVIS_BRANCH again, since its now available on travis-ci.org 2012-11-28 16:33:50 +01:00
Ingo Schommer
7bd200f2db Re-adding usage of $TRAVIS_BRANCH, fixing wrong 3.0 dependency 
Probably caused by a merge from 3.0
 2012-11-28 16:14:01 +01:00
Sean Harvey
e5b2643a11 Merge branch '3.0' 2012-11-26 17:19:14 +13:00
Kirk Mayo
40a1a35618 BUG Namespaces for CmsFormsContext and CmsUiContext are wrong 2012-11-26 01:16:02 +01:00
Kirk Mayo
670c579153 BUG Namespaces for CmsFormsContext and CmsUiContext are wrong 2012-11-26 11:49:51 +13:00
Ingo Schommer
8d5cea550c TRAVIS_BRANCH doesn't seem to be set in before_script, hardcoding 2012-11-23 16:31:51 +01:00
Ingo Schommer
e67474293f More verbose travis build process 2012-11-23 16:20:14 +01:00
Ingo Schommer
b42cb5c308 Passing through $TRAVIS_BRANCH to before_script 2012-11-23 16:10:07 +01:00
Ingo Schommer
47e14f5e56 Fixed $TRAVIS_BRANCH env var usage in before_script 
Fixes "class TableListField not found" errors in travis.
Before that, we've been testing the 3.0 cms with
master framework, which of course is a bad idea ;)
 2012-11-23 15:59:01 +01:00
Ingo Schommer
76b99e4006 Fixed tests without assertions 2012-11-23 15:52:00 +01:00
Ingo Schommer
26bdee4f08 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	tests/model/SiteTreeTest.php
 2012-11-23 15:31:03 +01:00
Ingo Schommer
ff1df3696f Limiting redirection-follow to specific tests in CMSMainTest 
Fixes *some* quirks when running tests with
the 'translatable' module enabled (which redirects
to URLs with ?locale=<locale> in the CMS by default).
 2012-11-23 15:30:11 +01:00
Ingo Schommer
8659c27487 Remove unused set_up_once() invocations from various tests 
SapphireTest method name was changed to instance method
and setUpOnce() naming in mid 2010 already (093da759).
Since those methods were never invoked, they're obsolete.
Checked that the SiteTree-related tests pass with
Translatable enabled.
 2012-11-23 13:58:54 +01:00
Ingo Schommer
e6e12fe00e Merge branch '3.0' 
Conflicts:
	composer.json
 2012-11-22 23:48:18 +01:00
Ingo Schommer
20a817875a Shortened behat.yml 2012-11-14 00:51:21 +01:00
Ingo Schommer
df23a6ce1a Corrected step wording 2012-11-14 00:51:21 +01:00
Ingo Schommer
9841d5b074 NEW Added Behat tests 2012-11-14 00:51:21 +01:00
Andrew O'Neil
48a9bcf276 APICHANGE: Use late static binding for Object::remove_extension() 2012-11-07 11:08:36 +13:00
Andrew O'Neil
1722f00869 APICHANGE: add_extension() is now called directly on the class, instead of on Object 2012-11-07 11:08:36 +13:00
Ingo Schommer
db3499cdf5 Merge remote-tracking branch 'origin/3.0' 2012-10-16 10:26:09 +02:00
Damian Mooyman
d50cb230e4 BUG Fixed issue with MigrateSiteTreeLinkingTask test data being incorrectly loaded into database 
Fixed issue
 2012-10-16 16:48:27 +13:00
Simon Welsh
38f28deafe Adds Travis testing to the CMS 2012-09-27 13:00:49 +12:00
Sean Harvey
b92f759963 Fixing test to be less fragile (selects the input ID directly instead of holder) 2012-09-27 12:14:14 +12:00
Sean Harvey
cb8c10a473 Merge branch '3.0' of github.com:silverstripe/silverstripe-cms into 3.0 2012-09-27 10:49:03 +12:00
Sean Harvey
2c4ebd3cb9 Fixing broken SiteTreeHTMLEditorFieldTest 2012-09-23 22:49:44 +12:00
Ingo Schommer
cbd31e3ab2 API Removed SiteTree.MetaTitle and MetaKeywords 
They are irrelevant in terms of SEO, general page informancy,
clutter up the CMS UI, and encourage CMS authors to waste
their time filling them out.

[1] http://www.seomoz.org/learn-seo/title-tag
[2] http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/
 2012-09-21 11:31:00 +02:00
Ingo Schommer
77ef6570a3 Merge remote-tracking branch 'origin/3.0' 2012-09-21 10:48:22 +02:00
Simon Welsh
4506e92536 Adds Travis testing to the CMS 2012-09-21 15:43:01 +12:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Ingo Schommer
1cd82e2db1 BUG Enforce $allowed_children in controllers on page creation (fixes #7694) 
Original bug fix contributed by @kmayo-ss
 2012-09-02 18:20:22 +02:00
Ingo Schommer
8a514d8b64 BUG Correct live state in SiteTree->getAbsoluteLiveLink() 
Was fetching the record from live (and its direct URLSegment),
but all of its parents from the current stage, which might be draft,
leading to "mixed" draft/live nested URLs which might no longer
be reachable in live mode.
 2012-08-28 19:04:16 +02:00
Hamish Friedlander
d45dd34db9 FIX VirtualPageTest failing on apps with no $db on Page 
VirtualPageTest was adding fields to Page via a decorator, but Page might
not have any fields itself. This changed Page from not having a table
to having a table, which then caused a problem on tearDown
 2012-08-28 15:13:57 +12:00
carlos barberis
f7b6f1de5a BUGFIX: ticket #5239 - Infinite loop: live subpage of draft page redirects onto itself when called just by url segment 2012-07-23 17:06:37 +12:00
Mateusz Uzdowski
54fd54a2fb BUG Change all shortcodes into the new, comma separated, format. 
Ref http://open.silverstripe.org/ticket/7337
 2012-07-12 17:57:38 +02:00
Ingo Schommer
813ed75869 MINOR Test MenuTitle null'ing (see #7505) 2012-06-20 18:26:55 +02:00
Ingo Schommer
e50936fe9f MINOR Added caching to SiteTree->getStatusFlags(), as its called twice for every node now in LeftAndMain->SiteTreeAsUL() (see #7410) 2012-06-12 19:35:15 +02:00
Sean Harvey
542d727db2 MINOR Don't use deprecated extraStatics when adding extra statics with 
DataExtension
 2012-05-23 22:13:27 +12:00
Sean Harvey
0515555ab1 MINOR Fixing CMSMainTest using old code, updating to new CMS admin/pages URL 2012-05-22 17:35:04 +12:00
Sean Harvey
2cb89ed696 MINOR Fixing invalid URL 2012-05-22 17:16:29 +12:00
Sean Harvey
c72bae3a8e MINOR Fixing assertType() assertions with assertInstanceOf() 2012-05-09 23:06:55 +12:00
Sean Harvey
dedb9d0461 MINOR Removing use of _t() in test, assert the english text since en_US 
is the locale set for tests by default.
 2012-05-09 21:54:33 +12:00
Sean Harvey
46660e98bc MINOR Fixing broken test 2012-05-09 21:52:32 +12:00
Ingo Schommer
8563322971 BUGFIX Fixed publication of multibyte URLSegment in SiteTree->onBeforeWrite(), was wrongly detecting a change and double encoding 2012-05-08 23:45:29 +02:00
Ingo Schommer
08a7bf0879 BUGFIX Remove double URL/filename filtering in FilesystemPublisher to avoid breaking multibyte URLs (now possible through recently introduced URLSegmentFilter class). Multibyte safe url path processing in FilesystemPublisher. 2012-05-08 22:22:08 +02:00
Julian Seidenberg
8ad93a197e BUGFIX: check for abstract classes when automatically registering SS_Report classes. Abstract classes are now no longer included in the list of Reports. Includes unit test for this scenario. 2012-04-20 16:32:39 +12:00
Ingo Schommer
0e071c9393 MINOR Fixed tests broken by recent CMS search and breadcrumbs changes 2012-04-18 23:40:27 +02:00
Ingo Schommer
1b3a634a56 MINOR Fixed hardcoded links from admin/page to admin/pages 2012-04-18 23:33:37 +02:00
Ingo Schommer
8a72b32e95 API CHANGE Moved Widget API to new module (https://github.com/silverstripe/silverstripe-widgets), incl. WidgetArea and WidgetAreaEditor classes 2012-04-18 23:21:59 +02:00
Andrew O'Neil
d1c500a5f9 MINOR: Remove checks for PHP <5.3.2, as it's no longer supported 2012-04-18 10:36:55 +12:00
Simon Welsh
b8e86ae261 MINOR Add newline to end of files without one 2012-04-15 10:56:40 +12:00
Ingo Schommer
dc0168d01b MINOR Removed $params argument to DataObject->getCMSFields(), please use FormScaffolder directly (fixes #7135) 2012-04-13 15:55:32 +02:00
Ingo Schommer
76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Normann Lou
c1b248e2cf ENHANCEMENT SiteTree->getStatusFlags() which makes SiteTree->getTreeTitle() extensible 2012-04-04 23:02:53 +02:00
Julian Seidenberg
349a04d049 API-CHANGE: SSF-168 changing the API/code-conventions for excluding specific reports. get_reports method now returns an ArrayList instead of an array of SS_Reports. 2012-04-04 10:58:48 +12:00
Julian Seidenberg
ee220bbcce API-CHANGE: SSF-168 initial rearranging the SS_Report class for use in SS3. Deprecating unnecessary methods, moving code around, rewriting get_reports method and writing unit tests 2012-04-03 18:06:35 +12:00
Julian Seidenberg
fe2805834a ENHANCEMENT: renaming SSReportTest to Report test so it matches the name of Report.php 2012-04-03 16:13:06 +12:00
Sean Harvey
ded3fd8d68 MINOR Fixed broken test from json changes 2012-03-30 16:25:21 +13:00
Ingo Schommer
651441225f Merge pull request #80 from halkyon/e_strict_support 
Fixes to method arguments in cms classes for E_STRICT support
 2012-03-28 02:48:17 -07:00
Ingo Schommer
1827dc6727 API CHANGE Removed SiteTree->HomepageForDomain and related functionality ($write_homepage_map and generate_homepage_domain_map()), use new 'homepagefordomain' module instead (fixes #6902) 2012-03-27 14:50:09 +02:00
Sean Harvey
0ea9451014 MINOR Fixes to method arguments in cms classes for E_STRICT support. 2012-03-27 21:42:54 +13:00
Ingo Schommer
4612b13d98 MINOR Fixed CMSMainTest to work with new breadcrumbs conventions (see 44a4e8a840) 2012-03-12 17:25:53 +01:00
Ingo Schommer
4225c0a966 MINOR Flattened AddForm and SiteConfig CMS logic, moved from base classes to specialised classes for better overview, and less inheritance where its not necessary. 2012-03-09 23:35:43 +01:00
Ingo Schommer
f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
Ingo Schommer
f88d4006f8 ENHANCEMENT CMSMain->Breadcrumbs() 2012-02-14 16:11:38 +01:00
Ingo Schommer
f4e3e79c0d API CHANGE Removed ThumbnailStripField class, as it was only used for the CMS image insertion logic (which was rewritten with a more powerful file selection based on GridField) 2012-02-14 13:32:58 +01:00
Fred Condo
d99e3a0927 Code cleanup: removed trailing ?> markers per code standard. 
All cms module except lang directory.
 2012-02-13 12:48:41 -08:00
Ingo Schommer
0bfd866623 MINOR Skip instanciation in CMSMainTest->testThatGetCMSFieldsWorksOnEveryPageType() when can_be_root is false (will fail the write call, not related to test) 2012-01-30 17:31:22 +01:00
Ingo Schommer
908a98b55b API CHANGE Default to /admin/pages rather than homepage edit view when CMS is first opened (#6762) 2012-01-24 14:20:55 +01:00
Ingo Schommer
a570e2f2a0 API CHANGE Publish ex-VirtualPage records when their page type changes, propagate type change to live (AIR-78) BUGFIX Remove extraneous database rows when changing a page from VirtualPage to another type (AIR-78) 2012-01-14 13:07:48 +01:00
Ingo Schommer
0e4e8034d6 BUGFIX Validate SiteTree::$can_be_root on saving, as well as for VirtualPage originals (AIR-80) 2012-01-14 11:20:54 +01:00
Ingo Schommer
87c318d168 BUGFIX Don't create new version on related VirtualPage records in SiteTree->onAfterWrite() when the write was triggered through writeWithoutVersion(). Use a new $_nextWriteWithoutVersion flag replacing the -1 Version number for this purpose (AIR-97) (see similar commit in sapphire) 2012-01-14 11:11:21 +01:00
Ingo Schommer
0194080951 merge 2011-12-21 17:22:47 +01:00
Ingo Schommer
7a80e6d2ea MINOR Ensuring assets/ folder is created before using it in FileLinkTrackingTest (and using ASSETS_PATH constant instead of hardcoding it) 2011-12-16 17:29:50 +01:00
Ingo Schommer
0b5d20513c ENHANCEMENT Using new URLPathFilter API in SiteTree->generateURLSegment(), allowing customisation of URL filtering and transliteration 2011-11-29 10:45:19 +01:00
Sam Minnee
5addb0054e MINOR: Fixed SearchFormTest to run last, and to recreate the test database so that MyISAM tables are used. 2011-11-08 11:27:25 +13:00
Stig Lindqvist
b5054589e3 MINOR Fixed unittest to use the correct way of setting up Fulltextsearch 2011-10-31 12:20:56 +13:00
Sean Harvey
748c0196cc MINOR Fixed broken CMSPageHistoryControllerTest assuming IDs 2011-10-30 00:19:26 +13:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Stig Lindqvist
a3a50b7b6f MINOR Skipping test when PHP Version is lower than 5.3.2 
ReflectionMethod#setAccessible was released in PHP Version 5.3.2
 2011-10-22 16:17:28 +02:00
Ingo Schommer
f98bc8480c BUGFIX Respect writeWithoutVersion() when updating VirtualPage relationships in SiteTree->onAfterWrite() (AIR-97) 2011-10-07 11:12:52 +02:00
Sam Minnee
5d235fa9f7 ENHACEMENT: Improved caching of permissions for improved CMS perfromance for non-admins (merged from r102278) 2011-10-07 10:36:56 +02:00