14538 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hamish Friedlander	b823d2df88	Merge pull request #4097 from tractorcow/pulls/3.1/fix-tinymce ... BUG Fix tinymce errors crashing CMS	2015-04-24 15:20:40 +12:00
Damian Mooyman	19423e9a44	BUG Fix tinymce errors crashing CMS ... When removing a tinymce field, internal third party errors should be caught and ignored gracefully rather than breaking the whole CMS.	2015-04-24 14:59:37 +12:00
Damian Mooyman	6c069ce7d5	Merge pull request #4094 from flashbackzoo/pulls/toggle-description ... This adds the ability to toggle a field description	2015-04-24 13:42:34 +12:00
David Craig	3122226273	Add toggleable description to CMS fields	2015-04-24 11:40:29 +12:00
Daniel Hensby	c2fd18e829	FIX use config for Security::$login_url	2015-04-23 17:20:07 +01:00
Phill Price	996ddea4a9	DOCS: formatting fix ... the end # removed from titles as they were showing on the page.	2015-04-23 17:12:49 +01:00
Damian Mooyman	e0b7bc9cda	Merge pull request #4054 from dnadesign/fixToPrintButton ... fixing print functionality if passed arrayData	2015-04-22 09:34:22 +12:00
Loz Calver	4fe4d17eaf	Merge pull request #4088 from AntonyThorpe/patch-3 ... Update 03_Testing_Email.md	2015-04-21 21:57:13 +01:00
Antony Thorpe	27d3a27a97	Update 03_Testing_Email.md ... Fix typo and link. It is assertEmailSent not assertEmailSend and a method of SapphireTest. Thanks.	2015-04-21 18:17:56 +12:00
Damian Mooyman	f2e2d4e376	Merge pull request #4083 from assertchris/abstract-gridfield-row-class-generation ... Abstracting GridField row class generation	2015-04-21 08:59:24 +12:00
Will Morgan	f1f1b5685b	Merge pull request #4080 from dhensby/pulls/loading-spinner ... Adding loading spinner to ui-autocomplete fields when making ajax reqests	2015-04-20 15:48:30 +01:00
Damian Mooyman	8e24511266	BUG Fix users with all cms section access not able to edit files ... Fixes #4078	2015-04-20 18:20:56 +12:00
Damian Mooyman	1a78044e21	Merge pull request #4084 from scott1702/css-cleanup ... Remove !important from gridfield-item hover	2015-04-20 16:20:12 +12:00
Christopher Pitt	5231dc7cc7	Abstracting GridField row class generation	2015-04-20 15:34:10 +12:00
scott1702	6ec466edbf	Remove 'important' from gridfield hover	2015-04-20 15:12:48 +12:00
Damian Mooyman	6c02770d64	Merge pull request #4082 from chillu/pulls/datadiff-empty-hasone ... Allow empty has_one returns in DataDifferencer	2015-04-20 10:28:07 +12:00
Sean Harvey	78e01c07ac	Merge pull request #4064 from chillu/pulls/osx-install-docs ... Improved install docs (Vagrant, Homebrew, MAMP)	2015-04-20 10:14:16 +12:00
Damian Mooyman	f76ba9afc9	Merge pull request #4079 from assertchris/add-row-and-cell-generator-methods ... Add row and cell generator methods	2015-04-20 10:01:05 +12:00
Ingo Schommer	8f5932acec	Allow empty has_one returns in DataDifferencer ... Sometimes the has_one getter is incorrectly implemented, resulting in an empty return object. While that's technically a core API validation, there's no checks around it (i.e. no PHP class interface). DataDifferencer has the option to continue here, so we should program it defensively rather than resulting in a fatal error.	2015-04-20 09:13:33 +12:00
Ingo Schommer	64f220617d	Merge pull request #4081 from spekulatius/patch-3 ... Update 01_Validation.md	2015-04-19 20:51:48 +12:00
spekulatius	9567d9c3f2	Update 01_Validation.md ... missing semicolon	2015-04-19 20:21:49 +12:00
Daniel Hensby	cb7aed46cd	Adding loading spinner to ui-autocomplete fields when making ajax reqests	2015-04-17 11:38:04 +01:00
Damian Mooyman	7e3c6fd726	Merge pull request #4074 from rotassator/patch-1 ... Improve SQL Format information paragraph	2015-04-17 16:26:10 +12:00
Christopher Pitt	2d9a003168	Add row and cell generator methods	2015-04-17 12:45:45 +12:00
Damian Mooyman	b33a660604	Merge pull request #4077 from scott1702/sidebar-fix ... Fix z-index bug with sidebar	2015-04-16 15:54:25 +12:00
scott1702	25c9e9141e	Fix z-index bug with sidebar	2015-04-16 15:31:48 +12:00
Steve D	0d7d6b4bd3	Improve SQL Format information paragraph ... Improve SQL Format information paragraph in the SilverStripe Coding Conventions	2015-04-15 13:08:39 +10:00
Will Rossiter	da6dbeca5f	Merge pull request #4014 from jedateach/patch-5 ... DOC broken link in docs to how_tos/extend_cms_interface	2015-04-15 12:27:56 +12:00
Ingo Schommer	67e0a6b5cc	Merge pull request #4072 from tractorcow/pulls/3.1/fix-togle ... BUG Fix accordion sometimes displaying scrollbars	2015-04-14 15:00:34 +12:00
Damian Mooyman	8caaae601b	BUG Fix accordion sometimes displaying scrollbars	2015-04-14 13:18:57 +12:00
Ingo Schommer	9ab61e9e95	Merge pull request #4069 from camfindlay/patch-24 ... DOCS Make a note to ensure people install Git and Composer	2015-04-14 08:10:46 +12:00
Damian Mooyman	f353268962	Merge pull request #4068 from halkyon/spelling-fix ... Fixing spelling mistake	2015-04-13 15:02:51 +12:00
Cam Findlay	0d44ea1af1	DOCS Make a note to ensure people install Git and Composer ... Since Composer uses git and this isn't explicitly documented anywhere at our end I have added a note and link for newcomers to follow and get Git before getting Composer.	2015-04-13 13:28:13 +12:00
Sean Harvey	2a16b5e2a3	Fixing spelling mistake	2015-04-13 11:35:24 +12:00
Ingo Schommer	602fdd57fd	Removed outdated IIS6 instructions ... Not linked from anywhere (other than the menu). IIS 6.0 is part of Windows 2003, which has been EOLed as far as I can tell: https://support.microsoft.com/en-us/lifecycle?p1=3198	2015-04-09 21:52:56 +12:00
Ingo Schommer	711efc4542	More install options (Vagrant and Bitnami)	2015-04-09 21:52:56 +12:00
Ingo Schommer	b633b584f6	Simplified base installation step docs ... Mention composer there rather than just the package download.	2015-04-09 21:52:56 +12:00
Ingo Schommer	27727df096	Updated MAMP install docs, added Homebrew install docs ... * Removed the `php.ini` configuration bits from both MAMP and Homebrew instructions, both actually come with reasonable defaults now (high `memory_limit`, `error_reporting` on full, `date.timezone` set). * Removed chapter about package install, we should favour composer now * Compressed the install wizard instructions	2015-04-09 21:52:53 +12:00
Daniel Hensby	178057aea2	Merge pull request #4066 from tractorcow/pulls/3.2/from-end-iterator ... API Introduce $FromEnd variable for iterators	2015-04-09 08:40:27 +01:00
Damian Mooyman	e91606e494	API Introduce $FromEnd variable for iterators	2015-04-09 17:02:30 +12:00
Ingo Schommer	72a284c9b8	Merge remote-tracking branch 'origin/3' ... Conflicts: core/Constants.php docs/en/05_Contributing/01_Code.md tests/model/SQLQueryTest.php	2015-04-09 16:26:16 +12:00
Damian Mooyman	385c2a75d3	Merge pull request #4041 from adrexia/patch-3 ... BUG: export and print buttons outside button row	2015-04-09 10:36:19 +12:00
Daniel Hensby	d34c39bc85	Merge pull request #4057 from silverstripe-elliot/patch-3 ... DOCS Update 01_Extensions.md	2015-04-02 07:31:55 +01:00
Elliot Sawyer	83a3c4b166	Update 01_Extensions.md ... Fix a typo	2015-04-02 15:51:51 +13:00
Damian Mooyman	2d4a3edd6c	Merge pull request #4030 from dhensby/pulls/debug-viewable-data ... FIX Debug::text no longer incorrecty returns "ViewableData_debugger"	2015-04-02 10:15:53 +13:00
Daniel Hensby	72bb9a2087	FIX Debug::text no longer incorrecty returns "ViewableData_debugger"	2015-04-01 22:13:05 +01:00
Damian Mooyman	2cc9d02f75	Merge pull request #4034 from dhensby/pulls/debug-viewable-data-3 ... NEW ViewableData_Debugger implements __toString	2015-04-02 09:56:31 +13:00
John Milmine	c5006be3d6	fixing print functionality if passed array data	2015-04-01 21:55:24 +13:00
Daniel Hensby	aea3512e61	Merge pull request #4051 from tractorcow/pulls/3/fix-security-returnurl ... API Security better respects BackURL on login	2015-03-31 21:44:04 +01:00
Damian Mooyman	9aa60ed4f3	Merge pull request #4052 from Turnerj/feature-max-size-by-upload-type ... FEATURE: Added maximum upload file size by type (on 3)	2015-04-01 09:32:56 +13:00