tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity
1,934 Commits 33 Branches 167 Tags 15 MiB
65649812d2
Commit Graph

1934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
8dc89fd2f9 Merge pull request #530 from torleif/patch-1 
Fixes #529
 2016-12-09 14:59:38 +13:00
torleif
a6229ab22b Fixes #529 2016-12-09 12:01:10 +13:00
torleif
6e567852b7 Fixes #529 2016-12-09 09:15:44 +13:00
Will Rossiter
1a74f45992 Merge pull request #524 from open-sausages/pulls/export-docs 
Suggest installing gridfieldqueuedexport
 2016-11-28 17:31:34 +13:00
Will Rossiter
bbd81d2bb0 Merge pull request #523 from ohararyan/issues/update-multi-option 
Make sure option gridfield is created before UpdateCMSFields
 2016-11-28 17:30:58 +13:00
Ingo Schommer
b571f81cc7 Suggest installing gridfieldqueuedexport 2016-11-28 16:46:02 +13:00
Ryan O'Hara
8af5ff93c3 Make sure option gridfield is created before the UpdateCMSFields function so we can override fields in extensions 2016-11-28 16:26:27 +13:00
Damian Mooyman
aa171f8e45 BUG Enable Shortcode parsing for the Content in EditableLiteralField 2016-11-21 12:26:18 +13:00
Eduard Briem
c3ba8f42e1 using forTemplate() instead of (string) casting fixes unit test 2016-11-21 10:48:10 +13:00
Eduard Briem
b1a4b4823f force cast to string $this->dbObject('Content') in EditableLiteralField 2016-11-21 09:20:46 +13:00
Damian Mooyman
346b8c8c05 Merge pull request #520 from muskie9/enhancement/setEmptyString 
ENHANCEMENT setEmptyString option on EditableDropdown
 2016-11-17 15:44:47 +13:00
Damian Mooyman
ba503d3803 Update translations 2016-11-17 12:39:49 +13:00
Nic Horstmeier
6e10acf6cd ENHANCEMENT setEmptyString option on EditableDropdown 
closes #17
 2016-11-16 17:04:54 -06:00
Damian Mooyman
fc36666d4e Remove obsolete branch-alias 2016-11-17 10:16:02 +13:00
Damian Mooyman
22c7fb4d07 Merge pull request #521 from digitall-it/master 
Add italian translation
 2016-11-16 21:21:16 +13:00
digitall-it
5db1aea438 Add italian translation 2016-11-16 08:21:04 +01:00
Damian Mooyman
df71a3d3f4
Re-alias master as 4.2 2016-11-16 16:53:44 +13:00
digitall-it
80bf3d0eae Create partial italian translation 2016-11-16 04:18:00 +01:00
Eduard Briem
184a433a15 enable Shortcode parsing using $this->dbObject instead of manually invoking the shortcode parsers 2016-11-07 11:42:55 +13:00
Eduard Briem
d6d61635be Enable Shortcode parsing for the Content in EditableLiteralField to be able to use internal links inside the HTMLEditorfield 2016-11-04 08:41:02 +13:00
Daniel Hensby
b68dc98380 Merge pull request #514 from muskie9/bugfix/fileSizeMethod#513 
BUGFIX incorrect method name
 2016-10-13 11:46:04 +01:00
Nic Horstmeier
1a5d5eac4b BUGFIX incorrect method name 
fixes #513
 2016-10-12 23:34:23 -05:00
Daniel Hensby
54e6e9aeb5
Merge branch '4.0' 2016-09-23 17:27:15 +01:00
Daniel Hensby
efcd85fcbe
Merge branch '3.1' into 4.0 2016-09-23 17:24:09 +01:00
Daniel Hensby
eed799dbd9
Merge branch '3.0' into 3.1 2016-09-23 17:21:37 +01:00
Daniel Hensby
dec9356923 Merge pull request #511 from muskie9/bugfix/#510 
BUGFIX EditableFormHeading doesn't properly handle numeric values
 2016-09-23 16:15:25 +01:00
Nic Horstmeier
76483188dc BUGFIX EditableFormHeading doesn't properly handle numeric values 
fixes #510
 2016-09-20 19:26:47 -05:00
Sebastian Dubbel
62f1d1098c Added missing translation for "ERROR_CONTAINER_HEADER" for english and german 2016-09-08 13:52:28 +02:00
Damian Mooyman
7167f3a1c5 Merge pull request #501 from muskie9/enhancement/fileSizeLimit#430 
ENHANCEMENT add customisable file upload size limit
 2016-08-23 17:36:29 +12:00
Damian Mooyman
1aae3d1169 Update branch alias to 4.1 2016-08-18 18:24:51 +12:00
Damian Mooyman
c6c609a4c9 Merge remote-tracking branch 'origin/3.1' 
# Conflicts:
#	code/forms/UserForm.php
#	code/model/UserDefinedForm.php
#	code/model/editableformfields/EditableFileField.php
#	code/model/editableformfields/EditableOption.php
 2016-08-18 10:20:56 +12:00
Damian Mooyman
eef16716ab Update translations 2016-08-17 11:08:01 +12:00
Stig Lindqvist
40288a9b96 Merge pull request #503 from tractorcow/pulls/fix-userform-template 
BUG Move UserForm.ss to correct location
 2016-08-16 16:54:20 +12:00
Damian Mooyman
d96ac7d77b BUG Move UserForm.ss to correct location 2016-08-16 16:42:47 +12:00
muskie9
b701b250a3 ENHANCEMENT add customisable file upload size limit 2016-08-11 17:51:47 -05:00
Daniel Hensby
9294734f73 Merge pull request #495 from tractorcow/pulls/psr-2 
Convert to psr-2
 2016-08-09 16:58:45 +01:00
Damian Mooyman
57048fd901 Convert to psr-2 2016-08-09 17:05:22 +12:00
Damian Mooyman
e620576e97 Merge pull request #407 from camfindlay/master 
DOCS Userguide documentation improvements
 2016-08-09 14:59:13 +12:00
Daniel Hensby
a3d425d443
Merge pull request #269 from mediabeastnz 2016-07-28 14:20:43 +01:00
Damian Mooyman
ca2a6a3e99 Merge pull request #496 from muskie9/bugfix/#492 
BUGFIX no Sort value applie to EditableOption on write
 2016-07-25 18:17:01 +12:00
Daniel Hensby
3e151053b1 Merge pull request #490 from tractorcow/pulls/support-risky-to 
API Allow risky "to" recipient fields to be configured
 2016-07-21 13:47:40 +01:00
muskie9
08646ad45e BUGFIX no Sort value applie to EditableOption on write 2016-07-21 01:08:03 -05:00
Damian Mooyman
3ec291fbef Merge pull request #491 from muskie9/bugfix/#488 
BUGFIX progress bar button text change breaks buttons
 2016-07-21 18:00:20 +12:00
Damian Mooyman
255ded1542
API Allow risky "to" recipient fields to be configured 
Fixes #333
 2016-07-21 17:56:30 +12:00
Daniel Hensby
6aeca36c32 Merge pull request #370 from MarioHofer/master 
Added some german translations
 2016-07-19 21:26:54 +01:00
muskie9
14b7c65859 BUGFIX progress bar button text change breaks buttons 
fixes #488
 2016-07-14 09:29:25 -05:00
Damian Mooyman
931753bbca Merge pull request #478 from SilbinaryWolf/fix-reorderissue 
fix(Reorder): Fix bug where 'Content Authors' can no longer re-order form fields due to how GridFieldOrderableRows checks canEdit() permissions.
 2016-07-14 12:30:01 +12:00
Jake Bentvelzen
329ad80596 fix(Reorder): Changed $this->ID == 0 to !$this->exists() and added Controller::has_curr() check 2016-07-14 09:41:37 +10:00
Damian Mooyman
e34b87f760 Merge pull request #487 from sekjal/issue477 
Set EditableCustomRule.FieldValue to Varchar(255)
 2016-07-12 17:10:55 +12:00
Damian Mooyman
446b98b3e8 Merge pull request #454 from micmania1/add-value-to-options 
NEW added value to options
 2016-07-04 18:18:02 +12:00