Andreas Fischer f2b174c8b5 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11618] Replace glob() with scandir() and string matching

Conflicts:
	tests/template/template_test.php

2013-06-27 02:23:57 +02:00

..

datasets

[ticket/11519] Rename test event template file

2013-05-04 11:45:49 -05:00

parent_templates

[ticket/10800] Changing html to js for includejs tests

2012-05-01 17:41:46 +03:00

subdir

[ticket/9916] Updating license in non-distributed files

2012-01-02 19:10:36 +01:00

templates

Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into develop

2013-05-20 10:47:45 -05:00

includephp_test.php

[feature/template-events] Convert a single style name to array of them.

2012-11-17 16:42:40 -05:00

invalid_constructs_test.php

[ticket/10882] Fix test name - oops.

2012-06-11 18:50:05 -04:00

renderer_eval_test.php

[ticket/10756] Renaming template classes

2012-04-19 04:15:11 +02:00

template_compile_test.php

[feature/template-events] Chase template/style renames and changes.

2012-11-17 16:39:58 -05:00

template_events_test.php

[ticket/11435] Fix comments in events test

2013-04-25 15:26:59 -05:00

template_includejs_test.php

[ticket/10970] Added support for forms such as {FOO}bar.{EXT}

2012-07-08 20:41:22 +01:00

template_inheritance_test.php

[ticket/10665] New test class for templates with tree

2012-04-01 20:37:45 +03:00

template_locate_test.php

[ticket/10933] Update template locator test to use style resource locator.

2012-11-02 19:39:07 -04:00

template_spacing_test.php

[ticket/11435] Enable spacing test as it should now pass

2013-05-20 11:46:08 -05:00

template_test_case_with_tree.php

[feature/template-events] Convert a single style name to array of them.

2012-11-17 16:42:40 -05:00

template_test_case.php

Merge branch 'develop-olympus' into develop

2013-06-27 02:23:57 +02:00

template_test.php

[ticket/11618] Replace glob() with scandir() and string matching

2013-06-26 19:51:52 -04:00