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,641 Commits 31 Branches 527 Tags 162 MiB
7c76d2cb09
Commit Graph

17641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
420cbadaac Merge pull request #6149 from jonom/sort-fix-2 
FIX Revert natural sort
 2016-10-04 23:43:10 +01:00
Damian Mooyman
17c6580d3a Merge pull request #6138 from dhensby/pulls/3.4/fix-sessions-on-alternate-base-urls 
FIX Absolute alternate_base_url no longer breaks session cookies
 2016-10-05 11:26:27 +13:00
Damian Mooyman
82e72d062f BUG prevent form data / validation persisting in state when using form schema 2016-10-05 10:26:32 +13:00
Christopher Joe
30d161625f Fix unmock qs module, Backend-test refactored to not time out on error 2016-10-05 10:25:22 +13:00
Christopher Joe
287809ec3b Refactored react FormFields to use react-bootstrap FormControl components 
Addded Checkbox, CheckboxSet and Optionset (radio) fields
Refactored documentation
 2016-10-05 10:25:21 +13:00
Jonathon Menz
797be6ac82 FIX Revert natural sort 
More backwards compatible and more consistent with ORM sorting (fixes #6124)
 2016-10-04 13:56:12 -07:00
Daniel Hensby
6dde5ce571
FIX Absolute alternate_base_url no longer breaks session cookies 2016-10-04 14:21:32 +01:00
Daniel Hensby
111ab5f0af Merge pull request #6137 from lekoala/patch-4 
Have a clear error message
 2016-10-04 14:13:00 +01:00
Thomas Portelange
3d8db488d4 Have a clear error message 
Because it's really annoying not knowing which field causes the error
 2016-10-04 12:24:29 +02:00
Loz Calver
f1894b9712 Merge pull request #6132 from jonom/docs-template-global-provider 
DOCS Introduce TemplateGlobalProvider
 2016-10-04 09:03:52 +01:00
Jonathon Menz
24f8f2715c DOCS Introduce TemplateGlobalProvider 2016-10-03 09:36:47 -07:00
Daniel Hensby
f2ac6e30aa Merge pull request #6131 from kinglozzer/ssviewer-caching-tests 
Tests to cover caching repeated template lookups
 2016-10-03 17:09:59 +01:00
Loz Calver
cc68d336b1 Tests to cover caching repeated template lookups 2016-10-03 16:01:02 +01:00
Daniel Hensby
45736ef2db
Merge branch '3' 2016-10-03 12:00:20 +01:00
Daniel Hensby
5e9d16646d
Merge branch '3.4' into 3 2016-10-03 10:24:32 +01:00
Damian Mooyman
c72d81222b Merge pull request #6118 from open-sausages/pulls/4.0/add-to-campaign-UI 
Add to campaign styles UI enhancements
 2016-10-03 12:27:32 +13:00
Damian Mooyman
ebbb0258dd Fix linting issue 2016-10-03 10:58:58 +13:00
Daniel Hensby
f2d3026e93
Merge pull request #3628 from JeremyRoundill/3.1 2016-09-30 17:16:47 +01:00
Stephan van Diepen
95b66d19b2
Added MySQL support for Bigint. 
Conflicts:
	model/MySQLDatabase.php
 2016-09-30 16:38:25 +01:00
Paul Clarke
3ac0eaaf62 Remove legacy styles 2016-09-30 15:45:12 +13:00
Paul Clarke
b794a40864 Group button icon styles 2016-09-30 15:44:17 +13:00
Paul Clarke
374ef6e0c3 Modal styles 2016-09-30 15:44:17 +13:00
Paul Clarke
5f92e12911 If description field is empty hide it as it has margin 2016-09-30 15:44:17 +13:00
Paul Clarke
d6a24f4133 Use bootstrap modal variables 2016-09-30 15:44:17 +13:00
Paul Clarke
3f5d241be4 Add modal specific stylesheet 2016-09-30 15:44:17 +13:00
Paul Clarke
3fdeaea162 Increase the size of select dropdown so they match the size of other fields 2016-09-30 15:44:17 +13:00
Paul Clarke
32383114ce Remove custom add to campaign styles and make them more reusable 2016-09-30 15:44:17 +13:00
Damian Mooyman
7663102ef1 Merge pull request #6122 from open-sausages/pulls/4.0/panel-link-fix 
FIX tab link on top panel changes
 2016-09-30 15:36:00 +13:00
Christopher Joe
963445e743 FIX tab link on top panel changes even when "cancel to browse" was selected 2016-09-30 14:57:15 +13:00
Christopher Joe
2f4867fef8 API added watch command to package.json 2016-09-30 13:19:40 +13:00
Anton Smith
ae4108bf00 BUG Content-Disposition header breaks in Firefox (#4087) 2016-09-29 13:25:14 +13:00
jeffreyguo
801574b9b0 Update index.md (#4020) 
MINOR: wording correction
 2016-09-29 13:21:17 +13:00
Daniel Hensby
a08a854c9c Merge pull request #6100 from thezenmonkey/patch-3 
Update jquery.js reference
 2016-09-28 14:22:26 +01:00
Richard Rudy
c94eb8adf2 Get jQuery from Google CDN 
jquery is no longer included at the original location. Pulling from the CDN to avoid any other issues if another version gets (re)moved
 2016-09-28 08:20:15 -04:00
Richard Rudy
b2d07a1fd7 Update jquery.js reference 
jquery is no longer included at the path specified. Shoudl be in the admin directory
 2016-09-27 09:54:03 -04:00
Damian Mooyman
5a2e2b7ed5 Merge pull request #6089 from open-sausages/pulls/codecoverage 
Code coverage via CodeCov.io
 2016-09-27 10:23:30 +13:00
Ingo Schommer
0c06c4d389 Fast-finish Travis builds 
The PHP7 build includes code coverage, which makes it run a bit longer now.
In general, we shouldn't wait for allowed_failures with build feedback.
Travis seems to run builds (roughly) in order, so allowed_failures
tend to prolong build times, since it only runs a few builds concurrently.

We'll move the PHP7 build out of allowed_failures eventually,
but I think the general concept still applies:
There's little value in waiting around for allowed_failures builds.

See https://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
 2016-09-27 09:19:41 +13:00
Ingo Schommer
48e98c3d4f Add uncovered files to code coverage 
If the files are never included through the PHP test run,
they won't count as uncovered otherwise.

See https://phpunit.de/manual/current/en/code-coverage-analysis.html#code-coverage-analysis.whitelisting-files
 2016-09-27 08:47:01 +13:00
Ingo Schommer
9cb33ea5bf Fixed @covers namespaces 2016-09-27 07:46:17 +13:00
Daniel Hensby
ad79b5c88c
fixing bad folder caseing 2016-09-26 18:06:40 +01:00
Loz Calver
189ac2eed0 Merge pull request #6088 from webbuilders-group/fix-windows-regression 
BUGIX: Fix regression causing the admin to crash on windows due to FRAMEWORK_DIR being prefixed by a backslash
 2016-09-26 16:00:16 +01:00
Daniel Hensby
74ecaded08
Merge branch '3' 2016-09-26 14:00:58 +01:00
UndefinedOffset
ce91c3820e BUGIX: Fix regression causing the admin to crash on windows due to FRAMEWORK_DIR being prefixed by a backslash 2016-09-26 09:46:00 -03:00
Ingo Schommer
345b4d56e6 Code coverage via CodeCov on PHP7 builds 
PHP7+phpdbg is waaaay faster: http://blog.remirepo.net/post/2015/11/09/PHPUnit-code-coverage-benchmark
 2016-09-26 22:33:03 +13:00
Ingo Schommer
ef966557d8 Merge pull request #6083 from JorisDebonnet/issue-4983 
Set default Varchar size to 255, up from 50 (#4983)
 2016-09-26 22:29:49 +13:00
Joris Debonnet
44e474a687 Set default Varchar size to 255, up from 50 (#4983) 2016-09-26 07:31:40 +02:00
Ingo Schommer
53501c73bc Merge pull request #5909 from timkung/tabset-opentabfromurl-fix 
Fixing TabSet.js error when expected elements are not available
 2016-09-26 17:14:04 +13:00
Andrew Aitken-Fincham
ad0d68d133 add IPUtils.php to control and implement symfony IpUtils (#6062) 2016-09-26 12:44:55 +13:00
Daniel Hensby
99f98e51d0
Merge branch '3' 2016-09-23 17:15:59 +01:00
Daniel Hensby
6022012481
Merge branch '3.4' into 3 2016-09-23 16:33:45 +01:00