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
5,200 Commits 29 Branches 403 Tags 28 MiB
2108d8ef08
Commit Graph

5200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
147181e96f
Merge branch '3.3' into 3.4 2016-10-16 22:42:40 +01:00
Daniel Hensby
bc71f2de01
Merge branch '3.2' into 3.3 2016-10-16 22:42:26 +01:00
Daniel Hensby
12c0f3c1c7
Merge branch '3.1' into 3.2 2016-10-16 22:40:56 +01:00
Daniel Hensby
89deba884f Merge pull request #1646 from open-sausages/pulls/4.0/fix-double-alert 
Fix double nested alert message
 2016-10-16 20:58:40 +01:00
Christopher Joe
5df580578a
Fix double nested alert message 2016-10-16 14:19:58 +01:00
Damian Mooyman
17a471a47a Merge pull request #1640 from dhensby/pulls/3.4/fix-history-versions 
FIX History controller now shows right comparison versions
 2016-10-12 09:11:45 +13:00
Damian Mooyman
431714d0eb Merge pull request #1638 from open-sausages/features/4.0/jlayout-to-flexbox 
Part 1 of 5, remove JLayout and apply flexbox to pages section (excludes preview)
 2016-10-11 17:35:47 +13:00
Christopher Joe
712849c732 Fix page form layout 2016-10-11 13:51:44 +13:00
Christopher Joe
38b095ca2c moved preview overlay to template, added area grow to preview panel 2016-10-11 13:51:44 +13:00
Paul Clarke
4c61868e59 move preview fallback message 2016-10-11 13:51:44 +13:00
Christopher Joe
2b00bdfdd6 adjust toggle to not display block when showing 2016-10-11 13:51:44 +13:00
Paul Clarke
b8b35de82d Replace Layout classes with Flexbox classes 2016-10-11 13:51:44 +13:00
Paul Clarke
67aca9f4e6 Replace Layout classes with flexbox css classes 2016-10-11 13:51:44 +13:00
Daniel Hensby
ae83b7b5ef
FIX History controller now shows right comparison versions 2016-10-07 16:33:03 +01:00
Ingo Schommer
ae9e05c99d Merge pull request #1639 from open-sausages/pulls/4.0/many-many-through 
API Update for DataObjectSchema changes
 2016-10-07 09:44:42 +13:00
Damian Mooyman
d1dbe91247 API Update for DataObjectSchema changes 2016-10-06 18:10:54 +13:00
Damian Mooyman
1e898782c6 Merge pull request #1637 from open-sausages/pulls/4.0/add-status-flag 
API Cleaned up versioned status checks
 2016-10-06 18:08:56 +13:00
Damian Mooyman
1ce243ccc1
API Cleaned up versioned status checks 2016-10-06 10:31:25 +13:00
Damian Mooyman
f9697f75cd Merge pull request #1636 from dhensby/pulls/3.4/fix-sort-duplicate-children 
FIX Sort order for duplicated child pages is now retained
 2016-10-04 10:34:56 +13:00
Daniel Hensby
98d95cd707
FIX Sort order for duplicated child pages is now retained 2016-10-03 22:08:05 +01:00
Loz Calver
7cf001d52f Merge pull request #1635 from sminnee/the-chrisening 
MINOR: Replace get_class($this) with static::class
 2016-09-28 09:32:13 +01:00
Sam Minnee
0a561f1656 MINOR: class name references 
- Replace get_class($this) with static::class
 - Replace __CLASS__ with self::class
 2016-09-28 11:55:15 +13:00
Daniel Hensby
47d066a0a0 Merge pull request #1633 from sminnee/no-class-property 
FIX: Remove references to Object::$class
 2016-09-27 11:45:49 +01:00
Sam Minnee
11888a006a FIX: Remove references to Object::$class 
To reduce dependence on a ‘god ancestor’ class we should use get_class()
instead.
 2016-09-27 18:02:25 +13:00
Ingo Schommer
ec66912bc0 Use sass-lint 
See https://github.com/silverstripe/silverstripe-framework/pull/6016
 2016-09-27 17:10:47 +13:00
Ingo Schommer
c2132af70f Updated npm-shrinkwrap (failed to build otherwise) 
Caused errors with watchpack (dep of webpack)
 2016-09-27 17:10:47 +13:00
Daniel Hensby
012867f485 Simplifying SiteTree::getControllerName (#1629) 2016-09-23 16:32:29 +12:00
Damian Mooyman
ffe85db33f
BUG Fix incorrect search form 2016-09-23 14:48:55 +12:00
Damian Mooyman
6524d60f75 Update translations 2016-09-23 14:02:58 +12:00
Daniel Hensby
5a978ceb08 Merge pull request #1605 from kinglozzer/virtualpage-refactor 
Virtualpage refactor
 2016-09-22 16:35:09 +01:00
Loz Calver
62816e1ff8 Refactor VirtualPage, remove VirtualPage_Controller 2016-09-22 14:37:54 +01:00
Loz Calver
3d827543a8 NEW: Allow pages to specify the controller they use 2016-09-22 14:37:51 +01:00
Ingo Schommer
c46a6c3e9b Merge pull request #1621 from open-sausages/die-dist-conflicts-die 
FIX: Break dist javascript and onto newlines.
 2016-09-22 14:45:56 +12:00
Paul
63f69b55db Merge pull request #1618 from open-sausages/pulls/4.0/fix-cms-buttons 
API use new bootstrap button row template
 2016-09-22 14:44:23 +12:00
Ingo Schommer
4b2c6b0503 FIX: Break dist javascript and onto newlines. 
This doesn’t have much impact on resulting JS size, but it will
hopefully make merge conflicts much less frequent.

The CSS growth is a little higher (6.5% increase in size) but is not
material.

If this materially reduces the number of merge conflicts we have, by
letting the git merge tools resolve some dist file mergers, I think it
would be worth it.

See https://github.com/silverstripe/silverstripe-framework/pull/6051
 2016-09-22 14:39:02 +12:00
Damian Mooyman
760caaab44 API use new bootstrap button row template 2016-09-22 13:20:31 +12:00
Damian Mooyman
07ba92c5b7 Merge pull request #1617 from open-sausages/pulls/4.0/webpack-optimise 
Remove framework bundle include
 2016-09-21 17:14:56 +12:00
Ingo Schommer
5c31bf357b Remove framework bundle include 
This is now handled through one combined bundle
which is included through LeftAndMain.php (in framework module)
Rename bundle-legacy.js to bundle.js: It'll contain more than legacy stuff eventually
Remove leftover dist artefacts: These weren't part of the webpack build any more
Building SilverStripeNavigator separately (and rename bundle)
 2016-09-21 15:00:26 +12:00
Damian Mooyman
b2f250c539 Merge pull request #1614 from open-sausages/pulls/4.0/alignment-and-spacing 
Alignment and spacing of main CMS panels
 2016-09-21 10:13:05 +12:00
Ingo Schommer
402c6879a3 Merge pull request #1615 from open-sausages/pulls/4.0/fix-level-up 
BUG Fix pages level up link
 2016-09-20 14:57:45 +12:00
Damian Mooyman
18939157f0
BUG Fix pages level up link 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5400
 2016-09-20 13:03:56 +12:00
Damian Mooyman
685a72d470 Merge pull request #1613 from open-sausages/pulls/4.0/file-links 
Moved Backlink list/table to SS Template
 2016-09-20 12:57:07 +12:00
Damian Mooyman
4f19113c5c API Use new DBField::getSchemaValue() 2016-09-20 12:08:20 +12:00
Christopher Joe
4b3f4ba01c move BackLinkHTMLList to template 2016-09-19 10:43:39 +12:00
Paul Clarke
c42a20ae05 Update preview classes as area broken 2016-09-16 15:18:54 +12:00
Paul Clarke
1158520f40 Use consistent panel styles, apply .panel styles 2016-09-16 15:18:54 +12:00
Paul Clarke
59b2e293cf Convert to new styles to use .panel and .toolbar 2016-09-16 15:18:54 +12:00
Damian Mooyman
fba54c8ae8 Merge pull request #1589 from sminnee/webpack 
Replace browserify/gulp with Webpack
 2016-09-16 14:18:36 +12:00
Damian Mooyman
7751a6cee7 Behat test cases for site tree duplication (#995) 2016-09-16 11:44:07 +12:00
Ingo Schommer
fee7e0211e Use CDN jQuery for RemoveOrphanedPagesTask 
We shouldn't rely on static file paths from framework,
since they tend to change around.
 2016-09-15 15:16:12 +12:00