tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
6,539 Commits 29 Branches 403 Tags 28 MiB
4.13
Commit Graph

6539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
fd2dd25f08
Merge pull request #2560 from creative-commoners/pulls/4.6/travis 
Travis 4.6
 2020-06-23 10:18:50 -07:00
Steve Boyd
1ee1db3298 Travis 4.6 2020-06-23 13:26:34 +12:00
Loz Calver
2f235ab5a3
Merge pull request #2558 from lerni/no-fqn-on-sitetype-dropdown 
#2557 removs FQN if lang != EN on SiteType dropdown in page-settings
 2020-06-18 09:08:12 +01:00
Lukas Erni
926571a2bf https://github.com/silverstripe/silverstripe-cms/issues/2557 - remove FQN if lang != EN on SiteType dropdown in page-settings 2020-06-17 16:28:23 +02:00
Garion Herman
4009e37847 Merge branch '4.6' into 4 2020-06-15 15:54:43 +12:00
Garion Herman
aa6f0fd66c Update translations 2020-06-15 12:35:00 +12:00
Robbie Averill
fecd8944b5
Merge pull request #2555 from open-sausages/pulls/4/set-up-47-dev 
Merge up 4.6 branch + update travis to target x-dev branches
 2020-06-03 17:56:50 -07:00
Maxime Rainville
eb9ae5de62 Update travis config to target x-dev branches 2020-06-04 12:19:30 +12:00
Robbie Averill
5ec498c0c5
Merge pull request #2553 from open-sausages/pulls/4.6/update-travis 
Target 4.6 minor branches in build
 2020-05-28 09:20:13 -07:00
Maxime Rainville
79813ebd15 Target 4.6 minor branches in build 2020-05-28 17:56:47 +12:00
Maxime Rainville
c46454f946 Update translations 2020-05-27 03:06:45 +00:00
Maxime Rainville
9974c6e206 Merge branch '4.5' into 4 2020-05-26 14:27:33 +12:00
Robbie Averill
c58144ad6d
Merge pull request #2548 from t3hn0/4.5 
BUG Prioritise same-level pages in OldPageRedirector
 2020-05-11 12:45:55 -07:00
Robbie Averill
e766a8dbd3
Merge pull request #2544 from silverstripe/dependabot/npm_and_yarn/jquery-3.5.0 
Bump jquery from 3.4.1 to 3.5.0
 2020-05-04 16:56:06 -07:00
Klemen Dolinšek
c92e3b9d79 BUG Prioritise same-level pages in OldPageRedirector 
Added option to pass integer ParentID=0 to OldPageRedirector::find_old_page to ensure search through nested pages from the root of SiteTree structure. Added new call of function and still offering fallback to old behaviour if first call returns false (fixed #2522)
 2020-05-04 09:11:19 +02:00
Robbie Averill
2663db06b5
Merge pull request #2547 from creative-commoners/pulls/4.5/fix-page-location-title 
FIX Correct placement of 'Page location' field title
 2020-05-01 10:06:04 -07:00
Loz Calver
bec342e885
Merge pull request #2543 from open-sausages/pulls/4/treeview-reloading-for-nothing 
BUG Prevent Treeview from always reloading
 2020-05-01 09:35:11 +01:00
Garion Herman
891f068202 FIX Correct placement of 'Page location' field title 2020-05-01 15:45:08 +12:00
Robbie Averill
3ae58cf8c8
Merge pull request #2545 from sunnysideup/patch-10 
PATCH: fixing properties in comments
 2020-04-30 17:30:01 -07:00
Nicolaas
22694c7474
PATCH: fixing properties in comments 2020-05-01 11:01:51 +12:00
Maxime Rainville
fff806ca33 BUG Prevent Treeview from always reloading 2020-05-01 10:44:26 +12:00
dependabot[bot]
b2ab77f7b4
Bump jquery from 3.4.1 to 3.5.0 
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-30 02:18:50 +00:00
Guy Marriott
d46c2a3827
Merge pull request #2542 from chrometoasters/pulls/array-short-syntax 
Use short array syntax across the module's codebase
 2020-04-20 10:01:10 -07:00
Michal Kleiner
d8331c1e0a Use short array syntax across the module's codebase 2020-04-19 16:18:01 +12:00
Andre Kiste
6257156999
Merge pull request #2539 from silverstripe-terraformers/bugfix/published-pages-filter 
BUG: Published pages filter correction (missing default filter)
 2020-04-17 00:04:16 +12:00
Mojmir Fendek
d7c76bdbba BUG: Published pages filter correction (missing default filter) 2020-04-15 13:31:02 +12:00
Daniel Hensby
e25d0861fd
Merge pull request #2538 from mattclegg/4 
Update docs and remove duplication
 2020-04-10 08:43:36 +01:00
mattclegg
58795a2324
REFACTOR: Remove duplication and set SiteTree instances to use generic CMSEditLink() 2020-04-10 09:12:39 +05:45
mattclegg
d85cc24aa0
DOCS: Set @var to SiteTree where appropriate 2020-04-10 09:11:00 +05:45
Robbie Averill
b3848bf85e
Merge pull request #2537 from open-sausages/pulls/4/myisam 
InnoDB FULLTEXT compat in tests
 2020-04-08 17:21:19 -07:00
Ingo Schommer
e51bd421a6 FIX InnoDB FULLTEXT compat in tests 
> InnoDB FULLTEXT indexes have special transaction handling characteristics due its caching and batch processing behavior. Specifically, updates and insertions on a FULLTEXT index are processed at transaction commit time, which means that a FULLTEXT search can only see committed data. The following example demonstrates this behavior. The FULLTEXT search only returns a result after the inserted lines are committed.

https://dev.mysql.com/doc/refman/5.6/en/innodb-fulltext-index.html#innodb-fulltext-index-transaction
 2020-04-09 11:05:19 +12:00
Ingo Schommer
dd839ca2d9 FIX Remove searchEngine() test that's using API wrong 
Required to allow InnoDB usage, see https://github.com/silverstripe/silverstripe-framework/pull/9454.

This came up in https://github.com/silverstripe/silverstripe-cms/issues/1452, and wasn't fully addressed.
Either we allow boolean mode and all the constraints this brings around special character usage,
or we filter out those special characters, which makes boolean mode pointless.
You can't just pass arbitrary user input in a power-user function like this.
See https://dev.mysql.com/doc/refman/5.6/en/fulltext-boolean.html

Context: This used to work for some examples like "foo>*" under MyISAM,
presumably because it had a more lenient parser. InnoDB rightfully complains about this now.
 2020-04-09 09:59:53 +12:00
Robbie Averill
e81659344c
Merge pull request #2536 from mattclegg/1585990198 
ENHANCEMENT: Remove unused $controller from lambda function
 2020-04-05 19:16:44 -07:00
mattclegg
2bbc280ce6
ENHANCEMENT: Remove unused $controller from lambda function 2020-04-04 16:20:24 +05:45
Garion Herman
1185d7d3c8 Merge branch '4.5' into 4 2020-02-28 13:49:24 +13:00
Robbie Averill
e3b318a9e7
Merge pull request #2528 from creative-commoners/pulls/4.5/php-7.4-builds 
Update Travis config to include PHP 7.4 build, upgrade to Xenial
 2020-02-26 11:33:56 +11:00
Garion Herman
1b3bf47bbc Update Travis config to include PHP 7.4 build, upgrade to Xenial 2020-02-26 11:54:27 +13:00
Maxime Rainville
9cb96bfc52 Update translations 2020-02-17 02:29:19 +00:00
Maxime Rainville
e279a06f0b Merge remote-tracking branch 'origin/4.4' into 4.5 2020-02-17 14:45:16 +13:00
Maxime Rainville
7b50a5c0b6 Update translations 2020-02-17 00:42:58 +00:00
Steve Boyd
6f0217aa70
Merge pull request #2524 from creative-commoners/pulls/4.5/update-core-requirement 
FIX Update core requirements to 4.5 series
 2020-02-17 11:09:21 +13:00
Garion Herman
06a58c5cbc
Merge pull request #2523 from t3hn0/4 
Fixing issue #2522
 2020-02-13 10:52:38 +13:00
Klemen Dolinšek
ed41f15799 BUG Prioritise same-level pages in OldPageRedirector 
Added option to pass integer ParentID=0 to OldPageRedirector::find_old_page to ensure search through nested pages from the root of SiteTree structure. Added new call of function and still offering fallback to old behaviour if first call returns false (fixed #2522)
 2020-02-11 22:30:42 +01:00
Garion Herman
664e6c99c0 FIX Update core requirements to 4.5 series 2020-02-11 11:35:06 +13:00
Guy Marriott
82387cb444
NEW Add extension hook updateRedirectionLink() (#2518) 
NEW Add extension hook updateRedirectionLink()
 2020-01-24 09:56:45 -08:00
Guy Marriott
6dfc27f6a5
Merge pull request #2517 from creative-commoners/pulls/4.5/update-urlsegment-field-not-page 
FIX Update URLSegment field on enter key, rather than saving page
 2020-01-24 09:55:08 -08:00
Will Rossiter
6ee17a83e3
NEW Add extension hook updateRedirectionLink() 2020-01-24 22:13:03 +13:00
Garion Herman
9750538a5a FIX Update URLSegment field on enter key, rather than saving page 2020-01-24 12:35:21 +13:00
Steve Boyd
ee18bcf57b
Merge pull request #2515 from creative-commoners/pulls/4/fix-unrelated-alert 
Fix alert showing for unrelated elements
 2020-01-23 13:24:16 +13:00
bergice
82a76b9300 Fix alert showing for unrelated elements 
Resolves https://github.com/silverstripe/silverstripe-userforms/issues/920
 2020-01-22 13:15:16 +13:00