tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
11,835 Commits 31 Branches 527 Tags 162 MiB
477c3c9de6
Commit Graph

11835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
 2013-08-07 17:14:47 +02:00
Ingo Schommer
c0f5007d57 Create folder if required in dev/generatesecuretoken 2013-08-07 16:59:18 +02:00
Ingo Schommer
b159284c6c Fixed "session started" error on install.php 2013-08-07 16:28:54 +02:00
Ingo Schommer
2dc39de460 Merge pull request #2304 from wernerkrauss/pull/translationstring-security 
Update en.yml
 2013-08-07 02:14:28 -07:00
wernerkrauss
eee32b7f3c Update en.yml 
Added missing string Security.LOSTPASSWORDHEADER
 2013-08-07 11:06:20 +02:00
Hamish Friedlander
428391ad1e Merge pull request #2291 from chillu/pulls/transifex-3.0 
Translations: Switch to Transifex format (3.0)
 2013-08-06 15:26:40 -07:00
Ingo Schommer
00ffe72944 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-07 00:25:16 +02:00
Mateusz U
00e0bf10ab Merge pull request #2298 from candidasa/defect51-timeout-message 
BUG adding a more descriptive message when the CMS session times out. It...
 2013-08-06 15:13:23 -07:00
Hamish Friedlander
2110493466 Merge branch '3.0' into 3.1 2013-08-07 09:43:52 +12:00
Ingo Schommer
f037cf0781 Merge pull request #2285 from hafriedlander/fix/flush_30 
FIX Flush on memory exhaustion and when headers sent
 2013-08-06 14:22:16 -07:00
Julian Seidenberg
17e0432252 BUG adding a more descriptive message when the CMS session times out. It used to say "Forbidden", now it says "Not logged in". 2013-08-06 17:27:37 +12:00
Hamish Friedlander
5f9387c42c FIX Constants magic_quotes handling needs function from Core 2013-08-05 14:58:44 +12:00
Hamish Friedlander
041466fe02 FIX Token redirect where in IIS a / needs adding between host & url 2013-08-05 09:15:11 +12:00
Ingo Schommer
c5442810cf Merge pull request #2271 from ARNHOE/3.1-twotoneborders 
Updated field class to use doubleborder mixin
 2013-08-03 09:49:23 -07:00
Ingo Schommer
31e8ec3795 Docs: Consistent arg quoting in <% require %> (#1614) 2013-08-03 18:44:32 +02:00
Ingo Schommer
9bd9b60576 Merge pull request #2277 from joernroeder/3.1 
fixed undefined offset #2276
 2013-08-03 09:38:13 -07:00
Ingo Schommer
ab207d7d19 Merge pull request #2278 from jonshutt/patch-1 
Minor bug fix to show link description field
 2013-08-03 09:35:50 -07:00
Ingo Schommer
452dd16781 Merge pull request #2284 from wilr/closure_this_reference_fix 
FIX: pass controller as reference inside closure.
 2013-08-03 09:32:03 -07:00
Hamish Friedlander
a685a8dee9 FIX Include flushtoken when install redirects to successfullyinstalled 2013-08-02 11:00:26 +12:00
Hamish Friedlander
342058742c FIX Flush on memory exhaustion and headers sent 2013-08-02 09:41:16 +12:00
Ingo Schommer
97e6108fa9 Changelog note on form method limitations 
See 14c59be85e.
Raised by Fara Rustein of Deloitte Argentina (CVE-2013-2653).
 2013-08-01 15:48:51 +02:00
Will Rossiter
919a8c21c3 FIX: pass controller as reference inside closure. 
Non referenced causes segfaults on PHP <= 5.3.8 environments when opening subtrees in the CMS. Likely the cause of silverstripe-cms/issues/803.
 2013-07-31 14:12:08 +12:00
Sean Harvey
bacf0f6171 Merge pull request #2279 from ss23/patch-7 
Fix misleading documentation about Children.max in partial caching
 2013-07-29 19:16:11 -07:00
Stephen Shkardoon
6e47a25098 Fix misleading documentation about Children.max 
Currently, the documentation implies that doing a `Children.max(LastEdited)` will work, which isn't the case.
This change uses `AllChildren.max(LastEdited)` instead, which while slightly more inefficient, will actually work consistently.
 2013-07-29 15:18:39 +12:00
Jon
4ae15aa360 Minor bug fix to show link description field 
When adding a link, the description field was present, but hidden. Adjusted javascript to show the description field
 2013-07-29 09:37:41 +12:00
Jörn Röder
e2a43961d0 fixed undefined offset #2276 2013-07-28 19:39:40 +02:00
Arno Poot
968e99f45e Updated field class to use doubleborder mixin 2013-07-26 16:44:00 +02:00
Hamish Friedlander
541436feb0 Merge branch 'origin/3.0' into 3.1 2013-07-24 12:09:44 +12:00
Sam Minnée
3c6ba1c322 Merge pull request #2257 from hafriedlander/fix/flush_30 
FIX Nice errors and allows flush on module removal
 2013-07-23 16:44:25 -07:00
Sean Harvey
23d1e8c76d Merge pull request #2260 from ARNHOE/3.1-fixedeastgermany 
Fixed CountryDropDownField showing East Germany
 2013-07-23 15:25:17 -07:00
Hamish Friedlander
a1ea905ca8 FIX Nice errors and allows flush on module removal 2013-07-24 09:57:01 +12:00
Arno Poot
aa6da4ee4e Fixed CountryDropDownField showing East Germany 2013-07-23 19:13:11 +02:00
Will Rossiter
ff1b0e3a08 Merge pull request #2256 from tractorcow/3.1-setratiosize-dbz-fix 
BUG Fixed divide by zero with SetRatioSize on missing image file
 2013-07-22 23:02:29 -07:00
Damian Mooyman
b3ca4a275b BUG Fixed divide by zero with SetRatioSize on missing image file 
Fixes issue #2047
 2013-07-23 11:24:48 +12:00
Sam Minnée
88d0cbea62 Merge pull request #2255 from hafriedlander/fix/flush_30 
Split Core.php into Constants.php and Core.php and adjust main.php startup
 2013-07-22 15:33:35 -07:00
Hamish Friedlander
84011aa736 FIX Only suppress fatal errors 2013-07-22 14:48:16 +12:00
Hamish Friedlander
604d9bf7dc Split Core.php into Constants.php and Core.php and adjust main.php startup 
The recent flush filter fix had a problem that you couldnt set a custom
BASE_PATH in _ss_environment because that file didnt get included until
after checking the confirmation token. This patch pulls the part of Core.php
that defines BASE_PATH into a seperate file that can be included earlier
in the startup sequence so that ParameterConfirmationToken can access it.

Core.php includes Constants.php with a require_once call, so for startup
scripts that dont pull in Constants.php themselves (like cli-script.php)
no change is needed.
 2013-07-22 13:52:00 +12:00
Will Rossiter
58a2eb0155 Versioned documentation typo (Thanks aragonne) 2013-07-19 18:14:53 +12:00
Hamish Friedlander
bed25a7a79 Merge branch 'origin/3.0' into 3.1 2013-07-19 15:51:54 +12:00
Sam Minnée
7bfc872a8e Merge pull request #2248 from hafriedlander/fix/flush_30 
FIX: Have ParameterConfirmationToken work regardless of include path
 2013-07-18 20:46:56 -07:00
Hamish Friedlander
a312cd08e1 FIX: Ignore invalid tokens instead of throwing 403 2013-07-19 14:47:05 +12:00
Hamish Friedlander
036c36a7dd FIX: Have ParameterConfirmationToken work regardless of include path 2013-07-19 14:33:56 +12:00
Hamish Friedlander
d38bd7d5cb Merge branch 'origin/3.0' into 3.1 2013-07-19 14:18:49 +12:00
Sam Minnée
7656a22329 Merge pull request #2243 from hafriedlander/fix/flush_30 
FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692)
 2013-07-18 17:39:10 -07:00
Hamish Friedlander
1298d4a5bd FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692) 2013-07-19 12:24:32 +12:00
Hamish Friedlander
b915c2364c Merge pull request #2244 from mateusz/lockout-errors 
BUG First error should take precedence here. No further checks needed.
 2013-07-18 14:38:23 -07:00
Mateusz Uzdowski
d4a6f7304e BUG First error should take precedence here. No further checks needed. 2013-07-19 08:54:52 +12:00
Sam Minnée
2ca089532f Merge pull request #2219 from chillu/pulls/clickjacking 
BUG Prevent clickjacking in CMS and Security controllers (fixes #2215)
 2013-07-16 14:35:53 -07:00
Simon Welsh
d9b0d14ee9 Merge pull request #2229 from ss23/patch-6 
FIX preg_replace_callback in emailer was broken
 2013-07-14 21:55:07 -07:00
Stephen Shkardoon
999fd3901c FIX preg_replace_callback in emailer was broken 
Fixes bug introduced by 9deb11f9a0
Email has no content
This is what happens when we make commits without testing!
 2013-07-15 16:50:41 +12:00