Commit Graph

1628 Commits

Author SHA1 Message Date
Daniel Hensby
695c18ac6d
Merge branch '3.2' into 3.3 2016-06-13 12:29:45 +01:00
UndefinedOffset
341f49c630 BUGFIX: Fixed lookup of next closest visible field for focus restoring (fixes #5618) 2016-05-31 11:09:40 -03:00
Patrick Nelson
693408330b FIX for #5410 to help focus errors occurring on tabs within GridField controlled DataObjects (et al).
Tidy up Entwine logic for selecting tabs containing errors
2016-05-13 16:12:32 -07: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
Daniel Hensby
840cd4f877
Update translations 2016-05-05 12:46:38 +01: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
e8cfe1cc72
Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19 2016-05-05 01:01:37 +01:00
Daniel Hensby
47c3165aa3
Merge remote-tracking branch 'security/patch/3.1/ss-2015-029' into 3.1.19 2016-05-05 01:01:15 +01:00
Daniel Hensby
32f0a637b4
Merge branch '3.2' into 3.3 2016-05-04 23:17:36 +01:00
Daniel Hensby
0884683c6b
Merge branch '3.1' into 3.2 2016-05-04 23:15:43 +01:00
Damian Mooyman
a38eb8b784 Fix incorrect logic check 2016-05-02 18:15:39 +12:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3
Conflicts:
	.travis.yml
2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2
Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md
2016-04-26 00:09:33 +01:00
Daniel Hensby
fde6376996
FIX Admin bloacklisted messages using correct $.inArray check 2016-04-24 08:57:45 +01:00
Daniel Hensby
a24c8260b1
[SS-2016-004] FIX Store current page IDs as ints 2016-04-20 23:55:59 +01:00
Daniel Hensby
3c0f2e8e11
[SS-2015-029] FIX Add CSFR protection to tree reorganise 2016-04-19 00:01:04 +01:00
Daniel Hensby
36283b86d5
FIX Stop "success" message showing in CMS
fixes #5281
2016-04-12 16:14:31 +01:00
Daniel Hensby
863b737717 Merge pull request #5214 from tractorcow/pulls/3.1/fix-array-values
Do not hang on nested parameters in search context
2016-03-21 09:21:33 +00:00
Damian Mooyman
94b0f61957 Merge pull request #3494 from dnadesign/tabForceActive
fixing issue where 'ss-tabs-force-active' wasn't actually working
2016-03-21 16:53:49 +13:00
Nicola Fontana
11561aeb54 Do not hang on nested parameters in search context
Backport of 0b5a573 for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
2016-03-21 15:54:22 +13:00
Daniel Hensby
ada12066f3 FIX Autocomplete loading spinner now showing 2016-03-21 15:15:00 +13:00
Jonathon Menz
283885f091 FIX tab wrapping
jQuery UI css specificity is different to SS so causes some conflicts. (fixes #5207)
2016-03-20 11:09:36 -07:00
Damian Mooyman
8566825194 Merge pull request #5131 from dhensby/pulls/3.3/fix-help-link
Fixing user help link
2016-03-07 14:04:45 +13:00
Ingo Schommer
3c53da0890 Merge remote-tracking branch 'origin/3.2' into 3.3 2016-03-04 14:05:06 +13:00
Ingo Schommer
7bb6295c79 Fix TreeDropdownField auto-close regression
Causes build failures due to Behat not being able to select
a link from a dropdown in "Insert Media".

Follow on effect from triggering a window.resize event
when the window wasn't actually resized (in order to force a layout redraw).

See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context
2016-03-03 17:54:07 +13:00
Daniel Hensby
f313d7659d Fixing user help link 2016-03-02 12:43:10 +00:00
Nicola Fontana
29b35c7ccf Do not hang on nested parameters in search context
Backport of 0b5a57389b for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
2016-02-28 21:40:34 +01: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
scott1702
a67b8144b0 Fix incorrect height on main nav after toggle 2016-02-24 10:23:16 +13:00
Damian Mooyman
3738436d0e Update translations 2016-02-19 10:54:36 +13:00
Damian Mooyman
cfd1a5d696 Update translations 2016-02-19 10:21:03 +13:00
Damian Mooyman
35b5c03fbc Merge branch 3.3.0 into 3.3 2016-02-09 18:22:58 +13:00
Damian Mooyman
adc7a59108 Update translations 2016-02-09 17:45:21 +13:00
Daniel Hensby
cb39c41872 Merge pull request #5015 from webbuilders-group/3.3-datetime-search-fix
BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel
2016-02-05 15:31:37 +00:00
UndefinedOffset
0c252af334 BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel 2016-02-05 10:53:35 -04:00
Loz Calver
70f8343475 Re-instate back button for item edit forms 2016-02-05 09:39:57 +00:00
Damian Mooyman
d754884214 Update translations 2016-02-04 11:03:41 +13:00
scott1702
f39989a396 Add new font icons to set
Add .no-text class for icons which have no text
2016-02-04 10:34:30 +13:00
scott1702
15fba5a4cb Remove old logout icon on retina screens
Remove background rules for old preview icons
2016-02-03 16:36:21 +13:00
Damian Mooyman
75493e79ff Update translations 2016-01-25 15:06:55 +13: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
scott1702
e4222d8186 Add default action from batch actions 2016-01-22 16:02:27 +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
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