Damian Mooyman
bcc19df231
Merge pull request #1286 from spekulatius/remove-trailing-spaces
...
remove trailing spaces in the codebase
2015-09-29 17:37:59 +13:00
Peter Thaleikis
4694763fa5
remove trailing spaces in the codebase
2015-09-29 17:18:03 +13:00
Damian Mooyman
dc9286af6e
Merge pull request #1279 from open-sausages/pulls/move-addfile-ui
...
Moved upload files page to main files area
2015-09-29 13:19:46 +13:00
David Craig
1ea22c766c
Move UI to main assets area
2015-09-29 09:35:28 +13:00
Ingo Schommer
3d315b418f
Merge pull request #1282 from tractorcow/pulls/4.0/fix-virtualpage-regressions
...
BUG Fix regressions in CMS from db field changes
2015-09-29 09:05:31 +13:00
Peter Thaleikis
f291c5f365
fixing phpdoc blocks to refering to Objects to built-in types of PHP
2015-09-28 22:31:31 +13:00
Damian Mooyman
8e3f549b19
BUG Fix regressions in CMS from db field changes
2015-09-28 17:22:44 +13:00
Daniel Hensby
f7985b34f2
Merge pull request #1259 from stevie-mayhew/pulls/get_response
...
UPDATE: make all response code use getResponse() method
2015-09-25 12:23:43 +01:00
Stevie Mayhew
d54e117392
UPDATE: make all response code use getResponse() method
2015-09-25 09:10:24 +12:00
Loz Calver
052aba17ac
FIX: Incorrect field IDs breaking SiteTree settings toggles ( fixes #1280 )
2015-09-23 14:53:07 +01:00
Damian Mooyman
0df0f35278
Update translations
2015-09-18 14:21:19 +12:00
Damian Mooyman
e382818399
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
lang/cs.yml
lang/de.yml
lang/en.yml
lang/es.yml
lang/fr.yml
lang/id.yml
lang/it.yml
lang/lt.yml
lang/nb.yml
lang/sk.yml
lang/sr_RS@latin.yml
lang/sv.yml
2015-09-15 12:48:48 +12:00
Damian Mooyman
6e72bd2cf8
Update translations
2015-09-15 10:51:27 +12:00
Damian Mooyman
ce212972c8
Update translations
2015-09-15 10:42:32 +12:00
Damian Mooyman
105b3c60d1
Update translations
2015-09-15 10:33:25 +12:00
Damian Mooyman
60e75cbd99
Fix travis php version back to 5.4
2015-09-09 17:46:57 +12:00
Damian Mooyman
e68a752ac7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
.travis.yml
2015-09-09 14:53:48 +12:00
Damian Mooyman
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
Damian Mooyman
f2efbefb8c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
2015-09-09 14:09:00 +12:00
Damian Mooyman
353e5938de
Update translations
2015-09-02 11:15:52 +12:00
Loz Calver
2a7a5ac9fc
Merge pull request #1268 from scott1702/font-icons
...
Update font icons to use new library
2015-08-28 10:31:18 +01:00
Damian Mooyman
b26b6c3eca
Update translations
2015-08-26 13:56:19 +12:00
Loz Calver
a382dd1cfc
Merge pull request #1269 from sminnee/travis-disable-irc
...
MINOR: Remove IRC notifications of travis builds.
2015-08-25 09:07:20 +01:00
Sam Minnee
8a3e84ba1c
MINOR: Remove IRC notifications of travis builds.
...
Companion to https://github.com/silverstripe/silverstripe-framework/pull/4535
2015-08-25 18:12:22 +12:00
scott1702
c028278957
Update font icons to use new library
2015-08-25 15:08:09 +12:00
Damian Mooyman
1ada2dab1d
Merge pull request #1264 from scott1702/filtered-tree
...
Update the filtered tree styling
2015-08-25 14:50:36 +12:00
scott1702
4f05c4c4f8
Update the filtered tree styling
2015-08-25 13:02:20 +12:00
Sam Minnée
da348f74e8
Merge pull request #1265 from tractorcow/pulls/3.2/fix-archived-actions
...
BUG block adding children from archived pages
2015-08-24 17:04:46 +12:00
Sam Minnée
a650d6ad39
Merge pull request #1266 from tractorcow/pulls/3.2/packages
...
Fix missing packages
2015-08-24 17:04:43 +12:00
Damian Mooyman
a3f789c2b5
Update translations
2015-08-24 16:29:40 +12:00
Damian Mooyman
46180f671e
Fix missing packages
2015-08-24 16:14:33 +12:00
Damian Mooyman
6c17397322
BUG block adding children from archived pages
...
Fixes #1260
2015-08-24 15:16:09 +12:00
Damian Mooyman
3adef16034
Merge remote-tracking branch 'origin/3'
...
Conflicts:
.travis.yml
2015-08-24 12:02:51 +12:00
Sam Minnée
4db4db05af
Merge pull request #1263 from ss23/fix_812_oldpageredirector
...
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
2015-08-21 17:26:09 +12:00
Stephen Shkardoon
b87f5473d9
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
...
Previously, we would be limited by the way allParams will return 3 parameters
at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
Daniel Hensby
bf6a84bd2f
Fixing behat regression
2015-08-18 00:34:49 +01:00
Daniel Hensby
ab59113612
Fixing core release for travis
2015-08-18 00:09:02 +01:00
Sean Harvey
e5a4cdb302
Merge pull request #1261 from dhensby/pulls/remove-nightly
...
Removing hhvm-nightly as its not supported on travis
2015-08-18 10:07:16 +12:00
Daniel Hensby
f81159c2f7
Removing PHP 5.3 from travis
2015-08-17 17:30:48 +01:00
Daniel Hensby
4039805ac2
Removing hhvm-nightly as its not supported on travis
2015-08-17 16:53:42 +01:00
Daniel Hensby
7d50e0fac7
Merge branch '3'
...
Conflicts:
.travis.yml
2015-08-17 14:24:16 +01:00
Daniel Hensby
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
Daniel Hensby
80aca3a511
Merge branch '3.1' into 3.2
2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1
Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
...
* antons--773-nested-virtual-pages-allowed_children:
Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6
Issue #773 - $allowed_children not allowing nested virtual pages
...
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
Damian Mooyman
a1b9e99342
Update localisation
2015-08-04 13:02:52 +12:00
Sam Minnée
fd457fe93e
Merge pull request #1256 from tractorcow/pulls/3.2/batch-restore-beta
...
API batch restore action (ALTERNATE SOLUTION)
2015-08-03 22:08:13 +12:00
Damian Mooyman
e22b653e06
API batch restore action
2015-08-03 20:57:30 +12:00
Damian Mooyman
f38402bee3
Merge pull request #1254 from scott1702/update-alerts
...
Update archive warning to include children pages
2015-08-03 18:14:12 +12:00
Sam Minnée
fa8aa8f92e
Merge pull request #1241 from tractorcow/pulls/3.2/predictable-ids
...
API respect custom attributes on OptionsetField and CheckboxSetField
2015-08-03 17:23:24 +12:00
