Ingo Schommer
|
995680f4bb
|
Merge pull request #1320 from tractorcow/pulls/3.2/deprecated-reports
Restore deprecated reports
|
2015-11-10 17:43:33 +13:00 |
|
Damian Mooyman
|
b26c3a3b4e
|
Restore deprecated reports
|
2015-11-10 17:17:56 +13:00 |
|
Damian Mooyman
|
7e2838c81c
|
Merge pull request #1319 from chillu/pulls/3.2/sitetree-extension-points
Extension hooks for "restore to stage" and "archive"
|
2015-11-10 16:12:24 +13:00 |
|
Ingo Schommer
|
21df7069d0
|
Extension hooks for "restore to stage" and "archive"
|
2015-11-10 15:30:15 +13:00 |
|
Damian Mooyman
|
369f3dda8d
|
API Remove deprecated ListboxField::setMultiple()
|
2015-11-09 17:05:31 +13:00 |
|
Sam Minnée
|
3dbe5f278d
|
Merge pull request #1315 from tractorcow/pulls/cms-tests
BUG Ensure CMSMainTest uses correct siteconfig
|
2015-11-09 11:57:20 +13:00 |
|
Damian Mooyman
|
271b5f7f15
|
Merge pull request #1316 from scott1702/allowed-ext
move allowed extensions into a sidebar
|
2015-11-09 10:35:28 +13:00 |
|
scott1702
|
e4ccd2d4bc
|
move allowed extensions into a sidebar
|
2015-11-05 19:33:58 +13:00 |
|
Damian Mooyman
|
c6c650f136
|
BUG Ensure CMSMainTest uses correct siteconfig
BUG Prevent CMSAddPageController invoking Security::LoginForm code during error handling
|
2015-11-05 16:47:58 +13:00 |
|
Damian Mooyman
|
18e368448a
|
Merge remote-tracking branch 'origin/3'
Conflicts:
code/controllers/AssetAdmin.php
code/controllers/CMSMain.php
code/controllers/CMSSiteTreeFilter.php
code/controllers/LeftAndMainPageIconsExtension.php
code/controllers/ModelAsController.php
code/controllers/SilverStripeNavigator.php
code/model/ErrorPage.php
code/model/SiteTreeFileExtension.php
|
2015-11-03 14:23:04 +13:00 |
|
Damian Mooyman
|
748866ec0f
|
Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
code/controllers/CMSMain.php
code/model/ErrorPage.php
|
2015-11-03 13:11:26 +13:00 |
|
Damian Mooyman
|
54b8389b8a
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
code/model/ErrorPage.php
lang/fa_IR.yml
|
2015-11-03 11:11:29 +13:00 |
|
Ingo Schommer
|
e3a321b306
|
Merge pull request #1304 from scott1702/update-upload-button
Update asset admin toolbar
|
2015-10-30 10:27:29 +13:00 |
|
scott1702
|
6dc3fc1f26
|
Update asset admin toolbar
|
2015-10-30 10:05:51 +13:00 |
|
Ingo Schommer
|
79f23631c9
|
Merge pull request #1300 from open-sausages/features/dbfile-generated-files
Generated files API
|
2015-10-23 16:54:18 +13:00 |
|
Damian Mooyman
|
227e2ba162
|
API Move ErrorPage to new generated files API
|
2015-10-23 10:08:51 +13:00 |
|
Sam Minnée
|
f340130e8d
|
Merge pull request #1303 from open-sausages/pulls/php-5.5-min
Increase minimum required PHP version to 5.5
|
2015-10-22 10:45:07 +01:00 |
|
Ingo Schommer
|
d9b5895ee3
|
Increase minimum required PHP version to 5.5
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
|
2015-10-22 22:13:14 +13:00 |
|
Damian Mooyman
|
604edd8f6e
|
Merge pull request #1302 from kinglozzer/yaml-fix
FIX: Remove tab - invalid YAML
|
2015-10-20 09:10:22 +13:00 |
|
Loz Calver
|
d7dcb41b27
|
FIX: Remove tab - invalid YAML
|
2015-10-19 17:10:47 +01:00 |
|
Ingo Schommer
|
b487d59d02
|
Merge pull request #1291 from open-sausages/pulls/4.0/dbfile-file-dataobject
API CMS Implementation of RFC-1 Asset Abstraction (DataObject Refactoring)
|
2015-10-19 16:47:18 +13:00 |
|
Damian Mooyman
|
2bd9d00da0
|
API Remove filesystem sync
API support new asset abstraction
BUG Fix file link tracking for new asset abstraction
|
2015-10-19 13:42:39 +13:00 |
|
Damian Mooyman
|
b302a9a9be
|
Merge pull request #1296 from patricknelson/issue-1294-errorpage-fatal-3.1
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
|
2015-10-19 07:59:47 +13:00 |
|
Damian Mooyman
|
bc669311dd
|
Merge pull request #1297 from patricknelson/issue-586-delete-validation-3.2
FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary.
|
2015-10-16 17:18:16 +13:00 |
|
Damian Mooyman
|
a791ceecf5
|
Merge pull request #1295 from patricknelson/issue-1294-errorpage-fatal
FIX for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
|
2015-10-16 17:16:01 +13:00 |
|
Patrick Nelson
|
75dc391df9
|
FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary. Cleaned up type hint.
|
2015-10-09 15:36:21 -04:00 |
|
Patrick Nelson
|
ff6c0a3160
|
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
|
2015-10-08 17:48:31 -04:00 |
|
Patrick Nelson
|
785f85047f
|
FIX for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
|
2015-10-08 17:38:58 -04:00 |
|
Damian Mooyman
|
c963706a88
|
Merge pull request #1292 from patricknelson/issue-1288-button-type
FIX (partial) for #1288 where non-submit buttons are being activated on "enter" key press.
|
2015-10-07 12:13:07 +13:00 |
|
Patrick Nelson
|
332e490147
|
FIX (partial) for #1288 where non-submit buttons are being activated on "enter" key press (relates to framework issue at https://github.com/silverstripe/silverstripe-framework/issues/3181).
|
2015-10-06 15:08:29 -04:00 |
|
Damian Mooyman
|
d8915115f8
|
Update translations
|
2015-10-06 18:33:16 +13:00 |
|
Damian Mooyman
|
aab9999390
|
Merge pull request #1281 from kinglozzer/pulls/sitetree-settings-toggles
FIX: Incorrect field IDs breaking SiteTree settings toggles (fixes #1280)
|
2015-10-06 11:53:12 +13:00 |
|
Damian Mooyman
|
65492d8de0
|
Merge pull request #1283 from spekulatius/fixing-phpdoc-blocks
fixing phpdoc blocks to refering to Objects to built-in types of PHP
|
2015-10-06 11:46:37 +13:00 |
|
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 |
|