Commit graph

21230 commits

Author SHA1 Message Date
Joas Schilling
0b6accf1ac Merge pull request #2359 from Nicofuma/ticket/12097
[ticket/12097] Validate_data() should work with class method

* Nicofuma/ticket/12097:
  [ticket/12097] Bug fix and adding unit test
  [ticket/12097] Validate_data() should work with class method
2014-04-27 20:43:03 +02:00
Nicofuma
ea15b879f1 [ticket/12432] Correcting the assertion
PHPBB3-12432
2014-04-26 18:54:47 +02:00
Nicofuma
7b8a8a2a5d [ticket/12444] Replacing spaces with tabs
PHPBB3-12444
2014-04-26 18:52:26 +02:00
Joas Schilling
0b32860e90 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12406] Fix variable description of core.viewtopic_modify_page_title
2014-04-26 18:18:33 +02:00
Joas Schilling
42e29daa1f Merge pull request #2325 from n-aleha/ticket/12406
[ticket/12406] Fix variable description of core.viewtopic_modify_page_ti...

* n-aleha/ticket/12406:
  [ticket/12406] Fix variable description of core.viewtopic_modify_page_title
2014-04-26 18:18:18 +02:00
Joas Schilling
927c219b1f [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
PHPBB3-12273
2014-04-26 18:04:47 +02:00
Joas Schilling
7a44f66448 [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
PHPBB3-12273
2014-04-26 16:59:18 +02:00
Joas Schilling
6aa8596d4d [ticket/12273] Fix doc blocks
PHPBB3-12273
2014-04-26 16:39:53 +02:00
Nicofuma
6ba61785f8 [ticket/12097] Bug fix and adding unit test
PHPBB3-12097
2014-04-26 15:46:50 +02:00
Nicofuma
a29f3c878a [ticket/12097] Validate_data() should work with class method
https://tracker.phpbb.com/browse/PHPBB3-12097

PHPBB3-12097
2014-04-26 14:10:10 +02:00
Nicofuma
28176b0746 [ticket/12432] Adding unit test
PHPBB3-12432
2014-04-26 12:15:21 +02:00
Nicofuma
595f831589 [ticket/12432] Migrator should not revert custom functions
https://tracker.phpbb.com/browse/PHPBB3-12432

PHPBB3-12432
2014-04-26 12:15:19 +02:00
Andreas Fischer
828696a723 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12199] Move deprecated functions to functions_compatibility.php
2014-04-26 01:41:56 +02:00
Andreas Fischer
9eedd45aac Merge pull request #2345 from Nicofuma/ticket/12199
[ticket/12199] Move deprecated functions to functions_compatibility.php

* Nicofuma/ticket/12199:
  [ticket/12199] Move deprecated functions to functions_compatibility.php
2014-04-26 01:41:50 +02:00
Nicofuma
af827bf2b4 [ticket/12199] Move deprecated functions to functions_compatibility.php
Currently 13 functions are marked as deprecated:
functions.php:
function set_var()
function request_var()
function set_config()
function set_config_count()
function tz_select()
function add_log()

functions_admin:
function cache_moderators()
function update_foes()

functions_compatibility:
function get_user_avatar()
function phpbb_hash()
function phpbb_check_hash()
function phpbb_clean_path()

functions_install:
function get_tables()

8 of them are still used in the core:
add_log              Used in many places (~198 calls)
get_tables           Used in install\install_convert::get_convert_settings
			and functions_install.php\connect_check_db
get_user_avatar      Used in phpbb\user_loader:get_avatar
phpbb_hash           Used in phpbb\db\migration\data\v30x\release_3_0_5_rc1
request_var          Used quite everywhere (~997 calls)
set_config           Used in many places (~129 calls)
set_config_count     Used in a few places (~37 calls)
set_var              Used by phpbb_http_login
			and phpbb\auth\provider\apache::autologin

PHPBB3-12199
2014-04-26 01:25:51 +02:00
Nicofuma
5ec9f40b78 [ticket/12445] Disapproved post: the name of the poster should be in logs
https://tracker.phpbb.com/browse/PHPBB3-12445

PHPBB3-12445
2014-04-26 01:18:34 +02:00
Nicofuma
41b004ae50 [ticket/12444] Replace spaces with tabs
PHPBB3-12444
2014-04-26 00:52:56 +02:00
Nicofuma
3d1569d385 [ticket/12444] Adding regression test
PHPBB3-12444
2014-04-26 00:42:24 +02:00
Nicofuma
2991918bac [ticket/12444] The logs message aren't filled correctly
https://tracker.phpbb.com/browse/PHPBB3-12444

PHPBB3-12444
2014-04-25 23:31:31 +02:00
Crizzo
df47cbb254 [ticket/12404] Splits up the line 18 in subsilver2 into more lines
PHPBB3-12404
2014-04-25 22:15:13 +02:00
Cesar G
0931d9f97d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12418] Notice displayed for feed.php
2014-04-25 13:03:45 -07:00
Cesar G
0553d79808 Merge remote-tracking branch 'Nicofuma/ticket/12418' into develop-ascraeus
* Nicofuma/ticket/12418:
  [ticket/12418] Notice displayed for feed.php
2014-04-25 13:03:23 -07:00
Cesar G
5cc0f50d28 [ticket/11339] Always clear timeout functions on subsequent AJAX calls
PHPBB3-11339
2014-04-25 12:10:46 -07:00
Joas Schilling
18be18e998 [ticket/12273] Do not allow 3.1-A1 for template events
PHPBB3-12273
2014-04-25 20:26:47 +02:00
Cesar G
7c6bba694b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12437] Clean up redundant "clear" elements & "corners"
2014-04-25 10:10:54 -07:00
Cesar G
fe768d460d Merge remote-tracking branch 'PayBas/ticket/12437' into develop-ascraeus
* PayBas/ticket/12437:
  [ticket/12437] Clean up redundant "clear" elements & "corners"
2014-04-25 10:10:32 -07:00
Andreas Fischer
fddf56223c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12012] Move property to the top
  [ticket/12012] Move MS SQL server comparison into a method
  [ticket/12012] Fix docs in connection manager
  [ticket/12012] Remove duplicated code (only the $sql are different)
  [ticket/12012] Handle begin and commit transactions in tests
  [ticket/12012] Drop and recreate indexes when removing columns
  [ticket/12012] Add a unit test for removing a column with indexes
  [ticket/12012] Add a unit test for changing the column type
  [ticket/12012] Return SQL statements for index drop/create
  [ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
  [ticket/12012] Drop and recreate indexes when changing a column on MSSQL
  [ticket/12012] Fix query layout
  [ticket/12012] Correctly drop default value constraints on MSSQL
2014-04-25 18:54:48 +02:00
Andreas Fischer
d7c3cf4700 Merge pull request #2288 from nickvergessen/ticket/12012
[ticket/12012] Correctly drop default value constraints

* nickvergessen/ticket/12012:
  [ticket/12012] Move property to the top
  [ticket/12012] Move MS SQL server comparison into a method
  [ticket/12012] Fix docs in connection manager
  [ticket/12012] Remove duplicated code (only the $sql are different)
  [ticket/12012] Handle begin and commit transactions in tests
  [ticket/12012] Drop and recreate indexes when removing columns
  [ticket/12012] Add a unit test for removing a column with indexes
  [ticket/12012] Add a unit test for changing the column type
  [ticket/12012] Return SQL statements for index drop/create
  [ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
  [ticket/12012] Drop and recreate indexes when changing a column on MSSQL
  [ticket/12012] Fix query layout
  [ticket/12012] Correctly drop default value constraints on MSSQL
2014-04-25 18:54:40 +02:00
Cesar G
001292cc0f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12389] Change "PM" to "Message"
  [ticket/12389] Moved PM tools to UCP template
  [ticket/12389] Replace email and print icons.
  [ticket/12389] Change language of email friend
  [ticket/12389] Move print topic & email topic icons to topic tools
2014-04-25 07:34:01 -07:00
Cesar G
b305ec5611 Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeus
* PayBas/ticket/12389:
  [ticket/12389] Change "PM" to "Message"
  [ticket/12389] Moved PM tools to UCP template
  [ticket/12389] Replace email and print icons.
  [ticket/12389] Change language of email friend
  [ticket/12389] Move print topic & email topic icons to topic tools
2014-04-25 07:33:22 -07:00
Cesar G
8327c2f078 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12382] Mark broken nested loop with include as incomplete
  [ticket/12382] Add template test for subloops inside includes
  [ticket/12382] Add template test for subloops inside events
2014-04-25 07:25:39 -07:00
Cesar G
fefd6b7423 Merge remote-tracking branch 'nickvergessen/ticket/12382' into develop-ascraeus
* nickvergessen/ticket/12382:
  [ticket/12382] Mark broken nested loop with include as incomplete
  [ticket/12382] Add template test for subloops inside includes
  [ticket/12382] Add template test for subloops inside events
2014-04-25 07:24:50 -07:00
Andreas Fischer
26295d5b13 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11917] Replace space with tabs
2014-04-25 16:02:37 +02:00
Andreas Fischer
c61f92eb46 Merge pull request #2352 from nickvergessen/ticket/11917
[ticket/11917] Replace space with tabs

* nickvergessen/ticket/11917:
  [ticket/11917] Replace space with tabs
2014-04-25 16:01:26 +02:00
rxu
60d2a3389a [ticket/12403] Add template events to acp_users_prefs.html
Since it is possible for extensions to add new user preferences to UCP,
it should be also possible to control it via ACP too
just like for build-in user preferences.
Thus, some prepend/append template events are added.

PHPBB3-12403
2014-04-25 21:46:38 +08:00
PayBas
5109d3a12f [ticket/12442] Add CSS classes to important headings
PHPBB3-12442
2014-04-25 12:56:58 +02:00
Joas Schilling
9c689ef8dd [ticket/11917] Replace space with tabs
PHPBB3-11917
2014-04-25 12:45:48 +02:00
Joas Schilling
3bcda97e28 [ticket/12273] Sort arguments alphabetically before exporting
PHPBB3-12273
2014-04-25 12:37:39 +02:00
Joas Schilling
48278f122c [ticket/12273] Do not allow 3.1-A1 version
PHPBB3-12273
2014-04-25 12:31:57 +02:00
Joas Schilling
b32895308d [ticket/12273] Update since version to 3.1.0-a* style
PHPBB3-12273
2014-04-25 12:15:44 +02:00
Joas Schilling
7324cb051f [ticket/12371] Fix redirect link for approve_post and post_in_queue
PHPBB3-12371
2014-04-25 11:52:29 +02:00
Joas Schilling
40d91a5d6e [ticket/12371] Delete the approve_post notification when editing a post
We need to delete the initial approve notification,
so we can notify the user again, when his post got reapproved.

PHPBB3-12371
2014-04-25 11:52:28 +02:00
Joas Schilling
465aa9c346 [ticket/12371] Fix language in comment
PHPBB3-12371
2014-04-25 11:52:28 +02:00
Joas Schilling
16329c7ad9 [ticket/12371] Reapprove the post and topic again in tests
PHPBB3-12371
2014-04-25 11:52:27 +02:00
Joas Schilling
ddbb521e57 [ticket/12371] Correctly set is_starter when editing first post of the topic
PHPBB3-12371
2014-04-25 11:52:26 +02:00
Joas Schilling
793680478b [ticket/12371] Add functional tests for reapproving
PHPBB3-12371
2014-04-25 11:52:26 +02:00
Joas Schilling
70f5686efb [ticket/12371] Fix query in mcp_sorting()
PHPBB3-12371
2014-04-25 11:52:25 +02:00
Joas Schilling
1d61fcf3c9 [ticket/12371] Rename disapprove and softdelete tests
PHPBB3-12371
2014-04-25 11:52:25 +02:00
Joas Schilling
84a77d07be [ticket/12371] We do not group quote notifications anymore
PHPBB3-12371
2014-04-25 11:52:23 +02:00
Joas Schilling
8375c3f789 [ticket/12371] Fix SQL query
PHPBB3-12371
2014-04-25 11:52:23 +02:00