Commit Graph

16727 Commits

Author SHA1 Message Date
Oly Su
059d03bb37 Moved spinner to right so it does not overlap text 2016-07-19 13:57:08 +12:00
Damian Mooyman
4b4aa4e91c API Exclude templates in 'themes' directories from $default theme (#5820)
API $themes parameter is now mandatory in TemplateLoader::findTemplate()
2016-07-19 13:17:07 +12:00
Sam Minnee
0685a6779a TESTS: code-climate ignore admin/thirdparty
admin/thirdparty shouldn’t be checked by code climate as it isn’t code
that we maintain.
2016-07-19 13:12:51 +12:00
madmatt
43dcde5197 FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded 2016-07-19 11:22:36 +12:00
Daniel Hensby
6f164c03fe Merge pull request #5822 from antons-/patch-1
Use columns from gridfield for export
2016-07-18 23:39:44 +01:00
Anton Smith
4c856c4377 Use columns from gridfield for export 2016-07-19 08:26:07 +12:00
Daniel Hensby
a73f08bd88 Merge pull request #5815 from kinglozzer/form-buttonclicked-duplicate-code
Refactor duplicate code in Form
2016-07-18 10:13:37 +01:00
Daniel Hensby
2bbddab210 Merge pull request #5821 from open-sausages/pulls/4.0/fix-uploadfield-casting
BUG Fix regression with uploadfield casting
2016-07-18 09:46:39 +01:00
Damian Mooyman
b89fcfa188 BUG Fix regression with uploadfield casting 2016-07-18 18:33:44 +12:00
Damian Mooyman
9ce433c7fe Merge pull request #5744 from jonners99/patch-1
Update GridFieldAddExistingAutocompleter.php
2016-07-18 18:13:32 +12:00
Daniel Hensby
a8c0c0fc6a
Merge pull request #3614 from chillu/pulls/switch-states 2016-07-17 12:39:20 +01:00
Daniel Hensby
9282662293
Fixing bad syntax from PR 2016-07-15 17:00:33 +01:00
Daniel Hensby
51e02e2ed7
Merge remote-tracking branch 'tony/patch-1' into 3 2016-07-15 16:58:48 +01:00
Loz Calver
2b1dd99be1
Refactor duplicate code in Form 2016-07-15 16:47:27 +01:00
Loz Calver
0a7e4cf7c3
Merge branch '3' 2016-07-15 16:01:48 +01:00
Loz Calver
391161208e
Merge branch '3.4' into 3 2016-07-15 14:34:50 +01:00
Loz Calver
44d7919496
Merge branch '3.3' into 3.4 2016-07-15 14:34:18 +01:00
Loz Calver
de61551885
Merge branch '3.2' into 3.3 2016-07-15 14:33:38 +01:00
Loz Calver
6ee3e458b6
Merge branch '3.1' into 3.2 2016-07-15 14:32:35 +01:00
Daniel Hensby
a6f1544621 Merge pull request #5814 from kinglozzer/2534-form-actions
FIX: Fixes support for "inline" form actions (fixes #2534)
2016-07-15 14:19:18 +01:00
Loz Calver
b3fea3723f
FIX: Fixes support for "inline" form actions (fixes #2534) 2016-07-15 10:11:47 +01:00
Sam Minnée
366224078b FIX: Allow caching of false config values (Fixes #4755) (#4762)
False values were indistinguishable from cache misses. This patch solves
this by introducing a new multiple-return-value varation on cache->get().
The new method is named differently so as not to break a public API.
2016-07-15 09:22:58 +01:00
Daniel Hensby
6abce3a0b8 Merge pull request #5810 from tractorcow/pulls/3/xframe-option
API Allow X-Frame-Options to be configured
2016-07-15 09:13:05 +01:00
Sam Minnée
5c98d331a3 Merge pull request #5804 from open-sausages/feature/themestack
API Theme stacking
2016-07-15 17:12:54 +12:00
Sam Minnée
af891ea60a Merge pull request #5776 from open-sausages/pulls/4.0/form-action-menu
API Implement composite react fields / PopoverField
2016-07-15 17:06:26 +12:00
Hamish Friedlander
b8b4e98ac2 API Theme stacking 2016-07-15 16:29:25 +12:00
Damian Mooyman
5cb4ab4a82 API Add PopoverField for extra-actions popup in react 2016-07-15 15:46:11 +12:00
Damian Mooyman
9e1b12a891 API Support composite react formfields
Cleanup and standardise CompositeField API and subclasses
2016-07-15 14:26:28 +12:00
Damian Mooyman
d08ab6ac81
API Allow X-Frame-Options to be configured
Fixes #2970
2016-07-15 14:08:14 +12:00
Daniel Hensby
a64a066bbf Merge pull request #5665 from tractorcow/pulls/3.3/fix-button-clicked
BUG Fix buttonClicked() error
2016-07-15 00:30:25 +01:00
Daniel Hensby
0b869254d5 Merge pull request #5809 from giankdm/5772-notifications
Quick fix for HTTP/2.0 on OSX/Safari v9.1.1
2016-07-15 00:26:38 +01:00
Daniel Hensby
b7fc0a2752 Merge pull request #5790 from patricknelson/issue-5784-email-reply-to
FIX for #5784: Email API improvements, documentation cleanup.
2016-07-15 00:23:25 +01:00
Patrick Nelson
74c555e004 FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards. 2016-07-14 10:25:40 -07:00
Giancarlo Di Massa
8f2953f1a0 Quick fix for HTTP/2.0 on OSX/Safari v9.1.1 2016-07-14 16:35:51 +02:00
Daniel Hensby
d19955afc8
Merge branch '3' 2016-07-14 14:05:18 +01:00
Daniel Hensby
4c40cf8dbb
Merge branch '3.4' into 3 2016-07-14 12:01:19 +01:00
Daniel Hensby
d766c8559b
Merge branch '3.3' into 3.4 2016-07-14 11:57:15 +01:00
Daniel Hensby
a2581b9cf7
Merge branch '3.2' into 3.3 2016-07-14 11:56:35 +01:00
Damian Mooyman
6e68f38efb API Update react sections to use react-router instead of page.js (#5796)
Fixes #5711
2016-07-14 17:51:01 +12:00
Chris Joe
291c527174 Remove double checking for Code 2016-07-14 16:47:48 +12:00
Damian Mooyman
af5a539c9a Re-enable travis artifacts on framework (#5807) 2016-07-14 14:53:21 +12:00
Damian Mooyman
83c2af72ca BUG Fix some regressions from #5653 (#5806) 2016-07-14 14:43:53 +12:00
Damian Mooyman
3b43145954 Merge pull request #5735 from silverstripe-terraformers/versions
FIX: Saving null values to the _versions table.
2016-07-14 13:30:30 +12:00
Daniel Hensby
2025d8c76f Merge pull request #5805 from Zauberfisch/gridfield-detail-form-fix-3.2
only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX
2016-07-13 15:05:08 +01:00
zauberfisch
3482c98cce only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX (fixes #5801) 2016-07-13 13:32:50 +00:00
Daniel Hensby
60546308f3 Merge pull request #5653 from tractorcow/pulls/4.0/default-cast
API Enforce default_cast
2016-07-13 08:59:28 +01:00
Damian Mooyman
fb6f8a0a04
BUG Fix Security page showing double escaped HTML 2016-07-13 19:08:09 +12:00
Damian Mooyman
26d46517ac
API Remove custom DBHTMLText::exists() custom behaviour
Fix merge regressions
2016-07-13 18:45:57 +12:00
Damian Mooyman
6a7c1056fe BUG Fix shortcode parsing in HTMLEditorField::getanchors()
Fixes #5678
2016-07-13 17:15:45 +12:00
Damian Mooyman
009f2de17c BUG Fix incorrect enum string parsing 2016-07-13 17:15:45 +12:00