1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 22:02:07 +02:00

11972 Commits

Author SHA1 Message Date
Andreas Fischer
33593a508c [ticket/11509] Be exact when referencing the branch name.
PHPBB3-11509
2014-02-04 02:18:46 +01:00
Andreas Fischer
5069922e24 [ticket/11509] Run commit message checker only in one environment.
PHPBB3-11509
2014-02-03 23:50:48 +01:00
Andreas Fischer
6f727bc0f9 [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.
PHPBB3-11509
2014-02-03 23:44:15 +01:00
Nils Adermann
32536880f4 Merge remote-tracking branch 'github-bantu/ticket/11509' into develop-olympus
* github-bantu/ticket/11509:
  [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.
2014-02-03 01:07:19 +01:00
Andreas Fischer
34c6677d14 Merge remote-tracking branch 'Crizz0/ticket/12146' into develop-olympus
* Crizz0/ticket/12146:
  [ticket/12146] Added a missing # to inline css-style of <span>
2014-02-02 17:15:46 +01:00
Andreas Fischer
16e81d4d18 [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.
PHPBB3-11509
2014-02-02 17:11:30 +01:00
Crizz0
88fad5856a [ticket/12146] Added a missing # to inline css-style of <span>
PHPBB3-12146
2014-02-02 16:44:52 +01:00
Nils Adermann
ed43436c18 Merge remote-tracking branch 'github-bantu/ticket/12147' into develop-olympus
* github-bantu/ticket/12147:
  [ticket/12147] Remove Travis CI notifications.
2014-02-02 16:26:33 +01:00
Andreas Fischer
9cc8768fa0 [ticket/12147] Remove Travis CI notifications.
We don't want to get notifications for branches other people are working on.

PHPBB3-12147
2014-02-02 15:12:30 +01:00
Andreas Fischer
1666476b42 Merge remote-tracking branch 'naderman/ticket/12140' into develop-olympus
* naderman/ticket/12140:
  [ticket/12140] Remove the diff class / MOD text build script
2014-02-02 13:51:56 +01:00
Nils Adermann
9047c0c061 [ticket/12140] Remove the diff class / MOD text build script
PHPBB3-12140
2014-02-02 13:36:12 +01:00
Andreas Fischer
917a61832e Merge remote-tracking branch 'vinny/ticket/12119' into develop-olympus
* vinny/ticket/12119:
  [ticket/12119] Remove meta tags from view-print templates
2014-01-27 20:47:19 +01:00
Marcus Vinicius
a32db45166 [ticket/12119] Remove meta tags from view-print templates
PHPBB3-12119
2014-01-27 16:42:39 -03:00
Andreas Fischer
0d6e587fda Merge remote-tracking branch 'vinny/ticket/12118' into develop-olympus
* vinny/ticket/12118:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
2014-01-26 20:50:40 +01:00
Marcus Vinicius
cb7a0d6f2a [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
PHPBB3-12118
2014-01-26 03:19:43 -03:00
Cesar G
ed409d3d5b Merge remote-tracking branch 'nickvergessen/ticket/12120' into develop-olympus 2014-01-23 14:10:46 -08:00
Joas Schilling
42e4566fe4 [ticket/12120] Restore alphabetic order
PHPBB3-12120
2014-01-23 22:59:42 +01:00
Joas Schilling
a672d983c9 [ticket/12120] Add prototech to authors
PHPBB3-12120
2014-01-23 22:59:33 +01:00
Nathan Guse
90f3cc48e5 Merge remote-tracking branch 'remotes/bantu/ticket/12046' into develop-olympus
* remotes/bantu/ticket/12046:
  [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
2014-01-17 20:50:04 -06:00
Joas Schilling
89fd73c18d Merge remote-tracking branch 'Elsensee/ticket/10023' into develop-olympus
* Elsensee/ticket/10023:
  [ticket/10023] Make password change notification more noticeable
2013-12-16 10:25:21 +01:00
Oliver Schramm
e6b91de17b [ticket/10023] Make password change notification more noticeable
PHPBB3-10023
2013-12-12 16:57:06 +01:00
Joas Schilling
6658cd279c Merge remote-tracking branch 'Elsensee/ticket/12061' into develop-olympus
* Elsensee/ticket/12061:
  [ticket/12061] Fix keyboard shortcut in firefox
2013-12-09 01:21:24 +01:00
Oliver Schramm
204d6781d8 [ticket/12061] Fix keyboard shortcut in firefox
PHPBB3-12061
2013-12-06 19:59:33 +01:00
Joas Schilling
0e93c2516c Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympus
* bantu/ticket/12056:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
2013-12-04 15:56:03 +01:00
Andreas Fischer
e41cd384f5 [ticket/12056] Fix failure due to "Creating default object from empty value".
PHPBB3-12056
2013-12-04 13:22:47 +01:00
Joas Schilling
1977a10efb Merge remote-tracking branch 'bantu/ticket/11699' into develop-olympus
* bantu/ticket/11699:
  [ticket/11699] Also exclude the phpBB/cache directory.
  [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
  [ticket/11699] Exclude build/new_version and build/old_versions from lint.
2013-12-02 23:32:39 +01:00
Joas Schilling
be338864ef Merge remote-tracking branch 'prototech/ticket/12048' into develop-olympus
* prototech/ticket/12048:
  [ticket/12048] Fix the regexp for language keys in custom bbcodes.
2013-12-02 10:07:06 +01:00
Cesar G
eef1b586d5 [ticket/12048] Fix the regexp for language keys in custom bbcodes.
PHPBB3-12048
2013-12-02 00:53:42 -08:00
Andreas Fischer
981df153d2 [ticket/11699] Also exclude the phpBB/cache directory.
PHPBB3-11699
2013-11-29 14:02:50 +01:00
Andreas Fischer
0834a749e7 [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
PHPBB3-11699
2013-11-29 14:00:55 +01:00
Andreas Fischer
4171ef9ed7 [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
PHPBB3-12046
2013-11-29 13:53:11 +01:00
Andreas Fischer
97b1d70a37 [ticket/11699] Exclude build/new_version and build/old_versions from lint.
PHPBB3-11699
2013-11-29 10:50:38 +01:00
Joas Schilling
afb4585dd9 Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus
* prototech/ticket/12037:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.
2013-11-26 11:31:43 +01:00
Cesar G
e111d7bd13 [ticket/12037] Fix hard-coded text in acp_inactive.html.
PHPBB3-12037
2013-11-25 12:38:53 -08:00
Joas Schilling
af3417ce86 Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympus
* prototech/ticket/11814:
  [ticket/11814] Remove redundant text from the topic reply email notification.
2013-11-19 15:28:06 +01:00
Cesar G
f833a42e7e [ticket/11814] Remove redundant text from the topic reply email notification.
PHPBB3-11814
2013-11-19 06:20:37 -08:00
Nils Adermann
3eb4575f61 Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympus
* github-bantu/ticket/11970:
  [ticket/11970] Make apt-get less quiet.
  [ticket/11970] Add set -x to Travis setup scripts.
2013-10-26 10:53:35 -05:00
Andreas Fischer
e65483ac32 [ticket/11970] Make apt-get less quiet.
PHPBB3-11970
2013-10-26 01:39:04 +02:00
Andreas Fischer
3c135ccab2 [ticket/11970] Add set -x to Travis setup scripts.
Output is hidden by Travis by default and this will allow easier debugging.

PHPBB3-11970
2013-10-26 01:37:03 +02:00
Andreas Fischer
66841a55d0 Merge remote-tracking branch 'bantu/ticket/11920' into develop-olympus
* bantu/ticket/11920:
  [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
2013-10-25 14:01:33 +02:00
Andreas Fischer
acc6e440d0 [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
PHPBB3-11920
2013-10-25 13:21:10 +02:00
Nils Adermann
5e01ea61f9 Merge branch 'task/github-readme/travis' into develop-olympus
* task/github-readme/travis:
  [task/github-readme/travis] Fix Travis-Badge and link
2013-10-24 21:53:47 -05:00
Falk Seidel
98a6f10ce7 [task/github-readme/travis] Fix Travis-Badge and link
PHPBB3-11968
2013-10-24 21:51:49 -05:00
Nils Adermann
a5eaaa10dc Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympus
* github-bantu/ticket/11951:
  [ticket/11951] Add MariaDB to platforms we test on.
  [ticket/11951] Add MariaDB to supported DBMSes in requirement section.
2013-10-20 16:03:23 -07:00
Andreas Fischer
7df35a288a [ticket/11951] Add MariaDB to platforms we test on.
PHPBB3-11951
2013-10-19 23:08:04 +02:00
Andreas Fischer
6de519431d [ticket/11951] Add MariaDB to supported DBMSes in requirement section.
PHPBB3-11951
2013-10-19 23:05:27 +02:00
Nils Adermann
16ab35c1b5 Merge pull request #1782 from bantu/ticket/11920
[ticket/11920] Actually call travis/setup-mariadb.sh.
2013-10-15 16:34:32 -07:00
Andreas Fischer
5a481bb176 [ticket/11920] Print MariaDB version after successful setup.
PHPBB3-11920
2013-10-16 00:25:07 +02:00
Andreas Fischer
0f64f0edc4 [ticket/11920] Manually purge mysql-common.
PHPBB3-11920
2013-10-16 00:24:44 +02:00
Andreas Fischer
878cb836f5 [ticket/11920] Actually call travis/setup-mariadb.sh.
PHPBB3-11920
2013-10-15 22:44:49 +02:00