Commit Graph

3577 Commits

Author SHA1 Message Date
Sean Harvey
d229fdcc6d Merge branch 'removestatic' of git://github.com/wilr/silverstripe-cms into wilr-removestatic 2012-09-25 14:15:09 +12:00
Ingo Schommer
cebce51bc1 Merge branch 'open/7875' of git://github.com/jbridson/silverstripe-cms into jbridson-open/7875 2012-09-21 10:49:20 +02:00
Ingo Schommer
77ef6570a3 Merge remote-tracking branch 'origin/3.0' 2012-09-21 10:48:22 +02:00
Ingo Schommer
c6ed250290 Merge pull request #207 from simonwelsh/travis
Adds Travis testing to the CMS
2012-09-21 01:33:04 -07:00
Will Rossiter
a3007b618f API moved StaticCache / StaticPublisher to module.
Removed all related functionality for exporting a static version of the website to the silverstripe-static module.
2012-09-21 19:59:31 +12:00
Simon Welsh
4506e92536 Adds Travis testing to the CMS 2012-09-21 15:43:01 +12:00
Simon Welsh
90a154c888 Merge pull request #206 from chillu/pulls/public-function
Method visibility according to coding conventions
2012-09-20 01:54:45 -07:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Jeremy Bridson
05d5bd7508 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:22:12 +12:00
Simon Welsh
4af60dfee6 Merge pull request #204 from wilr/removecontentcontroller
Remove ContentController view, moved functionality to Controller view
2012-09-19 02:22:12 -07:00
Will Rossiter
76373a4da6 Remove ContentController view, moved functionality to Controller view 2012-09-19 21:13:49 +12:00
Sean Harvey
b599c3a931 Merge branch '3.0' 2012-09-17 15:18:10 +12:00
UndefinedOffset
a2d76c9305 BUG Remove page types from the "add new page here" menu if they appear in a hide_ancestor (fixes #7712) 2012-09-15 17:04:02 +12:00
Simon Welsh
fe7c44d7d4 Merge pull request #201 from halkyon/doctype_contentcontroller_template
Use HTML5 doctype for default ContentController template
2012-09-13 19:27:22 -07:00
Sean Harvey
a77d1b8230 Use HTML5 doctype for default ContentController template 2012-09-14 14:24:47 +12:00
Ingo Schommer
4462eec7fa Merge pull request #199 from patbolo/bugfix/7856
FIX 7856
2012-09-12 02:58:37 -07:00
Ingo Schommer
a3bfd563cf Merge branch '3.0.2' into 3.0 2012-09-12 11:05:39 +02:00
Niklas Forsdahl
17db5baf19 BUG: Page type names not translated in pages overview search form
Fixed by using the singularname translation for the class as values in the page
types array used for the page types dropdown field.
2012-09-12 11:02:24 +02:00
Ingo Schommer
9b6ca79746 Fixed report title column localization 2012-09-12 11:02:24 +02:00
Ingo Schommer
1a2961d2cc Updated translations 2012-09-12 10:56:09 +02:00
Ingo Schommer
bb4af2efbf Merge remote-tracking branch 'origin/3.0' 2012-09-11 14:05:40 +02:00
Ingo Schommer
9124d8ae1a Fixed report title column localization 2012-09-11 12:49:27 +02:00
Ingo Schommer
94c406139e Updated translations 2012-09-11 12:03:18 +02:00
Ingo Schommer
ed096ca6d2 Updated translations 2012-09-11 12:01:35 +02:00
jean
45819cfba2 FIX 7856 Show the Create button as disabled if no pagetypes are available for page creation 2012-09-11 14:56:13 +12:00
Ingo Schommer
f95a10852b Merge remote-tracking branch 'origin/translation-staging' 2012-09-07 17:23:21 +02:00
Ingo Schommer
5bfb994496 Merge remote-tracking branch 'origin/3.0' 2012-09-07 17:21:47 +02:00
Damian Mooyman
02e95adb4c BUG Consistently save SiteConfig, and refactor Translatable hooks
Squashed commit of the following:

commit a60eddfacc710d3047bd1d5107e5df0cc6dba93c
Merge: c847b55 76be14b
Author: Ingo Schommer <ingo@silverstripe.com>
Date:   Fri Sep 7 17:02:47 2012 +0200

    Merge branch '3.0-translation-migration' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-migration

commit 76be14b1fc
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:28:18 2012 +1200

    FIXED: Indentation

commit 715b60387c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:25:14 2012 +1200

    FIXED: Coding style inconsistencies

commit 6395f9030e
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 16:30:11 2012 +1200

    FIXED: Issue where new SiteConfig instances weren't always saved to the database

commit aca242e31c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 14:22:56 2012 +1200

    UPDATED: Refactored Translation module specific code out of the SiteConfig
2012-09-07 17:06:29 +02:00
TeamCity
dd58f17d26 MINOR Updated translations 2012-09-08 01:27:15 +12:00
TeamCity
54a7b93ed6 MINOR Updated translations 2012-09-07 22:21:40 +12:00
TeamCity
a5f77b06bd MINOR Updated translations 2012-09-07 21:21:41 +12:00
Ingo Schommer
c847b55608 Merge pull request #195 from creamarketing/page-type-dropdown-translations
BUG: Page type names not translated in pages overview search form
2012-09-06 12:36:35 -07:00
TeamCity
8019a86707 MINOR Updated translations 2012-09-07 07:21:52 +12:00
TeamCity
4ec38c18da MINOR Updated translations 2012-09-07 06:22:12 +12:00
Sean Harvey
c61d4aacc3 Merge pull request #197 from ajoneil/sitetree-filter-fix
BUGFIX: Fix site tree filter not showing parents of results more than a ...
2012-09-04 20:08:25 -07:00
Andrew O'Neil
f843dd56dc BUGFIX: Fix site tree filter not showing parents of results more than a level deep in the hierachy 2012-09-05 14:35:48 +12:00
TeamCity
8dacb07730 MINOR Updated translations 2012-09-05 11:21:41 +12:00
TeamCity
24e1d9de26 MINOR Updated translations 2012-09-05 02:21:48 +12:00
Niklas Forsdahl
2934423ebc BUG: Page type names not translated in pages overview search form
Fixed by using the singularname translation for the class as values in the page
types array used for the page types dropdown field.
2012-09-04 09:00:04 +03:00
TeamCity
1b2d1f9b3c MINOR Updated translations 2012-09-04 17:21:51 +12:00
TeamCity
0e10837d9a MINOR Updated translations 2012-09-04 16:21:34 +12:00
TeamCity
80435b1fca MINOR Updated translations 2012-09-04 13:35:16 +12:00
Sean Harvey
4ad2b25679 Merge pull request #194 from patbolo/doc_support
NEW 7839 Support for documents as a file type in Files and images
2012-09-03 17:25:59 -07:00
jean
53fdafb473 NEW 7839 Support for documents as a file type in Files and images 2012-09-04 11:26:09 +12:00
TeamCity
275a8f0d77 MINOR Updated translations 2012-09-04 10:21:25 +12:00
TeamCity
fa423fff58 MINOR Updated translations 2012-09-04 06:20:47 +12:00
TeamCity
fddd63d74b MINOR Updated translations 2012-09-03 11:21:58 +12:00
Hamish Friedlander
af2c890168 Merge pull request #190 from silverstripe-rebelalliance/open/5971
NEW Add warning if viewed SiteTree object class is obsolete
2012-09-02 14:12:23 -07:00
Ingo Schommer
fd8e852c92 BUG Disallow "add page here" shortcut to avoid $allowed_children edge cases (fixes #7694) 2012-09-02 18:20:49 +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