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

..

api

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

assets

FIX extra_requirements to accept non associative arrays.

2013-06-02 13:37:34 +12:00

behat

BUG Prevent session hijackers from resetting a user password

2016-05-16 10:54:18 +12:00

cache

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

control

Merge 3.3 into 3

2016-04-26 00:24:59 +01:00

core

Merge 3.3 into 3.4

2016-08-05 16:48:26 +12:00

dev

BUG Fix permission checking code not correctly handling escaped SQL identifiers

2016-08-01 18:15:30 +12:00

email

Set deprecation level for all changes in 3.x to 4.0

2015-06-19 13:07:41 +12:00

filesystem

test to prove #5222

2016-05-04 12:05:02 +12:00

forms

Merge branch '3.3' into 3.4

2016-07-15 14:34:18 +01:00

i18n

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

injector

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

integration

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

javascript

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

model

Merge branch '3.3' into 3.4

2016-07-20 19:43:41 +01:00

oembed

Add unit tests for oembed autodiscover and thumbnail detection

2016-04-15 14:00:10 +12:00

parsers

Merge branch '3.3' into 3.4

2016-07-04 23:53:55 +01:00

phpcs

Add code-sniffs other than line length to scrutinizer

2013-05-23 10:39:01 +12:00

search

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

security

Merge branch '3.3' into 3.4

2016-07-04 23:53:55 +01:00

tasks

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

templates

FIX: Regression with <% with / %> (fixes #5656)

2016-06-06 10:14:07 +01:00

testing

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

view

FIX: Regression with <% with / %> (fixes #5656)

2016-06-06 10:14:07 +01:00

Bare.yml

MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests.

2011-02-02 14:17:57 +13:00

bootstrap.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

FakeController.php

FEATURE: implement getter and setter usage for response

2015-08-29 10:24:06 +12:00

MemoryLimitTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

phpcs_runner.php

Only have Scrutinizer check PHP files

2013-08-21 21:02:12 +12:00

PhpSyntaxTest.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00