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,814 Commits 31 Branches 527 Tags 162 MiB
a2026add04
Commit Graph

11814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hamish Friedlander
a2026add04 FIX flushing on non-dev when Session::cookie_secure is true 2013-08-21 09:50:07 +12:00
Mateusz U
afd3e3f0d0 Merge pull request #2345 from hafriedlander/fix/performance 
Couple of performance fixes - eliminate un-necessary redraws and preview updating
 2013-08-20 14:40:22 -07:00
Hamish Friedlander
0ca4969cda FIX Dont update preview iframe if hidden 
Updating the iframe src when the iframe isnt visible in IE8 causes a
view disconcerting font glitch (and it slows down navigation anyway),
so if the iframe isnt visible, delay setting the src until it is
 2013-08-21 09:29:28 +12:00
Hamish Friedlander
c59305d6d4 FIX Multiple redraw calls on navigation 2013-08-21 09:29:28 +12:00
Ingo Schommer
a592c36adf Merge remote-tracking branch 'origin/3.0' into 3.1.0 
Conflicts:
	docs/en/changelogs/index.md
 2013-08-20 20:49:01 +02:00
Ingo Schommer
a2f9af54c7 Merge pull request #2340 from hafriedlander/fix/memleaks 
Fix some memory leaks in 3.1.0 admin
 2013-08-20 07:28:14 -07:00
Ingo Schommer
2fd5558a70 Fixed "insert image" behat feature 
Was using wrong button label, and ignoring the
"unsaved changes" warning dialog
 2013-08-20 16:19:30 +02:00
Ingo Schommer
99da5cd198 Merge pull request #2336 from hafriedlander/fix/flush_30 
FIX Double slashes in ParameterConfirmationToken
 2013-08-20 06:26:44 -07:00
Hamish Friedlander
68d8ec31a5 FIX Memory leaks in jstree drag & drop 2013-08-20 16:07:54 +12:00
Hamish Friedlander
fda4b91d06 FIX Make sure CurrentXHR is set back to null on completion 2013-08-20 15:49:37 +12:00
Hamish Friedlander
e282f0b661 FIX Two memory leaks with HtmlEditorField 
We werent calling tinyMCE.Editor.destroy, which is needed to
clean up event bindings. The advanced theme also wasnt cleaning
up after itself on destroy properly
 2013-08-20 15:49:04 +12:00
Hamish Friedlander
13377ee4bd Update jQuery Entwine to latest to pull memory leak fix 2013-08-20 15:17:50 +12:00
Hamish Friedlander
4a7aef0e25 FIX Double slashes in ParameterConfirmationToken 2013-08-19 11:35:34 +12:00
Ingo Schommer
de3b1b22d3 Fixed behat tests for confirming grid field dialogs 2013-08-16 13:34:23 +02:00
Ingo Schommer
362d35742f Fixed behat tests to confirm file deletion dialog 2013-08-16 13:34:23 +02:00
Naomi Guyer
fb67181366 BUG: Context menu too long - CSS only (Fixes CMS #811) 2013-08-16 13:34:23 +02:00
Ingo Schommer
b6b06945d0 Merge pull request #2320 from jbridson/3.1 
MINOR: ISSUE-19 CWP Accessibility fixes - Added macron to Māori toggle b...
 2013-08-15 14:35:25 -07:00
Jeremy Bridson
cf75166d83 MINOR: ISSUE-19 CWP Accessibility fixes - Added macron to Māori toggle button for translations on the CWP demo site. 2013-08-12 15:39:00 +12:00
Ingo Schommer
fd2a0cd1f9 Updated translations 2013-08-09 15:33:01 +02:00
Hamish Friedlander
0918cd2092 Remove SiteTree link tracking out of HtmlEditorField 2013-08-09 11:24:10 +02:00
Ingo Schommer
810f505924 Merge pull request #2315 from jbridson/patch-2 
Fixed Grammatical errors and issues where sentences didn't make sense.
 2013-08-09 02:04:01 -07:00
jbridson
1ce0a0d2b9 Fixed Grammatical errors and issues where sentences didn't make sense. 2013-08-09 15:22:03 +12:00
Sam Minnee
3510b60ab8 Added 3.1.0-rc1 changelog 2013-08-09 14:25:58 +12:00
Sean Harvey
f9dca6f857 Merge pull request #2313 from jbridson/patch-1 
Fixed issue with inconsistent use of punctuation and wording of Tutorial...
 2013-08-08 19:22:16 -07:00
jbridson
0c4ff76921 Fixed issue with inconsistent use of punctuation and wording of Tutorial 5 summary 2013-08-09 14:20:41 +12:00
Sam Minnee
750b5b4079 Updated translation master file 2013-08-09 14:18:10 +12:00
Ingo Schommer
7a117fe713 Added 3.0.6-rc1 changelog 2013-08-07 20:55:10 +02:00
Ingo Schommer
a213afd888 Added 3.0 changelog 2013-08-07 20:16:59 +02:00
Ingo Schommer
c78c0aa828 Fixed merge error 
See 00ffe72944
 2013-08-07 17:33:06 +02:00
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