makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 02:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
23481 commits 18 branches 192 tags 207 MiB
Commit graph

23481 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tristan Darricau
0a2e0ee964 [ticket/12600] Add @log to the dependencies of extension:show 
PHPBB3-12600
 2014-05-27 15:35:10 +02:00
Andreas Fischer
311dda277c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12592] Make hhvm run MySQL again.
 2014-05-27 13:43:41 +02:00
Andreas Fischer
b3ba11024b Merge pull request #2497 from bantu/ticket/12592 
[ticket/12592] Make hhvm run MySQL again.

* bantu/ticket/12592:
  [ticket/12592] Make hhvm run MySQL again.
 2014-05-27 13:43:41 +02:00
Andreas Fischer
af05015a69 [ticket/12582] Add script for strippping ICC profiles from images. 
PHPBB3-12582
 2014-05-27 13:13:29 +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
PayBas
9f37d414be [ticket/12561] Reworked tests by nickvergessen 
PHPBB3-12561
 2014-05-27 00:41:11 +02:00
Tristan Darricau
05cd25a88b [ticket/12509] Add example in doc block 
PHPBB3-12509
 2014-05-27 00:05:12 +02:00
Tristan Darricau
1ba516a052 [ticket/11942] Don't show the checkbox if the post is already soft-deleted 
PHPBB3-11942
 2014-05-26 23:59:27 +02:00
Tristan Darricau
8a227b981a [ticket/12536] Restore missing @throws 
PHPBB3-12536
 2014-05-26 23:52:09 +02:00
Tristan Darricau
9a846e447b [ticket/12509] Add missing ',' in arrays 
PHPBB3-12509
 2014-05-26 23:44:30 +02:00
Tristan Darricau
2ff3efc4a1 [ticket/12325] Update coding style in template 
PHPBB3-12325
 2014-05-26 23:38:30 +02:00
Tristan Darricau
814d10fe5e [ticket/11942] Remove useless IF in templates 
PHPBB3-11942
 2014-05-26 23:35:47 +02:00
Andreas Fischer
ef96f8aa2c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12570] Keep MySQLi procedural
  [ticket/12570] Remove test for affected rows after SELECT
  [ticket/12570] Add a test for set_array() and updating with the same value
  [ticket/12570] Fix MySQL affectedrows
  [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS
  [ticket/12570] Add a unit test to show broken sql_affectedrows()
  [ticket/12570] Add test for updating a config with the same value
 2014-05-26 23:09:51 +02:00
Andreas Fischer
d646354b0e Merge pull request #2492 from nickvergessen/ticket/12570 
[ticket/12570] Fix updating a config with the same value

* nickvergessen/ticket/12570:
  [ticket/12570] Keep MySQLi procedural
  [ticket/12570] Remove test for affected rows after SELECT
  [ticket/12570] Add a test for set_array() and updating with the same value
  [ticket/12570] Fix MySQL affectedrows
  [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS
  [ticket/12570] Add a unit test to show broken sql_affectedrows()
  [ticket/12570] Add test for updating a config with the same value
 2014-05-26 23:09:51 +02:00
Andreas Fischer
ea17a7cc5b [ticket/12592] Make hhvm run MySQL again. 
PHPBB3-12592
 2014-05-26 21:55:44 +02:00
Joas Schilling
fcdf1101cb [ticket/12570] Keep MySQLi procedural 
PHPBB3-12570
 2014-05-26 21:43:40 +02:00
Joas Schilling
275e56ce70 [ticket/12570] Remove test for affected rows after SELECT 
It's not supposed to work

PHPBB3-12570
 2014-05-26 21:43:40 +02:00
Joas Schilling
adc62684f0 [ticket/12570] Add a test for set_array() and updating with the same value 
PHPBB3-12570
 2014-05-26 21:43:39 +02:00
Joas Schilling
d87dba3b05 [ticket/12570] Fix MySQL affectedrows 
We always want the number of matched rows instead of changed rows,
when running an update. So when mysql_info() returns the number of
matched rows we return that one instead of mysql_affected_rows()

PHPBB3-12570
 2014-05-26 21:43:38 +02:00
Joas Schilling
b92eac71e4 [ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS 
PHPBB3-12570
 2014-05-26 21:43:38 +02:00
Joas Schilling
15516bd078 [ticket/12570] Add a unit test to show broken sql_affectedrows() 
PHPBB3-12570
 2014-05-26 21:43:37 +02:00
Joas Schilling
ce5258d801 [ticket/12570] Add test for updating a config with the same value 
PHPBB3-12570
 2014-05-26 21:43:36 +02:00
Joas Schilling
cfa9d23988 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12592] Add PHP 5.4 environment using mysql driver.
  [ticket/12592] Rename mysql environment to mysqli.
 2014-05-26 21:38:07 +02:00
Joas Schilling
502cbad5a7 Merge pull request #2496 from bantu/ticket/12592 
[ticket/12592] Run mysql driver on Travis CI.

* bantu/ticket/12592:
  [ticket/12592] Add PHP 5.4 environment using mysql driver.
  [ticket/12592] Rename mysql environment to mysqli.
 2014-05-26 21:36:17 +02:00
PayBas
3cabe5fd79 [ticket/12561] Added tests for "after last", "after missing" and "empty" 
Also removed tabs

PHPBB3-12561
 2014-05-26 20:47:19 +02:00
PayBas
c51b926631 [ticket/12561] Add check to see if "after" column actually exists 
If not, just append to the end

PHPBB3-12561
 2014-05-26 19:28:37 +02:00
Andreas Fischer
d90da12afc [ticket/12592] Add PHP 5.4 environment using mysql driver. 
PHPBB3-12592
 2014-05-26 19:07:40 +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
Andreas Fischer
c0dc0fc09b [ticket/12592] Rename mysql environment to mysqli. 
PHPBB3-12592
 2014-05-26 18:49:29 +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
Tristan Darricau
91305a43af [ticket/12589] Add test searching in a non absolute directory 
PHPBB3-12589
 2014-05-26 18:30:04 +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
Tristan Darricau
930c5d85ed [ticket/12589] Fix tests 
PHPBB3-12589
 2014-05-24 18:58:52 +02:00
Tristan Darricau
f7896f46a5 [ticket/12589] Search directly in $directory if it's an absolute sub-path 
PHPBB3-12589
 2014-05-24 17:57:01 +02:00
PayBas
05839f8599 [ticket/12561] Added test for "after" 
PHPBB3-12561
 2014-05-24 14:37:08 +02: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
55aa5c8296 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
 2014-05-24 14:30:28 +02:00
Joas Schilling
1b73c217f0 Merge pull request #2458 from prototech/ticket/12543 
[ticket/12543] Only take over ENTER and ESC keys when alert box is active.

* prototech/ticket/12543:
  [ticket/12543] Only take over ENTER and ESC keys when alert box is active.
 2014-05-24 14:28:38 +02:00
Tristan Darricau
672ffbe8f6 [ticket/12325] Fix: add a missing colon 
PHPBB3-12325
 2014-05-24 14:25:04 +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