Damian Mooyman
a38eb8b784
Fix incorrect logic check
2016-05-02 18:15:39 +12:00
Hamish Friedlander
feca77c902
Merge pull request #5408 from open-sausages/pulls/4.0/changeset-preview
...
API Implement basic preview behaviour
2016-05-02 16:29:57 +12:00
Paul Clarke
1506f83ef5
focus adjustments to items so selected item isn't blury
2016-05-02 15:27:12 +12:00
Damian Mooyman
72fcfbf4bc
API Campaign preview for images
2016-05-02 15:27:12 +12:00
Damian Mooyman
4be5e7c961
API Implement basic preview behaviour
2016-05-02 15:27:12 +12:00
Damian Mooyman
e7cd864ebc
Merge branch 'master'
2016-05-02 10:38:08 +12:00
Damian Mooyman
e7d5c92ec1
Fix merge regressions
2016-05-02 09:08:37 +12:00
Tim
a15e8eca72
[BUG] Updating Upload_Validator and related translatable files to change all cases of filesize spelling to file size ( #5369 )
2016-05-02 08:58:35 +12:00
Paul
ddda7db303
reduced line-height to old height and vertically centered ( #5406 )
2016-05-02 08:56:20 +12:00
Damian Mooyman
2a5ba397e6
BUG Fix SS_HTTPResponse being cast as string ( #5413 )
...
Fixes #5335
2016-05-02 08:54:19 +12:00
Paul
9238bc5778
Added class to actions cell to reduce space ( #5404 )
2016-05-02 08:53:53 +12:00
Damian Mooyman
8d2f063f0c
Fix eslint errors ( #5411 )
2016-05-02 08:51:31 +12:00
Paul
2e056dd98b
media query to use mixin ( #5402 )
2016-05-02 08:50:29 +12:00
Damian Mooyman
baa3d4e7d7
Fix trailing spaces on merge
2016-04-29 17:54:52 +12:00
Damian Mooyman
d52db0ba34
Merge 3 into master
...
# Conflicts:
# .travis.yml
# admin/css/ie7.css
# admin/css/ie7.css.map
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/javascript/LeftAndMain.js
# admin/scss/_style.scss
# admin/scss/_uitheme.scss
# control/HTTPRequest.php
# core/Object.php
# css/AssetUploadField.css
# css/AssetUploadField.css.map
# css/ConfirmedPasswordField.css.map
# css/Form.css.map
# css/GridField.css.map
# css/TreeDropdownField.css.map
# css/UploadField.css
# css/UploadField.css.map
# css/debug.css.map
# dev/Debug.php
# docs/en/00_Getting_Started/00_Server_Requirements.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
# filesystem/File.php
# filesystem/Folder.php
# filesystem/GD.php
# filesystem/Upload.php
# forms/ToggleField.php
# forms/Validator.php
# javascript/lang/en_GB.js
# javascript/lang/fr.js
# javascript/lang/src/en.js
# javascript/lang/src/fr.js
# model/Image.php
# model/UnsavedRelationList.php
# model/Versioned.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/DBField.php
# model/fieldtypes/Enum.php
# scss/AssetUploadField.scss
# scss/UploadField.scss
# templates/email/ChangePasswordEmail.ss
# templates/forms/DropdownField.ss
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
# tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
# tests/forms/EnumFieldTest.php
# tests/security/MemberTest.php
# tests/security/MemberTest.yml
# tests/security/SecurityTest.php
2016-04-29 17:50:55 +12:00
NightJar
89351e6c31
Fix the most egregious error for an NZ based proj. ( #5416 )
...
The Bay of Plenty Rugby team is the Steamers, and play in the NPC (National Provincial Championship), hailing from the Te Ika a Maui (North Island).
The Canterbury Crusaders (note the alliteration) hail from Te Waipounamu (South Island), and are an entry in the Super Rugby championship, which is an international affair (also known as the Super12, Super15 & most recently Super18), in which the Bay of Plenty is (most unfortunately, depending on your disposition) drafted under the Waikato region's entry with The Chiefs. Being the most popular sport and widely announced news topic in the country means that even people that don't particuarly follow rugby know this, and simple trolls (whether intentional or not) cannot be allowed to slide past quality control; for those that do can get quite upset about this kind of thing. Plus international folk can't be getting the wrong idea; Everyone knows the internet is no place for misinformation!
2016-04-29 12:07:25 +12:00
Damian Mooyman
877a1f5f8d
Merge pull request #5405 from open-sausages/pulls/4.0/OSS-1820-campaign-preview-smaller-screens
...
Add back button for smaller screens and fix for #5374
2016-04-27 15:08:38 +12:00
Paul Clarke
acb1b46a46
Add back button for smaller screens
2016-04-27 14:09:57 +12:00
Ingo Schommer
e48b23222f
Finished sentence in CSS conventions
2016-04-27 08:00:44 +12:00
Ingo Schommer
cb723a684a
Fixed docs wording
2016-04-27 07:58:58 +12:00
Daniel Hensby
8673ac15bc
MINOR Empty YAML config causes invalid argument error
2016-04-26 12:58:27 +01:00
Daniel Hensby
b9e5a198e8
Merge pull request #5394 from kinglozzer/3192-gf-pagination
...
FIX: GridFieldPaginator now prevents viewing pages with no results (fixes #3192 )
2016-04-26 12:44:11 +01:00
Loz Calver
61a9b2a41a
FIX: GridFieldPaginator now prevents viewing pages with no results ( fixes #3192 )
2016-04-26 09:34:03 +01:00
Damian Mooyman
da8f4a7eb6
Merge pull request #3828 from dhensby/pulls/byids-arraylist
...
API `byIDs` added to `ArrayList`
2016-04-26 17:52:22 +12:00
Paul
fc8d94d789
Fix for toolbar-south width ( #5391 )
2016-04-26 17:41:07 +12:00
Damian Mooyman
7c00073ed3
Merge pull request #5378 from open-sausages/pulls/4.0/campaign-admin-add
...
Campaign admin edit/add view
2016-04-26 17:34:25 +12:00
Damian Mooyman
e88a40853a
Merge pull request #3772 from phptek/cms/1054
...
FIX: Fixes CMS errors when viewing history on "Deleted" pages.
2016-04-26 17:21:19 +12:00
Damian Mooyman
43f2680af8
BUG Fix missing return in ReadonlyField
2016-04-26 16:57:07 +12:00
Ingo Schommer
5d26035a51
Update build artifacts
2016-04-26 15:34:11 +12:00
Paul Clarke
bbf74bdca9
Minor adjustments to align header, removed cancel icon and give space to main actions
2016-04-26 15:32:10 +12:00
David Craig
778ed1257d
Fix campaign section cancel buttons
...
- Cancel buttons we submitting forms.
- Nothing happened when clicking the DeatilEdit cancel button.
Now both cancel button route to the Campaign index view
2016-04-26 15:32:10 +12:00
David Craig
8af1ad09d0
Add loading indicator to save button on scaffolded forms
2016-04-26 15:32:10 +12:00
Ingo Schommer
576e916504
Don't group form buttons by default
...
Looks weird with a "save" and "cancel" button for example
2016-04-26 15:32:10 +12:00
Ingo Schommer
b0d4283c17
Allow form action props override in FormBuilder
...
Also added bootstrapButtonStyle defaults
2016-04-26 15:32:10 +12:00
Paul Clarke
78a385c16a
Update no-text class to BEM
2016-04-26 15:32:10 +12:00
Paul Clarke
ec99452ce1
Toolbar renaming from north-header and move styles to component
2016-04-26 15:32:10 +12:00
David Craig
0b9a339b79
Make 'form' state key singular rather than plural
2016-04-26 15:32:10 +12:00
David Craig
25f1f992a9
Made FormBuilder.mergeFieldData do deep merge
2016-04-26 15:32:09 +12:00
David Craig
7e7946e50a
Fixed case sensitive naming regressions
2016-04-26 15:32:09 +12:00
Ingo Schommer
c94802ea15
i18n for campaigns section
2016-04-26 15:32:09 +12:00
Ingo Schommer
a615dae3ac
Enforce permissions in campaigns section
2016-04-26 15:32:09 +12:00
David Craig
312bab8a6f
Add back button to Campaign creation view
2016-04-26 15:32:09 +12:00
David Craig
35ad44b8c8
Refactor GridFieldComponent render method
...
- Splits render out into logical methods
- Fixes missing key props issue for table header palceholder
2016-04-26 15:32:09 +12:00
David Craig
2f7a7c3a5c
Fix GridFieldComponent not rendering all records
2016-04-26 15:32:09 +12:00
Damian Mooyman
b2e8fd96ec
BUG Fix form schema to use correct ID values
...
API Implement creation of new changesets endpoint
2016-04-26 15:32:08 +12:00
David Craig
2b8ef99d5e
Add 'Cancel' button to Campaign creation form
2016-04-26 15:32:08 +12:00
David Craig
5cc6171f77
Apply default action props in FormBuilder
...
Perviously consumers had to props to FormBuilder for styling common actions like 'save'. The props are now automatically passed to FormActions by the FormBuilder. Consumers can override these defaults via the 'createFn' prop.
2016-04-26 15:32:08 +12:00
David Craig
ae285f3286
Adds route for creating new Campaigns
2016-04-26 15:32:08 +12:00
Ingo Schommer
48d01343c3
Adapt to new naming convention
2016-04-26 15:32:08 +12:00
David Craig
a15a392bd3
Styling updates for the Campaign edit form
2016-04-26 15:32:08 +12:00
