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
43ccfbc6f4
[ticket/12093] Check that document.selection is supported.
...
PHPBB3-12093
2014-01-25 15:37:33 -08: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
Dhruv
1aa27f400c
[ticket/11271] Make path conversion more precise
...
PHPBB3-11271
2013-12-27 03:31:28 +05:30
Dhruv
a71625ca76
[ticket/11271] Add docblock of feed_generate_content( )
...
PHPBB3-11271
2013-12-27 00:38:42 +05:30
Dhruv
f7c764986f
[ticket/11271] Fix tabs and use !empty( ) instead of count( )
...
PHPBB3-11271
2013-12-27 00:22:29 +05:30
Dhruv
6611329d83
[ticket/11271] Remove unnecessary inclusion of functions_display
...
PHPBB3-11271
2013-12-27 00:22:28 +05:30
Dhruv
3bae72d164
[ticket/11271] Typecast forum and topic id to integer
...
PHPBB3-11271
2013-12-27 00:22:27 +05:30
Dhruv
dc37f3a0e3
[ticket/11271] Use absolute path for displaying inline attachments in feeds
...
PHPBB3-11271
2013-12-27 00:22:26 +05:30
erangamapa
62263c13d4
[ticket/11271] Changed executable bit.
...
Changed executable bit value from 755 to 644.
PHPBB3-11271
2013-12-27 00:22:25 +05:30
erangamapa
08d69de933
[ticket/11271] Formatting code and removing null assignment.
...
Formatted code and replaced null assignment with empty array
assignment to attachments parameter in method 'feed_generate_content'.
PHPBB3-11271
2013-12-27 00:22:24 +05:30
erangamapa
cca4067694
[ticket/11271] Removing unnecessary database object
...
Removed unnecessary global database object from 'feed_generate_content'
Method.
PHPBB3-11271
2013-12-27 00:22:22 +05:30
erangamapa
8586171187
[ticket/11271] Separated attachment fetching query
...
Removed external query used to fetch related attachments.
Added attachments fetching method with database query to
post based feed.
PHPBB3-11271
2013-12-27 00:22:21 +05:30
erangamapa
91a14a9e63
[ticket/11271] Fetched feed attachments before loop.
...
Fetched feed attachments before looping through feed items and
send them to method 'feed_generate_content' for each feed item.
PHPBB3-11271
2013-12-27 00:22:20 +05:30
erangamapa
a41e2ca380
[ticket/11271] Removed in-line attachment comments properly.
...
Added a new regex to remove in-line attachment comments.
PHPBB3-11271
2013-12-27 00:22:19 +05:30
erangamapa
5bf4726195
[ticket/11271] Displaying in-line attached images in ATOM feed.
...
In-line attached images are not displaying as they are not parsing.
Included 'parse_attachments' column name for data fetching queries
in feed.php. Checked weather feeds have in-line attachments and
parsed them by using parse_attachments() method.
PHPBB3-11271
2013-12-27 00:22:18 +05:30
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