Commit Graph

4228 Commits

Author SHA1 Message Date
Ingo Schommer
88081d5333 Merge branch 'context-menu' of https://github.com/adrexia/silverstripe-cms into adrexia-context-menu 2013-08-20 14:47:40 +02:00
Shea Dawson
bb86373ab9 CMS tree pane to scroll to the page being edited. Fixes #827 2013-08-19 11:18:37 +10:00
Ingo Schommer
7ad9712f05 Merge remote-tracking branch 'origin/3.1' 2013-08-16 13:37:49 +02:00
Ingo Schommer
44fdf66834 Merge pull request #809 from ARNHOE/3.1-siteconfig
Updated siteconfig layout to be more like modeladmin
2013-08-15 13:45:50 -07:00
Ingo Schommer
004dfa76b1 Updated translations 2013-08-09 14:53:17 +02:00
Ingo Schommer
d18bb858e3 Fixed share instructions wording in template
This also removed all the existing translations from Transifex
because the string changed.
2013-08-09 14:45:26 +02:00
Ingo Schommer
9a387f91ec Updated translations 2013-08-09 12:47:44 +02:00
Ingo Schommer
a42c89a110 Merge remote-tracking branch 'origin/3.1' 2013-08-09 12:12:05 +02:00
Hamish Friedlander
71608f0d4a FIX Add SiteTree link tracking as an extension, and apply to SiteTree itself 2013-08-09 11:46:32 +02:00
Sam Minnee
8ad00a1004 Updated translation master file 2013-08-09 14:14:35 +12:00
Sam Minnée
d7d0cb45ae Merge pull request #824 from hafriedlander/fix/archivedate
FIX ArchiveDate enforcement
2013-08-08 17:38:53 -07:00
Sam Minnée
e922717b42 Merge pull request #825 from simonwelsh/canview
FIX Check for stage and drafts in SiteTree::canView()
2013-08-08 17:38:27 -07:00
Simon Welsh
b1664f86a4 FIX Check for stage and drafts in SiteTree::canView() 2013-08-09 10:45:09 +12:00
Hamish Friedlander
2fae9280e5 FIX ArchiveDate enforcement 2013-08-08 17:17:35 +12:00
Ingo Schommer
5eaeb7462a Merge remote-tracking branch 'origin/3.1'
Conflicts:
	lang/en.yml
2013-08-07 17:20:28 +02:00
Ingo Schommer
99ba7bdb4e Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	lang/en.yml
	templates/CMSPageHistoryController_versions.ss
2013-08-07 17:15:17 +02:00
Ingo Schommer
a54c51c586 Merge pull request #821 from chillu/pulls/transifex-3.1
Translations: Switch to Transifex format (3.1)
2013-08-07 08:09:26 -07:00
Ingo Schommer
d01728675d Merge pull request #820 from chillu/pulls/transifex-3.0
Translations: Switch to Transifex format (3.0)
2013-08-07 08:09:11 -07:00
Naomi Guyer
a2a4957fa5 BUG: Context menu too long (Fixes #811)
Added javascript to add and remove classes on context sub menus, to
allow for multi column layout.
2013-08-07 13:46:40 +12:00
Ingo Schommer
07cccc8e95 Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
  issues with unknown locales in Zend's CLDR database
2013-08-04 12:31:29 +02:00
Ingo Schommer
3f118ef08f Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 12:28:07 +02:00
Ingo Schommer
ab0f83c48d Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Renamed "lolcat" locale from "lc_xx" to "en@lolcat" (Transifex/CLDR notation)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 11:05:41 +02:00
Ingo Schommer
e0aa610172 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss
2013-08-03 19:46:46 +02:00
Loz Calver
09b869f5d3 Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798) 2013-07-31 09:30:58 +01:00
Arno Poot
afd9f28279 Updated siteconfig layout to be more like modeladmin 2013-07-26 17:45:28 +02:00
Simon Welsh
f937b95eaf Merge pull request #799 from ARNHOE/3.1
Updated templates to be more consistent and removed trailing spaces
2013-07-18 12:49:04 -07:00
Arno Poot
184aeabcb4 Updated templates to be more consistent and removed trailing spaces
Edit
2013-07-18 13:14:29 +02:00
Simon Welsh
ff18abb994 Merge branch '3.0' into 3.1
Conflicts:
	.travis.yml
2013-07-14 17:24:06 +12:00
Simon Welsh
3a3e8f2faa Adds LoginForm as an allowed action
Behaves as a form method defined on ContentController
2013-07-14 17:21:59 +12:00
Simon Welsh
094039dbc8 Remove PHP 5.5 from allowed failures 2013-07-14 17:21:18 +12:00
Andrew Short
27de4367b8 Merge branch '3.1' 2013-07-10 20:07:33 +10:00
Ingo Schommer
9417092040 Fixed installer message escaping, unified usage (fixes #2211)
Same entity was already fixed in a different file,
we can't have them use different strings, so used the new one instead.
2013-07-10 10:29:04 +02:00
Andrew Short
1710958207 Merge branch '3.1'
Conflicts:
	.travis.yml
	code/controllers/ReportAdmin.php
2013-07-09 13:54:05 +10:00
Mateusz U
f7031b799b Merge pull request #792 from hafriedlander/fix/stageaccess
FIX Not checking stage in SiteTree#canView
2013-07-04 18:30:05 -07:00
Hamish Friedlander
a5f00ae2c3 FIX Not checking stage in SiteTree#canView
SiteTree versions that arent the live version shouldnt be accessed by
regular users, but the logic to check that was split off into canViewStage,
which wasnt checked by code that isnt specifically SiteTree aware
(like RestfulServer)
2013-07-05 12:14:22 +12:00
Ingo Schommer
2545f41bdc Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	.travis.yml
2013-07-05 00:22:14 +02:00
Ingo Schommer
e194b962db PHP 5.5 CI, don't allow failures for sqlite3 and postgres 2013-07-04 23:01:09 +02:00
Ingo Schommer
a2c2be2ad5 Correct form name in CMSFileAddController, fixes upload
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2172
2013-07-02 09:33:38 +02:00
Ingo Schommer
0bd257c8fc Merge pull request #770 from chillu/pulls/cmsform
Using new CMSForm class to allow for validation errors in CMS
2013-06-28 02:54:09 -07:00
Ingo Schommer
98750a9cf1 Merge pull request #772 from chillu/pulls/sitetree-urlsegment-votes
API SiteTree->validURLSegment() prioritizes extension votes
2013-06-25 02:18:08 -07:00
Ingo Schommer
e324e9fc4e Merge pull request #778 from silverstripe/pulls/allowed_actions-deny
Fix AssetAdmin::$allowed_actions
2013-06-25 01:07:31 -07:00
Ingo Schommer
aeacbc38aa Fix AssetAdmin::$allowed_actions 2013-06-21 00:54:28 +02:00
Ingo Schommer
f03f396b35 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-19 14:03:49 +02:00
Ingo Schommer
f2a9f9aa0a ErrorPageTest: Reset env state
Otherwise SapphireTest will complain, see 0da70dafa457564a6adb02140ffeb5dd01f3a982
2013-06-19 13:17:22 +02:00
Ingo Schommer
a29ce594a1 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:57 +02:00
Ingo Schommer
8e7802f8a1 Fixed spelling mistake in SilverStripeNavigator
Thanks to Donald Rogers for pointing it out
2013-06-18 18:27:49 +02:00
Ingo Schommer
a136170f55 Merge pull request #765 from jthomerson/enhancement_3.1_allow_disabling_generator_meta_tag
ENHANCEMENT: allow sites to override meta generator tag
2013-06-17 13:43:58 -07:00
Jeremy Thomerson
b8908efdf7 ENHANCEMENT: allow sites to override meta generator tag 2013-06-17 20:35:14 +00:00
Mike Parkhill
c7f14129ea FIX #651 Broken redirection after creating new folder in assets 2013-06-13 14:58:09 +02:00
Ingo Schommer
2deb525d47 Using new CMSForm class to allow for validation errors in CMS
This class allows deferring handling of responses to the parent
controller's response negotiator implementation.
2013-06-13 07:44:37 +02:00