php-phpbb/.gitignore

*~
/phpunit.xml
/phpBB/cache/*.html
/phpBB/cache/*.php
/phpBB/cache/queue.php.lock
/phpBB/config.php
/phpBB/ext/*
/phpBB/files/*
/phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/*
/phpBB/store/*
/tests/phpbb_unit_tests.sqlite2
/tests/test_config.php
/tests/tmp/*
Merge branch 'ticket/igorw/9816' into develop-olympus * ticket/igorw/9816: [ticket/9816] Remove config.php from repository Conflicts: .gitignore 2010-10-15 15:39:36 +02:00			`*~`
[ticket/10255] Add leading slash in gitignore to only ignore specified files PHPBB3-10255 2011-07-14 02:33:32 +02:00			`/phpunit.xml`
Merge remote-tracking branch 'github-p/feature/template-engine' into develop * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php 2011-08-13 23:59:15 -04:00			`/phpBB/cache/*.html`
[ticket/10255] Add leading slash in gitignore to only ignore specified files PHPBB3-10255 2011-07-14 02:33:32 +02:00			`/phpBB/cache/*.php`
			`/phpBB/cache/queue.php.lock`
			`/phpBB/config.php`
[ticket/10680] Add /phpBB/ext/* to .gitignore PHPBB3-10680 2012-02-29 21:55:22 +00:00			`/phpBB/ext/*`
[ticket/10255] Add leading slash in gitignore to only ignore specified files PHPBB3-10255 2011-07-14 02:33:32 +02:00			`/phpBB/files/*`
			`/phpBB/images/avatars/gallery/*`
			`/phpBB/images/avatars/upload/*`
			`/phpBB/store/*`
			`/tests/phpbb_unit_tests.sqlite2`
			`/tests/test_config.php`
[ticket/10309] Update .gitignore and move .gitkeep. PHPBB3-10309 2011-08-20 14:34:02 -04:00			`/tests/tmp/*`