Commit graph

1504 commits

Author SHA1 Message Date
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
Joas Schilling
9925733350 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
2014-08-07 16:24:48 +02:00
Joas Schilling
a2b6f4e166 Merge pull request #2812 from bantu/ticket/12826
[ticket/12826] Add root namespace indicator to exception catching.

* bantu/ticket/12826:
  [ticket/12826] Add optional root namespace indicator for consistency.
  [ticket/12826] Add mandatory root namespace indicator to exception catching.
2014-08-07 16:24:41 +02:00
Joas Schilling
05b290c6b2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html
2014-08-07 16:13:46 +02:00
Joas Schilling
0194c261c3 Merge pull request #2720 from PayBas/ticket/12838
[ticket/12838] Add ACP events to acp_ranks

* PayBas/ticket/12838:
  [ticket/12838] Simplify normal special rank array creation
  [ticket/12838] Update RC2 to RC3
  [ticket/12838] Update events.md to RC3
  [ticket/12838] Allow for extra columns in cache obtain_ranks()
  [ticket/12838] Add raw row-data to acp_ranks core event
  [ticket/12838] Simplify special rank template conditional
  [ticket/12838] Add core events to acp_ranks.php
  [ticket/12838] Update events.md
  [ticket/12838] Add _before versions
  [ticket/12838] Add template events to acp_ranks.html
2014-08-07 16:13:35 +02:00
Joas Schilling
6e3c1eb72a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12920] Add missing comma
  [ticket/12920] Update composer.lock file after update nothing
  [ticket/12920] Fix sh syntax error in post-update-cmd script
  [ticket/12920] Remove incorrect @ from self.version reference in composer.json
  [ticket/12920] Output warning message about vendor cleaning target
  [ticket/12920] Turn phpBB composer.json into publishable full version
  [ticket/12920] Add require for minimum php version
  [ticket/12920] Add composer.json for phpbb/phpbb-core library
2014-08-07 16:09:59 +02:00
Nils Adermann
be04b6c136 [ticket/12920] Add missing comma
PHPBB3-12920
2014-08-07 15:44:36 +02:00
Nils Adermann
200c6f2d32 [ticket/12920] Add require for minimum php version
PHPBB3-12920
2014-08-07 15:25:47 +02:00
Nils Adermann
3b3da3938d [ticket/12920] Add composer.json for phpbb/phpbb-core library
PHPBB3-12920
2014-08-07 15:16:58 +02:00
Tristan Darricau
2b3e15cf64 [ticket/12873] Add migration to rename the index
PHPBB3-12873
2014-08-07 14:27:12 +02:00
Andreas Fischer
cc1a713fd8 [ticket/12826] Add mandatory root namespace indicator to exception catching.
PHPBB3-12826
2014-08-07 14:24:38 +02:00
PayBas
d8d09e0df2 [ticket/12838] Simplify normal special rank array creation
PHPBB3-12838
2014-08-07 14:24:21 +02:00
Tristan Darricau
27b4ab9241 [ticket/12873] Don not touch the existing migrations
PHPBB3-12873
2014-08-07 14:16:57 +02:00
Joas Schilling
3722aac495 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12847] Allow the extensions to say if they can be enabled
2014-08-07 13:00:21 +02:00