Daniel Hensby
|
801a51d0f7
|
Merge branch '3.5' into 3.6
|
2018-06-05 16:30:20 +01:00 |
|
Robbie Averill
|
13ea2f9b80
|
Merge pull request #8132 from dhensby/pulls/3.5/postgres-test-fix
FIX Regression from #8009
|
2018-06-05 13:43:19 +12:00 |
|
Daniel Hensby
|
41e601a036
|
FIX Regression from #8009
|
2018-06-04 17:03:05 +01:00 |
|
Loz Calver
|
050018dba6
|
Merge pull request #8134 from dhensby/pulls/3.5/memory-limit
Increase memory limit to 2G in Travis builds
|
2018-06-04 16:50:52 +01:00 |
|
Loz Calver
|
0a4e3fc716
|
Merge pull request #8133 from dhensby/pulls/3.5/php53-compat
FIX PHP 5.3 compat for referencing $this in closures
|
2018-06-04 16:30:21 +01:00 |
|
Robbie Averill
|
c1b0c56788
|
Increase memory limit to 2G in Travis builds
|
2018-06-04 16:24:18 +01:00 |
|
Robbie Averill
|
1cbf27e0f4
|
FIX PHP 5.3 compat for referencing $this in closure, and make method public for same reason
sdf
|
2018-06-04 16:05:49 +01:00 |
|
Robbie Averill
|
d21660971f
|
Merge branch 'heads/3.6.6' into 3.6
|
2018-05-28 17:44:28 +12:00 |
|
Robbie Averill
|
dae8fefb1e
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2018-05-28 17:43:55 +12:00 |
|
Robbie Averill
|
df4648a308
|
Merge branch 'heads/3.5.8' into 3.5
|
2018-05-28 17:42:31 +12:00 |
|
Robbie Averill
|
912dc60cf3
|
Added 3.5.8 changelog
|
2018-05-28 15:50:54 +12:00 |
|
Robbie Averill
|
91327ab63e
|
Added 3.6.6 changelog
|
2018-05-14 10:59:58 +12:00 |
|
Robbie Averill
|
097f16282d
|
Added 3.6.6-rc1 changelog
|
2018-05-10 16:03:20 +12:00 |
|
Robbie Averill
|
0408048653
|
Merge pull request #71 from silverstripe-security/pulls/3.6/ss-2018-014
[SS-2018-014] Remove dotm, potm, jar, css, js, xltm from default File.allowed_extensions
|
2018-05-10 15:55:32 +12:00 |
|
Robbie Averill
|
19fdebfa24
|
[SS-2018-014] Remove dotm, potm, jar, css, js, xltm from default File.allowed_extensions
|
2018-05-10 15:53:11 +12:00 |
|
Robbie Averill
|
8b750b3d80
|
Merge remote-tracking branch 'origin/3.5.8' into 3.6.6
|
2018-05-10 15:52:23 +12:00 |
|
Robbie Averill
|
89dcc93a4f
|
Added 3.5.8 changelog
|
2018-05-10 12:00:45 +12:00 |
|
Robbie Averill
|
9d055dd946
|
Added 3.5.8-rc1 changelog
|
2018-05-10 09:38:54 +12:00 |
|
Robbie Averill
|
65668b8b58
|
Merge pull request #63 from silverstripe-security/pulls/3.6/ss-2018-001
[ss-2018-001] Restrict non-admins from being assigned to admin groups
|
2018-05-10 09:25:19 +12:00 |
|
Damian Mooyman
|
5771388821
|
[ss-2018-001] Restrict non-admins from being assigned to admin groups
|
2018-05-09 15:12:40 +12:00 |
|
Daniel Hensby
|
cda61fb1ec
|
Merge branch '3.5' into 3.6
|
2018-05-01 20:23:21 +01:00 |
|
Daniel Hensby
|
2a9ef6ef94
|
Merge pull request #8039 from ngaitahutourism/3.6
Address issue #8038
|
2018-04-27 10:22:46 +01:00 |
|
Matthew Walker
|
766b2a4947
|
Address issue #8038
Within TinyMCE, adding a link to "page on the site" generates an error "Target page not found" under the Anchor field.
|
2018-04-27 09:50:21 +01:00 |
|
Daniel Hensby
|
8359f3dc97
|
Merge branch '3.5' into 3.6
|
2018-04-18 13:14:07 +01:00 |
|
Daniel Hensby
|
f30cd61cb7
|
Merge pull request #8009 from webbuilders-group/duplicate-many-many-fix
FIX: Duplicating many_many relationships looses the extra fields (fixes #7973)
|
2018-04-18 13:11:22 +01:00 |
|
UndefinedOffset
|
36198c482e
|
Removed extra lookup of the list
|
2018-04-18 12:16:12 +01:00 |
|
UndefinedOffset
|
af3a9f3ec8
|
FIX: Duplicating many_many relationships looses the extra fields (fixes #7973)
|
2018-04-18 12:16:02 +01:00 |
|
Damian Mooyman
|
a761056021
|
Merge pull request #7994 from creative-commoners/pulls/3.6/phpdocs
Update some phpdocs that had typos, missing parts or incorrect formats
|
2018-04-13 09:07:40 +12:00 |
|
Robbie Averill
|
51d4d2c11e
|
Update some phpdocs that had typos, missing parts or incorrect formats
|
2018-04-11 20:12:38 +12:00 |
|
Robbie Averill
|
f5c1f181bb
|
Merge pull request #7990 from lerni/patch-2
README fix contributing-link, add httpS
|
2018-04-11 09:15:04 +12:00 |
|
Lukas
|
6bce88b6ba
|
README fix contributing-link, add httpS
|
2018-04-10 17:54:44 +02:00 |
|
Daniel Hensby
|
b36ba81a40
|
Merge branch '3.5' into 3.6
|
2018-03-28 11:06:32 +01:00 |
|
Damian Mooyman
|
45a7b44a15
|
Merge pull request #7858 from dhensby/pulls/3.5/add-support-file
Add support.md file
|
2018-03-28 16:56:11 +13:00 |
|
Daniel Hensby
|
61463424ff
|
Support file grammer improvements
|
2018-03-27 11:49:04 +01:00 |
|
Daniel Hensby
|
e3cdefaa3c
|
Add support.md file
|
2018-03-27 11:43:13 +01:00 |
|
Robbie Averill
|
0d8915a898
|
Merge pull request #7947 from lerni/lerni-patch-1
Update link forum
|
2018-03-27 14:22:02 +13:00 |
|
Lukas
|
78896a73e2
|
Update link forum
|
2018-03-20 22:14:23 +01:00 |
|
Daniel Hensby
|
a7931e7a11
|
Merge branch '3.5' into 3.6
|
2018-03-14 13:49:29 +00:00 |
|
Daniel Hensby
|
35f28a824a
|
Merge pull request #7922 from mooror/3.6
|
2018-03-12 13:18:23 +00:00 |
|
Benjamin Blake
|
6fb8d27ac5
|
Updated the DocBlock for ManyManyList's add() method
|
2018-03-11 14:49:17 -06:00 |
|
Loz Calver
|
535d02ffeb
|
Merge pull request #7874 from flamerohr/pulls/3.6/to-match-thy-father
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
|
2018-02-28 10:06:36 +00:00 |
|
Christopher Joe
|
86addea1d2
|
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
|
2018-02-16 23:34:05 +13:00 |
|
Daniel Hensby
|
9c50b03b86
|
Merge branch '3.5' into 3.6
|
2018-02-13 14:30:29 +00:00 |
|
Daniel Hensby
|
1bec8a5d0c
|
Merge pull request #7850 from jonom/singleton-fix-3x
FIX Singleton creation
|
2018-02-13 08:29:47 +00:00 |
|
Jonathon Menz
|
c767e472dc
|
FIX DataObject singleton creation
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)
|
2018-02-12 20:30:35 -08:00 |
|
Robbie Averill
|
1a91806bcc
|
Merge pull request #7857 from dhensby/pulls/3.5/add-license
Create licence file so that GitHub (and humans) can more easily find it
|
2018-02-13 09:32:24 +13:00 |
|
Daniel Hensby
|
24ea2638fe
|
Create licence file so that GitHub (and humans) can more easily find it
|
2018-02-12 11:21:03 +00:00 |
|
Daniel Hensby
|
48a8a82326
|
Merge branch '3.5' into 3.6
|
2018-02-09 13:20:38 +00:00 |
|
Daniel Hensby
|
2a8d365aac
|
Merge pull request #6973 from steadlane/fix/csv-unescaped-values
Fix for badly escaped values in CSV export
|
2018-02-08 13:45:52 +00:00 |
|
JorisDebonnet
|
5df1ec7eee
|
Use fputcsv in GridFieldExportButton
|
2018-02-08 12:26:29 +00:00 |
|