Damian Mooyman
|
b612c0549d
|
Merge 3.1.19 into 3.1
|
2016-05-11 13:15:10 +12:00 |
|
Damian Mooyman
|
de5949b3dd
|
Added 3.3.2 changelog
|
2016-05-11 11:25:17 +12:00 |
|
Damian Mooyman
|
cfb3d96a03
|
Added 3.2.4 changelog
|
2016-05-11 11:24:49 +12:00 |
|
Damian Mooyman
|
68dca6f6c0
|
Added 3.1.19 changelog
|
2016-05-11 11:09:20 +12:00 |
|
Damian Mooyman
|
f4c2a89d5a
|
Update translations
|
2016-05-11 11:05:57 +12:00 |
|
Damian Mooyman
|
c27cb2dae7
|
Update translations
|
2016-05-11 11:05:37 +12:00 |
|
Damian Mooyman
|
60644a5be8
|
Update translations
|
2016-05-11 10:58:25 +12:00 |
|
Loz Calver
|
dc331347a0
|
Merge pull request #5506 from dhensby/pulls/3.1/fix-manymanylisttest
Allow ManyManyListTest to run standalone
|
2016-05-10 16:21:04 +01:00 |
|
Daniel Hensby
|
971d561633
|
Allow ManyManyListTest to run standalone
|
2016-05-10 15:24:07 +01:00 |
|
Daniel Hensby
|
d5ff8ff5f3
|
Merge pull request #5499 from kinglozzer/sqlselect-count-int
FIX: SQLSelect count methods now cast to int (fixes #5498)
|
2016-05-10 13:44:30 +01:00 |
|
Loz Calver
|
d1df67d308
|
FIX: SQLSelect count methods now cast to int (fixes #5498)
|
2016-05-10 12:31:45 +01:00 |
|
Loz Calver
|
6430c66303
|
Merge pull request #5426 from tractorcow/pulls/3.3/fix-gridfield-autocomplete
BUG Fix GridFieldAddExistingAutocompleter
|
2016-05-10 09:34:59 +01:00 |
|
Daniel Hensby
|
5eafdce963
|
Added 3.3.2-rc1 changelog
|
2016-05-05 13:38:46 +01:00 |
|
Daniel Hensby
|
840cd4f877
|
Update translations
|
2016-05-05 12:46:38 +01:00 |
|
Daniel Hensby
|
d1751e3310
|
Merge remote-tracking branch '3.2.4' into 3.3.2
|
2016-05-05 12:33:21 +01:00 |
|
Daniel Hensby
|
73b922d43b
|
Added 3.2.4-rc1 changelog
|
2016-05-05 11:48:07 +01:00 |
|
Daniel Hensby
|
2edef65d7a
|
Update translations
|
2016-05-05 11:18:02 +01:00 |
|
Daniel Hensby
|
cf29b2c146
|
Merge remote-tracking branch '3.1.19' into 3.2.4
|
2016-05-05 11:17:45 +01:00 |
|
Daniel Hensby
|
ee5133f355
|
Added 3.1.19-rc1 changelog
|
2016-05-05 09:33:57 +01:00 |
|
Daniel Hensby
|
686db04a0a
|
Update translations
|
2016-05-05 02:05:54 +01:00 |
|
Daniel Hensby
|
92599727b9
|
Merge remote-tracking branch 'security/patch/3.1/ss-2016-006' into 3.1.19
|
2016-05-05 01:01:49 +01:00 |
|
Daniel Hensby
|
7af7f8dd65
|
Merge remote-tracking branch 'security/patch/3.1/ss-2016-005' into 3.1.19
|
2016-05-05 01:01:44 +01:00 |
|
Daniel Hensby
|
e8cfe1cc72
|
Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19
|
2016-05-05 01:01:37 +01:00 |
|
Daniel Hensby
|
09370290dc
|
Merge remote-tracking branch 'security/patch/3.1/ss-2016-001' into 3.1.19
|
2016-05-05 01:01:27 +01:00 |
|
Daniel Hensby
|
47c3165aa3
|
Merge remote-tracking branch 'security/patch/3.1/ss-2015-029' into 3.1.19
|
2016-05-05 01:01:15 +01:00 |
|
Daniel Hensby
|
32f0a637b4
|
Merge branch '3.2' into 3.3
|
2016-05-04 23:17:36 +01:00 |
|
Daniel Hensby
|
0884683c6b
|
Merge branch '3.1' into 3.2
|
2016-05-04 23:15:43 +01:00 |
|
Damian Mooyman
|
5925b65547
|
Merge pull request #5395 from dhensby/pulls/3.3/empty-manifest-fix
MINOR Empty YAML config causes invalid argument error
|
2016-05-04 10:48:28 +12:00 |
|
Damian Mooyman
|
096f30ebe5
|
BUG Fix GridFieldAddExistingAutocompleter
This fix exchanges references to sub-components by ID with class references
Fixes #5382
|
2016-05-03 14:28:41 +12:00 |
|
Damian Mooyman
|
71a4f1e605
|
Merge branch 'pull/5384' into 3.1
|
2016-05-02 18:16:41 +12:00 |
|
Damian Mooyman
|
a38eb8b784
|
Fix incorrect logic check
|
2016-05-02 18:15:39 +12:00 |
|
Damian Mooyman
|
2a5ba397e6
|
BUG Fix SS_HTTPResponse being cast as string (#5413)
Fixes #5335
|
2016-05-02 08:54:19 +12:00 |
|
Daniel Hensby
|
8673ac15bc
|
MINOR Empty YAML config causes invalid argument error
|
2016-04-26 12:58:27 +01:00 |
|
Damian Mooyman
|
e88a40853a
|
Merge pull request #3772 from phptek/cms/1054
FIX: Fixes CMS errors when viewing history on "Deleted" pages.
|
2016-04-26 17:21:19 +12:00 |
|
Daniel Hensby
|
745faebd81
|
Merge 3.2 into 3.3
Conflicts:
.travis.yml
|
2016-04-26 00:17:09 +01:00 |
|
Daniel Hensby
|
a0812f987a
|
Merge 3.1 into 3.2
Conflicts:
admin/javascript/LeftAndMain.js
control/HTTPRequest.php
docs/en/00_Getting_Started/00_Server_Requirements.md
|
2016-04-26 00:09:33 +01:00 |
|
Daniel Hensby
|
fde6376996
|
FIX Admin bloacklisted messages using correct $.inArray check
|
2016-04-24 08:57:45 +01:00 |
|
Daniel Hensby
|
1ccd3926e3
|
[SS-2016-001] FIX Properly check backurl on CMSSecurity@success
|
2016-04-20 23:58:50 +01:00 |
|
Daniel Hensby
|
a6bd22ab2f
|
[SS-2016-006] FIX dont disable XSS for login forms
|
2016-04-20 23:57:59 +01:00 |
|
Daniel Hensby
|
a24c8260b1
|
[SS-2016-004] FIX Store current page IDs as ints
|
2016-04-20 23:55:59 +01:00 |
|
Daniel Hensby
|
f32c893546
|
[SS-2016-005] FIX Apply brute force protection to default admin
|
2016-04-19 23:20:29 +01:00 |
|
Daniel Hensby
|
3c0f2e8e11
|
[SS-2015-029] FIX Add CSFR protection to tree reorganise
|
2016-04-19 00:01:04 +01:00 |
|
Michael Strong
|
1f820b0b1c
|
DOCS allowed_actions access control (#5333)
|
2016-04-18 17:49:30 +12:00 |
|
Damian Mooyman
|
936dcb691b
|
Merge pull request #5300 from patricknelson/issue-5299-injector-minor-doc
FIX for #5299 Adding <code> blocks to Injector documentation.
|
2016-04-18 11:56:21 +12:00 |
|
Loz Calver
|
69858760e1
|
Merge pull request #5312 from dhensby/pulls/3.1/fix-5281
FIX Stop "success" message showing in CMS
|
2016-04-12 16:56:06 +01:00 |
|
Daniel Hensby
|
36283b86d5
|
FIX Stop "success" message showing in CMS
fixes #5281
|
2016-04-12 16:14:31 +01:00 |
|
Damian Mooyman
|
e1f281fd8b
|
Merge pull request #5236 from dhensby/pulls/3.2/avoid-plain-text-friendlyerrors
FIX Dont allow plain text friendly errors
|
2016-04-12 12:00:54 +12:00 |
|
Patrick Nelson
|
707aa14c6c
|
FIX for #5299 Adding <code> blocks to Injector documentation.
|
2016-04-11 10:56:46 -07:00 |
|
Daniel Hensby
|
e57d26bb8e
|
Merge pull request #5298 from bummzack/patch-email-tests-3.2
Fix Email test issue discovered in #5271.
|
2016-04-11 15:06:15 +01:00 |
|
Roman Schmid
|
9146450c49
|
Fix Email test issue discovered in #5271.
Updated/added tests for changed- and forgot-password Emails.
Updated fixture and tests to no longer use a real Email address.
|
2016-04-11 13:46:41 +02:00 |
|