makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 17:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
31338 commits 18 branches 192 tags 207 MiB
Commit graph

10917 commits

Author SHA1 Message Date
Yuriy Rusko
1d61bcedfd Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 
Conflicts:
	phpBB/docs/hook_system.html
 2014-05-27 21:55:40 +02:00
Yuriy Rusko
27f787e5e4 [ticket/12594] Update footer credit lines 
PHPBB3-12594
 2014-05-27 21:39:30 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers 
PHPBB3-12594
 2014-05-27 20:51:13 +02:00
Tristan Darricau
ac1eb2d789 [ticket/10899] Get $phpbb_log from the container 
PHPBB3-10899
 2014-05-27 19:57:25 +02:00
Andreas Fischer
e74628ee8d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12527] Fix "board’s language" vs "boards language"
  [ticket/12527] Use a proper language string on confirm screen
  [ticket/12527] Remove unnecessary language strings
  [ticket/12527] Check whether the language exists
  [ticket/12527] Restore missing files and variables check
  [ticket/12527] Remove editor from template
  [ticket/12527] Remove language file editor form ACP
 2014-05-27 17:34:50 +02:00
Andreas Fischer
edf81cd534 Merge pull request #2440 from nickvergessen/ticket/12527 
[ticket/12527] Remove translation editor from ACP

* nickvergessen/ticket/12527:
  [ticket/12527] Fix "board’s language" vs "boards language"
  [ticket/12527] Use a proper language string on confirm screen
  [ticket/12527] Remove unnecessary language strings
  [ticket/12527] Check whether the language exists
  [ticket/12527] Restore missing files and variables check
  [ticket/12527] Remove editor from template
  [ticket/12527] Remove language file editor form ACP
 2014-05-27 17:34:50 +02:00
Tristan Darricau
c517cd6778 [ticket/8610] Throw an error when the dest topic isn't set 
PHPBB3-8610
 2014-05-27 01:38:43 +02:00
Tristan Darricau
d20d86bf10 [ticket/8610] Fix bookmarks when merging all the posts of a topic 
PHPBB3-8610
 2014-05-27 01:35:52 +02:00
Tristan Darricau
9a846e447b [ticket/12509] Add missing ',' in arrays 
PHPBB3-12509
 2014-05-26 23:44:30 +02:00
Joas Schilling
5e3ce27e13 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12074] Update the visibility of the constructor
  [ticket/12074] Don't log errors
  [ticket/12074] Managing extensions doesn't produce any log entry
 2014-05-26 19:00:40 +02:00
Joas Schilling
a6782801e7 Merge pull request #2429 from Nicofuma/ticket/12074 
[ticket/12074] Managing extensions doesn't produce any log entry

* Nicofuma/ticket/12074:
  [ticket/12074] Update the visibility of the constructor
  [ticket/12074] Don't log errors
  [ticket/12074] Managing extensions doesn't produce any log entry
 2014-05-26 18:55:19 +02:00
Joas Schilling
e2cb2ec66b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12583] Redirect only on non-empty $message
  [ticket/12583] Add event core.mcp_warn_post_before/after
 2014-05-26 18:39:51 +02:00
Joas Schilling
26674bff39 Merge pull request #2487 from n-aleha/ticket/12583 
[ticket/12583] Add event core.mcp_warn_post_before/after

* n-aleha/ticket/12583:
  [ticket/12583] Redirect only on non-empty $message
  [ticket/12583] Add event core.mcp_warn_post_before/after
 2014-05-26 18:39:44 +02:00
Joas Schilling
d29ca3d4f3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12584] Redirect only on non-empty $message
  [ticket/12584] Add event core.mcp_warn_user_before/after
 2014-05-26 18:36:59 +02:00
Joas Schilling
85fb2bf203 Merge pull request #2488 from n-aleha/ticket/12584 
[ticket/12584] Add event core.mcp_warn_user_before/after

* n-aleha/ticket/12584:
  [ticket/12584] Redirect only on non-empty $message
  [ticket/12584] Add event core.mcp_warn_user_before/after
 2014-05-26 18:36:53 +02:00
Joas Schilling
0a01b6a4cb Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
 2014-05-26 18:18:37 +02:00
Joas Schilling
172b7cfe35 Merge pull request #2134 from marcosbc/ticket/12270 
[ticket/12270] Current post and topic approval notification message

* marcosbc/ticket/12270:
  [ticket/12270] Fixed topic counting bug and tests
  [ticket/12270] Fixed tests not working
  [ticket/12270] No quote notif and double poster notification fix
  [ticket/12270] Fixed tests
  [ticket/12270] Fixed rebase conflicts
  [ticket/12270] Correct confirm approval message for topics
  [ticket/12270] Correcting to follow phpBB coding standards
  [ticket/12270] Better structured code and no debug error message
  [ticket/12270] Correct notifications for posts/topics now working
  [ticket/12270] Reverted templates
  [ticket/12270] Correct post&topic approval msg, no template changes
  [ticket/12270] Corrent post and topic approval notification message
 2014-05-26 18:09:54 +02:00
n-aleha
62cb7e0c10 [ticket/12584] Redirect only on non-empty $message 
PHPBB3-12584
 2014-05-25 22:40:20 +03:00
n-aleha
fdb53b23fb [ticket/12584] Add event core.mcp_warn_user_before/after 
Event for when warning a user from MCP.

PHPBB3-12584
 2014-05-25 22:40:15 +03:00
n-aleha
589ad564cc [ticket/12583] Redirect only on non-empty $message 
PHPBB3-12583
 2014-05-25 22:00:37 +03:00
Skouat
a0a5c852d5 [ticket/12492] Add support of special chars 
Add support of special chars during db test in the installation

PHPBB3-12492
 2014-05-24 14:33:02 +02:00
Joas Schilling
4ef9334dba Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12275] Change if (empty) to if (!isset)
  [ticket/12275] Fix a bug on the event "core.modify_username_string"
 2014-05-24 14:20:51 +02:00
Joas Schilling
c7f51ca1a7 Merge pull request #2199 from Zoddo/ticket/12275 
[ticket/12275] Fix a bug on the event "core.modify_username_string"

* Zoddo/ticket/12275:
  [ticket/12275] Change if (empty) to if (!isset)
  [ticket/12275] Fix a bug on the event "core.modify_username_string"
 2014-05-24 14:18:43 +02:00
marcosbc
36dfb95816 [ticket/12270] Fixed topic counting bug and tests 
Topics was not correctly counted (the counter didn't count topics
that were re-approved, for example, but only the ones that were
unapproved.
This should also fix the test that wasn't working correctly.

PHPBB3-12270
 2014-05-24 14:06:23 +02:00
Andreas Fischer
219d8a41dc Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12585] Use a 5 minutes interval instead of 10 minutes
  [ticket/12585] Don't check the cron on each page load
 2014-05-24 11:55:34 +02:00
Andreas Fischer
42bc2612c4 Merge pull request #2490 from Nicofuma/ticket/12585 
[ticket/12585] Don't check the cron on each page load

* Nicofuma/ticket/12585:
  [ticket/12585] Use a 5 minutes interval instead of 10 minutes
  [ticket/12585] Don't check the cron on each page load
 2014-05-24 11:55:32 +02:00
Tristan Darricau
0ae4b82c30 [ticket/12585] Use a 5 minutes interval instead of 10 minutes 
PHPBB3-12585
 2014-05-23 23:02:31 +02:00
n-aleha
7a6867d54e [ticket/12583] Add event core.mcp_warn_post_before/after 
Event for when warning a user for a post.

PHPBB3-12583
 2014-05-23 16:30:41 +03:00
Andreas Fischer
fefaf2f68e Merge pull request #2478 from VSEphpbb/ticket/12564 
[ticket/12564] Remove version definition from ACP/MCP/UCP module info files

* VSEphpbb/ticket/12564:
  [ticket/12564] Remove version definitions from modules in tests
  [ticket/12564] Remove version definition from ACP/MCP/UCP module info files
 2014-05-23 01:14:24 +02:00
Tristan Darricau
c83b568848 [ticket/12585] Don't check the cron on each page load 
PHPBB3-12585
 2014-05-22 22:34:03 +02:00
Tristan Darricau
ff280d3f46 [ticket/12576] Remove cron from common.php 
PHPBB3-12576
 2014-05-22 12:45:03 +02:00
marcosbc
c47c50a29e [ticket/12270] Fixed tests not working 
The success message wasn't output correctly if we were approving
topics.

PHPBB3-12270
 2014-05-21 00:52:42 +02:00
Matt Friedman
6aeb22bfd7 [ticket/12564] Remove version definition from ACP/MCP/UCP module info files 
PHPBB3-12564
 2014-05-18 17:43:26 -07:00
Cesar G
8b5b318f0a Merge remote-tracking branch 'n-aleha/ticket/12547' into develop-ascraeus 
* n-aleha/ticket/12547:
  [ticket/12547] Rename jquery.js to jquery.min.js in assets directory
 2014-05-16 22:04:52 -07:00
Joas Schilling
34c1691d7e [ticket/12433] Use a different message when nesting of quotes is not allowed 
PHPBB3-12433
 2014-05-15 14:03:27 +02:00
Tristan Darricau
d53336af06 [ticket/11224] Remove new line in acm_memory.php 
PHPBB3-11224
 2014-05-15 12:36:22 +02:00
Tristan Darricau
7c99e30920 [ticket/11224] Fix coding style 
PHPBB3-11224
 2014-05-15 01:17:02 +02:00
n-aleha
cc99a6b6ab [ticket/12547] Rename jquery.js to jquery.min.js in assets directory 
phpBB uses the minified version of jQuery hence the rename.

PHPBB3-12547
 2014-05-15 01:18:26 +03:00
Tristan Darricau
9dd71fa32e [ticket/11224] Fix the blank line after ?> 
PHPBB3-11224
 2014-05-14 20:23:27 +02:00
Tristan Darricau
0c4b53e2f1 [ticket/11224] Fix returned data 
PHPBB3-11224
 2014-05-14 20:22:36 +02:00
Tristan Darricau
0c109c9d37 [ticket/11224] SQL cache destroy does not destroy queries to tables joined 
https://tracker.phpbb.com/browse/PHPBB3-11224

PHPBB3-11224
 2014-05-14 20:00:04 +02:00
Tristan Darricau
9d7c36041e [ticket/12509] Update calls to set_custom_style in forgotten places 
PHPBB3-12509
 2014-05-14 02:16:32 +02:00
Tristan Darricau
1e427fa031 [ticket/12509] Fix the call to set_custom_file in adm/index and messenger 
PHPBB3-12509
 2014-05-13 23:39:42 +02:00
Tristan Darricau
300d5c32db [ticket/12509] Add an option to set the path of custom file for extensions 
https://tracker.phpbb.com/browse/PHPBB3-12509

PHPBB3-12509
 2014-05-13 23:22:54 +02:00
Tristan Darricau
237619792d [ticket/11942] Always display delete reason 
PHPBB3-11942
 2014-05-11 19:28:26 +02:00
Joas Schilling
192bb74e3c [ticket/12527] Use a proper language string on confirm screen 
PHPBB3-12527
 2014-05-11 13:30:13 +02:00
Joas Schilling
ada9fc81a3 [ticket/12527] Check whether the language exists 
PHPBB3-12527
 2014-05-11 13:29:56 +02:00
Joas Schilling
63e195d7f0 [ticket/12527] Restore missing files and variables check 
PHPBB3-12527
 2014-05-11 13:29:49 +02:00
Joas Schilling
61bca8ed8a [ticket/12527] Remove language file editor form ACP 
PHPBB3-12527
 2014-05-11 13:29:17 +02:00
Cesar G
a7d1fd44ee [ticket/12526] Fix undefined index: filesize when editing PM with attachments. 
PHPBB3-12526
 2014-05-11 02:36:48 -07:00