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

23315 Commits

Author SHA1 Message Date
Tristan Darricau
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
Tristan Darricau
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
Tristan Darricau
1c98b46625 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11528] Revert Mink changes
2014-08-10 00:56:30 +02:00
Tristan Darricau
6a8413f064 Merge pull request #2691 from dhruvgoel92/ticket/11528
[ticket/11528] Revert all mink changes in functional tests

* dhruvgoel92/ticket/11528:
  [ticket/11528] Revert Mink changes
2014-08-10 00:28:01 +02:00
Tristan Darricau
761f5a771d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12954] Correctly setup PATH_INFO on Travis CI.
2014-08-10 00:13:55 +02:00
Tristan Darricau
469790146c Merge pull request #2854 from bantu/ticket/12954
[ticket/12954] Correctly setup PATH_INFO on Travis CI.

* bantu/ticket/12954:
  [ticket/12954] Correctly setup PATH_INFO on Travis CI.
2014-08-10 00:12:58 +02:00
Dhruv
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
Dhruv Goel
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
Marc Alexander
026a1fc3dd Merge branch 'develop-ascraeus' into develop 2014-08-09 18:47:59 +02:00
Marc Alexander
59398020b6 Merge pull request #2848 from bantu/ticket/12948
[ticket/12948] Remove no longer needed opcache workaround. Travis has 5.5.15
2014-08-09 18:47:41 +02:00
Andreas Fischer
23ca9cd81d [ticket/12954] Correctly setup PATH_INFO on Travis CI.
PHPBB3-12954
2014-08-09 18:33:48 +02:00
Andreas Fischer
076d4ddd7f [ticket/12941] Fix remaining Sami complaints.
PHPBB3-12941
2014-08-09 18:08:49 +02:00
Tristan Darricau
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
Marc Alexander
496b804a0f [ticket/12742] Add sorting back to bookmark notification list of users
PHPBB3-12742
2014-08-09 17:48:59 +02:00
Marc Alexander
57d94b7bb4 [ticket/12742] Add sort options for notification types requiring sorting
PHPBB3-12742
2014-08-09 17:43:28 +02:00
Tristan Darricau
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
Dhruv
dd8adb5d6e [ticket/11528] Revert Mink changes
PHPBB3-11528
2014-08-09 17:18:33 +02:00
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
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
Andreas Fischer
873d1c6d57 [ticket/12941] Check for Sami parse errors on Travis CI.
PHPBB3-12941
2014-08-09 15:58:04 +02:00
Andreas Fischer
4f131c2248 [ticket/12941] Add sami.conf.php for Travis CI.
PHPBB3-12941
2014-08-09 15:58: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
Andreas Fischer
0a6fdbe636 [ticket/12948] Remove no longer needed opcache workaround. Travis has 5.5.15.
PHPBB3-12948
2014-08-09 15:24:21 +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
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
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