Commit graph

4419 commits

Author SHA1 Message Date
Nils Adermann
f33be87d03 Merge remote-tracking branch 'github-nicofuma/ticket/11649' into develop
* github-nicofuma/ticket/11649:
  [ticket/11649] Fix coding style
  [ticket/11649] Expose Twig through the container
2014-08-09 17:17:57 +02:00
Tristan Darricau
827510a418 [ticket/11649] Fix coding style
PHPBB3-11649
2014-08-09 16:14:58 +02:00
Tristan Darricau
192b8e2568 [ticket/11649] Expose Twig through the container
PHPBB3-11649
2014-08-09 16:13:22 +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
Joas Schilling
f87831aee5 [ticket/12710] Fix missing closing bracket
PHPBB3-12710
2014-08-09 15:04:49 +02:00
Geolim4
635cde218c [ticket/12671] Possibility to use NOT LIKE expression
PHPBB3-12671
2014-08-09 15:04:39 +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
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
Marc Alexander
0de1d65804 [ticket/12742] Remove unneeded sort of users
It doesn't matter which user will get the notification first so we shouldn't
sort the users array.

PHPBB3-12742
2014-08-09 12:49:32 +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
Marc Alexander
6a13f983a4 [ticket/12742] Replace authenticated with authorised
PHPBB3-12742
2014-08-09 12:42:14 +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
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
Geolim4
01943adbf7 [ticket/12671] Possibility to use NOT LIKE expression
PHPBB3-12671
2014-08-08 18:32:17 +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
Marc Alexander
a6b275de5c [ticket/12794] Properly validate google+ field against valid character set
PHPBB3-12794
2014-08-08 17:06:01 +02:00
Marc Alexander
cccd54dde8 [ticket/12742] Add check for empty $users and add method to fitting methods
The method might now return an empty array in case of an empty users array,
too. The notification types then check if the returned array is empty and
return this if it is empty and if the notification types would otherwise
carry out other operations afterwards.

PHPBB3-12742
2014-08-08 16:54:23 +02:00
Marc Alexander
80788980aa [ticket/12742] Add method for getting authenticated recipients
PHPBB3-12742
2014-08-08 16:43:31 +02:00
Geolim4
6b60153ab4 [ticket/12671] Possibility to use NOT LIKE expression
PHPBB3-12671
2014-08-08 16:40:33 +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
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
Tristan Darricau
e07e9f6cee [ticket/12789] Move duplicated functions to the base class
PHPBB3-12789
2014-08-08 14:49:12 +02:00
Tristan Darricau
e7251252ce [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
PHPBB3-12789
2014-08-08 14:37:18 +02:00
Dhruv
833ba11113 [ticket/12718] Fix docblocks
PHPBB3-12718
2014-08-07 23:46:12 +02:00
Joas Schilling
b39305b9f6 [ticket/12710] Fix changing the column type on oracle
PHPBB3-12710
2014-08-07 19:45:34 +02:00
Joas Schilling
339bf90ec2 [ticket/12710] Prepare get_existing_indexes() for other DBMS
PHPBB3-12710
2014-08-07 18:43:48 +02:00
Dhruv
5402834ccf Merge branch 'develop-ascraeus' into develop
# By jeroendedauw
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version
2014-08-07 18:02:20 +02:00
jeroendedauw
f6f6657842 [ticket/12903] Remove dead phpbb\extension\metadata_manager::_validate_version
PHPBB3-12903
2014-08-07 17:52:59 +02:00
Marc Alexander
e0c2013bb9 [ticket/12822] Add method for deleting avatars and use confirm_box
The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.

PHPBB3-12822
2014-08-07 17:29:33 +02:00
Marc Alexander
4f23bb711c [ticket/12822] Remove "None" option from avatar select boxes
This option is just used for deleting avatars for which we already have
a checkbox.

PHPBB3-12822
2014-08-07 17:28:21 +02:00
Dhruv
340bea63b6 [ticket/12718] Update docblock
PHPBB3-12718
2014-08-07 17:19:28 +02:00
Dhruv
17e360225d [ticket/12718] Use remove_topic_from_statistic() for delete_topic
PHPBB3-12718
2014-08-07 17:19:14 +02:00
Joas Schilling
39a99df080 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12873] Add migration to rename the index
  [ticket/12873] Don not touch the existing migrations
  [ticket/12873] Test the good identifier in \phpbb\db\tools
2014-08-07 16:51:04 +02:00
Joas Schilling
9b36b5283c Merge pull request #2761 from Nicofuma/ticket/12873
[ticket/12873] Test the correct identifier in \phpbb\db\tools

* Nicofuma/ticket/12873:
  [ticket/12873] Add migration to rename the index
  [ticket/12873] Don not touch the existing migrations
  [ticket/12873] Test the good identifier in \phpbb\db\tools
2014-08-07 16:49:37 +02:00
Tristan Darricau
8f1be5e741 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
2014-08-07 16:46:31 +02:00
Tristan Darricau
ab8a197e92 Merge pull request #2623 from dhruvgoel92/ticket/12738
[ticket/12738] Move related code from functions_posting to function

* dhruvgoel92/ticket/12738:
  [ticket/12738] Update constructor docblock
  [ticket/12738] Add $config to constructor in notification test
  [ticket/12738] Fix tests with new config object injection
  [ticket/12738] Inject config object into content_visibility class
  [ticket/11528] Move related code from functions_posting to function
2014-08-07 16:44:49 +02:00