1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

20 Commits

Author SHA1 Message Date
Michael Cullum
864606feed [ticket/10680] Add /phpBB/ext/* to .gitignore
PHPBB3-10680
2012-02-29 21:55:22 +00:00
Andreas Fischer
4253a73e81 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10309] Update .gitignore and move .gitkeep.
  [ticket/10309] Coding guidelines fix.
  [ticket/10309] Write unicode data to tests/tmp.

Conflicts:
	.gitignore
2011-08-21 14:12:08 +02:00
Oleg Pudeyev
57accade85 [ticket/10309] Update .gitignore and move .gitkeep.
PHPBB3-10309
2011-08-20 14:34:02 -04:00
Nils Adermann
6fa83ba876 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
Andreas Fischer
d16525e176 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10255] Add leading slash in gitignore to only ignore specified files

Conflicts:
	.gitignore
2011-07-14 03:20:55 +02:00
Joas Schilling
b7459cc5f7 [ticket/10255] Add leading slash in gitignore to only ignore specified files
PHPBB3-10255
2011-07-14 02:33:32 +02:00
Oleg Pudeyev
6ae5a64f6c [feature/template-engine] Fixed absolute path PHP includes, added test.
PHPBB3-9726
2011-05-19 12:18:16 -04:00
Oleg Pudeyev
81d281f9e5 Merge branch 'ticket/erikfrerejean/10090' into develop-olympus
* ticket/erikfrerejean/10090:
  [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
2011-03-11 19:44:39 -05:00
Erik Frèrejean
2fb9bfe3b3 [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
PHPBB3-10090
2011-03-10 22:48:12 +01:00
Andreas Fischer
a229dd9896 [ticket/10079] Add gallery avatars to .gitignore.
PHPBB3-10079
2011-03-07 16:43:39 +01:00
Igor Wiedler
e00c5544d2 [ticket/9990] Integrate utf normalizer tests into test suite
PHPBB3-9990
2011-01-11 01:06:01 +01:00
Igor Wiedler
9a52bd0301 [task/phpunit-xml] Use phpunit.xml for test suite
PHPBB3-9967
2011-01-04 22:54:01 +01:00
Andreas Fischer
32ee8955b2 [ticket/9848] Add avatars, attachments and store files to .gitignore.
PHPBB3-9848
2010-10-15 18:08:43 +02:00
Andreas Fischer
b8f37a5024 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
Igor Wiedler
81d3f382a9 [ticket/9825] Add unit test config and db to gitignore
PHPBB3-9825
2010-09-16 23:16:30 +02:00
Igor Wiedler
20505ff326 [ticket/9816] Remove config.php from repository
PHPBB3-9816
2010-09-12 14:21:25 +02:00
Nils Adermann
fd23bccd4d [develop-olympus] Basic gitignore file for cache files and backups. 2010-05-02 23:44:42 +02:00
Oleg Pudeyev
db70d613bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10090] Add phpBB/cache/queue.php.lock to the gitignore
2011-03-11 19:44:54 -05:00
Andreas Fischer
062c951d33 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10079] Add gallery avatars to .gitignore.
  [ticket/10069] Improvements to sample nginx configuration.
2011-03-07 22:01:37 +01:00
Oleg Pudeyev
8de411cc25 [ticket/10013] Changed cache test to use tests/tmp/cache as cache directory
This is the first step of making the test suite use a single directory
for writing files to, this directory being tests/tmp.

The cache test, instead of tests/cache/tmp, now writes to tests/tmp/cache.

Also remove cache directory in setUp method, in case an earlier test run
did not complete successfully and the cache directory was not cleaned up.

Finally, this change makes the cache test take responsibility over the entire
contents of its cache directory.

PHPBB3-10013
2011-02-12 14:44:53 +01:00