1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 06:06:32 +02:00
Commit Graph

1426 Commits

Author SHA1 Message Date
3450b793e7 Merge pull request #2859 from Nicofuma/ticket/12957
[ticket/12957] Update the constructions of the template engine
2014-08-10 10:23:28 +02:00
143c1ba8d1 [ticket/12957] Removed unused use
PHPBB3-12957
2014-08-10 04:01:47 +02:00
e7e6d45789 [ticket/12957] Update the constructions of the template engine
PHPBB3-12957
2014-08-10 03:32:27 +02:00
ab2878b37b Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12949] Check if mime_content_type is actually callable
2014-08-10 01:30:58 +02:00
5c93735557 Merge pull request #2851 from marc1706/ticket/12949
[ticket/12949] Check if mime_content_type is actually callable
2014-08-10 01:29:59 +02:00
59b5ab4866 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
2014-08-10 01:02:38 +02:00
b000d10ef8 Merge pull request #2849 from bantu/ticket/12941
[ticket/12941] Check for Sami parse errors on Travis CI.

* bantu/ticket/12941:
  [ticket/12941] Fix remaining Sami complaints.
  [ticket/12941] Check for Sami parse errors on Travis CI.
  [ticket/12941] Add sami.conf.php for Travis CI.
2014-08-10 01:02:27 +02:00
e12969d2c7 Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12742] Add sorting back to bookmark notification list of users
  [ticket/12742] Add sort options for notification types requiring sorting
  [ticket/12742] Remove unneeded sort of users
  [ticket/12742] Replace authenticated with authorised
  [ticket/12742] Add check for empty $users and add method to fitting methods
  [ticket/12742] Add method for getting authenticated recipients
2014-08-09 20:03:17 +02:00
d066240e27 Merge pull request #2840 from marc1706/ticket/12742
[ticket/12742] Put duplicated code into one method in notifications base
2014-08-09 20:01:59 +02:00
076d4ddd7f [ticket/12941] Fix remaining Sami complaints.
PHPBB3-12941
2014-08-09 18:08:49 +02:00
04c084ead8 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
2014-08-09 17:50:54 +02:00
496b804a0f [ticket/12742] Add sorting back to bookmark notification list of users
PHPBB3-12742
2014-08-09 17:48:59 +02:00
57d94b7bb4 [ticket/12742] Add sort options for notification types requiring sorting
PHPBB3-12742
2014-08-09 17:43:28 +02:00
86f94f922c Merge pull request #2624 from dhruvgoel92/ticket/12718
[ticket/12718] Use remove_topic_from_statistic() for delete_topic

* dhruvgoel92/ticket/12718:
  [ticket/12718] Use a separate variable for sql query
  [ticket/12718] Fix spacing and type casting
  [ticket/12718] Fix docblocks
  [ticket/12718] Add tests to check user_posts on post deletion
  [ticket/12718] Update docblock
  [ticket/12718] Use remove_topic_from_statistic() for delete_topic
2014-08-09 17:33:44 +02:00
9f87341046 [ticket/12949] Check if mime_content_type is actually callable
PHPBB3-12949
2014-08-09 17:21:19 +02:00
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
827510a418 [ticket/11649] Fix coding style
PHPBB3-11649
2014-08-09 16:14:58 +02:00
192b8e2568 [ticket/11649] Expose Twig through the container
PHPBB3-11649
2014-08-09 16:13:22 +02:00
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
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
f87831aee5 [ticket/12710] Fix missing closing bracket
PHPBB3-12710
2014-08-09 15:04:49 +02:00
0806c74084 [ticket/12710] Prefix column so it does not start with a number
PHPBB3-12710
2014-08-09 14:42:31 +02:00
ef9360d285 [ticket/12710] Pass the original column data to the create function
PHPBB3-12710
2014-08-09 14:42:28 +02:00
37a1874782 [ticket/12710] Fix foreach generation
PHPBB3-12710
2014-08-09 14:41:25 +02:00
c8e7db60ba [ticket/12710] Compare to uppercase version
PHPBB3-12710
2014-08-09 13:34:22 +02:00
f03a003bea [ticket/12710] Do not try to match the uniqueness in the query
PHPBB3-12710
2014-08-09 13:14:08 +02:00
7d44995f16 [ticket/12710] Remove table_name from index_name before deleting and recreating them
PHPBB3-12710
2014-08-09 12:53:15 +02:00
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
078c68da63 [ticket/12710] Can not use upper in oracles where claus
PHPBB3-12710
2014-08-09 12:46:59 +02:00
6a13f983a4 [ticket/12742] Replace authenticated with authorised
PHPBB3-12742
2014-08-09 12:42:14 +02:00
12eb993d23 [ticket/12710] Correctly select index name and compare to column name
PHPBB3-12710
2014-08-09 08:54:40 +02:00
cdcfd1fe1e [ticket/12710] Fix problems with creating unique indexes on oracle
PHPBB3-12710
2014-08-09 08:28:44 +02:00
96fc29eecc [ticket/12710] Correctly fetch unique and normal indexes only in MSSQL
PHPBB3-12710
2014-08-09 08:27:10 +02:00
44295bae74 Merge branch 'develop-ascraeus' into develop 2014-08-09 01:47:13 +02:00
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
e6f43f5974 [ticket/security-155] Fix spelling error in comment
SECURITY-155
2014-08-09 01:45:26 +02:00
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
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
558aff46cd [ticket/security-155] Cast the types of string values in the controller routes
SECURITY-155
2014-08-08 17:15:01 +02:00
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
80788980aa [ticket/12742] Add method for getting authenticated recipients
PHPBB3-12742
2014-08-08 16:43:31 +02:00
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
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
fcb57edd06 [ticket/12738] Pass $this->config in content_visibility constructor
PHPBB3-12738
2014-08-08 15:54:42 +02:00
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
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
e07e9f6cee [ticket/12789] Move duplicated functions to the base class
PHPBB3-12789
2014-08-08 14:49:12 +02:00
e7251252ce [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()
PHPBB3-12789
2014-08-08 14:37:18 +02:00
833ba11113 [ticket/12718] Fix docblocks
PHPBB3-12718
2014-08-07 23:46:12 +02:00
b39305b9f6 [ticket/12710] Fix changing the column type on oracle
PHPBB3-12710
2014-08-07 19:45:34 +02:00