Commit Graph

1789 Commits

Author SHA1 Message Date
Loz Calver 38a8a4370f Merge pull request #1428 from dhensby/pulls/2.4/travis-update
Updating travis settings
2016-03-15 17:20:14 +00:00
Daniel Hensby 76a99dccb6 Updating travis settings 2016-03-15 17:08:18 +00:00
Ingo Schommer 00a791666d Merge pull request #1012 from silverstripe/pulls/2.4-travis
Update travis configuration to use composer phpunit
2014-05-05 22:49:00 +12:00
Damian Mooyman 56ea23a3b6 Update travis configuration to use composer phpunit 2014-05-05 17:22:24 +12:00
Ingo Schommer 5fb8b8eb7d Merge pull request #958 from tractorcow/pulls/2.4-merge-#955
BUGFIX Load jquery before leftandmain.js in upload iframe for assets
2014-03-03 08:48:13 +13:00
jean 48a8213a18 BUGFIX Load jquery before leftandmain.js in upload iframe for assets 2014-02-27 14:59:28 +13:00
Ingo Schommer eb3304025a Merge tag '2.4.13' into 2.4 2013-09-27 00:24:57 +02:00
Ingo Schommer 84c59b7904 Tagged 2.4.13 2013-09-26 01:12:04 +02:00
Ingo Schommer 36afefc1f7 Tagged 2.4.12 2013-09-12 16:29:36 +02:00
Ingo Schommer 6543b4e6f0 FIX Privilege escalation through Group and Member CSV upload (SS-2013-004)
See http://www.silverstripe.org/ss-2013-004-privilege-escalation-through-group-and-member-csv-upload/
2013-08-30 15:43:02 +02:00
Ingo Schommer 2713c462a2 composer/installers dep workaround
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
2013-08-07 14:36:54 +02:00
Ingo Schommer f8cfb5afd6 composer/installers dep workaround
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
2013-04-30 19:09:16 +03:00
Ingo Schommer f212ebe0f0 Simplified travis builds (external setup scripts) 2013-03-28 21:11:38 +01:00
Ingo Schommer c7b0666390 BUG Escape page titles in CommentAdmin table listing 2013-02-17 23:22:02 +01:00
Ingo Schommer 4c525fe801 Fixed composer.json dependencies 2012-12-04 23:01:41 +01:00
Ingo Schommer 41aec54e88 BUG Consistently use FormResponse in CMS JavaScript (fixes #8036)
Regression caused by a security fix in 9bf3ae9a190
2012-12-04 12:07:17 +01:00
Ingo Schommer 75e58c9508 More graceful handling of missing GET data in ModelAdmin
See https://github.com/silverstripe/silverstripe-cms/pull/253
2012-12-04 11:38:32 +01:00
Ingo Schommer 6eb597a2d5 Fixed travis.yml paths 2012-11-21 14:03:04 +01:00
Ingo Schommer 3f24b0fc17 Added README with build status 2012-11-09 13:14:28 +01:00
Ingo Schommer 65793e2b38 Added travis support 2012-11-09 13:07:23 +01:00
Ingo Schommer 7abb6eccc1 Added composer.json 2012-11-01 16:34:52 +01:00
Ingo Schommer 3fff44a5b4 Merge pull request #157 from silverstripe-big-o/staticPublishingFix24
Static publishing fix24
2012-07-09 01:13:22 -07:00
Julian Seidenberg 838ac97177 BUGFIX: fixing an edge-case bug where a 404-page would get statically published and overwrite the homepage of the site (this would sometimes happen when a RedirectorPage was set to an external URL and still referenced an internal page ID) 2012-07-09 13:24:00 +12:00
Ingo Schommer 4abe136db5 API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:56:21 +01:00
Ingo Schommer 7645f5fb22 Merge pull request #14 from lku/tinymce_ssbuttons_cz
CZ translation for tinymce_ssbuttons plugin
2011-12-18 08:05:28 -08:00
Ingo Schommer bb757d13a4 ENHANCEMENT Allow editing of new File.ShowInSearch flag through AssetTableField 2011-09-15 16:17:47 +02:00
Ingo Schommer d15e8509b0 SECURITY Using JSON instead of serialize() to stringify user data in PageCommentsInterface 2011-09-15 15:22:54 +02:00
Ingo Schommer b5ea2f68fe BUGFIX Consistently using Convert::raw2sql() instead of DB::getConn()->addslashes() or PHP's deprecated addslashes() for database escaping 2011-09-15 15:20:04 +02:00
Will Rossiter 5cd1b523ea Merge pull request #24 from candidasa/2.4
BUGFIX: fixing random changing of access tab radio buttons when refreshing the CMS
2011-09-01 16:14:09 -07:00
Julian Seidenberg af0bf453b2 BUGFIX: fixing random changing of access tab radio buttons when refreshing the CMS with a URL such as /admin#Root_Access in Firefox. 2011-08-31 10:31:33 +12:00
Will Rossiter a2464a5184 Merge pull request #16 from lku/new_translation
MINOR: Adding translation for CMSMain saved form response.
2011-06-09 14:20:23 -07:00
Ladislav Kubes 1f0277b781 Add some missing CZ translations in cms javascript 2011-06-09 17:21:49 +02:00
Ladislav Kubes 5d3ddafbd8 Add some translation in cms core 2011-06-09 16:18:35 +02:00
Ladislav Kubes aa748113e3 CZ translation for tinymce_ssbuttons plugin 2011-06-09 11:34:08 +02:00
Sean Harvey 27aad3deca BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey 3b6a9579d4 BUGFIX #6304 PageCommentInterface::PostCommentForm() loads inappropriate data from cookie, including wrong values for ParentID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer 25de6303a8 BUGFIX Allowing CMSMain->rollback() outside of form contexts, temporariliy disabling CSRF protection. Necessary in order to get rollback actions working from admin/getversion (regression from 2.4.4 release, see #6291)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115313 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer 6a02f2edb5 BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission() (from r115185)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey 77c5701fa6 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!) (from r114940)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer 357b868b4f BUGFIX Disallow web access to cms/silverstripe_version to avoid information leakage (from r114770)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer 375151c14d MINOR Updated SilverStripe logo to new design (from r114764)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer 7428010748 BUGFIX Added SecurityToken to PageCommentInterface->DeleteAllLink() (fixes #6223, thanks Pigeon)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:52 +13:00
Andreas Piening 3ba6e70540 MINOR: fixed visual glitch in CMS access tab for IE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Sean Harvey e907e2e266 BUGFIX Fixed case where AssetAdmin would throw an error if $links was not an object in AssetAdmin::getCustomFieldsFor()
MINOR Defined $backlinks as an array before adding entries to it


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Saophalkun Ponlu 75f12d5a7e ENHANCEMENT: Update Asset's left and right panels with filders and files after 'Look for new files' was triggered (open #5543)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer b8338bc2bc MINOR Typo in AssetAdmin (fixes #6191, thanks Juanitou)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113695 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer e8e5c62c5a BUGFIX Avoid reloading CMS form twice after certain saving actions (fixes #5451, thanks muzdowski)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113692 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer c19aa2ce85 MINOR Making some JavaScript strings in cms/javascript translatable, and updated their cs_CZ and sk_SK translations (fixes #6085, thanks Pike)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer 6df2e74323 MINOR Fixed regression from r113282 for changed SecurityToken API in CMSMain->publishall() (fixes #6159)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer bc3df654bd API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00