Commit Graph

4965 Commits

Author SHA1 Message Date
Daniel Hensby
dc8d4ffe0b API Refactor usages of HTMLText -> HTMLFragment
API Revert hack in VirtualPage
API Respect default_cast
2016-07-13 18:48:46 +12:00
Daniel Hensby
1cc39a9c0b Merge pull request #1542 from tractorcow/pulls/3.3/fix-live-link
BUG Fix getAbsoluteLiveLink() concatenation
2016-07-12 13:52:57 +01:00
Damian Mooyman
8123c433f0 BUG Fix getAbsoluteLiveLink() concatenation
Fixes #1183
2016-07-12 15:57:52 +12:00
Daniel Hensby
3a395e6d56
Merge branch '3' 2016-07-12 01:13:07 +01:00
Daniel Hensby
00d16ec276
Merge branch '3.4' into 3 2016-07-12 01:12:07 +01:00
Daniel Hensby
a2657b519a
Merge branch '3.3' into 3.4 2016-07-12 01:08:54 +01:00
Daniel Hensby
118a09afff
Merge branch '3.2' into 3.3 2016-07-12 01:07:12 +01:00
Hamish Friedlander
d2485a60fd Merge pull request #1536 from open-sausages/pulls/4.0/namespace-security
API Apply SilverStripe\Security namespace
2016-07-07 13:24:25 +12:00
Daniel Hensby
ba98f77747 Merge pull request #1540 from open-sausages/pulls/4.0/fix-tab-styles
BUG Fix missing tabs layout in pages view
2016-07-06 12:48:56 +01:00
Damian Mooyman
59d4b51d8e BUG Fix missing tabs layout in pages view 2016-07-06 16:56:30 +12:00
micmania1
5f2d8cae0d
Merge pull request #1522 from micmania1/fix-sitetree-rading-stage 2016-07-05 16:13:23 +01:00
Damian Mooyman
25e4cad164
API Apply SilverStripe\Security namespace 2016-07-05 15:08:05 +12:00
Ingo Schommer
d208a6f511 Merge pull request #1534 from open-sausages/pulls/4.0/namespace-orm
API Update for new SilverStripe\ORM namespace
2016-07-01 15:09:00 +12:00
Christopher Joe
49e5cd54fa When page is disabled, rename "Edit" label in contextmenu and hide duplicate options 2016-06-30 17:28:17 +12:00
Damian Mooyman
bf511939f4 Merge pull request #1514 from stevie-mayhew/pulls/redirector-description
DOCS: updated description for redirector page
2016-06-28 18:13:28 +12:00
Damian Mooyman
e378332ff3
API Update for new SilverStripe\ORM namespace 2016-06-24 11:00:21 +12:00
Hamish Friedlander
6d5d7c0e11 Merge pull request #1519 from open-sausages/pulls/4.0/config-table-name
Support custom table_name and DataObjectSchema
2016-06-14 16:01:07 +12:00
Damian Mooyman
880ce895f5
Support custom table_name and DataObjectSchema 2016-06-14 15:37:41 +12:00
Daniel Hensby
a3d7d986a7
Merge branch '3' 2016-06-13 14:38:08 +01:00
Daniel Hensby
3c0011074c
Merge branch '3.4' into 3 2016-06-13 14:36:59 +01:00
Daniel Hensby
ea81389a18
Merge branch '3.3' into 3.4 2016-06-13 14:35:40 +01:00
Daniel Hensby
19047d1577
Merge branch '3.2' into 3.3 2016-06-13 14:34:12 +01:00
Daniel Hensby
c8976a9d64
Merge branch '3.1' into 3.2 2016-06-13 14:33:35 +01:00
Damian Mooyman
c50bc91772 API Cleanup inconsistent SiteTree::duplicate API 2016-06-13 15:47:47 +12:00
Daniel Hensby
039f6c198f Merge pull request #1160 from dhensby/pulls/inherited-allowed-children-test
Pulls/inherited allowed children test
2016-06-04 23:23:54 +01:00
Daniel Hensby
d6a57eb507
Amending redundant test 2016-06-04 23:03:06 +01:00
Damian Mooyman
7794bc8af0 Merge 3.4.0 into 3.4 2016-06-03 11:33:41 +12:00
Damian Mooyman
1ea9444be9 Update translations 2016-06-02 17:07:41 +12:00
Damian Mooyman
aca12d1de5 Merge pull request #1515 from dhensby/pulls/3.2/fix-infinite-404-redirect
Prevent OldPageRedirector looping infinitely
2016-06-01 10:32:07 +12:00
Daniel Hensby
eba89b9520
FIX OldPageRedirector no longer loops infinitely if 404 thrown on existing page 2016-05-31 15:46:17 +01:00
Stevie Mayhew
9feec1f1da Merge pull request #1513 from silverstripe/copyright-in-contributingmd
Add copyright note to contributing.md
2016-05-30 14:57:57 +12:00
Stevie Mayhew
e7bcbe3f79 DOCS: updated description for redirector page 2016-05-30 14:51:51 +12:00
Sam Minnée
a5ff3cd178 Add copyright note to contributing.md
This is important and so I think it shouldn't solely exist buried int he contributing guidelines.
2016-05-30 14:33:59 +12:00
Sam Minnée
359b969346 Merge pull request #1505 from open-sausages/features/bootify/actions-toolbars
Swap out .Actions class for bootstrap .btn-toolbar
2016-05-27 13:39:23 +12:00
Daniel Hensby
0a7610f245 Merge pull request #1508 from tractorcow/pulls/4.0/fix-rollback-page
BUG Fix rollback page crash
2016-05-24 21:30:42 +01:00
Daniel Hensby
478cc57f4b Merge pull request #1509 from open-sausages/pulls/4.0/allow-cancreate-override
API Allow extensions to influence can* methods
2016-05-24 09:24:14 +01:00
Paul Clarke
f4e080e046 Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required 2016-05-24 12:28:38 +12:00
Paul Clarke
11192b0207 Swap out .Actions class for bootstrap .btn-toolbar 2016-05-24 12:28:38 +12:00
Damian Mooyman
04e617d65d
API Allow extensions to influence canCreate, canEdit, canView, canDelete, and canAddChildren even for admins.
Resolves issues where modules expect to apply business logic to models that admins must adhere to.
2016-05-24 10:16:14 +12:00
Daniel Hensby
092c8986cb
FIX Query string not built properly 2016-05-23 19:04:28 +01:00
Damian Mooyman
ad213b3576 BUG Fix rollback page crash
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5532
2016-05-23 17:36:58 +12:00
Damian Mooyman
3be0f394bf Merge remote-tracking branch 'tractorcow/pulls/handle-request-cleanup' 2016-05-23 16:57:23 +12:00
Damian Mooyman
0f646ba375 Fix undefined index error 2016-05-23 16:55:31 +12:00
Daniel Hensby
e04e992c73
Fixes relating to Controller cleanup 2016-05-23 00:49:08 +01:00
Daniel Hensby
933a294478 Merge pull request #1503 from silverstripe/add-helpful-robot-badge
Added Helpful Robot badge
2016-05-21 07:58:03 +01:00
Christopher Pitt
c489a0c865 Added Helpful Robot badge 2016-05-21 16:59:14 +12:00
Ingo Schommer
344ec04cb3 Merge pull request #1502 from tractorcow/pulls/4.0/fix-install
BUG fix missing install image
2016-05-20 18:39:43 +12:00
Damian Mooyman
90397c945d
BUG fix missing install image
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5528
2016-05-20 17:22:11 +12:00
Daniel Hensby
329eaaaf1e Merge pull request #1500 from chillu/pulls/3.3/remove-branch-alias
Removed branch alias which should only apply to latest release branch
2016-05-19 09:54:40 +01:00
Ingo Schommer
0106e11722 Removed branch alias which should only apply to latest release branch
See 070ae2555b
for similar commit when going from 3.1 to 3.2.
2016-05-19 19:03:06 +12:00