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
17,124 Commits 31 Branches 527 Tags 162 MiB
45736ef2db
Commit Graph

17124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Joe
d93d9bc3c4 Disable datepicker for disabled or readonly fields, they were still editable through the picker 2016-08-01 11:47:48 +12:00
Daniel Hensby
d42826e2ba Merge pull request #5851 from open-sausages/pulls/4.0/fix-hash-navigation 
BUG Fix hash link navigation in CMS
 2016-07-29 11:26:07 +01:00
Damian Mooyman
6468f78b4b Merge pull request #5724 from open-sausages/pulls/4.0/history-panel-tidyup 
History panel forms style tidy up
 2016-07-29 17:04:51 +12:00
Damian Mooyman
06ae50e4f5
BUG Fix hash link navigation in CMS 2016-07-29 15:58:23 +12:00
Oly Su
89508a8f19 Tidy up history panel 2016-07-29 15:54:00 +12:00
Jono Menz
6c37532a7a FIX Gridfield delete action back link (#5848) 
Access backlink before the record is deleted
 2016-07-29 10:51:53 +12:00
Paul
e2826927a7 Adjust width of select dropdown (#5850) 2016-07-29 10:48:12 +12:00
Sam Minnée
c5d662b4fe Merge pull request #5832 from open-sausages/pulls/4.0/bootify-forms-addpage 
Add page styles based on new bootstrap forms
 2016-07-28 18:13:25 +12:00
Hamish Friedlander
4d2fd04c64 FIX Behat preview mode finder being too specific (#5846) 2016-07-28 17:59:31 +12:00
Damian Mooyman
d15b19d208 Fix merge regressions in add-link fixes 2016-07-28 17:03:46 +12:00
Damian Mooyman
a868ecdbfa BUG Correct include paths for legacy JS files 2016-07-28 16:34:28 +12:00
Damian Mooyman
6e74b57c36 BUG Fix issue with gulpfile.js not compiling client/src/legacy dir 
BUG Make SelectionGroup.ss and SelectionGroup.js work together
BUG Fix for IE visual indentation of composite field
 2016-07-28 16:32:40 +12:00
Oly Su
2805baecd3 Added missing bootstrap form messages 
Align top of selection-group and label
Fix styles for overly nested composite fields
Step label added and new templates for forms
 2016-07-28 16:32:40 +12:00
Damian Mooyman
c556b01071 API Update core templates for CompositeField / SelectionGroup.ss 2016-07-28 16:32:40 +12:00
Damian Mooyman
7a095b1a70 Merge pull request #5845 from open-sausages/fix/behat_tests 
Fix "Insert Link" dialog in HTMLEditorField. CSS still needs work.
 2016-07-28 16:30:51 +12:00
Hamish Friedlander
1f8c2f781b Fix "Insert Link" dialog in HTMLEditorField. CSS still needs work. 2016-07-28 16:01:50 +12:00
Damian Mooyman
0c4d9a90c0 Merge pull request #5840 from sminnee/correct-classname-values 
FIX: Remap obsolete ClassName values.
 2016-07-26 09:59:50 +12:00
Daniel Hensby
a7d17ebb75
Merge branch '3' 2016-07-25 12:29:13 +01:00
Daniel Hensby
7391ba6229
Merge branch '3.4' into 3 2016-07-25 11:46:06 +01:00
Loz Calver
12e32debc4 Merge pull request #5839 from tractorcow/pulls/3.4/fix-editor-js 
BUG Fix regression in missing require_js from #4259
 2016-07-25 09:18:55 +01:00
Loz Calver
73d418dbee Merge pull request #5838 from tractorcow/pulls/4.0/minor-error-string 
MINOR Clarify string concatenation to improve readability
 2016-07-25 09:17:14 +01:00
Sam Minnee
f9b4872583 FIX: Remap obsolete ClassName values. 
With the namespacing work, there are a number of classname values that
need to be updated in existing databases.

This change to DatabaseAdmin carries out the remapping as part of
dev/build.
 2016-07-25 18:37:17 +12:00
Damian Mooyman
020d0c181e Changelog for https://github.com/silverstripe/silverstripe-cms/pull/1556 (#5837) 2016-07-25 18:27:38 +12:00
Damian Mooyman
9c7c7f6aa9 BUG Fix regression in missing require_js from #4259 2016-07-25 17:50:56 +12:00
Damian Mooyman
a809e80d01 API Convert CMS forms to bootstrap 
NEW Add cms-forms microtheme to cater to bootstrap's needs.

Note that the old SS3 assets section is buggy as a result of this change.
 2016-07-25 17:24:26 +12:00
Damian Mooyman
43efe73fc7 MINOR Clarify string concatenation to improve readability 
Replaces #5802
 2016-07-25 16:56:23 +12:00
Daniel Hensby
c130e5550d Merge pull request #5834 from tractorcow/pulls/4.0/fix-admin 
BUG Fix regressions in custom admin url from #3274
 2016-07-22 09:31:03 +01:00
Damian Mooyman
7c24703804 BUG Fix regressions in custom admin url from #3274 2016-07-22 10:56:35 +12:00
Hamish Friedlander
46b15a93ca Merge pull request #5830 from open-sausages/pulls/4.0/nested-themes-fixes 
API Abstract ThemeManifest into ThemeList
 2016-07-21 15:13:53 +12:00
Damian Mooyman
20daf1f8e1
API Abstract ThemeManifest into ThemeList 
BUG Fix Requirements not resolving $default theme
 2016-07-21 12:11:25 +12:00
Daniel Hensby
f548ddf8a8
Merge branch '3' 2016-07-20 21:44:47 +01:00
Daniel Hensby
340a48306b
Merge branch '3.4' into 3 2016-07-20 19:48:17 +01:00
Daniel Hensby
cf247534d5
Merge branch '3.3' into 3.4 2016-07-20 19:43:41 +01:00
Daniel Hensby
96b061ffff
Merge branch '3.2' into 3.3 2016-07-20 19:41:46 +01:00
Damian Mooyman
319d6d293e BUG Fix doclink (#5827) 
Fixes #5721
 2016-07-20 10:12:42 +01:00
Daniel Hensby
c587059674 Merge pull request #5823 from madmatt/pulls/3.2-hierarchy-marking-fix 
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
 2016-07-19 15:35:16 +01:00
Daniel Hensby
c7767b0e5b Merge pull request #5812 from silverstripe-terraformers/fixes/cms-action-spinner 
Moved spinner to right so it does not overlap text
 2016-07-19 15:34:44 +01:00
Daniel Hensby
ac17e12464
Merge pull request #3274 from colymba/custom-admin-url 2016-07-19 14:42:25 +01:00
Damian Mooyman
b82c37acb3 Merge pull request #5808 from flamerohr/patch-1 
Remove double checking for Code
 2016-07-19 16:07:36 +12:00
Damian Mooyman
b8477ae238 Merge pull request #5824 from sminnee/codeclimate-ignore-thirdparty 
TESTS: code-climate should ignore admin/thirdparty
 2016-07-19 16:07:04 +12:00
Damian Mooyman
ce280071d7 Merge pull request #5825 from xini/patch-1 
change Chinese language name to 中文
 2016-07-19 16:05:10 +12:00
Florian Thoma
7ae0863f73 change Chinese language name to 中文 
The direct translation of 中国的 (current value) would be "Chinese", but it means this in purely a possessive aspect - something or someone that is from China. 中文, on the other hand means Chinese (Mandarin) language.
 2016-07-19 12:07:25 +10:00
Oly Su
059d03bb37 Moved spinner to right so it does not overlap text 2016-07-19 13:57:08 +12:00
Damian Mooyman
4b4aa4e91c API Exclude templates in 'themes' directories from $default theme (#5820) 
API $themes parameter is now mandatory in TemplateLoader::findTemplate()
 2016-07-19 13:17:07 +12:00
Sam Minnee
0685a6779a TESTS: code-climate ignore admin/thirdparty 
admin/thirdparty shouldn’t be checked by code climate as it isn’t code
that we maintain.
 2016-07-19 13:12:51 +12:00
madmatt
43dcde5197 FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded 2016-07-19 11:22:36 +12:00
Daniel Hensby
6f164c03fe Merge pull request #5822 from antons-/patch-1 
Use columns from gridfield for export
 2016-07-18 23:39:44 +01:00
Anton Smith
4c856c4377 Use columns from gridfield for export 2016-07-19 08:26:07 +12:00
Daniel Hensby
a73f08bd88 Merge pull request #5815 from kinglozzer/form-buttonclicked-duplicate-code 
Refactor duplicate code in Form
 2016-07-18 10:13:37 +01:00
Daniel Hensby
2bbddab210 Merge pull request #5821 from open-sausages/pulls/4.0/fix-uploadfield-casting 
BUG Fix regression with uploadfield casting
 2016-07-18 09:46:39 +01:00