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
15,573 Commits 31 Branches 527 Tags 162 MiB
da8f4a7eb6
Commit Graph

15573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
14aa497b80 Merge branch '3.2.3' into 3.2 2016-02-27 21:11:57 +13:00
Damian Mooyman
807377ad2d Added 3.3.1-rc2 changelog 2016-02-27 21:02:09 +13:00
Damian Mooyman
3d2c87029c Added 3.3.1-rc2 changelog 2016-02-27 21:01:57 +13:00
Damian Mooyman
80a6242912 Update translations 2016-02-27 21:01:57 +13:00
Daniel Hensby
b7b1aba3fb FIX undeclared constant issue 2016-02-27 21:01:57 +13:00
Damian Mooyman
3c053bb85d Added 3.2.3-rc2 changelog 2016-02-27 21:00:59 +13:00
Damian Mooyman
3f5c635353 Added 3.2.3-rc2 changelog 2016-02-27 21:00:46 +13:00
Damian Mooyman
6bbd50c917 Update translations 2016-02-27 21:00:46 +13:00
Daniel Hensby
c2a0e8945f FIX undeclared constant issue 2016-02-27 21:00:45 +13:00
Damian Mooyman
cd05068814 Merge branch '3.1.18' into 3.1 2016-02-27 20:59:51 +13:00
Damian Mooyman
b77acaeeb7 Added 3.1.18-rc2 changelog 2016-02-27 20:53:23 +13:00
Damian Mooyman
9d9a6fc0e8 Added 3.1.18-rc2 changelog 2016-02-27 20:53:15 +13:00
Damian Mooyman
387264fbbb Update translations 2016-02-27 20:53:15 +13:00
Daniel Hensby
bd48d89642 FIX undeclared constant issue 2016-02-27 20:53:15 +13:00
Damian Mooyman
4d6e8a4dbd Merge pull request #5102 from dhensby/pulls/fix-proxy-host-header 
BUG Fixing undeclared constant issue
 2016-02-27 20:19:11 +13:00
Daniel Hensby
3d2fcf9087 Fixing undeclared constant issue 2016-02-26 14:45:07 +00:00
Damian Mooyman
d27be2b325 Merge branch '3.3' into 3 
# Conflicts:
#	javascript/GridField.js
 2016-02-26 17:45:06 +13:00
Damian Mooyman
a2c7524b85 Merge branch '3.1.18' into 3.1 2016-02-26 17:39:06 +13:00
Damian Mooyman
73780ce94e Merge branch '3.2.3' into 3.2 2016-02-26 17:36:45 +13:00
Damian Mooyman
ae29576763 Merge branch '3.3.1' into 3.3 2016-02-26 17:35:42 +13:00
Damian Mooyman
a80c6e1e8c Added 3.3.1-rc1 changelog 2016-02-26 17:30:07 +13:00
Damian Mooyman
8c12b6f992 Added 3.2.3-rc1 changelog 2016-02-26 17:25:00 +13:00
Damian Mooyman
9e0037d43e Added 3.1.18-rc1 changelog 2016-02-26 17:13:49 +13:00
Damian Mooyman
0840f5d021 BUG Fix regressions in missing CSRF on print button 2016-02-26 17:05:56 +13:00
Damian Mooyman
2c1b934ba2 BUG Fix regression in gridfield get actions 2016-02-26 17:05:48 +13:00
Damian Mooyman
320c833fa1 BUG Fix regressions in missing CSRF on print button 2016-02-26 17:03:35 +13:00
Damian Mooyman
b0ad86bf8f BUG Fix regression in gridfield get actions 2016-02-26 17:03:27 +13:00
Damian Mooyman
cc95703b18 BUG Fix regressions in missing CSRF on print button 2016-02-26 16:59:40 +13:00
Damian Mooyman
3dc0d0ee89 BUG Fix regression in gridfield get actions 2016-02-26 16:59:25 +13:00
Ingo Schommer
59026a7838 Merge pull request #5101 from open-sausages/pulls/3.3/fix-printbutton 
BUG Fix regressions in missing CSRF on print button
 2016-02-26 16:38:01 +13:00
Damian Mooyman
99ca2aa23d BUG Fix regressions in missing CSRF on print button 2016-02-26 15:49:28 +13:00
Damian Mooyman
e1865151c5 Merge pull request #5098 from bummzack/5086-fix-member-validator 
Fix for issue #5086
 2016-02-26 14:39:53 +13:00
Daniel Hensby
11ad3e17c1 Merge pull request #5099 from tractorcow/pulls/3.3/gridfield-csrf-regression 
BUG Fix regression in gridfield get actions
 2016-02-26 00:48:14 +00:00
Damian Mooyman
f7caccaa7a BUG Fix regression in gridfield get actions 2016-02-26 12:35:00 +13:00
Damian Mooyman
c4f850003b Merge pull request #5089 from jakedaleweb/3 
added if statement to catch NULL validators
 2016-02-26 09:29:53 +13:00
Roman Schmid
f691a5da32 Improve Member_Validator to: 
- properly check for existing members.
- allow extensions.
- remove old code and replace with new syntax and add config API.

Fix issue in Group code where Member_Validator was instantiated via "new" which didn't allow injector overrides.
Added unit-tests.

Establish a link between the member and the validator for said member.
 2016-02-25 16:10:52 +01:00
Damian Mooyman
9fed5561f4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	core/Constants.php
#	dev/DevelopmentAdmin.php
 2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	dev/DevelopmentAdmin.php
#	docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
#	lang/cs.yml
#	lang/lt.yml
 2016-02-24 17:29:06 +13:00
Damian Mooyman
efa13eb10a Merge remote-tracking branch 'origin/3.3.0' into 3.3 2016-02-24 17:27:19 +13:00
Damian Mooyman
ff5ed6efeb Merge remote-tracking branch 'origin/3.2.2' into 3.2 2016-02-24 17:03:43 +13:00
Damian Mooyman
06d5050321 Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-24 16:54:18 +13:00
Damian Mooyman
0ec021dac8 Added 3.3.0 changelog 2016-02-24 16:30:34 +13:00
Damian Mooyman
301155b3e8 Update translations 2016-02-24 16:06:04 +13:00
Damian Mooyman
531b8b167b Added 3.2.2 changelog 2016-02-24 15:33:02 +13:00
Damian Mooyman
1fe7d029db Added 3.1.17 changelog 2016-02-24 15:31:12 +13:00
Damian Mooyman
01c13bf6b3 Update translations 2016-02-24 15:20:40 +13:00
Damian Mooyman
50aab6d8d4 Update translations 2016-02-24 15:14:58 +13:00
Jake Ovenden
48ecb8d8f4 added if statement to catch NULL validators 2016-02-24 15:13:00 +13:00
Damian Mooyman
9a4f0b48df Added 3.1.17-rc2 changelog 2016-02-24 12:38:54 +13:00
Damian Mooyman
d51264873d Merge pull request #5087 from scott1702/fix-nav 
Fix incorrect height on main nav after toggle
 2016-02-24 12:32:47 +13:00