Commit graph

20698 commits

Author SHA1 Message Date
Nathaniel Guse
4f236729e4 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12444' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12444:
  [ticket/12444] Replacing spaces with tabs
  [ticket/12444] Replace spaces with tabs
  [ticket/12444] Adding regression test
  [ticket/12444] The logs message aren't filled correctly
2014-05-01 21:49:18 -05:00
Nathaniel Guse
5c54cd6a45 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12445:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
2014-05-01 21:46:34 -05:00
Nathaniel Guse
621023e4ae Merge remote-tracking branch 'remotes/prototech/ticket/11339' into develop-ascraeus
# By Cesar G
# Via Cesar G
* remotes/prototech/ticket/11339:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
2014-05-01 21:35:40 -05:00
Joas Schilling
83cdad77ec Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-04-29 21:29:29 +02:00
Joas Schilling
1ba6a45a78 Merge pull request #2362 from n-aleha/ticket/12186a
[ticket/12186] Move PM reports below post reports while installing for ascraeus

* n-aleha/ticket/12186a:
  [ticket/12186] Move PM reports below post reports while installing for ascraeus
  [ticket/12186] Move PM reports below post reports while installing
2014-04-29 21:29:18 +02:00
Joas Schilling
06e9d8871c Merge pull request #2319 from n-aleha/ticket/12186
[ticket/12186] Move PM reports below post reports while installing

* n-aleha/ticket/12186:
  [ticket/12186] Move PM reports below post reports while installing
2014-04-29 21:28:54 +02:00
Joas Schilling
417a0d0ea6 Merge pull request #2366 from bantu/ticket/12458
[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code

* bantu/ticket/12458:
  [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
2014-04-29 20:40:06 +02:00
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
2014-04-29 17:51:21 +02:00
Andreas Fischer
40351fae96 Merge pull request #2364 from nickvergessen/ticket/12456
[ticket/12456] Missing new lines at the end of file in language files

* nickvergessen/ticket/12456:
  [ticket/12456] Add , after the last array element
  [ticket/12456] Fix duplicated empty lines in language files
  [ticket/12456] Fix missing new lines at the end of email templates
2014-04-29 17:08:49 +02:00
Joas Schilling
23b3667978 [ticket/12456] Add , after the last array element
PHPBB3-12456
2014-04-29 16:24:51 +02:00
Joas Schilling
38f05750b7 [ticket/12456] Fix duplicated empty lines in language files
PHPBB3-12456
2014-04-29 15:44:17 +02:00
Joas Schilling
cec060bb9b [ticket/12456] Fix missing new lines at the end of email templates
PHPBB3-12456
2014-04-29 15:43:55 +02:00
Nicofuma
5c33c20186 [ticket/12445] Change the formulation
PHPBB3-12445
2014-04-28 18:44:56 +02:00
n-aleha
ac8ce42a12 [ticket/12186] Move PM reports below post reports while installing for ascraeus
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
2014-04-27 22:44:41 +03:00
n-aleha
edeeaa03c1 Merge branch 'ticket/12186' into ticket/12186a 2014-04-27 22:29:37 +03:00
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
7b8a8a2a5d [ticket/12444] Replacing spaces with tabs
PHPBB3-12444
2014-04-26 18:52:26 +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
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
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
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
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
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
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
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
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
Joas Schilling
9c689ef8dd [ticket/11917] Replace space with tabs
PHPBB3-11917
2014-04-25 12:45:48 +02:00
Joas Schilling
d5ea4906ca [ticket/12012] Move property to the top
PHPBB3-12012
2014-04-24 22:57:35 +02:00
PayBas
65c8280fb6 [ticket/12389] Change "PM" to "Message"
PHPBB3-12389
2014-04-24 22:09:15 +02:00
Joas Schilling
bbc2e6c7b2 [ticket/12012] Move MS SQL server comparison into a method
PHPBB3-12012
2014-04-24 14:53:33 +02:00
Joas Schilling
f86bf3c4d3 Merge pull request #2348 from bantu/ticket/12436
[ticket/12436] Data passed to sql_multi_insert is expected to be multi-d...

* bantu/ticket/12436:
  [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
2014-04-24 14:31:07 +02:00
Andreas Fischer
69865852a0 [ticket/12436] Data passed to sql_multi_insert is expected to be multi-dim.
PHPBB3-12436
2014-04-24 13:16:50 +02:00
PayBas
d76d061cfa [ticket/12437] Clean up redundant "clear" elements & "corners"
PHPBB3-12437
2014-04-24 12:20:23 +02:00
Nils Adermann
6e85b2acc7 Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus
* github-nickvergessen/ticket/11917:
  [ticket/11917] Move OAuth Module to the bottom while installing
  [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend

Conflicts:
	phpBB/install/install_install.php
2014-04-24 11:33:00 +02:00
n-aleha
5a91399dac [ticket/12186] Move PM reports below post reports while installing
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
2014-04-23 22:43:20 +03:00
Joas Schilling
5b6a675399 Merge pull request #2036 from prototech/ticket/12201
[ticket/12201] Clean up ACP attachment management page

* prototech/ticket/12201:
  [ticket/12201] Decreased pagination font size.
  [ticket/12201] Update select element to follow same design as prosilver.
  [ticket/12201] Increase sort font size just slightly.
  [ticket/12201] Add link to resync file stats after error.
  [ticket/12201] Fix typos in language pack.
  [ticket/12201] Display error and sorting options when there are no attachments
  [ticket/12201] Only the top pagination should be floated to the right.
  [ticket/12201] Rearrange pagination, sorting, and submit elements.
  [ticket/12201] Center the file size and mark columns.
  [ticket/12201] Separate pagination from table.
2014-04-22 19:58:15 +02:00
Joas Schilling
121bd90873 Merge pull request #2337 from prototech/ticket/12130
[ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.

* prototech/ticket/12130:
  [ticket/12130] Fix issue with li:first-child in <ul> having a bullet in IE8.
2014-04-22 19:51:16 +02:00
Joas Schilling
36ef90528b Merge pull request #2335 from Elsensee/ticket/12422
[ticket/12422] Fix debug warning in log search

* Elsensee/ticket/12422:
  [ticket/12422] Add tests
  [ticket/12422] Fix debug warning in log search
2014-04-22 19:42:20 +02:00
Andreas Fischer
631182524a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-04-22 19:25:14 +02:00
Andreas Fischer
d50d8a1512 Merge pull request #2342 from nickvergessen/ticket/12413-ascraeus
[ticket/12413-ascraeus] Revert e65a6dd8f4 in olympus

* nickvergessen/ticket/12413-ascraeus:
  [ticket/12413] Revert e65a6dd8f4
2014-04-22 19:25:10 +02:00
Andreas Fischer
c0f3011b53 Merge pull request #2341 from nickvergessen/ticket/12413
[ticket/12413] Revert e65a6dd8f4 in olympus

* nickvergessen/ticket/12413:
  [ticket/12413] Revert e65a6dd8f4
2014-04-22 19:24:43 +02:00
Joas Schilling
3425eeaf7d [ticket/12413] Revert e65a6dd8f4 in olympus
Merge branch 'ticket/12413' into ticket/12413-ascraeus

* ticket/12413:
  [ticket/12413] Revert e65a6dd8f4

Conflicts:
	phpBB/feed.php

The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.

PHPBB3-12413
2014-04-22 19:04:32 +02:00
Joas Schilling
f9cdec90fc [ticket/12413] Revert e65a6dd8f4
"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"

This reverts commit e65a6dd8f4, reversing
changes made to 214f515e9c.

PHPBB3-12413
2014-04-22 18:55:17 +02:00