Ingo Schommer 1181ba089a Merge remote-tracking branch 'origin/3.0' ...

Conflicts:
	.travis.yml

2012-10-16 10:26:04 +02:00

..

api

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

cache

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

control

Merge remote-tracking branch 'origin/3.0'

2012-10-03 16:16:19 +02:00

core

ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty.

2012-10-05 17:00:39 +13:00

dev

ENHANCEMENT Make it possible to extend SS_Log

2012-10-04 16:34:20 +10:00

filesystem

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

forms

Merge remote-tracking branch 'origin/3.0'

2012-10-03 16:16:19 +02:00

i18n

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

injector

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

integration

BUG Fixing regression in 26d70d6fca with formatted output in SS_HTMLValue

2012-10-16 11:59:30 +13:00

javascript

MINOR Cleaning up code of Datagrid with related classes with more tests

2011-09-29 12:16:15 +13:00

model

API Allow use of :not, :nocase and :case modifiers to SearchFilters.

2012-10-10 10:26:47 +13:00

oembed

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

parsers

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

phpcs

NEW Amend Travis build to run a simple PHP_CodeSniffer test.

2012-09-30 17:28:46 +13:00

search

Merge remote-tracking branch 'origin/3.0'

2012-10-03 16:16:19 +02:00

security

Merge remote-tracking branch 'origin/3.0'

2012-10-03 16:16:19 +02:00

tasks

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

templates

API: add api for setting a custom template on a RSS feed.

2012-07-01 21:27:50 +12:00

testing

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

travis

Merge branch '3.0'

2012-10-15 10:10:01 +13:00

view

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13: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

Revert "Make PHPUnit bootstrap add flush=1"

2012-08-14 19:01:30 +12:00

FakeController.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00

MemoryLimitTest.php

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

PhpSyntaxTest.php

FIX Remove instances of lines longer than 120c

2012-09-30 17:18:13 +13:00