Hamish Friedlander
|
fdf81c80cb
|
MINOR: Pull in latest changes from thirdparty tool php-peg
|
2011-03-10 15:04:01 +13:00 |
|
Ingo Schommer
|
04ae1abe65
|
Merge remote-tracking branch 'mandrew/master'
Conflicts:
docs/en/misc/contributing.md
|
2011-03-09 17:17:10 +13:00 |
|
Ingo Schommer
|
498e5758bf
|
BUGFIX Avoid privilege escalation from EDIT_PERMISSIONS to ADMIN through TreeMultiselectField (in Member->getCMSFields()) by checking for admin groups in Member->onChangeGroups()
|
2011-03-09 15:49:41 +13:00 |
|
Michael Andrewartha
|
626980acb5
|
Small text changes, added api links, cont. updating images for tutorials, fixed tutorials from member feedback
|
2011-03-09 10:05:51 +13:00 |
|
Ingo Schommer
|
3f748decbe
|
MINOR Documentation fixes
|
2011-03-08 19:19:17 +13:00 |
|
Julian Seidenberg
|
9ea7e6899a
|
ENHANCEMENT Replaced Prototype show/hide functionality in ConfirmedPasswordField with jQuery. Added additional test case for show/hide markup.
|
2011-03-08 18:31:00 +13:00 |
|
Sean Harvey
|
06089eddfd
|
MINOR Added fix to test troubleshooting docs about PHPUnit 3.5 missing MockObject
|
2011-03-08 13:34:29 +13:00 |
|
Ingo Schommer
|
cea41832b1
|
MINOR Fixed title escaping in 'built in page controls' documentation
|
2011-03-03 09:07:24 +13:00 |
|
Ingo Schommer
|
0fd7fa18a4
|
Merge branch 'candidasa-master'
|
2011-02-25 16:12:38 +13:00 |
|
Ingo Schommer
|
2003888152
|
MINOR Updated contributing guidelines
|
2011-02-25 08:56:52 +13:00 |
|
Julian Seidenberg
|
0bb424e2a2
|
API-CHANGE: updated jsmin to point at new github repo for the project
|
2011-02-24 18:10:58 +13:00 |
|
Julian Seidenberg
|
eee5f3e266
|
API-CHANGE: updated jquery-validate to new version compatible with jQuery 1.4.2+
|
2011-02-24 18:07:18 +13:00 |
|
Julian Seidenberg
|
04eb5f2cbf
|
API-CHANGE: updated livequery to new version that is compatible with jQuery 1.4+
|
2011-02-24 17:56:03 +13:00 |
|
Julian Seidenberg
|
beb75371fa
|
BUGFIX: update jquery form to latest version
|
2011-02-24 17:47:34 +13:00 |
|
Ingo Schommer
|
7cb687b5e0
|
MINOR Added docs/ contributing notes
|
2011-02-23 20:14:04 -08:00 |
|
Julian Seidenberg
|
9727d2e6f9
|
BUGFIX: rewriting overridden ajax success handler to work with new ajax function in jQuery 1.5
|
2011-02-24 17:08:21 +13:00 |
|
Julian Seidenberg
|
52070a0c3a
|
ENHANCEMENT: including all of jquery-ui instead of specifying individual pieces of it. This is a larger download size, but should be quicker overall as it is just a single download instead of lots of small files.
|
2011-02-24 17:07:24 +13:00 |
|
Julian Seidenberg
|
a836456cd9
|
BUGFIX: updated links to new jquery ui file paths
|
2011-02-24 12:07:34 +13:00 |
|
Julian Seidenberg
|
00b0bc1751
|
API-CHANGE: updated jquery-ui to version 1.8.10
|
2011-02-24 11:08:39 +13:00 |
|
Julian Seidenberg
|
b2cdb4be66
|
API-CHANGE: updated jquery ui themes to 1.8.10
|
2011-02-24 11:06:19 +13:00 |
|
Julian Seidenberg
|
69e5fdd1a6
|
API-CHANGE: updated jQuery to version 1.5. Removed deprecated jquery-packed.js file and obsolete readme which pointed to wrong code repository.
|
2011-02-24 10:21:54 +13:00 |
|
Julian Seidenberg
|
deb31b3bb4
|
API-CHANGE: updated jquery entwine to new version that is compatible with jQuery 1.5
|
2011-02-24 10:11:41 +13:00 |
|
Sam Minnee
|
d045970d83
|
Merge remote branch 'origin/master'
|
2011-02-22 10:57:59 +13:00 |
|
Sam Minnee
|
27246ce982
|
MINOR: Fixed 2.4 mergeback
|
2011-02-22 10:53:58 +13:00 |
|
Michael Andrewartha
|
e260b697c0
|
MINOR: formatting changes and fixes to original document formatting
|
2011-02-22 10:23:22 +13:00 |
|
Ingo Schommer
|
662c5259e5
|
BUGFIX Fixed Group->collateAncestorIDs() handling of orphans (fixes #6413)
|
2011-02-22 00:19:23 +13:00 |
|
Ingo Schommer
|
23e342ce03
|
API CHANGE Removing support for PHPUnit 3.4 (3.5.0 has been released in Sept 2010). Removing PhpUnitWrapper_3_4, and adding better version detection.
|
2011-02-21 18:49:09 +13:00 |
|
Ingo Schommer
|
65f6104cd6
|
MINOR Replaced assertType() calls with assertInstanceOf(), deprecated in PHPUnit 3.6 (throws warnings as of 3.5.10)
|
2011-02-21 18:49:09 +13:00 |
|
Hamish Friedlander
|
0b7d396ab8
|
ENHANCEMENT: Add old-style _t and sprintf(_t) tags back into new SSViewer rewrite
|
2011-02-21 17:44:46 +13:00 |
|
Hamish Friedlander
|
20ba97f8ff
|
BUGFIX: Empty if blocks are allowed (were hacky way of doing negation, now replaced by not)
|
2011-02-21 16:19:10 +13:00 |
|
Hamish Friedlander
|
a34df1cb1f
|
EHNANCEMENT: Allow presence checks in if and else_if blocks to be prefaced with not (allowed: <% if not A %>, not allowed: <% if not A == B %> - use <% if A != B %> instead
|
2011-02-21 15:24:14 +13:00 |
|
Hamish Friedlander
|
11459e40d4
|
MINOR: Add instructions for how to compile parser to comment
|
2011-02-21 13:50:10 +13:00 |
|
Hamish Friedlander
|
71892085fc
|
ENHANCEMENT: Add Up support
|
2011-02-21 13:50:10 +13:00 |
|
Ingo Schommer
|
ca2e80ec08
|
MINOR Updated 'from source' docs
|
2011-02-16 08:53:51 +13:00 |
|
Hamish Friedlander
|
829bf23192
|
MINOR: Add inline documentation to SSTemplateParser
|
2011-02-15 10:04:22 +13:00 |
|
Sam Minnee
|
1e0c4ae8d1
|
Merge branch '2.4'
Conflicts:
cache/Cache.php
cli/CliController.php
core/Convert.php
core/Core.php
core/ManifestBuilder.php
core/Object.php
core/SSViewer.php
core/control/ContentController.php
core/control/ContentNegotiator.php
core/control/FormResponse.php
core/control/RequestHandler.php
core/control/SilverStripeNavigatorItem.php
core/i18n.php
core/i18nTextCollector.php
core/model/DataObjectSet.php
core/model/Hierarchy.php
core/model/Image.php
core/model/MySQLDatabase.php
core/model/SiteConfig.php
core/model/SiteTree.php
core/model/Translatable.php
core/model/VirtualPage.php
dev/Debug.php
dev/SapphireTest.php
dev/TestRunner.php
dev/YamlFixture.php
dev/install/MySQLDatabaseConfigurationHelper.php
docs/en/installation/from-source.md
docs/en/topics/themes.md
docs/en/tutorials/4-site-search.md
email/Mailer.php
filesystem/File.php
filesystem/Folder.php
forms/ComplexTableField.php
forms/CurrencyField.php
forms/DateField.php
forms/FieldSet.php
forms/FileField.php
forms/FileIFrameField.php
forms/HtmlEditorConfig.php
forms/HtmlEditorField.php
forms/SelectionGroup.php
forms/SimpleImageField.php
forms/TabSet.php
forms/TableField.php
forms/TableListField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
integration/Geoip.php
javascript/SelectionGroup.js
javascript/TreeSelectorField.js
javascript/UpdateURL.js
javascript/core/jquery.ondemand.js
javascript/tiny_mce_improvements.js
javascript/tree/tree.js
lang/en_US.php
search/ContentControllerSearchExtension.php
security/Group.php
security/Member.php
security/PermissionCheckboxSetField.php
security/PermissionRole.php
security/Security.php
static-main.php
templates/RelationComplexTableField.ss
templates/TableListField.ss
tests/ConvertTest.php
tests/DataObjectSetTest.php
tests/DataObjectTest.php
tests/DataObjectTest.yml
tests/RequestHandlingTest.php
tests/SSViewerTest.php
tests/SiteTreePermissionsTest.php
tests/SiteTreeTest.php
tests/TransactionTest.php
tests/api/RestfulServiceTest.php
tests/control/DirectorTest.php
tests/control/ModelAsControllerTest.php
tests/fieldtypes/WidgetAreaEditorTest.php
tests/forms/CurrencyFieldTest.php
tests/forms/FormTest.php
tests/model/DatabaseTest.php
tests/model/ImageTest.php
tests/search/ContentControllerSearchExtensionTest.php
tests/security/MemberAuthenticatorTest.php
thirdparty/.gitignore
thirdparty/behaviour/behaviour.js
thirdparty/firebug-lite/firebug.js
thirdparty/firebug-lite/firebugx.js
thirdparty/jquery-form/jquery.form.js
thirdparty/jquery-livequery/jquery.livequery.js
thirdparty/jquery-livequery/test/jquery.js
thirdparty/jquery-livequery/test/test.html
thirdparty/jquery-livequery/test/test2.html
thirdparty/jquery-metadata/META.json
thirdparty/jquery-metadata/README
thirdparty/jquery-metadata/jquery.metadata.js
thirdparty/jquery-metadata/test/index.html
thirdparty/jquery-metadata/test/jquery.js
thirdparty/jquery-metadata/test/test.js
thirdparty/jquery-metadata/test/testrunner.js
thirdparty/jquery-metadata/test/testsuite.css
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png
thirdparty/jquery-ui/i18n/jquery-ui-i18n.js
thirdparty/jquery-ui/i18n/ui.datepicker-ar.js
thirdparty/jquery-ui/i18n/ui.datepicker-bg.js
thirdparty/jquery-ui/i18n/ui.datepicker-ca.js
thirdparty/jquery-ui/i18n/ui.datepicker-cs.js
thirdparty/jquery-ui/i18n/ui.datepicker-da.js
thirdparty/jquery-ui/i18n/ui.datepicker-de.js
thirdparty/jquery-ui/i18n/ui.datepicker-el.js
thirdparty/jquery-ui/i18n/ui.datepicker-eo.js
thirdparty/jquery-ui/i18n/ui.datepicker-es.js
thirdparty/jquery-ui/i18n/ui.datepicker-fa.js
thirdparty/jquery-ui/i18n/ui.datepicker-fi.js
thirdparty/jquery-ui/i18n/ui.datepicker-fr.js
thirdparty/jquery-ui/i18n/ui.datepicker-he.js
thirdparty/jquery-ui/i18n/ui.datepicker-hr.js
thirdparty/jquery-ui/i18n/ui.datepicker-hu.js
thirdparty/jquery-ui/i18n/ui.datepicker-hy.js
thirdparty/jquery-ui/i18n/ui.datepicker-id.js
thirdparty/jquery-ui/i18n/ui.datepicker-is.js
thirdparty/jquery-ui/i18n/ui.datepicker-it.js
thirdparty/jquery-ui/i18n/ui.datepicker-ja.js
thirdparty/jquery-ui/i18n/ui.datepicker-ko.js
thirdparty/jquery-ui/i18n/ui.datepicker-lt.js
thirdparty/jquery-ui/i18n/ui.datepicker-lv.js
thirdparty/jquery-ui/i18n/ui.datepicker-ms.js
thirdparty/jquery-ui/i18n/ui.datepicker-nl.js
thirdparty/jquery-ui/i18n/ui.datepicker-no.js
thirdparty/jquery-ui/i18n/ui.datepicker-pl.js
thirdparty/jquery-ui/i18n/ui.datepicker-pt-BR.js
thirdparty/jquery-ui/i18n/ui.datepicker-ro.js
thirdparty/jquery-ui/i18n/ui.datepicker-ru.js
thirdparty/jquery-ui/i18n/ui.datepicker-sk.js
thirdparty/jquery-ui/i18n/ui.datepicker-sl.js
thirdparty/jquery-ui/i18n/ui.datepicker-sq.js
thirdparty/jquery-ui/i18n/ui.datepicker-sr-SR.js
thirdparty/jquery-ui/i18n/ui.datepicker-sr.js
thirdparty/jquery-ui/i18n/ui.datepicker-sv.js
thirdparty/jquery-ui/i18n/ui.datepicker-th.js
thirdparty/jquery-ui/i18n/ui.datepicker-tr.js
thirdparty/jquery-ui/i18n/ui.datepicker-uk.js
thirdparty/jquery-ui/i18n/ui.datepicker-zh-CN.js
thirdparty/jquery-ui/i18n/ui.datepicker-zh-TW.js
thirdparty/jquery/jquery.js
thirdparty/jsmin/.piston.yml
thirdparty/jsmin/jsmin.php
thirdparty/prototype/prototype.js
thirdparty/scriptaculous/dragdrop.js
thirdparty/simplepie/.piston.yml
thirdparty/spyc/.piston.yml
thirdparty/spyc/README
thirdparty/spyc/php4/spyc.php4
thirdparty/spyc/php4/test.php4
thirdparty/spyc/spyc.php
thirdparty/spyc/spyc.yaml
thirdparty/tinymce-advcode/dialog.html
thirdparty/tinymce-advcode/editor_plugin_src.js
thirdparty/tinymce-advcode/js/dialog.js
thirdparty/tinymce/langs/en.js
thirdparty/tinymce/plugins/advhr/langs/en_dlg.js
thirdparty/tinymce/plugins/advhr/rule.htm
thirdparty/tinymce/plugins/advimage/image.htm
thirdparty/tinymce/plugins/advimage/langs/en_dlg.js
thirdparty/tinymce/plugins/advlink/langs/en_dlg.js
thirdparty/tinymce/plugins/advlink/link.htm
thirdparty/tinymce/plugins/emotions/emotions.htm
thirdparty/tinymce/plugins/emotions/langs/en_dlg.js
thirdparty/tinymce/plugins/example/dialog.htm
thirdparty/tinymce/plugins/fullpage/fullpage.htm
thirdparty/tinymce/plugins/fullpage/langs/en_dlg.js
thirdparty/tinymce/plugins/fullscreen/fullscreen.htm
thirdparty/tinymce/plugins/inlinepopups/template.htm
thirdparty/tinymce/plugins/media/langs/en_dlg.js
thirdparty/tinymce/plugins/media/media.htm
thirdparty/tinymce/plugins/paste/js/pasteword.js
thirdparty/tinymce/plugins/paste/langs/en_dlg.js
thirdparty/tinymce/plugins/paste/pastetext.htm
thirdparty/tinymce/plugins/paste/pasteword.htm
thirdparty/tinymce/plugins/searchreplace/langs/en_dlg.js
thirdparty/tinymce/plugins/searchreplace/searchreplace.htm
thirdparty/tinymce/plugins/spellchecker/editor_plugin.js
thirdparty/tinymce/plugins/spellchecker/editor_plugin_src.js
thirdparty/tinymce/plugins/style/langs/en_dlg.js
thirdparty/tinymce/plugins/style/props.htm
thirdparty/tinymce/plugins/table/cell.htm
thirdparty/tinymce/plugins/table/langs/en_dlg.js
thirdparty/tinymce/plugins/table/merge_cells.htm
thirdparty/tinymce/plugins/table/row.htm
thirdparty/tinymce/plugins/table/table.htm
thirdparty/tinymce/plugins/template/langs/en_dlg.js
thirdparty/tinymce/plugins/template/template.htm
thirdparty/tinymce/plugins/xhtmlxtras/abbr.htm
thirdparty/tinymce/plugins/xhtmlxtras/acronym.htm
thirdparty/tinymce/plugins/xhtmlxtras/attributes.htm
thirdparty/tinymce/plugins/xhtmlxtras/cite.htm
thirdparty/tinymce/plugins/xhtmlxtras/del.htm
thirdparty/tinymce/plugins/xhtmlxtras/ins.htm
thirdparty/tinymce/plugins/xhtmlxtras/langs/en_dlg.js
thirdparty/tinymce/themes/advanced/about.htm
thirdparty/tinymce/themes/advanced/anchor.htm
thirdparty/tinymce/themes/advanced/charmap.htm
thirdparty/tinymce/themes/advanced/color_picker.htm
thirdparty/tinymce/themes/advanced/image.htm
thirdparty/tinymce/themes/advanced/langs/en.js
thirdparty/tinymce/themes/advanced/langs/en_dlg.js
thirdparty/tinymce/themes/advanced/link.htm
thirdparty/tinymce/themes/advanced/source_editor.htm
thirdparty/tinymce/themes/simple/langs/en.js
thirdparty/tinymce/tiny_mce.js
thirdparty/tinymce/tiny_mce_src.js
widgets/Widget.php
|
2011-02-14 18:47:53 +13:00 |
|
Hamish Friedlander
|
67e4f8521a
|
BUGFIX: We dont try and detect mismatched end blocks except at the top level, so remove old redundant code from when we did
|
2011-02-14 16:52:01 +13:00 |
|
Sam Minnee
|
8d05811734
|
Merge remote branch 'cbarberis/master'
|
2011-02-14 16:34:02 +13:00 |
|
Hamish Friedlander
|
cc4d23061e
|
ENHANCEMENT: Enable tests disabled in 2.4, as they all work now
|
2011-02-14 14:58:58 +13:00 |
|
Hamish Friedlander
|
f6587c4ea2
|
ENHANCEMENT: Use the new SSTemplateParser class to compile the templates
|
2011-02-14 14:58:58 +13:00 |
|
Hamish Friedlander
|
f3c671988f
|
ENHANCEMENT: Add first version of SSTemplateParser, the new php-peg based template compiler
|
2011-02-14 14:58:57 +13:00 |
|
Hamish Friedlander
|
33d102d674
|
ENHANCEMENT: Piston in php-peg library
|
2011-02-14 14:58:57 +13:00 |
|
Ingo Schommer
|
6d7efc8a90
|
MINOR Fixed blackcandy github links in docs
|
2011-02-14 11:16:24 +13:00 |
|
Carlos Barberis
|
184e8bd852
|
ENHANCEMENT: Added allowed actions to core classes
|
2011-02-14 11:14:51 +13:00 |
|
Ingo Schommer
|
9354b4a68d
|
MINOR Removed reference to additional CSS download in tutorial 4, moved to the silverstripe-installer project
|
2011-02-14 11:09:40 +13:00 |
|
ajshort
|
900b0a7325
|
MINOR: Fixed an empty utility container adding extra padding to the bottom of table fields.
|
2011-02-13 15:54:05 +11:00 |
|
ajshort
|
9e49d04e15
|
MINOR: Only show the CTF utility bar if there are utilities available.
|
2011-02-13 15:54:05 +11:00 |
|
ajshort
|
590dbb5f3f
|
ENHANCEMENT: Made it possible to attach utility links to a ComplexTableField beyond just exporting (e.g. printing).
|
2011-02-13 15:54:05 +11:00 |
|
Ingo Schommer
|
60ca784aae
|
API CHANGE Removed Director::history(), history was no longer recorded. Removed Director::__construct(), as Director is a static utility class without instance state (fixes #6385)
|
2011-02-12 16:39:35 +13:00 |
|
Ingo Schommer
|
a63215c6a5
|
MINOR Added README
|
2011-02-12 14:27:36 +13:00 |
|