tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
19,689 Commits 31 Branches 527 Tags 162 MiB
26c3e224db
Commit Graph

19689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Carlino
cddaaf1444 Update TinyMCEConfig to use theme CSS 2017-07-03 10:38:50 +12:00
Daniel Hensby
3a7261ac6e Merge pull request #7093 from dhensby/pulls/3.5/lam-getchildasul-call 
FIX add missing $rootCall param from LeftAndMain
 2017-07-02 00:28:48 +01:00
Daniel Hensby
c69a565b08 Merge pull request #7046 from andrewandante/FEAT/add_inGroup_to_Group 
add inGroup(s) methods to Group
 2017-06-30 16:38:55 +01:00
Daniel Hensby
c6a6fdd784 Merge pull request #7079 from andrewandante/patch-1 
Add $fixture_file to the fixtures docs
 2017-06-30 15:45:46 +01:00
Daniel Hensby
d7cfe2fd34 Merge pull request #7101 from dhensby/pulls/4/unlock-webdriver 
Partial revert of #7096
 2017-06-30 13:38:56 +01:00
Andrew Aitken-Fincham
ab60a167e6 add inGroup(s) methods to Group 2017-06-30 12:47:37 +01:00
Daniel Hensby
bd50b6f865
Partial revert of #7096 2017-06-30 12:35:41 +01:00
Chris Joe
591fb28272 Merge pull request #7098 from open-sausages/pulls/4.0/installer-fixes 
BUG Fix broken installer assets and session crash
 2017-06-30 16:03:56 +12:00
Damian Mooyman
3633947699
BUG Fix broken installer assets and session crash 2017-06-30 14:50:58 +12:00
Ingo Schommer
a37672f4df Merge pull request #7097 from open-sausages/pulls/4.0/source-docs 
DOCS Update notes on —prefer-source/dist
 2017-06-30 13:23:29 +12:00
Ingo Schommer
afab2b04d8 Merge pull request #7082 from open-sausages/pulls/4.0/diffs-in-changelog 
Consistent 4.0 changelog docs formatting
 2017-06-30 13:20:56 +12:00
Damian Mooyman
60303571e4 DOCS Update notes on —prefer-source/dist 
Fixes https://github.com/silverstripe/silverstripe-installer/issues/186
 2017-06-30 13:19:51 +12:00
Ingo Schommer
3ffc6ebcd7 Consistent 4.0 changelog docs formatting 
Added diff styling, requires merge of https://github.com/silverstripe/silverstripe-docsviewer/pull/134.
 2017-06-30 13:13:26 +12:00
Damian Mooyman
ee05c586b6 Merge pull request #7083 from sminnee/get-one-miss-null 
FIX: DataObject::get_one() misses return null, not false
 2017-06-30 13:08:20 +12:00
Chris Joe
a2aaa66d70 Merge pull request #7096 from open-sausages/pulls/4.0/behat-greenage 
Temporarily restrict php-webdriver to 1.4.3
 2017-06-30 13:07:18 +12:00
Damian Mooyman
267d7ebfc4
Temporarily restrict php-webdriver to 1.4.3 
Add composer.lock to artifacts
See https://github.com/instaclick/php-webdriver/pull/79
 2017-06-30 12:35:01 +12:00
Damian Mooyman
0200e2b62a
BUG Fix travis artifacts paths 2017-06-30 10:05:20 +12:00
Damian Mooyman
ac4a6c06a7 Merge pull request #7076 from open-sausages/pulls/4.0/resource-loading-upgrade-docs 
Docs for resource loading upgrade path
 2017-06-30 09:27:29 +12:00
Ingo Schommer
24957418ed Docs for resource loading upgrade path 
See https://github.com/silverstripe/silverstripe-framework/pull/7065
 2017-06-30 08:51:56 +12:00
Andrew Aitken-Fincham
ef8e04a83e Add $fixture_file to the fixtures docs 
Currently no mention of it.
 2017-06-29 13:58:37 +01:00
Daniel Hensby
79a7b1016e
FIX add missing $rootCall param from LeftAndMain 2017-06-29 11:24:09 +01:00
Aaron Carlino
ad9d4e6820 Pulls/4.0/shortcode namespacing (#7085) 
* New shortcode providers, update config, docs

* Use new ImageShortcodeProvider

* Move tests

* New shortcodes namespace

* Move file and image shortcode registrations from framework to assets
 2017-06-29 18:45:17 +12:00
Damian Mooyman
15b4cf70ed Merge pull request #7090 from open-sausages/pulls/4.0/i-forgot-to-flush 
Fix enable ?flush rather than just ?flush=1
 2017-06-29 18:14:43 +12:00
Christopher Joe
061393a098 Fix enable ?flush rather than just ?flush=1 2017-06-29 16:13:38 +12:00
Chris Joe
d4b41b9541 Merge pull request #7067 from open-sausages/pulls/4.0/security-merge 
[SS-2017-002] FIX Lock out users who dont exist in the DB
 2017-06-29 15:35:39 +12:00
Chris Joe
f024a0b39b Merge pull request #6953 from open-sausages/pulls/4.0/npm-docs-update 
DOCS Add link to silverstripe npm account
 2017-06-29 13:59:37 +12:00
Daniel Hensby
30986b4ea3
[SS-2017-002] FIX Lock out users who dont exist in the DB 2017-06-29 13:58:55 +12:00
Sam Minnee
2c8790ca7d FIX: DataObject::get_one() misses return null, not false 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5441
 2017-06-29 13:51:52 +12:00
Damian Mooyman
3e0b7bde9c
DOCS Add link to silverstripe npm account 2017-06-29 13:37:17 +12:00
Damian Mooyman
23a719e14e Merge pull request #7080 from jonom/docs-image-force-resample 
DOCS clarify $force_resample behaviour
 2017-06-29 12:27:07 +12:00
Jonathon Menz
b60ccd11c3 DOCS clarify $force_resample behaviour 
Fixes https://github.com/silverstripe/silverstripe-assets/issues/21
 2017-06-28 14:40:18 -07:00
Daniel Hensby
e7df10dc52
Merge branch '3' 2017-06-28 18:59:08 +01:00
Daniel Hensby
eec8dfa7ad
Merge branch '3.6' into 3 2017-06-28 11:12:03 +01:00
Daniel Hensby
d94182702c
Merge branch '3.5' into 3.6 2017-06-28 11:10:43 +01:00
Chris Joe
9a98655124 Custom redux state in injector, updated docs (#7042) 
* Update docs for new Injector js structure and description for injector reducer API

* Injector documentation updates

* updates per ingo

* Update examples and some notes based on feedback

* Updates per ingo

* documentation updates to reflect new injector.component

* Minor doc updates
 2017-06-28 21:35:04 +12:00
Ingo Schommer
977c62a513 Merge pull request #7065 from sminnee/resource-url-generator 
Abstraction of resource loading
 2017-06-28 20:59:05 +12:00
Ingo Schommer
86302746e3 Merge pull request #7070 from sminnee/moar-php7 
MINOR: More PHP7 in travis builds
 2017-06-28 20:54:14 +12:00
Damian Mooyman
b2f3b218a3
BUG Fix incorrect $database autoinit 
BUG Fix missing $request in Installer bootstrapping
 2017-06-28 17:59:16 +12:00
Damian Mooyman
8078ee08f2
BUG Fix folder urls getting mtime querystring appended 2017-06-28 16:59:41 +12:00
Sam Minnee
741166e369 API: ModulePath template global now takes any composer package name. 
NEW: URL generation now handled by pluggable ResourceURLGenerator service.
NEW: Requirements::javascript() and Requirements::css() now support “vendor/package:resource” syntax.

These changes will make it easier to us to fully abstract:
 - file access from module location
 - file location from URL generation

API: ModulePath template global now takes any composer package name.
NEW: URL generation now handled by pluggable ResourceURLGenerator service.
NEW: Requirements::javascript() and Requirements::css() now support “vendor/package:resource” syntax.

These changes will make it easier to us to fully abstract:
 - file access from module location
 - file location from URL generation
 2017-06-28 16:59:28 +12:00
Sam Minnee
07913e6df6 MINOR: Drop dual MYSQL/PGSQL builds for PHP7 
We can get away with testing MySQL on PHP 5.6
and PHP 7.1 and testing PGSQL on PHP 7.0. We don’t
need a full matrix.
 2017-06-28 16:57:20 +12:00
Sam Minnee
1fa712e189 MINOR: More PHP7 in travis builds 
PHP7 is faster than PHP5.6 so we should use it for as many builds
as possible.

This leaves 1 build - the coverage build - running on PHP5.6
and puts the rest on PHP7.
 2017-06-28 16:51:41 +12:00
Chris Joe
51e4e4df6d Merge pull request #7045 from open-sausages/pulls/4.0/selective-form-unsaved-change-notification 
BUG Add flag on form whether to notify user when there's unsaved changes
 2017-06-28 15:36:33 +12:00
Damian Mooyman
a48628db20 Merge pull request #7030 from 3Dgoo/patch-1 
Documentation link fixes
 2017-06-28 12:15:42 +12:00
Damian Mooyman
2b8eb202db Merge pull request #6687 from hailwood/patch-6 
Do not default to locale if hasEmptyDefault is true
 2017-06-28 12:12:16 +12:00
Saophalkun Ponlu
288de2eb14 BUG Add flag on form whether to notify user when there's unsaved changes 2017-06-28 11:14:12 +12:00
Damian Mooyman
2bdb72c0f3 Merge pull request #7063 from wilr/prefix-patch 
Support empty DATABASE_PREFIX
 2017-06-28 10:55:23 +12:00
Will Rossiter
ecb5d85de0 Support empty SS_DATABASE_PREFIX 2017-06-28 08:18:21 +12:00
Daniel Hensby
399c46579a
Merge branch '3.6' into 3 2017-06-27 13:15:14 +01:00
Daniel Hensby
1e5592a3d9
Merge branch '3.5' into 3.6 2017-06-27 13:14:39 +01:00