mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
19,823 Commits 17 Branches 190 Tags
Commit Graph

19823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Forumhulp.com
6db1a2bfad [ticket/12241] Event to add and/or modify acp_board configurations 
PHPBB3-12241
 2014-03-14 09:38:11 +01:00
Nathan Guse
6152d6c41e Merge pull request #2065 from prototech/ticket/12232 
[ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() method.
 2014-03-01 15:20:21 -06:00
Joas Schilling
08ed4d2c67 Merge remote-tracking branch 'rxu3/ticket/12222' into develop 
* rxu3/ticket/12222:
  [ticket/12222] Replace hardoded comma with translatable separator
 2014-03-01 21:42:23 +01:00
Joas Schilling
79c36c885a Merge remote-tracking branch 'prototech/ticket/12238' into develop 
* prototech/ticket/12238:
  [ticket/12238] Remove defunct confirmation box template code.
 2014-03-01 19:27:58 +01:00
Joas Schilling
d636cb0fc9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [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.

Conflicts:
	.travis.yml
 2014-03-01 19:16:58 +01:00
Cesar G
6d1b0d41f1 [ticket/12238] Remove defunct confirmation box template code. 
Confirmation boxes are handled by confirm_body.html.

PHPBB3-12238
 2014-03-01 10:15:26 -08:00
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
Joas Schilling
e9ed9cd942 Merge branch 'develop-olympus' into develop 
* develop-olympus:
 2014-03-01 19:13:07 +01:00
Cesar G
99db2d9199 [ticket/12232] Fix a similar excessive pattern in the method. 
PHPBB3-12232
 2014-02-27 22:28:43 -08:00
Cesar G
5c3fc4840c [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() method 
The size of the template block array is calculated within a foreach loop
iterating through the array, which is unnecessary. It only needs to be done
once. In a block of 1000 rows, this results in
500,500 calls to sizeof() in this location. With this change, that's reduced to
1000.

PHPBB3-12232
 2014-02-27 19:29:02 -08:00
Nils Adermann
620f2840d7 Merge pull request #2062 from nickvergessen/ticket/12194 
[ticket/12194] Ensure that field_show_novalue is present
 2014-02-27 15:07:51 +01:00
Joas Schilling
de0b7ddce9 [ticket/12194] Ensure that field_show_novalue is present 
The field was not created on boards that were 3.1-dev before 3.0.11 was relesed

PHPBB3-12194
 2014-02-27 10:00:36 +01:00
Nils Adermann
f99cce0f44 Merge pull request #2060 from nickvergessen/ticket/12205-develop 
[ticket/12205-Develop] Do not display 0 for empty integers when show_novalue is off
 2014-02-26 11:49:32 +01:00
Nils Adermann
05d921fbbc Merge pull request #2059 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
ae98810ddc Merge remote-tracking branch 'nickvergessen/ticket/12205' into ticket/12205-develop 
* nickvergessen/ticket/12205:
  [ticket/12205] Do not display 0 for empty integers when show_novalue is off

Conflicts:
	phpBB/includes/functions_profile_fields.php
 2014-02-25 18:35:03 +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
rxu
aa8f43b356 [ticket/12222] Replace hardoded comma with translatable separator 
Replace hardoded comma with translatable separator
in forumlist_body.html.

PHPBB3-12222
 2014-02-23 21:04:35 +08:00
Andreas Fischer
4b7932e8b3 Merge pull request #2053 from prototech/ticket/12220 
[ticket/12220] Fix division by zero in search page with no results.

* prototech/ticket/12220:
  [ticket/12220] Fix division by zero in search page with no results.
 2014-02-21 22:12:51 +01:00
Cesar G
888a059994 [ticket/12220] Fix division by zero in search page with no results. 
The page url parameter no longer exists in the pagination.on_page() method,
therefore the page url passed is being divided by 0 - the total number of
items. Since PAGE_NUMBER is assigned in generate_template_pagination(), this
separate assignment is no longer needed.

PHPBB3-12220
 2014-02-21 12:36:26 -08:00
Nathan Guse
c0c19fbb29 Merge pull request #2035 from prototech/ticket/12138 
[ticket/12138] Include file time limit when generating attachment management pagination and stats.
 2014-02-20 21:13:06 -06:00
Nathan Guse
736d11225c Merge pull request #1939 from prototech/ticket/12078 
[ticket/12078] Check for f_delete when a user attempts to permanently delete a post.
 2014-02-20 21:04:52 -06:00
Nathan Guse
4f6b9080e8 Merge pull request #2037 from prototech/ticket/12080 
[ticket/12080] Fix color palettes when responsive.
 2014-02-20 20:59:14 -06:00
Nathan Guse
2df2032b48 Merge pull request #2025 from marc1706/ticket/12183 
[ticket/12183] Update user_newpasswd column in users table for passwords manager
 2014-02-20 20:54:30 -06:00
Nathan Guse
b8d30bfc80 Merge pull request #2021 from nickvergessen/ticket/12171 
Ticket/12171 Attachments from soft-deleted posts are still downloadable
 2014-02-20 20:51:58 -06: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
92cf69abec Merge branch 'ticket/12139' into develop 
* ticket/12139:
  [ticket/12139] Spaces $ show_guests viewonline.php
 2014-02-20 17:03:42 -06:00
karan
20625e896b [ticket/12139] Spaces $ show_guests viewonline.php 
PHPBB3-12139
 2014-02-20 17:02:50 -06:00
Nathan Guse
cadf0dd3fd Merge pull request #2050 from rxu/ticket/12217 
[ticket/12217] Add more template events to viewtopic_body.html
 2014-02-20 10:32:45 -06:00
rxu
6d9afcd077 [ticket/12217] Add more template events to viewtopic_body.html 
Add viewtopic template events before/after the posts,
after the sorting options to allow adding contents to
respective places (like advertisement and so on).

PHPBB3-12217
 2014-02-21 00:27:47 +08:00
Nathan Guse
2ffca79c0e Merge pull request #2044 from prototech/ticket/12212 
[ticket/12212] Encode the attachment file name before presenting to user.
 2014-02-20 10:18:22 -06:00
Nathan Guse
169b1cf6cb Merge pull request #2049 from prototech/ticket/12200 
[ticket/12200] Add missing profile field template files to adm/style/ directory.
 2014-02-20 10:15:15 -06:00
Cesar G
55b38e8003 [ticket/12200] Add missing profile field template files to adm/style/ directory 
PHPBB3-12200
 2014-02-19 22:08:36 -08:00
Nathan Guse
e56f562d47 Merge pull request #2047 from prototech/ticket/12153 
[ticket/12153] Replace old template variables with {PAGE_NUMBER}.
 2014-02-19 15:27:00 -06:00
Cesar G
f43dedb3fd [ticket/12153] Replace old template variables with {PAGE_NUMBER}. 
PHPBB3-12153
 2014-02-19 13:16:58 -08:00
Marc Alexander
92f1980377 [ticket/12183] Check if database columns were updated before changing them 
PHPBB3-12183
 2014-02-19 18:59:45 +01:00
Nathan Guse
60de5e66de Merge pull request #2030 from rxu/ticket/12190 
Add core event "core.modify_submit_post_data"
 2014-02-19 10:50:21 -06:00
rxu
01bf27f789 [ticket/12190] Add core event "core.modify_submit_post_data" 
Add core event - core.modify_submit_post_data
to submit_post() function. This allows extensions to modify the
whole post data before the post submitting, or even provide
its own post submit procedure.

PHPBB3-12190
 2014-02-20 00:47:26 +08:00
Nathan Guse
c30668b010 Merge pull request #2045 from rxu/ticket/12213 
[ticket/12213] Add MCP events for custom quick moderation options
 2014-02-19 10:42:17 -06:00
rxu
b7dea19bf3 [ticket/12213] Add MCP events for custom quick moderation options 
Add core events to mcp.php and mcp_main.php. This allows
extensions to add and to handle custom quick moderation options.

PHPBB3-12213
 2014-02-20 00:38:28 +08:00
Nathan Guse
bd8951cfbe Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12093] Check that document.selection is supported.

Conflicts:
	phpBB/adm/style/editor.js
	phpBB/assets/javascript/editor.js
	phpBB/styles/prosilver/template/editor.js
 2014-02-19 09:23:02 -06: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
Nathan Guse
eaf9a41ed8 Merge pull request #1994 from prototech/ticket/12158 
[ticket/12158] The pagination start value should be 0 when there are no items.
 2014-02-18 14:25:46 -06:00
Nathan Guse
7015fc8a00 Merge pull request #2002 from prototech/ticket/12153 
[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
 2014-02-18 14:11:48 -06:00
Cesar G
c7efadc26d [ticket/12153] Remove duplicate assignment of $u_previous_page & $u_next_page. 
PHPBB3-12153
 2014-02-18 12:04:31 -08:00
Nathan Guse
74d2d6c66a Merge pull request #2027 from lucifer4o/ticket/12177 
[ticket/12177] Add ucp_friend_list_before/after
 2014-02-18 12:36:55 -06:00
Nils Adermann
7a21d99b9b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12210] dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
 2014-02-18 19:34:08 +01: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
Nathan Guse
061d9fba5a Merge pull request #2038 from prototech/ticket/12206 
[ticket/12206] Fix mismatched Plupload language vars preventing localization.
 2014-02-18 12:29:17 -06:00