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
6,525 Commits 29 Branches 403 Tags 28 MiB
4f37770864
Commit Graph

6525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
87dfd714b2 FEATURE: reenabled the ability to upload images from the insert image tab. Still commented out while le a couple of tweaks are made 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91302 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-11 07:06:45 +00:00
Tom Rix
9c67f3e028 MINOR update lang files 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91249 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-11 00:40:34 +00:00
Tom Rix
d22e4d17a0 MINOR removed concurrent editing 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91198 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-10 21:14:08 +00:00
Ingo Schommer
2f7004f110 MINOR: Updating mergeinfo to ignore mergebacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90856 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:19:58 +00:00
Ingo Schommer
2e61bec03d BUGFIX: Added rewriteHashlinks = 'php' option to SSViewer so that static publisher can handle internal hashlinks properly. (from r89612) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90855 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:19:31 +00:00
Ingo Schommer
3587ba8a85 BUGFIX: Pass locale rather than language to spellchecker_languages (from r87869) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90854 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:17:52 +00:00
Ingo Schommer
8adc6757c2 BUGFIX: Fixed Links to Moderate Comments from the CMS and front end. MINOR: removed complextable functions which no longer get called, moved logic to the PageComment Class (from r86325) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90853 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:16:09 +00:00
Ingo Schommer
966c869cd4 BUGFIX: Tied rollback action to edit, rather than publish, permission, since it only involves editing the draft site. (from r84957) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90852 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:15:15 +00:00
Ingo Schommer
8a940f4943 BUGFIX Fixing the comment's author website url being converted to lowercase: now case is not affected. (from r84380) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90849 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:13:25 +00:00
Ingo Schommer
4fd6dd0bd0 BUGFIX CMSMenuItem constructor now calls parent to respect inheritance (from r83586) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90848 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:13:00 +00:00
Ingo Schommer
022f15c77b MINOR Added test for FilesystemPublisher::__construct() to ensure DataObject::defineMethods() doesn't break, even when FilesystemPublisher is disabled (from r83582) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90847 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:12:44 +00:00
Ingo Schommer
22aaf67b85 MINOR: fixed page comment form disappearing when validation failed (from r82778) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90846 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:11:40 +00:00
Ingo Schommer
bb87f843ca BUGFIX: Fixed bugs in content differencer, and improved styling. BUGFIX: fixed notice when getting title of member which didnt exist. Merged from trunk r77661. (from r81942) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90845 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:10:38 +00:00
Ingo Schommer
84a33b440a MINOR: Updating mergeinfo to ignore mergebacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90844 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 01:08:15 +00:00
Tom Rix
a0649efa49 BUGFIX WidgetArea now works. Can have multiple areas on a page, and has unit tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-05 00:13:56 +00:00
Ingo Schommer
c59911dce2 MINOR Correct labels for "delete from draft" batch actions (#4420) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-04 22:56:29 +00:00
Ingo Schommer
2cada6ff3a MINOR Reverted accidental commit in r90823 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90824 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-04 22:52:15 +00:00
Ingo Schommer
38d179b2a3 MINOR Correct labels for "delete from draft" batch actions (#4420) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90823 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-04 22:46:54 +00:00
Tom Rix
feafb55f94 MINOR fixed JS errors 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90684 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-03 02:01:19 +00:00
Sean Harvey
3268f35d29 BUGFIX Fixed "Class not found CMSBatchAction_Unpublish ..." in BatchActionHandler.php, since this class was removed in r90489 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90644 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-02 20:30:55 +00:00
Sam Minnee
287887ccca BUGFIX #4642: Fixed creation of folders in non-english languages. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90552 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 01:25:32 +00:00
Sam Minnee
0071e37840 BUGFIX: Fixed glitch in permission code formats. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90551 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-31 00:58:30 +00:00
Tom Rix
c33022f987 MINOR fix failing tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-30 03:27:27 +00:00
Tom Rix
1d281472ab MINOR i18n'd a whole bunch of the new permission codes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90493 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-30 01:43:34 +00:00
Tom Rix
8e2a5bf7c6 MINOR update batchactions to state how many failed to process 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90489 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-30 00:55:37 +00:00
Tom Rix
2b9bb9c48a MINOR improved broken link reports 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90454 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-29 21:59:47 +00:00
Tom Rix
08d38f55d0 MINOR apply roles permission code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90451 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-29 21:36:13 +00:00
Tom Rix
bb59c48078 MINOR categorized reports, fixed a few translations issues. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90394 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-29 02:50:47 +00:00
Tom Rix
e3d678f8ad MINOR shuffled permissions around, gave them help text and categorized them. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90371 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-29 00:55:20 +00:00
Tom Rix
85d722d275 MINOR permissions on Groups and Roles are now handled by a checkbox set field 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90342 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-28 23:03:35 +00:00
Tom Rix
b820fb6975 MINOR permission name changes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90332 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-28 21:23:08 +00:00
Tom Rix
22702dc8a4 MINOR SideReports now have a canView method 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90286 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-28 02:21:01 +00:00
Sam Minnee
f71804e465 API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog. 
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Sam Minnee <sam@silverstripe.com>


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90076 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-26 03:06:42 +00:00
Andrew O'Neil
b2eb234669 BUGFIX: Remove blockquote from tinymce default plugin list - blockquote isnt a plugin in tinymce3. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90051 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-23 02:24:09 +00:00
Ingo Schommer
5408163c1a ENHANCEMENT: Improved CMSSiteTreeFilter API to make it easier to create custom filter.s (from r89071, from r88465) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89883 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 22:26:52 +00:00
Ingo Schommer
022e3ee2ee BUGFIX Added setup/teardown methods to CMSMainTest to fix test breakages when used alongside cmsworkflow module (which unsets the public batch action) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89864 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 19:57:47 +00:00
Sean Harvey
c481f24e7e NOTFORMERGE Blocked revisions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89834 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 05:21:31 +00:00
Sean Harvey
de82c4620a FEATURE: If there is no Name set, but there is an author, use the author's name (from r89650) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89827 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:53:24 +00:00
Sean Harvey
780338c6d7 BUGFIX: Fix comment feed on SQLServer (from r89641) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:52:37 +00:00
Sean Harvey
9cd09d53f8 ENHANCEMENT Current search and current page of asset section are persistent. Fixes the open source ticket #4470 and also a part of #4256 (from r84091) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:39:50 +00:00
Sean Harvey
31e996a56b MINOR fixed comment text linking (from r83187) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89818 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:38:41 +00:00
Sean Harvey
9b234ca7f1 MINOR added the ability to link URLs in comments (with rel=nofollow) (from r83182) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89816 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:37:59 +00:00
Sean Harvey
399f9d4e31 ENHANCEMENT FilesystemSyncTask: If folderID GET parameter is available, only synchronise that folder ID - useful for only synchronising a specific folder and it's children (from r82841) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89815 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:37:02 +00:00
Sean Harvey
760b7eb67c MINOR Removed user_error() that broke AssetAdmin to the end user (from r82622) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89814 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:35:25 +00:00
Sean Harvey
b2fe474fde ENHANCEMENT Return the results of the FilesystemSyncTask to the status message in the CMS instead of a generic success message (from r82618) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89813 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:34:41 +00:00
Sean Harvey
2436d7869a BUGFIX If image does not exist in the file system, don't show a non-object error when viewing the Image/File record in AssetTableField (from r82390) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89812 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:33:51 +00:00
Sean Harvey
65a9830b13 BUGFIX Paging of search results now works for AssetTableField by overloading the TableListField link methods (from r81190, r82188) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89811 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 04:32:57 +00:00
Ingo Schommer
8d96124564 BUGFIX Fixed ModelAdmin_CollectionController->Link() return value 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89731 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:48:27 +00:00
Sam Minnee
0e224a7daa Merge branch 'master' of git@github.com:sminnee/silverstripe-cms 
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89702 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 01:53:49 +00:00
Sam Minnee
4b7a3e20fb MINOR: Made security fixture set-up tigher in a test. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89457 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-19 05:26:03 +00:00