tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,653 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

5653 Commits

Author SHA1 Message Date
Damian Mooyman acadcadbdf
Update composer 2017-10-12 11:30:11 +13:00
Damian Mooyman 42cd0903df Update translations 2017-10-11 17:46:48 +13:00
Damian Mooyman 18a3d28569 Remove obsolete branch-alias 2017-10-11 17:31:43 +13:00
Loz Calver 65db25e3f7 Merge pull request #1987 from open-sausages/pulls/4.0/fix-icon-urls 
Fix icon urls
 2017-10-10 10:25:18 +01:00
Damian Mooyman c8f95182cb
Fix icon urls 2017-10-10 17:03:22 +13:00
Chris Joe 504b014bab Merge pull request #1986 from open-sausages/pulls/4.0/better-beta4-upgrade 
Fix paths in Install_successfullyinstalled.ss
 2017-10-10 13:26:11 +13:00
Damian Mooyman 9d873db976
Fix paths in Install_successfullyinstalled.ss 2017-10-10 11:23:21 +13:00
Chris Joe 06dcc42fc0 Merge pull request #1956 from open-sausages/pulls/4.0/unique-icons-css 
BUG Prevent icons CSS being included twice
 2017-10-05 10:21:08 +13:00
Damian Mooyman 49fd3391fe BUG Prevent icons CSS being included twice 2017-10-05 10:04:57 +13:00
Ingo Schommer 46e2b19337 Merge pull request #1982 from open-sausages/pulls/4.0/fix-vendor-issues 
Fix regressions from vendor modularisation
 2017-10-04 00:17:57 +13:00
Damian Mooyman 9a11580563
Patch webpack-config temporarily 2017-10-03 18:15:41 +13:00
Damian Mooyman 2fc3f80f1f Fix tinymce issue 
Fix phpunit path issue
 2017-10-03 17:05:54 +13:00
Damian Mooyman 9c3b0cf9bf Merge pull request #1980 from open-sausages/pulls/4/vendorise-me-baby 
Expose as vendor module
 2017-10-03 16:15:23 +13:00
Daniel Hensby 8f2bbbeaf8 Merge pull request #1981 from open-sausages/pulls/4.0/test-dev 
Fix test environment type
 2017-10-02 17:05:01 +01:00
Ingo Schommer cf250f7751 Remove .htaccess (no longer in webroot) 
See https://github.com/silverstripe/silverstripe-framework/issues/7405
 2017-10-03 02:20:48 +13:00
Damian Mooyman a2f0a79b21
Fix test environment type 2017-10-02 17:05:54 +13:00
Ingo Schommer 6e5836680b Expose as vendor module 2017-10-01 22:12:37 +13:00
Daniel Hensby ee0ae49790
Merge branch '3' into 4 2017-09-28 17:46:48 +01:00
Daniel Hensby be34b9b61c
Merge branch '3.6' into 3 2017-09-28 17:45:41 +01:00
Daniel Hensby 50a9a5de6b
Merge branch '3.5' into 3.6 2017-09-28 17:45:22 +01:00
Daniel Hensby f8d0dc4ff7
Merge remote-tracking branch 'security/3.6.2' into 3.6 2017-09-28 17:45:18 +01:00
Daniel Hensby 6a11fbfbf8
Merge remote-tracking branch 'security/3.5.5' into 3.5 2017-09-28 17:44:53 +01:00
Chris Joe f37b78ef61 Merge pull request #1968 from open-sausages/pulls/4.0/toolbar-style-layout 
FIX toolbar title layout
 2017-09-21 16:48:20 +12:00
Daniel Hensby 32c74a86e2
Merge branch '3.5.5' into 3.6.2 2017-09-20 16:34:42 +01:00
Daniel Hensby d99a80cef9 Merge pull request #6 from silverstripe-security/patch/3.5/authenticator-fix 
FIX Default LoginForm generated from default_authenticator
 2017-09-20 11:37:40 +01:00
Chris Joe fb9ad4453e Merge pull request #1973 from open-sausages/pulls/4.0/update-classinfo-usages 
Update usages of ClassInfo
 2017-09-20 16:29:37 +12:00
Damian Mooyman fa0b559a7b
Update usages of ClassInfo 
Add missing unit tests for SiteTreeFolderExtension
 2017-09-20 15:20:17 +12:00
Chris Joe d6a26c3731 Merge pull request #1966 from open-sausages/pulls/4.0/anchor-modal 
API Implement insert-anchor modal
 2017-09-20 14:33:48 +12:00
Damian Mooyman 496b9c8c04 API Implement insert-anchor modal 2017-09-20 13:35:25 +12:00
Damian Mooyman dbf42c0967 Merge pull request #1965 from open-sausages/pulls/4.0/get-your-react-together-man 
Update airbnb rules for linting
 2017-09-20 11:29:14 +12:00
Saophalkun Ponlu e5e5a52d66 Change webpack-config dep version 2017-09-20 10:24:02 +12:00
Christopher Joe e15373ba0e Fixed linting errors and tests 2017-09-18 17:02:07 +12:00
Daniel Hensby 72289a1ae7 Merge pull request #1970 from mikenz/patch-7 
Tests: Batch Actions Tests assume enforce_strict_hierarchy is enabled
 2017-09-16 22:56:26 +01:00
Mike Cochrane 85a30733be Tests: Batch Actions Tests assume enforce_strict_hierarchy is enabled 2017-09-16 14:20:55 +12:00
Saophalkun Ponlu 68128b46c3 FIX toolbar title layou 2017-09-15 16:17:47 +12:00
Damian Mooyman 1a42b60c90 Merge pull request #1959 from creative-commoners/pulls/4.0/fix-client-config-merging 
FIX Ensure client config merging includes existing parent "form" attributes
 2017-09-15 16:01:56 +12:00
Robbie Averill d18568c395 FIX Ensure client config merging includes existing parent "form" attributes 2017-09-15 09:12:53 +12:00
Daniel Hensby a04d87debe Merge pull request #1963 from open-sausages/pulls/4.0/trusty 
Switch cms to trusty (4.x branch)
 2017-09-13 12:31:17 +01:00
Damian Mooyman f756a98989 Merge pull request #1960 from open-sausages/pulls/4.0/fine-tune-buttons 
FIX Fine-tune button styles
 2017-09-13 10:58:50 +12:00
Damian Mooyman a83d94abe0
Switch cms to trusty 2017-09-13 10:56:30 +12:00
Saophalkun Ponlu 4f3b4f7626 FIX Fine-tune button styles 2017-09-13 10:44:11 +12:00
Daniel Hensby 0aac4ddb7e
FIX Default LoginForm generated from default_authenticator 2017-09-12 15:59:05 +01:00
Damian Mooyman 06fda1a9bf Merge pull request #1955 from creative-commoners/pulls/4.0/url-button 
FIX Add styles for url segment field
 2017-09-12 16:42:47 +12:00
Damian Mooyman 2b2cdb4c44
BUG Fix yarn build 2017-09-12 15:40:44 +12:00
Damian Mooyman 89429683f4
Update .travis.yml 2017-09-12 15:06:02 +12:00
Sacha Judd 2dde777132 FIX Add styles for url segment field 2017-09-12 14:37:03 +12:00
Damian Mooyman 53157a60fb Update translations 2017-09-08 16:52:23 +12:00
Chris Joe 6b14cbb1b6 Merge pull request #1954 from open-sausages/pulls/4.0/fix-change-detection 
BUG Fix race condition with change detection / loading animation
 2017-09-07 12:05:25 +12:00
Damian Mooyman 3669f30e4e BUG Fix race condition with change detection / loading animation 
Fixes #1859
 2017-09-07 11:54:03 +12:00
Damian Mooyman 62ea34c0cb Merge pull request #1948 from creative-commoners/pulls/4.0/segment-field-buttons 
FIX Update unused button classes for url segment field
 2017-09-06 14:05:48 +12:00