Commit Graph

70 Commits

Author SHA1 Message Date
Ingo Schommer
b464952522 BUGFIX wrong jsparty PATH references
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63295 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 18:49:35 +00:00
Ingo Schommer
9d8b60ac87 ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-27 16:02:38 +00:00
Ingo Schommer
3b956bb983 MINOR Added CMS->SiteTreeAsUL() to $allowed_actions (#2733)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-25 14:50:33 +00:00
Sam Minnee
387b5edd21 Merged changes from branches/2.2.2-assets:
Static publishing
Ability to lock down comments to logged-in members only

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:59:27 +00:00
Ingo Schommer
0a4deb5c7f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:49:59 +00:00
Ingo Schommer
2b87d00c13 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Sam Minnee
3b602a3390 Added missing semicolons to javascript snippets returned after publish
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58346 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-18 03:40:32 +00:00
Andrew O'Neil
610a02e08a Merged revisions 54407 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2

........
  r54407 | sminnee | 2008-05-13 15:11:59 +1200 (Tue, 13 May 2008) | 1 line
  
  Removed references to 'mot' folder in code
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:11:07 +00:00
Sean Harvey
3015bea8dc ENHANCEMENT Allow subclass of CMSMain to view the SwitchView context for staging/published site links
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-24 03:22:39 +00:00
Ingo Schommer
a894ad377d MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Sam Minnee
b76083ee64 Merged revisions 52395 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r52395 | sminnee | 2008-04-09 18:07:57 +1200 (Wed, 09 Apr 2008) | 1 line
  
  #2388 - Fixed CMS search.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53501 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:40:00 +00:00
Sam Minnee
2c1b94f355 Merged revisions 50205 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r50205 | sminnee | 2008-02-26 15:26:11 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  Fixed CMS bottom-navigation after publish, when using the subsites module (or other alternateAbsoluteLink implementors)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:20:24 +00:00
Sam Minnee
dcedf0193a Added delete from stage button to CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:02:05 +00:00
Matt Peel
66c3db1e8e Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
4475726ad6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
f7474bf059 Added to main CMS controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:41:33 +00:00
Sam Minnee
8cee1ab4de Merged revisions 43365 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r43365 | hsmith | 2007-10-12 15:33:57 +1300 (Fri, 12 Oct 2007) | 1 line
  
  Changed call to ViewableData::castingHelperPair to fix sort not being set by getNewItem
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:15:44 +00:00
Sam Minnee
a5b8e4f9c4 Merged revisions 43321 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2

........
  r43321 | hsmith | 2007-10-11 17:50:49 +1300 (Thu, 11 Oct 2007) | 2 lines
  
  Added LeftAndMainSubsites->augmentNewSiteTreeItem that allows extensions of LeftAndMain to provide the current SubsiteID for the new item.
  CMSMain->getNewItem now calls $this->extend('augmentNewSiteTreeItem', $newItem);
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:15:23 +00:00
Sam Minnee
121e8314e0 #2088 - Notice level error on compare versions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-01 02:26:01 +00:00
Sam Minnee
22f27b5afa Merged revisions 48503 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz

........
  r48503 | sminnee | 2008-01-24 11:22:14 +1300 (Thu, 24 Jan 2008) | 1 line
  
  Added 'duplicate page and children' context-item in addition to 'duplicate just this page'
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:01:52 +00:00
Sam Minnee
96fee2a031 wakeless: #2144 - More memory-efficient version of admin/publishall
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-18 02:35:39 +00:00
Sam Minnee
b00e1ca72e Fixed bug: Page class wasn't shown in add-page dropdown
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 05:31:38 +00:00
Matt Peel
b811884441 Fixed the $hide_ancestor static on SiteTree subclasses so that it actually works.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 02:10:05 +00:00
Sam Minnee
7d00a996b4 rbarreiros: #1918 Translate newsletter and other strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Sam Minnee
d9ac1a1f85 Improved API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:33:49 +00:00
Sam Minnee
bfc448fa7f Added package tags and docblock info for API documentation
Fixed whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:41:55 +00:00
Sam Minnee
d1ead49133 #1056 - Fixed deletefromlive messages with quote in title
Fixed Convert::raw2js() for strings containing slashes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:16:10 +00:00
Andrew O'Neil
1396764915 Special Characters Error Fixing In Translate Mode (merged from branches/2.2.0@45907, r45259)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:37:42 +00:00
Andrew O'Neil
59c8237efd Change remaining references to 'Sitemap' to 'GoogleSitemap'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:22:43 +00:00
Normann Lou
dd0f2f72be comment out Sitemap::ping() since it has been fixed in 2.2-rc2 and have not merge back yet.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-27 21:41:23 +00:00
Normann Lou
a3f9d9b6d3 switch externals to trunk.
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk 
r32483: merge 2.0infom with lastes chunk 
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block 
r33580: styling for combined form communication in myinfom pages 
r33706: styling of combined form (communication) in Email 
r33881: made compatible to $extraClass 
r33885: added defaultVal
r33887: fixed typo 
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class 
r34914: WIP3866: Factfinder: Hide "self emplyed" block 
r34964: Change current plan upto TraumaInsurance? 
r35038: disabled friggin field focus 
r35230: #1032 Fixed hash-link insertion 
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion) 
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField 
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code 
r36826: change wrong indent format 
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode 
r40815: add an unsubscribe record when a member subscribe a newslettertype 
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31: CRM not showing search results
r43226: fixed search (partial merge from trunk) 
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:10:19 +00:00
Sam Minnee
584481c100 parents-merge 33200 - Fix duplicate page with multiple parents
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:20:05 +00:00
Andrew O'Neil
b4fc0105e4 #1801 - search provides all results back, not a filtered search (merged from branches/2.2.0, r44867)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:46:52 +00:00
Normann Lou
da2b28b180 new lang files updated from translateserver. Date ago() translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:05:52 +00:00
Normann Lou
e5ad6ab87a SiteTreeFilterOptions needs to be translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 23:28:54 +00:00
Ingo Schommer
9e5c9ce323 i18n: entity update
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44290 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:19:20 +00:00
Sam Minnee
0b0eadaf1d #1576 - New pages are created in the database straight away
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 01:52:04 +00:00
Andrew O'Neil
104e29c9fa #1482 - Email link doesn't work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 00:55:52 +00:00
Andrew O'Neil
7412274587 #1481 - Buttons overlap content area when viewing history
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 00:30:43 +00:00
Ingo Schommer
5966b2c0d6 #1485 Changing the name of a group results in javascript error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43880 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-26 03:00:21 +00:00
Ingo Schommer
bfe092ecdd ENHANCEMENT Changed page dropdown labels from "Add a page" to "page" (doesn't work out with i18n)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 03:03:14 +00:00
Andrew O'Neil
5b7301b2db GSOC #118 - Coding Conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 01:10:31 +00:00
Andrew O'Neil
5868bb1e8f GSOC #99 - Switch TinyMCE languages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-07 23:48:05 +00:00
Andrew O'Neil
e5060b6d30 Fix php notice (merged from 2.1.0 branch, r42205)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42933 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:08:36 +00:00
Ingo Schommer
bdf7da1842 removed debug-code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42746 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 22:39:45 +00:00
Ingo Schommer
0fddddb87e !!BUGFIX: Refactored CSS and Requirements: Created more specific css-files to reduce side-effects and ease debugging, moved generic form-styling from cms/css/cms_*.css into sapphire/css/Form.css.
!!BUGFIX: Ordered Requirement-inclusions in CMSMain/LeftAndMain to be more coherent (avoiding duplicate Requirement-calls)
ENHANCEMENT: Removed some css-rules disabled by comments
ENHANCEMENT: coding-conventions (see r42726)
FEATURE: Added Profile-page with LeftAndMain->myprofile()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42728 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:56:55 +00:00
Ingo Schommer
d3cc97c8a0 Added _manifest_exclude to lang folder (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:58:42 +00:00
Ingo Schommer
8fab54429f renamed cmsMainMarkingFilterFunction(), fixed php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42306 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-19 14:04:50 +00:00
Ingo Schommer
78ed0a0795 code formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42161 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:53:31 +00:00
Ingo Schommer
8425e69757 bfojcapell: Avoid improductive DB interaction when creating a translatio
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42151 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:02:47 +00:00