Daniel Hensby
|
447ce0f84f
|
[SS-2017-002] FIX Lock out users who dont exist in the DB
|
2017-05-25 16:14:52 +01:00 |
|
Daniel Hensby
|
25b77a2ff8
|
[SS-2017-017] FIX SVG uploads disabled by default
|
2017-05-25 13:07:53 +01:00 |
|
Damian Mooyman
|
9c2b9d7e98
|
Merge pull request #6961 from dhensby/pulls/3.4/test-nesting
Remove unnecessary nesting of config/injector in tests
|
2017-05-25 10:18:59 +12:00 |
|
Daniel Hensby
|
85f0650796
|
Remove unnecessary nesting of config/injector in tests
|
2017-05-24 16:05:39 +01:00 |
|
Daniel Hensby
|
283e3279be
|
Merge branch '3.6' into 3
|
2017-05-18 13:55:07 +01:00 |
|
Daniel Hensby
|
db33c8a37c
|
Merge branch '3.6.0' into 3.6
|
2017-05-18 13:54:48 +01:00 |
|
Daniel Hensby
|
9f6e0cdc8f
|
Merge branch '3.5' into 3.6
|
2017-05-18 13:54:11 +01:00 |
|
Daniel Hensby
|
cc70d893bc
|
Merge branch '3.4' into 3.5
|
2017-05-18 13:53:49 +01:00 |
|
Damian Mooyman
|
3883878c13
|
Merge pull request #6797 from halkyon/broken-group-search
Fixing broken search in SecurityAdmin Groups field
|
2017-05-18 14:28:53 +12:00 |
|
Damian Mooyman
|
8f7e7ae1de
|
Merge pull request #6130 from lekoala/patch-3
Allow filtering if a relation is defined or a formatting
|
2017-05-18 13:11:16 +12:00 |
|
Daniel Hensby
|
49a0354998
|
Make sure that nested relations dont break
|
2017-05-17 23:01:42 +01:00 |
|
Thomas Portelange
|
efbf14be63
|
Allow filtering if a relation is defined or a formatting
|
2017-05-17 21:05:21 +01:00 |
|
Damian Mooyman
|
7b9c8afeb9
|
Merge pull request #6777 from robbieaverill/bugfix/image-pad-transparency
FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad
|
2017-05-16 23:43:03 +12:00 |
|
Robbie Averill
|
197bc53c49
|
FIX Add transparency percent argument to Image::generatePad to ensure transparency works from ::Pad
|
2017-05-16 21:20:21 +12:00 |
|
Daniel Hensby
|
9bdce9790d
|
Added 3.6.0-beta2 changelog
|
2017-05-10 21:55:25 +01:00 |
|
Loz Calver
|
7ae203908f
|
Merge pull request #6882 from robbieaverill/patch-6
DOCS Fix broken markdown rendering in 03_Template_debugging.md
|
2017-05-09 09:38:28 +01:00 |
|
Daniel Hensby
|
bbb250916e
|
Merge branch '3.6' into 3
|
2017-05-08 16:22:32 +01:00 |
|
Daniel Hensby
|
d441f3ebd4
|
Merge branch '3.6.0' into 3.6
|
2017-05-08 16:21:55 +01:00 |
|
Daniel Hensby
|
f4f1c55fb6
|
Merge branch '3.5' into 3.6
|
2017-05-08 15:20:11 +01:00 |
|
Daniel Hensby
|
793a020ce9
|
Merge branch '3.4' into 3.5
|
2017-05-08 11:31:33 +01:00 |
|
Jake Bentvelzen
|
ecefcc8f0e
|
DOC Add documentation for how to use alternate ConfigStaticManifest
|
2017-05-08 17:52:13 +12:00 |
|
Jake Bentvelzen
|
082c2ddb90
|
Adjust ConfigStaticManifest_Reflection deprecation notices
|
2017-05-08 17:52:13 +12:00 |
|
Silbinary Wolf
|
08bb23823b
|
Adjusted code based on feedback on PR (Pull-request)
|
2017-05-08 17:52:13 +12:00 |
|
Silbinary Wolf
|
8f65c44865
|
Modified how to re-enable old SS_ConfigStaticManifest to suit the SS config system
|
2017-05-08 17:52:13 +12:00 |
|
Silbinary Wolf
|
65ac23098e
|
Adds support for using the newer ConfigStaticManifest from the 4.0/master branch. If the developer is doing something weird that involves accessing the 'getStatics()', they can simply delete the ConfigStaticManifest40.php file to bring back full compatibility. My reasoning for this addition is that it reduces the /dev/build process greatly and increases the programmers productivity and improves their quality of life (in my opinion anyway, less waiting for 7-12s for private static changes).
I'm thinking this should go into 3.3.
|
2017-05-08 17:52:13 +12:00 |
|
Damian Mooyman
|
f16d7e1838
|
API Deprecate unused / undesirable create_new_password implementation
|
2017-05-08 17:41:37 +12:00 |
|
Robbie Averill
|
f2b21fb828
|
DOCS Fix broken markdown rendering in 03_Template_debugging.md
|
2017-05-08 17:40:02 +12:00 |
|
Ben Speakman
|
27bca14f86
|
Test for getExtension()
|
2017-05-08 17:22:50 +12:00 |
|
Ben Speakman
|
705d342080
|
Update regex to only match files with names
|
2017-05-08 17:22:50 +12:00 |
|
Damian Mooyman
|
1b8e0691c3
|
Merge pull request #6867 from gregsmirnov/pulls/3.4/fix-class-name-reference-consistency
Fix class name reference consistency
|
2017-05-04 10:07:23 +12:00 |
|
Chris Joe
|
9315ac2442
|
Merge pull request #6864 from 3Dgoo/patch-1
Fixing pagination api doc typo
|
2017-05-03 22:42:50 +12:00 |
|
Gregory Smirnov
|
2d138b0ef0
|
Fix class name reference consistency
|
2017-05-03 09:34:25 +02:00 |
|
3Dgoo
|
2187c160b9
|
Fixing pagination api doc typo
|
2017-05-03 06:23:47 +09:30 |
|
Patrick Nelson
|
a511e3511c
|
FIX #6855: Mangled JS in Requirements, escaping replacement values prior to passing to preg_replace().
|
2017-05-02 13:43:50 +12:00 |
|
Uncle Cheese
|
b0b31637e4
|
Remove .tx folder
|
2017-05-01 16:24:11 +12:00 |
|
Daniel Hensby
|
bceae57208
|
Merge pull request #6845 from gregsmirnov/pulls/3.4/6838-fix-image-class-substitution
#6838 fix image class substitution
|
2017-04-26 16:53:12 +01:00 |
|
Gregory Smirnov
|
1d36f354e8
|
FIX Create Image_Cached with Injector.
|
2017-04-26 10:40:10 +02:00 |
|
Daniel Hensby
|
d119272b92
|
Aliasing 3 as 3.7.x-dev
|
2017-04-21 16:10:06 +01:00 |
|
Daniel Hensby
|
c52d406e42
|
Merge branch '3.6' into 3
|
2017-04-21 13:56:53 +01:00 |
|
Daniel Hensby
|
7e13878cb0
|
Merge branch '3.5' into 3.6
|
2017-04-21 13:56:24 +01:00 |
|
Daniel Hensby
|
04c1374a74
|
Merge branch '3.4' into 3.5
|
2017-04-21 13:51:11 +01:00 |
|
root
|
96d323fba1
|
Added 3.6.0-beta1 changelog
|
2017-04-21 11:49:44 +01:00 |
|
root
|
f9e890176d
|
Update translations
|
2017-04-21 11:49:39 +01:00 |
|
Ingo Schommer
|
4041db455a
|
Merge pull request #6812 from open-sausages/pulls/3/remove-tx
Remove .tx folder
|
2017-04-21 11:42:55 +12:00 |
|
Ingo Schommer
|
47f64c128a
|
Merge pull request #6815 from open-sausages/pulls/3.5/remove-tx
Remove .tx folder
|
2017-04-21 11:42:46 +12:00 |
|
Ingo Schommer
|
22cdf4c786
|
Merge pull request #6814 from open-sausages/pulls/3.4/remove-tx
Remove .tx folder
|
2017-04-21 11:42:38 +12:00 |
|
Uncle Cheese
|
0ef6d4fb79
|
Remove .tx folder
|
2017-04-20 11:51:46 +12:00 |
|
Uncle Cheese
|
37d6cee83c
|
Remove .tx folder
|
2017-04-20 11:50:45 +12:00 |
|
Uncle Cheese
|
c371e2bcac
|
remove tx
|
2017-04-20 11:46:34 +12:00 |
|
Daniel Hensby
|
8e600bfb37
|
Merge branch '3.5' into 3
|
2017-04-18 16:45:20 +01:00 |
|