1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

23282 Commits

Author SHA1 Message Date
Nils Adermann
73bd77809e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12693] Don't try to check the composer.phar file
2014-08-09 16:11:44 +02:00
Nils Adermann
02801dee7c Merge remote-tracking branch 'github-nicofuma/ticket/12693' into develop-ascraeus
* github-nicofuma/ticket/12693:
  [ticket/12693] Don't try to check the composer.phar file
2014-08-09 16:11:34 +02:00
Tristan Darricau
3f73d32c30 [ticket/12693] Don't try to check the composer.phar file
PHPBB3-12693
2014-08-09 16:08:04 +02:00
Nils Adermann
1f7ada8e3d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
2014-08-09 15:41:01 +02:00
Nils Adermann
56ca276dcf Merge remote-tracking branch 'github-nickvergessen/ticket/12710' into develop-ascraeus
* github-nickvergessen/ticket/12710:
  [ticket/12710] Fix missing closing bracket
  [ticket/12710] Prefix column so it does not start with a number
  [ticket/12710] Pass the original column data to the create function
  [ticket/12710] Fix foreach generation
  [ticket/12710] Compare to uppercase version
  [ticket/12710] Do not try to match the uniqueness in the query
  [ticket/12710] Remove table_name from index_name before deleting and recreating them
  [ticket/12710] Can not use upper in oracles where claus
  [ticket/12710] Correctly select index name and compare to column name
  [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
  [ticket/12710] Fix problems with creating unique indexes on oracle
  [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
  [ticket/12710] Fix changing the column type on oracle
  [ticket/12710] Prepare get_existing_indexes() for other DBMS
2014-08-09 15:40:46 +02:00
Nils Adermann
19746b8fc2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12693] Fix composer.phar path
  [ticket/12693] The files skipped list can not be empty
  [ticket/12693] Force the composer.phar to be executable
  [ticket/12693] All the files in bin/ must be executable
  [ticket/12693] Expand manually the wildcard
  [ticket/12693] Fix the query for bin/*
  [ticket/12693] Extract exceptions, bin/* must be executable
  [ticket/12693] Remove the executable bit on icon_print.gif
  [ticket/12693] Check the persmissions of the owner
  [ticket/12693] Check if the are executable and not if they are 644
  [ticket/12693] Fix the permissions
  [ticket/12693] Check if the files have the right 644
  [ticket/12693] Fix indentation
  [ticket/12693] Add a travis test that checks file permissions
2014-08-09 15:19:37 +02:00
Nils Adermann
051466106a Merge remote-tracking branch 'github-nicofuma/ticket/12693' into develop-ascraeus
* github-nicofuma/ticket/12693:
  [ticket/12693] Fix composer.phar path
  [ticket/12693] The files skipped list can not be empty
  [ticket/12693] Force the composer.phar to be executable
  [ticket/12693] All the files in bin/ must be executable
  [ticket/12693] Expand manually the wildcard
  [ticket/12693] Fix the query for bin/*
  [ticket/12693] Extract exceptions, bin/* must be executable
  [ticket/12693] Remove the executable bit on icon_print.gif
  [ticket/12693] Check the persmissions of the owner
  [ticket/12693] Check if the are executable and not if they are 644
  [ticket/12693] Fix the permissions
  [ticket/12693] Check if the files have the right 644
  [ticket/12693] Fix indentation
  [ticket/12693] Add a travis test that checks file permissions
2014-08-09 15:19:27 +02:00
Joas Schilling
f87831aee5 [ticket/12710] Fix missing closing bracket
PHPBB3-12710
2014-08-09 15:04:49 +02:00
Joas Schilling
0806c74084 [ticket/12710] Prefix column so it does not start with a number
PHPBB3-12710
2014-08-09 14:42:31 +02:00
Joas Schilling
ef9360d285 [ticket/12710] Pass the original column data to the create function
PHPBB3-12710
2014-08-09 14:42:28 +02:00
Joas Schilling
37a1874782 [ticket/12710] Fix foreach generation
PHPBB3-12710
2014-08-09 14:41:25 +02:00
Joas Schilling
c8e7db60ba [ticket/12710] Compare to uppercase version
PHPBB3-12710
2014-08-09 13:34:22 +02:00
Joas Schilling
f03a003bea [ticket/12710] Do not try to match the uniqueness in the query
PHPBB3-12710
2014-08-09 13:14:08 +02:00
Marc Alexander
4840584cd6 Merge branch 'develop-ascraeus' into develop 2014-08-09 13:06:01 +02:00
Dhruv
9d8398d41b Merge branch 'develop-ascraeus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12940] Remove unused use statements.
2014-08-09 13:04:32 +02:00
Marc Alexander
20b8ea947c Merge pull request #2833 from Geolim4/ticket/11520
[ticket/11520] Re-adjust userpost count on topic fork
2014-08-09 13:00:34 +02:00
Joas Schilling
7d44995f16 [ticket/12710] Remove table_name from index_name before deleting and recreating them
PHPBB3-12710
2014-08-09 12:53:15 +02:00
Joas Schilling
078c68da63 [ticket/12710] Can not use upper in oracles where claus
PHPBB3-12710
2014-08-09 12:46:59 +02:00
Dhruv Goel
1351a1fe80 Merge pull request #2843 from bantu/ticket/12940
[ticket/12940] Remove unused use statements.
2014-08-09 12:14:57 +02:00
Andreas Fischer
336d7cd41a [ticket/12940] Remove unused use statements.
PHPBB3-12940
2014-08-09 12:04:30 +02:00
Joas Schilling
d497104671 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
2014-08-09 11:44:18 +02:00
Joas Schilling
7a016572bd Merge pull request #2724 from VSEphpbb/ticket/12841
[ticket/12841] Allow extensions to position new config vars

* VSEphpbb/ticket/12841:
  [ticket/12841] Make config position default to after
  [ticket/12841] Update comments in tests making after default
  [ticket/12841] prefix function name with phpbb_
  [ticket/12841] Add a tests for the new function
  [ticket/12841] Fix white space issues reported by sniffer
  [ticket/12841] Allow extensions to position new config vars
2014-08-09 11:43:56 +02:00
Joas Schilling
12eb993d23 [ticket/12710] Correctly select index name and compare to column name
PHPBB3-12710
2014-08-09 08:54:40 +02:00
Joas Schilling
4e4ea681be [ticket/12710] Fix "ORA-00972: identifier is too long [972]" on oracle
PHPBB3-12710
2014-08-09 08:33:15 +02:00
Joas Schilling
cdcfd1fe1e [ticket/12710] Fix problems with creating unique indexes on oracle
PHPBB3-12710
2014-08-09 08:28:44 +02:00
Joas Schilling
96fc29eecc [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
PHPBB3-12710
2014-08-09 08:27:10 +02:00
Marc Alexander
44295bae74 Merge branch 'develop-ascraeus' into develop 2014-08-09 01:47:13 +02:00
Marc Alexander
deaa0a8c75 Merge pull request #2841 from nickvergessen/ticket/security-155
[ticket/security-155] Cast the types of string values in the controller routes
2014-08-09 01:46:39 +02:00
Joas Schilling
e6f43f5974 [ticket/security-155] Fix spelling error in comment
SECURITY-155
2014-08-09 01:45:26 +02:00
Nils Adermann
7b8b8d0417 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12937] Do not return false. Return null for get and array() for all.
2014-08-08 17:23:16 +02:00
Nils Adermann
13ccb352ce Merge remote-tracking branch 'github-bantu/ticket/12937' into develop-ascraeus
* github-bantu/ticket/12937:
  [ticket/12937] Do not return false. Return null for get and array() for all.
2014-08-08 17:23:07 +02:00
Joas Schilling
558aff46cd [ticket/security-155] Cast the types of string values in the controller routes
SECURITY-155
2014-08-08 17:15:01 +02:00
Geolim4
3825aee130 [ticket/11520] Re-adjust userpost count on topic fork
PHPBB3-11520
2014-08-08 17:07:29 +02:00
Geolim4
af67bd3ea5 [ticket/11520] Coding guideline compliance
PHPBB3-11520
2014-08-08 17:07:16 +02:00
Geolim4
fc1e420a7c [ticket/11520] Re-adjust userpost count on topic fork
PHPBB3-11520
2014-08-08 17:05:40 +02:00
Andreas Fischer
28d95a7d7e Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12886] Remove obsolete check for f_user_lock
2014-08-08 16:11:47 +02:00
Andreas Fischer
f6da266109 Merge pull request #2822 from marc1706/ticket/12886
[ticket/12886] Remove obsolete check for f_user_lock

* marc1706/ticket/12886:
  [ticket/12886] Remove obsolete check for f_user_lock
2014-08-08 16:11:47 +02:00
Joas Schilling
a291825685 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12738] Pass $this->config in content_visibility constructor
2014-08-08 16:06:08 +02:00
Joas Schilling
0465e9d1b9 Merge pull request #2838 from dhruvgoel92/ticket/12738
[ticket/12738] Pass $this->config in content_visibility constructor

* dhruvgoel92/ticket/12738:
  [ticket/12738] Pass $this->config in content_visibility constructor
2014-08-08 16:05:55 +02:00
Andreas Fischer
eeb80d2ec5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
2014-08-08 16:03:25 +02:00
Andreas Fischer
42c26cd781 Merge pull request #2832 from marc1706/ticket/10404
[ticket/10404] Use anonymous function instead of create_function in acp/auth

* marc1706/ticket/10404:
  [ticket/10404] Fix codesniffer complaint about anonymous function
  [ticket/10404] Use anonymous function instead of create_function in acp/auth
2014-08-08 16:03:24 +02:00
Andreas Fischer
3c79287c0b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12778] Rename the file to *.bak instead of deleting
  [ticket/12778] Automatically delete files on update
2014-08-08 16:01:43 +02:00
Andreas Fischer
50fcd70428 Merge pull request #2815 from dhruvgoel92/ticket/12778
[ticket/12778] Automatically delete files on update

* dhruvgoel92/ticket/12778:
  [ticket/12778] Rename the file to *.bak instead of deleting
  [ticket/12778] Automatically delete files on update
2014-08-08 16:01:42 +02:00
Dhruv
fcb57edd06 [ticket/12738] Pass $this->config in content_visibility constructor
PHPBB3-12738
2014-08-08 15:54:42 +02:00
Andreas Fischer
c5f0c1aa8e [ticket/12937] Do not return false. Return null for get and array() for all.
PHPBB3-12937
2014-08-08 15:29:34 +02:00
Nils Adermann
6bfadd86ed Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12789] Move duplicated functions to the base class
  [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()

Conflicts:
	phpBB/phpbb/cache/driver/file.php
	phpBB/phpbb/cache/driver/memory.php
2014-08-08 15:06:46 +02:00
Nils Adermann
44a0f43062 Merge remote-tracking branch 'github-nicofuma/ticket/12789' into develop-ascraeus
* github-nicofuma/ticket/12789:
  [ticket/12789] Move duplicated functions to the base class
  [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
2014-08-08 15:04:01 +02:00
Joas Schilling
55c21834ad Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:55 +02:00
Joas Schilling
96e9d728b9 Merge pull request #2824 from brunoais/ticket/12927
[ticket/12927] core.mcp_queue_get_posts2_query_before

* brunoais/ticket/12927:
  [ticket/12927] core.mcp_queue_get_posts2_query_before
2014-08-08 14:52:35 +02:00
Tristan Darricau
e07e9f6cee [ticket/12789] Move duplicated functions to the base class
PHPBB3-12789
2014-08-08 14:49:12 +02:00