1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 14:18:24 +01:00

43 Commits

Author SHA1 Message Date
Marc Alexander
a88a68f8a6
Merge branch '3.2.x' into 3.3.x 2020-05-03 11:06:08 +02:00
mrgoldy
be74893e02 [ticket/16461] Update .gitignore to ignore node_modules and idea
PHPBB3-16461
2020-05-02 15:35:01 +02:00
hanakin
ff3458ff03 [ticket/16248] Add DS_Store to gitignore
PHPBB3-16248
2019-12-07 08:03:57 -10:00
Jakub Senko
64b053c997
[ticket/15694] Ignore lang files in prosilver/theme dir
PHPBB3-15694
2019-05-09 18:44:48 +02:00
Matt Friedman
40aac1cd57 [ticket/14547] Ignore backup config.php files
PHPBB3-14547
2016-04-28 08:36:49 -07:00
Matt Friedman
6196e4ae4d [ticket/14547] Add Vagrant to phpBB
PHPBB3-14547
2016-04-28 08:36:49 -07:00
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers
PHPBB3-13645
2015-08-23 22:36:10 +02:00
Marc Alexander
36a337ffab Merge branch 'develop-ascraeus' into develop 2014-11-26 13:37:21 +01:00
Tristan Darricau
6a4179cef5 [ticket/13362] Fix cache paths in .gitignore
PHPBB3-13362
2014-11-26 12:38:02 +01:00
Joas Schilling
74dfb56459 Merge branch 'develop-ascraeus' into develop 2014-11-25 22:45:37 +01:00
Tristan Darricau
f46057ca02 [ticket/13362] Ignore the whole cache directory in git
PHPBB3-13362
2014-11-25 18:00:07 +01:00
Andreas Fischer
c755aa91e8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
2014-10-29 15:09:22 +01:00
Andreas Fischer
932b75c166 Merge pull request #3065 from dhruvgoel92/feature/phantom
[feature/phantom]

* dhruvgoel92/feature/phantom:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
2014-10-29 15:09:22 +01:00
Andreas Fischer
10e99b018a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
2014-10-07 20:30:40 +02:00
Joas Schilling
ba1776d6a9 [ticket/13137] Add schema.json file to .gitignore
PHPBB3-13137
2014-10-07 16:33:26 +02:00
Dhruv
77d52982c8 [ticket/12962] Add facebook/webdriver dependency
Create a new composer.json for tests dir and add
facebook/webdriver dependency

PHPBB3-12962
2014-09-21 14:24:29 +05:30
Joas Schilling
59780bbd09 [ticket/12958] Remove more references of subsilver2
PHPBB3-12958
2014-08-10 12:17:03 +02:00
Joas Schilling
102faf4d1f [ticket/12706] Ignore additional rank images
PHPBB3-12706
2014-06-14 12:08:39 +02:00
Joas Schilling
08ce6b96a4 [ticket/12706] Ignore additional languages
PHPBB3-12706
2014-06-14 12:08:15 +02:00
Joas Schilling
a620a6c5fe [ticket/12706] Ignore additional styles
PHPBB3-12706
2014-06-14 12:07:48 +02:00
Joas Schilling
5496dd41ed [feature/sqlite3] Add sqlite3 database to .gitignore
PHPBB3-9728
2014-05-02 15:45:25 +02:00
Andreas Fischer
5e95815503 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
2014-05-02 14:22:02 +02:00
Joas Schilling
535cd5670f [ticket/12467] Add config*.php and tests_config*.php to .gitignore
PHPBB3-12467
2014-05-02 13:47:30 +02:00
Nathan Guse
74f19830f3 [feature/twig] Some additional operators, more stuff for IF
PHPBB3-11598
2013-06-12 12:48:37 -05:00
Nathan Guse
845bf6a638 [ticket/11262] Add .lock in cache directory to .gitignore
PHPBB3-11262
2012-12-13 16:15:49 -06:00
Igor Wiedler
313cf7297c Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympus
Feature/events dispatcher olympus
2012-03-30 11:15:54 -07:00
Michael Cullum
9391d423c0 [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
To keep the .gitignore's the same.

PHPBB3-9550
2012-03-30 19:13:32 +01:00
David King
dc4d0677b9 Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-olympus 2012-03-30 13:38:40 -04:00
David King
1789e0948b [ticket/10732] Add config_dev.php and config_test.php to .gitignore
PHPBB3-10732
2012-03-28 17:05:45 -04:00
Michael Cullum
c2169f6899 [feature/events-dispatcher] Adding phpBB/vendor to .gitignore
PHPBB3-9550
2012-03-21 09:17:16 +00:00
Michael Cullum
24f1896b3c [ticket/10697] Updating gitignore to match develop branch
PHPBB3-10697
2012-03-11 09:42:56 +00:00
Oleg Pudeyev
57accade85 [ticket/10309] Update .gitignore and move .gitkeep.
PHPBB3-10309
2011-08-20 14:34:02 -04: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
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