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
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
Damian Mooyman
cf3d01a3c1
Merge 3.2.4 into 3.2
2016-05-11 13:29:18 +12:00
Damian Mooyman
61d37fc084
Merge 3.1.19 into 3.1
2016-05-11 13:14:26 +12:00
Damian Mooyman
4571779213
Update translations
2016-05-11 11:05:57 +12:00
Damian Mooyman
dd0163ae00
Update translations
2016-05-11 11:05:37 +12:00
Damian Mooyman
03c628345b
Update translations
2016-05-11 10:58:24 +12:00
Ingo Schommer
e0a02713e6
Added CodeClimate integration
2016-05-11 09:47:47 +12:00
Ingo Schommer
fff84a5e13
Add SCSSLint
...
Not validating any files since it's all in legacy folders, but future proofing for new code
2016-05-11 09:47:03 +12:00
Ingo Schommer
ac708de6e7
Add ESLint
...
Not validating any code at the moment since it's all legacy, but will enforce on new files
2016-05-11 09:46:28 +12:00
Ingo Schommer
54573292a3
Merge pull request #1489 from open-sausages/pulls/4.0/fix-save-from-page-settings
...
FIX Not being able to save when viewing page settings
2016-05-09 18:07:11 +12:00
Hamish Friedlander
1263bf8a04
FIX Not being able to save when viewing page settings
2016-05-09 16:43:19 +12:00
Ingo Schommer
740d2c60a3
Merge pull request #1488 from open-sausages/pulls/4.0/fix-add-i18n-javascript-locations
...
FIX add_i18n_javascript calls not being updated after JS move
2016-05-09 15:56:00 +12:00
Hamish Friedlander
2af63a84ef
FIX add_i18n_javascript calls not being updated after JS move
...
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
2016-05-09 15:41:58 +12:00
Ingo Schommer
d52058a4fd
Merge pull request #1484 from open-sausages/pulls/4.0/Add-page-steps-bug
...
Make page steps use the same styles, consistent markup
2016-05-09 12:53:39 +12:00
Ingo Schommer
4297d33343
Merge pull request #1475 from candidasa/ss4-issue1473
...
MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it up…
2016-05-09 07:59:07 +12:00
Daniel Hensby
bc06d72e5f
Merge pull request #1481 from frankmullenger/4917-renaming
...
MINOR: Removing camel cased 'Html' references.
2016-05-07 11:11:16 +01:00
Paul Clarke
a039753f5c
removed .field class as it adds a bottom border
2016-05-06 15:30:08 +12:00
