Damian Mooyman
|
49e5038927
|
Merge pull request #4986 from benmanu/pulls/wysiwyg-file-links
BUG Fix TinyMCE insert link not respecting "open in new window" checkbox
|
2016-01-29 09:36:08 +13:00 |
|
Ben Manu
|
361c9a03fe
|
FIX: removing hardcoded target _blank for tinymce file links
This will allow file links to respect content editor input
|
2016-01-27 14:51:20 +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 |
|
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
|
f131b0d91e
|
Merge pull request #4961 from silverstripe/tractorcow-patch-1
DOCS Update branch names
|
2016-01-22 18:20:15 +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 |
|
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 |
|
Damian Mooyman
|
cca7129385
|
BUG Revert lost documentation
Resolves some regressions from #3735
|
2016-01-22 11:45:00 +13:00 |
|
Damian Mooyman
|
7a2a969814
|
Merge pull request #4944 from Meeeeeeow/patch-1
Docs: Fixed Typo
|
2016-01-22 08:39:05 +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
|
45c6d0284a
|
Minor: Update branch names
|
2016-01-21 14:02:42 +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
|
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 |
|
Damian Mooyman
|
5d240feaec
|
Merge remote-tracking branch 'origin/3.2' into 3.3
|
2016-01-19 15:08:24 +13:00 |
|
Damian Mooyman
|
46cbe809ac
|
Merge remote-tracking branch 'origin/3.1' into 3.2
# Conflicts:
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
# docs/en/03_Upgrading/index.md
# docs/en/05_Contributing/01_Code.md
# forms/TreeMultiselectField.php
# security/Permission.php
|
2016-01-19 14:00:19 +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 |
|
Damian Mooyman
|
4de81a7bc8
|
Merge pull request #4935 from SpiritLevel/3.1-docs
DOCS 3.1 : typos and broken internal links
|
2016-01-18 15:23:15 +13:00 |
|
David Alexander
|
45d2b57a65
|
DOCS 3.1 : typose and broken internal links
|
2016-01-15 16:39:23 +13:00 |
|
Damian Mooyman
|
bd0716d1ee
|
Merge pull request #4930 from SpiritLevel/3.1-docs
DOCS 3.1 - fixes broken internal links
|
2016-01-15 10:02:43 +13:00 |
|
David Alexander
|
5c99e33eb2
|
DOCS 3.1 - fixes broken internal links
|
2016-01-14 23:59:53 +13:00 |
|
Damian Mooyman
|
6e29d35c27
|
Merge pull request #4922 from flamerohr/vagrant-tutorial
DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox
|
2016-01-13 13:09:48 +13:00 |
|
Christopher Joe
|
007e0eeb2f
|
DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox
|
2016-01-13 12:12:21 +13:00 |
|
Damian Mooyman
|
aac59a85ff
|
Merge pull request #4908 from kinglozzer/cms-1307-filelink-field
FIX: Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307)
|
2016-01-12 11:01:49 +13:00 |
|
Damian Mooyman
|
1d13660530
|
Merge pull request #4907 from d-rivera-c/pulls/group-roles-admin-check
Display all roles when an admin, filter by OnlyAdminCanApply when not
|
2016-01-12 10:50:07 +13:00 |
|
Jono Menz
|
734bbd5df4
|
Merge pull request #4900 from scott1702/tabs-outline
Remove the focus outline when clicking on tabs
|
2016-01-11 09:19:27 -08:00 |
|
Loz Calver
|
85ba918a54
|
FIX: Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307)
|
2016-01-11 16:37:27 +00:00 |
|
Daniel Hensby
|
65a6f3d148
|
Merge pull request #4894 from spekulatius/patch-1
DOCS moving to spaces for some examples
|
2016-01-11 15:54:38 +00:00 |
|
Denise Rivera
|
7e32268ede
|
display filtered roles when not an admin
|
2016-01-11 13:05:10 +13:00 |
|
scott1702
|
4a0e157479
|
Remove focus outline when clicking tabs
|
2016-01-08 15:11:17 +13:00 |
|
Damian Mooyman
|
7e389b941b
|
Merge pull request #4882 from sb-relaxt-at/4881-drag-and-drop-bugfix
jquery.jstree patched to improve drag-and-drop handling
|
2016-01-08 12:54:01 +13:00 |
|
Damian Mooyman
|
3c55608075
|
Merge pull request #4892 from camfindlay/patch-37
DOCS FIX typo for i18n
|
2016-01-06 15:18:51 +13:00 |
|
Damian Mooyman
|
21e1e938eb
|
Merge pull request #4893 from dhensby/pulls/member-regenerate-session-id
FIX session_regenerate_id uses config system
|
2016-01-06 15:16:31 +13:00 |
|
Damian Mooyman
|
63a1739493
|
Merge pull request #4618 from dhensby/pulls/permission-check-empty-admin
Members with no ID have no permissions
|
2016-01-06 13:50:08 +13:00 |
|
Damian Mooyman
|
e59595bb23
|
Merge pull request #4879 from gordonbanderson/patch-1
Documentation : Using SQLite for Testing
|
2016-01-06 13:49:03 +13:00 |
|