mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 15:17:16 +01:00
Code Issues Releases Wiki Activity
11,984 Commits 17 Branches 190 Tags
Commit Graph

11984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
e123b0c0a0 [ticket/12176] Reword comment about config entries. 
PHPBB3-12176
 2014-03-13 00:53:07 +01:00
Andreas Fischer
d3ddf29e59 Merge pull request #6 from nickvergessen/ticket/bantu/12176 
[ticket/12176] Add newest_user_colour to config array to ensure it exists

* nickvergessen/ticket/bantu/12176:
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
 2014-03-13 00:17:59 +01:00
Joas Schilling
ca92ed918a [ticket/12176] Add newest_user_colour to config array to ensure it exists 
PHPBB3-12176
 2014-03-12 20:08:55 +01:00
Andreas Fischer
8960e6d777 [ticket/12176] Display correct message when trying to delete founder. 
PHPBB3-12176
 2014-02-15 02:27:54 +01:00
Andreas Fischer
587241f3a9 [ticket/12176] Add functional test for founder deletion message. 
PHPBB3-12176
 2014-02-15 02:27:54 +01:00
Nils Adermann
f245198652 Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into develop-olympus 
* github-nickvergessen/ticket/12188:
  [ticket/12188] Add php 5.6 to travis enviroments
 2014-02-13 15:42:50 +01:00
Joas Schilling
9d1d90e336 [ticket/12188] Add php 5.6 to travis enviroments 
PHPBB3-12188
 2014-02-13 14:47:51 +01:00
Nils Adermann
c955d01456 Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into develop-olympus 
* github-nickvergessen/ticket/12162:
  [ticket/12162] Set language to C before running diff to ensure its english
 2014-02-04 13:03:02 +01:00
Joas Schilling
aae4d4c90d [ticket/12162] Set language to C before running diff to ensure its english 
PHPBB3-12162
 2014-02-04 12:32:25 +01:00
Nils Adermann
39b9274a94 Merge pull request #2001 from bantu/ticket/12161 
[ticket/12161] Do not use subdirectories in build/save directory.
 2014-02-04 02:59:52 -08:00
Nils Adermann
2dc2476070 Merge pull request #1999 from bantu/ticket/11509 
[ticket/11509] Further improvements/fixes for the Travis CI commit message checker
 2014-02-04 02:59:11 -08:00
Andreas Fischer
33593a508c [ticket/11509] Be exact when referencing the branch name. 
PHPBB3-11509
 2014-02-04 02:18:46 +01:00
Andreas Fischer
78116a5298 [ticket/12161] Do not use subdirectories in build/save directory. 
This is pretty much pointless because a new build will wipe the save directory
and there are only a few files in there anyway.

PHPBB3-12161
 2014-02-04 02:07:45 +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