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
16,336 Commits 31 Branches 527 Tags 162 MiB
bbb250916e
Commit Graph

16336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
9805544cee Update translations 2016-08-05 11:06:51 +12:00
Michael Strong
5fcdf8c313 FIX don't look in node_modules 
Its a scary place. And can sometimes take 5 minutes+ to get back out.
 2016-08-04 22:54:34 +12:00
Damian Mooyman
e683c97f6e Merge pull request #5867 from andrewandante/MINOR_getAuthenticator-returns-default 
Modify getAuthenticator to fall back to get_default_authenticator
 2016-08-03 12:07:35 +12:00
Andrew Aitken-Fincham
66f2e6811b modify getAuthenticator to fall back to get_default_authenticator 2016-08-03 10:36:43 +12:00
Daniel Hensby
d083c9622a Merge pull request #4394 from simonwinter/patch-1 
Update 05_Typography.md
 2016-08-02 21:27:56 +01:00
Daniel Hensby
af3412a4c2 Merge pull request #5340 from dnadesign/fixToGridFieldLoadingWrongCurrentPage 
fix to grid field loading wrong current page id when using multiple tabs
 2016-08-02 12:44:11 +01:00
Daniel Hensby
e7c6509196
Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3 2016-08-02 12:00:04 +01:00
Damian Mooyman
cd80d501f9
BUG Fix unset config options returning isset() = true 
Fixes #4791
 2016-08-02 18:07:55 +12:00
Daniel Hensby
992413ef59 Merge pull request #5855 from tractorcow/pulls/3.4/fix-mysql-privileges 
BUG Fix permission checking code not correctly handling escaped SQL identifiers
 2016-08-01 09:48:17 +01:00
Damian Mooyman
7d0b8e6520 BUG Fix permission checking code not correctly handling escaped SQL identifiers 
Fixes https://github.com/silverstripe/silverstripe-installer/issues/96
 2016-08-01 18:15:30 +12:00
Jono Menz
6c37532a7a FIX Gridfield delete action back link (#5848) 
Access backlink before the record is deleted
 2016-07-29 10:51:53 +12:00
Daniel Hensby
7391ba6229
Merge branch '3.4' into 3 2016-07-25 11:46:06 +01:00
Loz Calver
12e32debc4 Merge pull request #5839 from tractorcow/pulls/3.4/fix-editor-js 
BUG Fix regression in missing require_js from #4259
 2016-07-25 09:18:55 +01:00
Damian Mooyman
9c7c7f6aa9 BUG Fix regression in missing require_js from #4259 2016-07-25 17:50:56 +12:00
Daniel Hensby
340a48306b
Merge branch '3.4' into 3 2016-07-20 19:48:17 +01:00
Daniel Hensby
cf247534d5
Merge branch '3.3' into 3.4 2016-07-20 19:43:41 +01:00
Daniel Hensby
96b061ffff
Merge branch '3.2' into 3.3 2016-07-20 19:41:46 +01:00
Damian Mooyman
319d6d293e BUG Fix doclink (#5827) 
Fixes #5721
 2016-07-20 10:12:42 +01:00
Daniel Hensby
c587059674 Merge pull request #5823 from madmatt/pulls/3.2-hierarchy-marking-fix 
FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded
 2016-07-19 15:35:16 +01:00
madmatt
43dcde5197 FIX: Hierarchy was incorrectly unexpanding nodes that had been previously expanded 2016-07-19 11:22:36 +12:00
Daniel Hensby
6f164c03fe Merge pull request #5822 from antons-/patch-1 
Use columns from gridfield for export
 2016-07-18 23:39:44 +01:00
Anton Smith
4c856c4377 Use columns from gridfield for export 2016-07-19 08:26:07 +12:00
Daniel Hensby
a73f08bd88 Merge pull request #5815 from kinglozzer/form-buttonclicked-duplicate-code 
Refactor duplicate code in Form
 2016-07-18 10:13:37 +01:00
Daniel Hensby
9282662293
Fixing bad syntax from PR 2016-07-15 17:00:33 +01:00
Daniel Hensby
51e02e2ed7
Merge remote-tracking branch 'tony/patch-1' into 3 2016-07-15 16:58:48 +01:00
Loz Calver
2b1dd99be1
Refactor duplicate code in Form 2016-07-15 16:47:27 +01:00
Loz Calver
391161208e
Merge branch '3.4' into 3 2016-07-15 14:34:50 +01:00
Loz Calver
44d7919496
Merge branch '3.3' into 3.4 2016-07-15 14:34:18 +01:00
Loz Calver
de61551885
Merge branch '3.2' into 3.3 2016-07-15 14:33:38 +01:00
Loz Calver
6ee3e458b6
Merge branch '3.1' into 3.2 2016-07-15 14:32:35 +01:00
Daniel Hensby
a6f1544621 Merge pull request #5814 from kinglozzer/2534-form-actions 
FIX: Fixes support for "inline" form actions (fixes #2534)
 2016-07-15 14:19:18 +01:00
Loz Calver
b3fea3723f
FIX: Fixes support for "inline" form actions (fixes #2534) 2016-07-15 10:11:47 +01:00
Sam Minnée
366224078b FIX: Allow caching of false config values (Fixes #4755) (#4762) 
False values were indistinguishable from cache misses. This patch solves
this by introducing a new multiple-return-value varation on cache->get().
The new method is named differently so as not to break a public API.
 2016-07-15 09:22:58 +01:00
Daniel Hensby
6abce3a0b8 Merge pull request #5810 from tractorcow/pulls/3/xframe-option 
API Allow X-Frame-Options to be configured
 2016-07-15 09:13:05 +01:00
Damian Mooyman
d08ab6ac81
API Allow X-Frame-Options to be configured 
Fixes #2970
 2016-07-15 14:08:14 +12:00
Daniel Hensby
a64a066bbf Merge pull request #5665 from tractorcow/pulls/3.3/fix-button-clicked 
BUG Fix buttonClicked() error
 2016-07-15 00:30:25 +01:00
Daniel Hensby
0b869254d5 Merge pull request #5809 from giankdm/5772-notifications 
Quick fix for HTTP/2.0 on OSX/Safari v9.1.1
 2016-07-15 00:26:38 +01:00
Daniel Hensby
b7fc0a2752 Merge pull request #5790 from patricknelson/issue-5784-email-reply-to 
FIX for #5784: Email API improvements, documentation cleanup.
 2016-07-15 00:23:25 +01:00
Patrick Nelson
74c555e004 FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards. 2016-07-14 10:25:40 -07:00
Giancarlo Di Massa
8f2953f1a0 Quick fix for HTTP/2.0 on OSX/Safari v9.1.1 2016-07-14 16:35:51 +02:00
Daniel Hensby
4c40cf8dbb
Merge branch '3.4' into 3 2016-07-14 12:01:19 +01:00
Daniel Hensby
d766c8559b
Merge branch '3.3' into 3.4 2016-07-14 11:57:15 +01:00
Daniel Hensby
a2581b9cf7
Merge branch '3.2' into 3.3 2016-07-14 11:56:35 +01:00
Daniel Hensby
2025d8c76f Merge pull request #5805 from Zauberfisch/gridfield-detail-form-fix-3.2 
only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX
 2016-07-13 15:05:08 +01:00
zauberfisch
3482c98cce only use PjaxResponseNegotiator in GridFieldDetailForm if the Request is actually AJAX (fixes #5801) 2016-07-13 13:32:50 +00:00
Daniel Hensby
6824f0d1a7 Merge pull request #5799 from tractorcow/pulls/3.3/arraylist-sql-sort-compat 
BUG Fix sorting ArrayList with sql-like syntax
 2016-07-12 13:49:52 +01:00
Damian Mooyman
24efc7edf8 BUG Fix sorting ArrayList with sql-like syntax 
Replaces #5726
 2016-07-12 17:00:17 +12:00
Damian Mooyman
ce11c47d00 Merge pull request #5700 from Ironcheese/patch-1 
Moving a field between tabs, wrong variable name
 2016-07-12 13:58:54 +12:00
Daniel Hensby
4ce7e9cd5c Merge pull request #5717 from tractorcow/pulls/3/optimistic-connect 
API Add optimistic_live_connect to SS_Database
 2016-07-12 00:13:16 +01:00
Damian Mooyman
e810a9928c
API Add optimistic_connect to SS_Database 
Fixes #4765
 2016-07-12 10:19:03 +12:00