Commit Graph

1605 Commits

Author SHA1 Message Date
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
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
d5b4c90cb4 Merge remote-tracking branch 'origin/3.3' into 3
# Conflicts:
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_fonts.scss
#	admin/scss/_retina.scss
2016-02-09 18:25:47 +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
Daniel Hensby
316d5ef967 Set the stage reading mode in LeftAndMain 2016-02-03 21:27:13 +00: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
Daniel Hensby
24aaee984e Set the stage reading mode in LeftAndMain 2016-02-02 13:35:39 +00:00
Daniel Hensby
c5fc9dd650 FIX CMS actions alignment 2016-01-26 14:38:48 +00: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
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
Igor
3924db26d8 Add special flag to CMS preview requests 2016-01-22 13:02:59 +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
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
Meeeeeeow
4301ae20bf Changed the link colours 2016-01-19 15:46:29 +13:00
Luke Ryley
2701248387 Minor: Unbolded labels in CMS
- updated _forms.scss removed font-weight
- also removed drop-shadow include
Luke Ryley - open source academy
2016-01-19 12:04:55 +13:00
scott1702
4a0e157479 Remove focus outline when clicking tabs 2016-01-08 15:11:17 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
scott1702
b64d73dcbf color updates to meet contrast requirements 2016-01-05 11:20:30 +13:00
Damian Mooyman
952896e638 Update translations 2015-12-23 13:22:38 +13:00
Damian Mooyman
9fcca5c7e2 Merge pull request #4842 from open-sausages/icon-tabs
Update icon-button-group css
2015-12-22 16:20:38 +13:00
Damian Mooyman
4e3d6f9118 Fix merge regressions from 3.2 -> 3 2015-12-22 14:35:05 +13:00
Damian Mooyman
48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
2015-12-22 14:07:52 +13:00
scott1702
78190f213d Update icon-button-group css 2015-12-11 18:20:33 +13:00
Damian Mooyman
b338efe5a7 Update translations 2015-11-11 16:07:20 +13:00
scott1702
4f8b061b59 Remove drag handle from non-draggable js-trees 2015-11-05 13:09:47 +13:00
Damian Mooyman
44728d1c76 Merge pull request #4740 from chillu/pulls/3.2/batch-action-url-fix
Batch actions break with Translatable installed
2015-11-04 09:31:21 +13:00
Ingo Schommer
acdcf8ca02 Batch actions break with Translatable installed
Due to ?locale GET parameter being appended to the action URL,
and naive string concatenation of additional GET parameters.
2015-11-04 08:35:25 +13:00
Damian Mooyman
c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php
2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	lang/cs.yml
	lang/sk.yml
2015-11-03 11:10:46 +13:00
Ed Linklater
42d2e0ebbf Don't try to unbind events from inside top-level iframes 2015-11-01 06:14:30 +13:00
Stephen Shkardoon
6030854725 Fix page reordering bug with ParentID
If you are viewing PageA in the CMS, but move PageB into PageC,
the edit form will recieve an edit form ParentID of PageC.
This is incorrect, as only PageB had it's ParentID change.
2015-10-12 20:10:48 +13:00
Damian Mooyman
0cd3569fb9 Update translations 2015-10-06 18:33:16 +13:00
Loz Calver
8f0f6475da FIX: Issues with field focus in edit forms (fixes #4621) 2015-09-23 15:19:24 +01:00
Nicola Fontana
c39cf2d55f Do not hang on nested parameters in search context 2015-09-23 09:12:02 +02:00
Damian Mooyman
00caeb700d Added 3.1.14 changelog
Update translations
2015-09-15 10:58:15 +12:00