Damian Mooyman
69c9ad1428
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_style.scss
# css/AssetUploadField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
# lang/fi.yml
2016-01-25 16:15:41 +13:00
Damian Mooyman
e091bb8474
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/scss/_forms.scss
# admin/scss/_style.scss
# tests/model/VersionedTest.yml
2016-01-25 15:57:37 +13:00
Damian Mooyman
f79f99f14b
Merge remote-tracking branch 'origin/3.3.0' into 3.3
2016-01-25 15:43:30 +13:00
Damian Mooyman
b4e76df531
Add upgrading notes to rc1
2016-01-25 15:35:42 +13:00
Damian Mooyman
5f511e5048
Added 3.3.0-rc1 changelog
2016-01-25 15:22:58 +13:00
Damian Mooyman
75493e79ff
Update translations
2016-01-25 15:06:55 +13:00
Damian Mooyman
7c448bb4a2
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# tests/model/DataObjectLazyLoadingTest.php
# tests/model/VersionedTest.yml
2016-01-25 14:11:37 +13:00
Damian Mooyman
f8ce2d7631
Merge pull request #4973 from dhensby/pulls/multibyte-char-fix
...
Remove question marks, equal signs and hashes
2016-01-25 10:00:07 +13:00
Daniel Hensby
75905b9d33
Merge pull request #4976 from assertchris/replace-obsolete-mime-types
...
Replaced obsolete mime types
2016-01-24 10:29:22 +00:00
assertchris
c66f973fce
Replaced obsolete mime types
2016-01-24 18:15:47 +13:00
Daniel Hensby
e9d45b4d5f
Merge pull request #4954 from tractorcow/pulls/3.3/version-fixes
...
BUG Fix VersionedTest sometimes failing given certain querystring arguments
2016-01-22 18:53:21 +00:00
Daniel Hensby
415318042d
Merge pull request #4952 from silverstripe/local-bin
...
Install sake into /usr/local/bin. /usr is now protected on OSX
2016-01-22 18:49:40 +00:00
Will Rossiter
d9fd442b0e
Install sake into /usr/local/bin. /usr is now protected on OSX
...
https://support.apple.com/en-us/HT204899
2016-01-22 18:48:58 +00:00
Daniel Hensby
f131b0d91e
Merge pull request #4961 from silverstripe/tractorcow-patch-1
...
DOCS Update branch names
2016-01-22 18:20:15 +00:00
Daniel Hensby
119bd2f873
Merge pull request #4845 from tractorcow/pulls/3/extension-hook-byref
...
API before/afterExtend now support parameters passed by reference
2016-01-22 16:08:20 +00:00
Jarkko Linnanvirta
bc9aa09b1f
Remove question marks, equal signs and hashes
...
Those were not removed if multibyte was allowed.
2016-01-22 15:40:11 +00:00
Daniel Hensby
cd42d070a0
Merge pull request #4968 from tractorcow/pulls/3.2/fix-versioned-rollback
...
BUG Fix Versioned::doRollbackTo
2016-01-22 15:12:33 +00:00
Daniel Hensby
8b0dc9786e
Merge pull request #4970 from scott1702/update-background
...
Update background colors
2016-01-22 15:01:05 +00:00
scott1702
1a1c7b2f55
Update background colors
2016-01-22 17:50:01 +13:00
divzpatel123@gmail.com
7ead6f0ca9
Minor: changed px value on tabs (border-bottom)
2016-01-22 17:22:31 +13:00
Meeeeeeow
d8ee25c39c
Minor: Remove Boxshadows
2016-01-22 17:18:02 +13:00
divzpatel123@gmail.com
fbc68f433f
Minor: update background colors
2016-01-22 16:32:52 +13:00
Damian Mooyman
b2bd3ccca9
Merge pull request #4969 from scott1702/batch-actions
...
Add default action for batch actions
2016-01-22 16:20:06 +13:00
scott1702
e4222d8186
Add default action from batch actions
2016-01-22 16:02:27 +13:00
Damian Mooyman
bf8bf5e4d5
BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects
...
Document correct configuration of Versioned DataObjects
Fixes #4936
2016-01-22 15:35:58 +13:00
Damian Mooyman
2fb193cf7f
Merge pull request #4967 from IgorNadj/patch-2
...
Add special flag to CMS preview requests
2016-01-22 15:15:12 +13:00
Ingo Schommer
88f8acff5a
Merge pull request #4966 from tractorcow/pulls/3.2/fix-docs
...
BUG Revert lost documentation
2016-01-22 13:08:51 +13:00
Igor
3924db26d8
Add special flag to CMS preview requests
2016-01-22 13:02:59 +13:00
Damian Mooyman
cca7129385
BUG Revert lost documentation
...
Resolves some regressions from #3735
2016-01-22 11:45:00 +13:00
Daniel Hensby
612772728e
Merge pull request #4962 from tractorcow/pulls/4.0/defaultclass
...
API Refactor out Page default classname hack
2016-01-21 22:40:28 +00:00
Damian Mooyman
7a2a969814
Merge pull request #4944 from Meeeeeeow/patch-1
...
Docs: Fixed Typo
2016-01-22 08:39:05 +13:00
Daniel Hensby
1bf0605f5e
Merge pull request #4568 from tractorcow/pulls/4.0/dropdown-cleanup
...
API Cleanup and refactor of select fields and Standardise Relation interface
2016-01-21 12:39:27 +00:00
Jarkko Linnanvirta
cf8e9f2427
Test removing some bad characters when multibyte is allowed
2016-01-21 12:57:50 +02:00
Loz Calver
219f76f87c
Merge pull request #4951 from divya-patel/logout-menu-update
...
Minor:updated the menu on the top left; changed styles
2016-01-21 09:54:54 +00:00
Damian Mooyman
5138bf1b7f
API Refactor out Page default classname hack
...
Fixes #1932
2016-01-21 17:12:55 +13:00
Damian Mooyman
99de74d69e
API Add isDisabledValue to SelectField
...
API Remove deprecated {comma} syntax for multi select string encoded values
API MemberDatetimeOptionsetField now has a fixed preview date
BUG fix inverted arguments in OptionSetField::getOptionClass
2016-01-21 15:40:19 +13:00
Damian Mooyman
bdb1a95758
API Cleanup and refactor of select fields
...
API Standardise Relation interface
2016-01-21 15:40:19 +13:00
Damian Mooyman
bc2a4dd652
Merge pull request #4953 from lry6003/search-icon
...
Search Icon Hover/Active/Focus changes
2016-01-21 14:57:13 +13:00
Damian Mooyman
d8ea6ceccc
Update translations
2016-01-21 14:22:35 +13:00
Damian Mooyman
45c6d0284a
Minor: Update branch names
2016-01-21 14:02:42 +13:00
divzpatel123@gmail.com
4dee924432
Minor:updated the menu on the top left; changed styles
2016-01-20 15:44:40 +13:00
Damian Mooyman
df76d783fe
BUG Fix VersionedTest sometimes failing given certain querystring arguments
2016-01-20 14:49:46 +13:00
Luke Ryley
38e2cb5b6d
Search Icon Hover/Active/Focus changes
...
Changed the color of the search icon when it is in Hover/Active/Focus state and removed backgroup color changes in these states
2016-01-20 14:35:54 +13:00
Damian Mooyman
eeb110a04f
Merge pull request #4939 from lry6003/unbold-labels
...
Minor: Unbolded labels in CMS
2016-01-20 13:31:13 +13:00
Damian Mooyman
e6b877df27
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# control/Director.php
# control/HTTP.php
# core/startup/ParameterConfirmationToken.php
# docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
# docs/en/00_Getting_Started/04_Directory_Structure.md
# docs/en/00_Getting_Started/05_Coding_Conventions.md
# docs/en/01_Tutorials/01_Building_A_Basic_Site.md
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/01_Tutorials/04_Site_Search.md
# docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
# docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
# docs/en/02_Developer_Guides/13_i18n/index.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
# docs/en/03_Upgrading/index.md
# docs/en/changelogs/index.md
# docs/en/howto/customize-cms-menu.md
# docs/en/howto/navigation-menu.md
# docs/en/index.md
# docs/en/installation/index.md
# docs/en/installation/windows-manual-iis-6.md
# docs/en/misc/contributing/code.md
# docs/en/misc/contributing/issues.md
# docs/en/misc/module-release-process.md
# docs/en/reference/dataobject.md
# docs/en/reference/execution-pipeline.md
# docs/en/reference/grid-field.md
# docs/en/reference/modeladmin.md
# docs/en/reference/rssfeed.md
# docs/en/reference/templates.md
# docs/en/topics/commandline.md
# docs/en/topics/debugging.md
# docs/en/topics/email.md
# docs/en/topics/forms.md
# docs/en/topics/index.md
# docs/en/topics/module-development.md
# docs/en/topics/modules.md
# docs/en/topics/page-type-templates.md
# docs/en/topics/page-types.md
# docs/en/topics/search.md
# docs/en/topics/testing/index.md
# docs/en/topics/testing/testing-guide-troubleshooting.md
# docs/en/topics/theme-development.md
# docs/en/tutorials/1-building-a-basic-site.md
# docs/en/tutorials/2-extending-a-basic-site.md
# docs/en/tutorials/3-forms.md
# docs/en/tutorials/4-site-search.md
# docs/en/tutorials/5-dataobject-relationship-management.md
# docs/en/tutorials/building-a-basic-site.md
# docs/en/tutorials/dataobject-relationship-management.md
# docs/en/tutorials/extending-a-basic-site.md
# docs/en/tutorials/forms.md
# docs/en/tutorials/index.md
# docs/en/tutorials/site-search.md
# main.php
# model/SQLQuery.php
# security/ChangePasswordForm.php
# security/MemberLoginForm.php
# tests/control/ControllerTest.php
# tests/core/startup/ParameterConfirmationTokenTest.php
# tests/model/SQLQueryTest.php
# tests/security/SecurityTest.php
# tests/view/SSViewerTest.php
# view/SSTemplateParser.php
# view/SSTemplateParser.php.inc
# view/SSViewer.php
2016-01-20 13:16:27 +13:00
Damian Mooyman
8e4db95f72
Fix merge regressions
2016-01-19 17:08:40 +13:00
Damian Mooyman
8c1cafd1a0
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/scss/_forms.scss
# admin/scss/_style.scss
# admin/scss/_tree.scss
# javascript/TreeDropdownField.js
2016-01-19 17:08:26 +13:00
Damian Mooyman
d561551a19
Merge pull request #4943 from Meeeeeeow/LinkColourChange
...
Changed the link colours
2016-01-19 16:33:21 +13:00
Meeeeeeow
e448774150
Fixed Typo
...
Changed 'Gudes' to 'Guides'
2016-01-19 16:18:35 +13:00
Meeeeeeow
4301ae20bf
Changed the link colours
2016-01-19 15:46:29 +13:00
