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 |
|
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 |
|
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 |
|
Damian Mooyman
|
d92a76cab2
|
Alias 3 as 3.5
|
2016-05-19 16:10:15 +12:00 |
|
Damian Mooyman
|
a096efa8f6
|
Merge 3.4.0 into 3
|
2016-05-19 15:48:00 +12:00 |
|
Damian Mooyman
|
f5b00786d6
|
Update translations
|
2016-05-19 14:48:39 +12:00 |
|
Damian Mooyman
|
8e21ec86e2
|
Merge pull request #1498 from WindSaber/master
DBField namespace in Search for php7 support
|
2016-05-18 10:27:56 +12:00 |
|
Omar Nava
|
6bc0d026f7
|
DBField namespace in Search for php7 support
|
2016-05-17 16:03:54 -05:00 |
|
Daniel Hensby
|
a507c80d15
|
Merge pull request #1492 from open-sausages/pulls/linting
Linting and CodeClimate support
|
2016-05-12 17:51:15 +01:00 |
|
Damian Mooyman
|
c58d8bdedc
|
Update translations
|
2016-05-12 15:37:09 +12:00 |
|
Damian Mooyman
|
cbded1ae69
|
Merge pull request #1494 from open-sausages/pulls/4.0/fix-preview-in-asset-admin
FIX preview issue in Asset Admin
|
2016-05-12 12:57:00 +12:00 |
|
Hamish Friedlander
|
7393995836
|
FIX preview in Asset Admin
|
2016-05-12 12:42:13 +12:00 |
|
Damian Mooyman
|
2695030430
|
Merge 3 into master
# Conflicts:
# client/lang/src/ar.js
# client/lang/src/cs.js
# client/lang/src/de.js
# client/lang/src/en.js
# client/lang/src/eo.js
# client/lang/src/es.js
# client/lang/src/fa_IR.js
# client/lang/src/fr.js
# client/lang/src/hu.js
# client/lang/src/id.js
# client/lang/src/is.js
# client/lang/src/it.js
# client/lang/src/ja.js
# client/lang/src/ko.js
# client/lang/src/lt.js
# client/lang/src/mi.js
# client/lang/src/nb.js
# client/lang/src/nl.js
# client/lang/src/pl.js
# client/lang/src/ro.js
# client/lang/src/ru.js
# client/lang/src/sk.js
# client/lang/src/sl.js
# client/lang/src/sr.js
# client/lang/src/sr_RS@latin.js
# client/lang/src/sv.js
# client/lang/src/zh.js
# lang/bg.yml
|
2016-05-11 14:35:12 +12:00 |
|
Damian Mooyman
|
7d9ca4fac5
|
Merge 3.3 into 3
# Conflicts:
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fa_IR.js
# javascript/lang/src/fr.js
# javascript/lang/src/hu.js
# javascript/lang/src/id.js
# javascript/lang/src/is.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/ko.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ro.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
|
2016-05-11 14:03:59 +12:00 |
|
Damian Mooyman
|
1f2c0aaaa0
|
Merge 3.2 into 3.3
|
2016-05-11 13:59:56 +12:00 |
|
Damian Mooyman
|
ef12e8f42b
|
Merge 3.1 into 3.2
# Conflicts:
# javascript/lang/ar.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fa_IR.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/hu.js
# javascript/lang/id.js
# javascript/lang/is.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/ko.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ro.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# lang/cs.yml
# lang/fa_IR.yml
|
2016-05-11 13:49:03 +12:00 |
|
Damian Mooyman
|
0de5f525ef
|
Merge 3.3.2 into 3.3
|
2016-05-11 13:33:15 +12:00 |
|