Daniel Hensby
|
6022012481
|
Merge branch '3.4' into 3
|
2016-09-23 16:33:45 +01:00 |
|
Jason Irish
|
dcc51ec479
|
Docs - sort by random instructions
Added instructions for sorting per database type. `RAND()` throws errors in PostgreSQL and SQLite
|
2016-09-20 14:16:22 -05:00 |
|
Daniel Hensby
|
f25b88b146
|
showqueries debugging tool now inserts parameters in place (#5885)
|
2016-09-15 09:15:19 +12:00 |
|
Daniel Hensby
|
a9df28c791
|
Merge branch '3.4' into 3
|
2016-09-14 11:40:15 +01:00 |
|
Daniel Hensby
|
e3ac75febd
|
DOCS Reference composer docs for installation instructions
|
2016-09-12 17:04:20 +01:00 |
|
Daniel Hensby
|
3fd9fe3aa0
|
Merge branch '3.4' into 3
|
2016-09-07 09:22:06 +01:00 |
|
Ingo Schommer
|
1a8348900d
|
Merge pull request #5899 from christopherdarling/patch-7
DOCS add missing commit af3412a to 3.4.1 changelog
|
2016-09-01 08:17:16 +12:00 |
|
Rob Ingram
|
a0d3ad1875
|
Change order of fixtures in example
* Make the document explicit about the definition of objects before they are referenced.
|
2016-08-24 07:37:55 +12:00 |
|
Daniel Hensby
|
060bf6b327
|
Merge branch '3.3' into 3.4
|
2016-08-22 16:22:37 +01:00 |
|
Daniel Hensby
|
088d88e978
|
Merge branch '3.2' into 3.3
|
2016-08-22 16:22:02 +01:00 |
|
Daniel Hensby
|
f4a6e9e517
|
Merge branch '3.1' into 3.2
|
2016-08-22 15:30:03 +01:00 |
|
Daniel Hensby
|
8e4e2b4fa8
|
Merge pull request #4173 from AntonyThorpe/patch-4
DOCS Update 06_Tabbed_Forms.md
|
2016-08-19 15:49:51 +01:00 |
|
Christopher Darling
|
ef1d93c994
|
DOCS add missing commit af3412a to 3.4.1 changelog
|
2016-08-18 16:27:36 +01:00 |
|
Damian Mooyman
|
d88516203c
|
Merge 3.4 into 3
|
2016-08-15 19:05:20 +12:00 |
|
Damian Mooyman
|
f4ba3cd175
|
Merge 3.3 into 3.4
# Conflicts:
# security/ChangePasswordForm.php
# templates/forms/OptionsetField.ss
|
2016-08-15 19:03:13 +12:00 |
|
Damian Mooyman
|
ebc0bafea9
|
Merge 3.2 into 3.3
|
2016-08-15 18:51:07 +12:00 |
|
Damian Mooyman
|
f3afd14e4f
|
Merge 3.2 into 3.3
|
2016-08-15 18:47:43 +12:00 |
|
Damian Mooyman
|
8ec89be9d4
|
Merge 3.1 into 3.2
# Conflicts:
# forms/CheckboxSetField.php
# forms/OptionsetField.php
# security/Member.php
# tests/forms/CheckboxSetFieldTest.php
|
2016-08-15 18:46:26 +12:00 |
|
Damian Mooyman
|
1f06e6dd18
|
Added 3.4.1 changelog
|
2016-08-15 18:29:38 +12:00 |
|
Damian Mooyman
|
68986558c9
|
Added 3.3.3 changelog
|
2016-08-15 18:05:32 +12:00 |
|
Damian Mooyman
|
351bf6cfe4
|
Added 3.2.5 changelog
|
2016-08-15 17:22:23 +12:00 |
|
Damian Mooyman
|
6f60d2518b
|
Added 3.1.20 changelog
|
2016-08-15 16:44:36 +12:00 |
|
Damian Mooyman
|
02000e5446
|
Added 3.4.1-rc2 changelog
|
2016-08-15 15:55:19 +12:00 |
|
Damian Mooyman
|
7c0669486a
|
Added 3.3.3-rc2 changelog
|
2016-08-15 15:34:41 +12:00 |
|
Damian Mooyman
|
d83c678b6a
|
Added 3.3.3-rc2 changelog
|
2016-08-15 15:07:26 +12:00 |
|
Damian Mooyman
|
1a03bdba7a
|
Added 3.2.5-rc2 changelog
|
2016-08-15 14:17:41 +12:00 |
|
Damian Mooyman
|
b2a7170c64
|
Added 3.1.20-rc2 changelog
|
2016-08-15 13:41:31 +12:00 |
|
Damian Mooyman
|
7de5b998e1
|
Merge 3.4 into 3
|
2016-08-05 19:12:25 +12:00 |
|
Damian Mooyman
|
2299b8e67a
|
Added 3.4.1-rc1 changelog
|
2016-08-05 18:52:14 +12:00 |
|
Damian Mooyman
|
ca754eb887
|
Merge 3.3 into 3.4
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
|
2016-08-05 16:48:26 +12:00 |
|
Damian Mooyman
|
958344eb5d
|
Added 3.3.3-rc1 changelog
|
2016-08-05 16:33:22 +12:00 |
|
Damian Mooyman
|
0d5ae23f2b
|
Merge 3.2 into 3.3
|
2016-08-05 14:36:35 +12:00 |
|
Damian Mooyman
|
6e6451fa71
|
Added 3.2.5-rc1 changelog
|
2016-08-05 13:24:35 +12:00 |
|
Damian Mooyman
|
cb39f2ef27
|
Merge 3.1 into 3.2
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/fa_IR.js
# javascript/lang/src/fa_IR.js
|
2016-08-05 11:41:04 +12:00 |
|
Damian Mooyman
|
ec969c21e6
|
Added 3.1.20-rc1 changelog
|
2016-08-05 11:17:57 +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
|
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 |
|
Damian Mooyman
|
319d6d293e
|
BUG Fix doclink (#5827)
Fixes #5721
|
2016-07-20 10:12:42 +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 |
|
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 |
|
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
|
3906228fc1
|
Merge branch '3.4' into 3
|
2016-07-11 21:14:21 +01:00 |
|
Daniel Hensby
|
f44c47eea1
|
Merge branch '3.3' into 3.4
|
2016-07-11 21:11:05 +01:00 |
|
Robbie Averill
|
04a4d7937e
|
DOCS Update 02_Relations (#5785)
* Code formatting on some variable names
* Add example for removing scaffolded parent relation fields
|
2016-07-07 22:32:43 +01:00 |
|
Damian Mooyman
|
4dadc276b5
|
Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
|
2016-07-04 17:35:47 +12:00 |
|
Ironcheese
|
9b1a4b328c
|
Moving a field between tabs, wrong variable name
|
2016-06-15 15:36:43 +02:00 |
|
Daniel Hensby
|
4e392a4d43
|
Merge branch '3.3' into 3.4
|
2016-06-13 12:30:16 +01:00 |
|