mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 09:35:24 +02:00
Code Issues Releases Wiki Activity
12,027 Commits 18 Branches 192 Tags
4333401a27
Commit Graph

12027 Commits

Author SHA1 Message Date
Marcos Bjorkelund
4333401a27 [ticket/12247] Makes static usernames work 
Relative to the last ticket, this allows static usernames to
work correctly (those inserted in the post-column post_username)
when sending the e-mail, instead of showing just "Anonymous".

PHPBB3-12247
 2014-03-14 00:49:20 +01:00
Marcos Bjorkelund
b322cb4c11 [ticket/12247] Add ['username'] to mcp_queue.php's user_notification() 
It includes the poster's username in the email notifications of
posts that get approved by moderators.

This is done by adding the username to every user_notification()
function located in /phpBB/includes/mcp/mcp_queue.php.

PHPBB3-12247
 2014-03-13 23:54:06 +01:00
Joas Schilling
03eb23cbae Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympus 
* bantu/ticket/12176:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.
 2014-03-13 10:16:41 +01:00
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 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
d81a604ef8 Merge remote-tracking branch 'Crizz0/ticket/10549' into develop-olympus 
* Crizz0/ticket/10549:
  [ticket/10549] using correct variable in includes/functions_module.php too
  [ticket/10549] changed "right" to "incorrect"
 2014-03-12 16:25:01 +01:00
Crizzo
d95d062a42 [ticket/10549] using correct variable in includes/functions_module.php too 
PHPBB3-10549
 2014-03-11 18:45:46 +01:00
Crizzo
239f72ddda [ticket/10549] changed "right" to "incorrect" 
PHPBB3-10549
 2014-03-11 18:24:35 +01:00
Joas Schilling
e65a6dd8f4 Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus 
* dhruvgoel92/ticket/11271:
  [ticket/11271] Make path conversion more precise
  [ticket/11271] Add docblock of feed_generate_content( )
  [ticket/11271] Fix tabs and use !empty( ) instead of count( )
  [ticket/11271] Remove unnecessary inclusion of functions_display
  [ticket/11271] Typecast forum and topic id to integer
  [ticket/11271] Use absolute path for displaying inline attachments in feeds
  [ticket/11271] Changed executable bit.
  [ticket/11271] Formatting code and removing null assignment.
  [ticket/11271] Removing unnecessary database object
  [ticket/11271] Separated attachment fetching query
  [ticket/11271] Fetched feed attachments before loop.
  [ticket/11271] Removed in-line attachment comments properly.
  [ticket/11271] Displaying in-line attached images in ATOM feed.
 2014-03-11 09:53:18 +01:00
Joas Schilling
214f515e9c Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympus 
* dhruvgoel92/ticket/11288:
  [ticket/11288] Handle +,- without preceeding whitespace characters
 2014-03-11 09:46:31 +01:00
Joas Schilling
a35901c29b Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into develop-olympus 
* EXreaction/ticket/12259-olympus:
  [ticket/12259] Reduce the size of our test matrix
 2014-03-11 09:13:37 +01:00
Nathan Guse
9aa947f7fb Merge pull request from Crizz0/ticket/12106 
[ticket/12106] Adds a explaination that admin/mods still able to use the...
 2014-03-10 21:49:29 -05:00
Nathan Guse
ea63e1412b Merge pull request from Crizz0/ticket/10549 
[ticket/10549] Adds language variables to Error messages MODULE...
 2014-03-10 21:40:44 -05:00
Nathan Guse
a4810405d2 [ticket/12259] Reduce the size of our test matrix 
Only test MariaDB or PostgreSQL once on PHP 5.4. This reduces our build matrix
by 10 builds (over half).

PHPBB3-12259
 2014-03-10 21:34:55 -05:00
Crizzo
957e9aabc3 [ticket/12106] Combined first and second sentence 
PHPBB3-12106
 2014-03-10 21:19:25 +01:00
Crizzo
13327a13a0 [ticket/12106] Adds a explaination that admin/mods still able to use the board 
PHPBB3-12106
 2014-03-10 18:50:39 +01:00
Crizzo
ec4c9833ca [ticket/10549] Adds language variables 
PHPBB3-10549
 2014-03-10 18:35:23 +01:00
Nathan Guse
00f8fe24d2 Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945' into develop-olympus 
* remotes/dhruvgoel92/ticket/10945:
  [ticket/10945] Fix return values for split_keywords function
  [ticket/10945] Display search query when search fails in native search
  [ticket/10945] remove trigger_error call
 2014-03-09 11:15:10 -05:00
Dhruv
c51dcbe6a0 [ticket/10945] Fix return values for split_keywords function 
The function now returns false if all the words are common words and true
otherwise.

PHPBB3-10945
 2014-03-08 21:23:08 +05:30
Dhruv
b6eec5c142 [ticket/10945] Display search query when search fails in native search 
If search fails and common words are present, split_keywords returns false
and search.php file prints appropriate message of common words.
If search fails and there are no common words, split_keywords returns true
and keyword_search returns false so that the search query is displayed in
search box.

PHPBB3-10945
 2014-03-08 21:20:37 +05:30
Dhruv Goel
f4645a6376 [ticket/10945] remove trigger_error call 
removes trigger_error call incase no search results are found or start
variable exceeds the amount. So that search query is displayed in the
search box even if no results are returned.

PHPBB3-10945
 2014-03-08 21:15:51 +05:30
Joas Schilling
9f4908f0f2 Merge remote-tracking branch 'bantu/ticket/11509' into develop-olympus 
* bantu/ticket/11509:
  [ticket/11509] Exit with the expected (non-zero) exit status on failure.
  [ticket/11509] Output which commit is being inspected.
  [ticket/11509] Three dots means sym. difference, but we only want new commits.
 2014-03-01 19:13:58 +01:00
Nils Adermann
05d921fbbc Merge pull request from nickvergessen/ticket/12205 
[ticket/12205] Do not display 0 for empty integers when show_novalue is off
 2014-02-25 19:48:54 +01:00
Joas Schilling
ffbc7ccb64 [ticket/12205] Do not display 0 for empty integers when show_novalue is off 
PHPBB3-12205
 2014-02-25 18:24:45 +01:00
Andreas Fischer
42e8c2e8cf [ticket/11509] Exit with the expected (non-zero) exit status on failure. 
PHPBB3-11509
 2014-02-21 01:48:55 +01:00
Andreas Fischer
fe5858902e [ticket/11509] Output which commit is being inspected. 
PHPBB3-11509
 2014-02-21 01:47:45 +01:00
Andreas Fischer
ccd30912d9 [ticket/11509] Three dots means sym. difference, but we only want new commits. 
PHPBB3-11509
 2014-02-21 01:47:37 +01:00
Nathan Guse
823dca737f Merge remote-tracking branch 'remotes/prototech/ticket/12093' into develop-olympus 
* remotes/prototech/ticket/12093:
  [ticket/12093] Check that document.selection is supported.
 2014-02-19 09:06:57 -06:00
Nils Adermann
14017b7032 Merge remote-tracking branch 'github-exreaction/ticket/12210' into develop-olympus 
* github-exreaction/ticket/12210:
  [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
 2014-02-18 19:33:36 +01:00
Nathaniel Guse
602f4a2b54 [ticket/12210] dbtools::sql_create_table incorrectly throws error 
related to auto-increment length on non auto-increment fields

PHPBB3-12210
 2014-02-17 23:46:39 -06: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 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 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