tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,397 Commits 29 Branches 513 Tags 147 MiB
Commit Graph

833 Commits

Author SHA1 Message Date
Damian Mooyman 6fe5c37d6a
Merge pull request #7795 from kinglozzer/uploadfield-height 
FIX: Fix UploadField cuts off “Save” button (closes #2862)
 2018-02-05 14:24:30 +13:00
Damian Mooyman fa44d22058
Merge pull request #6744 from d-rivera-c/dev/pharmac-fork 
fixing val reference to url in https hotlink and allowes https hotlinking on TinyMCE
 2018-02-05 14:22:08 +13:00
Damian Mooyman 98907b3ba4
Merge pull request #4096 from patricknelson/issue-4095-tinymce-embed 
FIX for #4095, TinyMCE not able to modify props of embed media (bug 1) and invalid HTML inserted (bug 2)
 2018-02-05 14:14:44 +13:00
Loz Calver f2b4c192ec FIX: Fix UploadField cuts off “Save” button (closes #2862) 2018-01-24 15:49:46 +00:00
Matthias Schelling eacfe280c1
TreeDropdownField: replace onadd by onmatch 
Makes TreeDropdownField work in situations where it's moved around in the DOM (e.g. when inside a drag'n'drop container)
 2017-09-15 12:02:18 +01:00
Mojmir Fendek b2d362beb9 Html editor selection is now properly stored while the dialog is open. 2017-06-26 12:55:05 +12:00
Dan Hensby e57d7a30bd Update translations 2016-12-16 20:49:05 +00:00
Daniel Hensby 4bb6765392
Merge branch '3.4' into 3.5 2016-11-28 13:36:06 +00:00
Daniel Hensby 17690ff6bc
Merge branch '3.3' into 3.4 2016-11-28 13:30:29 +00:00
Daniel Hensby 6552dce70e
Merge branch '3.2' into 3.3 2016-11-28 13:26:31 +00:00
Dan Hensby ee11b12e7a Update translations 2016-11-22 14:53:02 +00:00
Dan Hensby 50f456eed8 Update translations 2016-11-21 13:27:57 +00:00
Dan Hensby 0d2710c31b Update translations 2016-11-21 12:37:07 +00:00
Dan Hensby 5890f6f7e2 Update translations 2016-11-18 15:14:40 +00:00
Dan Hensby 662bc688e5 Update translations 2016-11-09 11:32:20 +00:00
Daniel Hensby 683bde6d82
Merge pull request #3535 from manja/3.1 2016-11-03 14:40:39 +00:00
Ingo Schommer 53501c73bc Merge pull request #5909 from timkung/tabset-opentabfromurl-fix 
Fixing TabSet.js error when expected elements are not available
 2016-09-26 17:14:04 +13:00
Cristian Torres d2d770c6fb FIX: Frontend UploadField wouldn't call ssdialog 
As in front end jQuery would be redefined by users custom version. Also the script should use the scope variable ```$``` as it represents the instance of jQuery with all the requirements loaded.
 2016-09-18 19:37:44 -06:00
Tim Kung 0461d1c019 Updating TabSet.js to open tabs correctly on page load when hash is added to URL 2016-08-24 09:05:02 +12:00
Damian Mooyman 00d1d294ca Update translations 2016-08-15 15:49:50 +12:00
Damian Mooyman bf19806f50 Update translations 2016-08-15 15:00:58 +12:00
Damian Mooyman 63937aa124 Update translations 2016-08-15 14:01:09 +12:00
Damian Mooyman ca754eb887 Merge 3.3 into 3.4 
# Conflicts:
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/it.js
#	lang/cs.yml
#	lang/eo.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/it.yml
#	lang/sk.yml
 2016-08-05 16:48:26 +12:00
Damian Mooyman 0d5ae23f2b Merge 3.2 into 3.3 2016-08-05 14:36:35 +12:00
Damian Mooyman cb39f2ef27 Merge 3.1 into 3.2 
# Conflicts:
#	admin/javascript/lang/cs.js
#	admin/javascript/lang/de.js
#	admin/javascript/lang/eo.js
#	admin/javascript/lang/es.js
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/fi.js
#	admin/javascript/lang/fr.js
#	admin/javascript/lang/id.js
#	admin/javascript/lang/id_ID.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/ja.js
#	admin/javascript/lang/lt.js
#	admin/javascript/lang/mi.js
#	admin/javascript/lang/nb.js
#	admin/javascript/lang/nl.js
#	admin/javascript/lang/pl.js
#	admin/javascript/lang/ro.js
#	admin/javascript/lang/ru.js
#	admin/javascript/lang/sk.js
#	admin/javascript/lang/sl.js
#	admin/javascript/lang/sr.js
#	admin/javascript/lang/sr@latin.js
#	admin/javascript/lang/sr_RS.js
#	admin/javascript/lang/sr_RS@latin.js
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	admin/javascript/lang/sv.js
#	admin/javascript/lang/zh.js
#	javascript/lang/fa_IR.js
#	javascript/lang/src/fa_IR.js
 2016-08-05 11:41:04 +12:00
Damian Mooyman 9805544cee Update translations 2016-08-05 11:06:51 +12:00
Damian Mooyman d125d4e304 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman 4f06a43986 Merge 3.3 into 3 
# Conflicts:
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/en.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	javascript/lang/fr.js
#	javascript/lang/src/ar.js
#	javascript/lang/src/cs.js
#	javascript/lang/src/de.js
#	javascript/lang/src/en.js
#	javascript/lang/src/eo.js
#	javascript/lang/src/es.js
#	javascript/lang/src/fi.js
#	javascript/lang/src/fr.js
#	javascript/lang/src/id.js
#	javascript/lang/src/id_ID.js
#	javascript/lang/src/it.js
#	javascript/lang/src/ja.js
#	javascript/lang/src/lt.js
#	javascript/lang/src/mi.js
#	javascript/lang/src/nb.js
#	javascript/lang/src/nl.js
#	javascript/lang/src/pl.js
#	javascript/lang/src/ru.js
#	javascript/lang/src/sk.js
#	javascript/lang/src/sl.js
#	javascript/lang/src/sr.js
#	javascript/lang/src/sr@latin.js
#	javascript/lang/src/sr_RS.js
#	javascript/lang/src/sr_RS@latin.js
#	javascript/lang/src/sv.js
#	javascript/lang/src/zh.js
#	lang/it.yml
 2016-05-11 14:06:23 +12:00
Damian Mooyman 01eaf9ed64 Merge 3.3.2 into 3.3 2016-05-11 13:33:45 +12:00
Damian Mooyman f4c2a89d5a Update translations 2016-05-11 11:05:57 +12:00
Damian Mooyman c27cb2dae7 Update translations 2016-05-11 11:05:37 +12:00
Damian Mooyman 60644a5be8 Update translations 2016-05-11 10:58:25 +12:00
Daniel Hensby d1751e3310
Merge remote-tracking branch '3.2.4' into 3.3.2 2016-05-05 12:33:21 +01:00
Daniel Hensby cf29b2c146
Merge remote-tracking branch '3.1.19' into 3.2.4 2016-05-05 11:17:45 +01:00
Daniel Hensby 686db04a0a
Update translations 2016-05-05 02:05:54 +01:00
Damian Mooyman 096f30ebe5 BUG Fix GridFieldAddExistingAutocompleter 
This fix exchanges references to sub-components by ID with class references
Fixes #5382
 2016-05-03 14:28:41 +12:00
Ingo Schommer 7ba4b5b6ef Merge pull request #5241 from timkung/pulls/upload-validator-filesize-spelling 
BUG changing all cases of filesize spelling to file size
 2016-03-29 16:15:27 +13:00
Tim Kung 7907d20da7 BUG changing all cases of filesize spelling to file size 2016-03-29 13:38:24 +13:00
Denise Rivera 22b3a71ec0 fixing val reference to url in https hotlink 2016-03-16 09:11:15 +13:00
Denise Rivera 5612b498b9 allowes hhtps hotlinking on TinyMCE 2016-03-16 08:33:44 +13:00
Damian Mooyman d27be2b325 Merge branch '3.3' into 3 
# Conflicts:
#	javascript/GridField.js
 2016-02-26 17:45:06 +13:00
Damian Mooyman 320c833fa1 BUG Fix regressions in missing CSRF on print button 2016-02-26 17:03:35 +13:00
Damian Mooyman b0ad86bf8f BUG Fix regression in gridfield get actions 2016-02-26 17:03:27 +13:00
Damian Mooyman cc95703b18 BUG Fix regressions in missing CSRF on print button 2016-02-26 16:59:40 +13:00
Damian Mooyman 3dc0d0ee89 BUG Fix regression in gridfield get actions 2016-02-26 16:59:25 +13:00
Damian Mooyman 99ca2aa23d BUG Fix regressions in missing CSRF on print button 2016-02-26 15:49:28 +13:00
Damian Mooyman f7caccaa7a BUG Fix regression in gridfield get actions 2016-02-26 12:35:00 +13:00
Damian Mooyman 9fed5561f4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	core/Constants.php
#	dev/DevelopmentAdmin.php
 2016-02-24 17:39:04 +13:00
Damian Mooyman 5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	dev/DevelopmentAdmin.php
#	docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
#	lang/cs.yml
#	lang/lt.yml
 2016-02-24 17:29:06 +13:00
Damian Mooyman 3738436d0e Update translations 2016-02-19 10:54:36 +13:00