mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
17,554 Commits 17 Branches 190 Tags
Commit Graph

17554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
0f18ff6228 Merge remote-tracking branch 'marc1706/ticket/11725' into develop 
* marc1706/ticket/11725:
  [ticket/11725] Use new paths for phpbb_class_loader in file.php
 2013-07-22 18:30:59 +02:00
Nathan Guse
1d050635d2 Merge pull request #1592 from bantu/ticket/11722 
[ticket/11722] Remove reference assignment for $captcha in report.php
 2013-07-22 09:19:36 -07:00
Marc Alexander
128af41a7c [ticket/11725] Use new paths for phpbb_class_loader in file.php 
In the PR #1559, the paths were changed from "{$phpbb_root_path}includes/" to
"{$phpbb_root_path}phpbb/" for the class loader. However, this was not changed
in all files that use it.

PHPBB3-11725
 2013-07-22 12:47:32 +02:00
Andreas Fischer
570e21285b [ticket/11722] Remove reference assignment for $captcha in report.php 
PHPBB3-11722
 2013-07-22 03:30:27 +02:00
Andreas Fischer
8efca016fa Merge remote-tracking branch 'EXreaction/ticket/11707' into develop 
* EXreaction/ticket/11707:
  [ticket/11707] Twig DEFINE not working as expected
 2013-07-22 03:07:38 +02:00
Andreas Fischer
fb5c8957ec Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:51:03 +02:00
Andreas Fischer
90e532430c Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:50:49 +02:00
Andreas Fischer
148df3607b Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into prep-release-3.0.12 
* marc1706/ticket/11720-prep-release:
  [ticket/11720] Add functional test for submitting report as user
  [ticket/11720] Do not call $captcha->validate if $captcha is not set
 2013-07-22 00:32:35 +02:00
Marc Alexander
865bf0db3d [ticket/11720] Add functional test for submitting report as user 
The already existing functional tests were not ran as the filename was
missing the appended "_test".

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Marc Alexander
56df3fd8ca [ticket/11720] Do not call $captcha->validate if $captcha is not set 
PHPBB3-11566 changed big parts of code. Unfortunately, a call to
$captcha->validate was added that is being called even if $captcha hasn't
been initialized. This change will fix this issue.

PHPBB3-11720
 2013-07-21 18:50:06 +02:00
Nathan Guse
e60816eeb1 Merge pull request #1584 from marc1706/ticket/11713 
[ticket/11713] Do not remove module if it couldn't be deleted
 2013-07-19 15:31:30 -07:00
Nathaniel Guse
375976eb38 [ticket/11707] Twig DEFINE not working as expected 
PHPBB3-11707
 2013-07-19 14:12:28 -05:00
Marc Alexander
f421c082f7 [ticket/11713] Do not remove module if it couldn't be deleted 
Up to now, the module or module category was always removed with jQuery,
even if there was an error. With this change, the modules will not be deleted
by jQuery if the return JSON array will have SUCCESS set to false.

PHPBB3-11713
 2013-07-18 22:41:23 +02:00
Andreas Fischer
29322e85ff Merge remote-tracking branch 'cyberalien/ticket/11712' into develop 
* cyberalien/ticket/11712:
  [ticket/11712] Fixing typo in editor.js
 2013-07-18 18:14:03 +02:00
Vjacheslav Trushkin
d05c04ae40 [ticket/11712] Fixing typo in editor.js 
PHPBB3-11712
 2013-07-18 19:10:36 +03:00
Joas Schilling
32ffae605f Merge remote-tracking branch 'cyberalien/ticket/11708' into develop 
* cyberalien/ticket/11708:
  [ticket/11708] Fix bulletin points in notifications
 2013-07-17 00:32:59 +02:00
Joas Schilling
530b96a4b0 Merge pull request #1575 from bantu/ticket/10931 
[ticket/10931] Add phpbb_php_ini as a service.
 2013-07-16 11:17:06 -07:00
Andreas Fischer
792c730f15 [ticket/10931] Add phpbb_php_ini as a service. 
PHPBB3-10931
 2013-07-16 20:11:58 +02:00
Vjacheslav Trushkin
0759b606c2 [ticket/11708] Fix bulletin points in notifications 
PHPBB3-11708
 2013-07-16 20:11:28 +03:00
David King
1891e24ea6 Merge remote-tracking branch 'upstream/pr/1570' into develop 
* upstream/pr/1570:
  [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
 2013-07-14 16:02:09 -04:00
Marc Alexander
a0e5f83311 [ticket/11706] Use @ to suppress errors for getimagesize in remote avatar 
PHPBB3-11706
 2013-07-14 15:13:09 -04:00
Nils Adermann
af69349398 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop 
* github-phpbb/develop-olympus:
  [ticket/11704] Use the correct directory for dependency checking.
  [ticket/11704] Correctly escape "
 2013-07-14 13:56:05 -04:00
Nils Adermann
8d8a0602d6 Merge pull request #1567 from bantu/ticket/11704 
[ticket/11704] phing build script does not include vendor folder, even if there are dependencies
 2013-07-14 10:55:32 -07:00
Andreas Fischer
da1ee75140 [ticket/11704] Use the correct directory for dependency checking. 
PHPBB3-11704
 2013-07-14 19:48:55 +02:00
Andreas Fischer
2a41128e6b [ticket/11704] Correctly escape " 
PHPBB3-11704
 2013-07-14 19:48:41 +02:00
Andreas Fischer
58a9e975f8 Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into develop 
* galaxyAbstractor/ticket/11697:
  [ticket/11697] author_search() used incorrect parameter
 2013-07-14 17:41:31 +02:00
Victor Nagy
e91b465de1 [ticket/11697] author_search() used incorrect parameter 
The author_search() function in fulltext_mysql.php had an argument
$m_approve_fid_ary parameter but it was changed in the Docblock
and code to $post_visibility. This change renames that argument
according to the docblock, the code and to mirror the other classes.

PHPBB3-11697
 2013-07-14 11:15:01 -04:00
Andreas Fischer
c15bde161a Merge remote-tracking branch 'nickvergessen/ticket/11702' into develop 
* nickvergessen/ticket/11702:
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
 2013-07-14 16:59:19 +02:00
Joas Schilling
405b5e54f6 [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php 
PHPBB3-11702
 2013-07-14 10:49:23 -04:00
Nils Adermann
3d9e57d0ce Merge pull request #1558 from nickvergessen/ticket/11696 
[ticket/11696] Rename db_tools.php so it can be autoloaded
 2013-07-14 07:29:29 -07:00
Joas Schilling
f302cbe175 [ticket/11696] Move file to new directory 
PHPBB3-11696
 2013-07-14 10:16:15 -04:00
Joas Schilling
131194d216 [ticket/11696] Rename constructor to __construct() 
PHPBB3-11696
 2013-07-14 10:12:49 -04:00
Joas Schilling
5d4c443c2d [ticket/11696] Remove manual loading of db_tools in extension controller test 
Remember to store the file, before commiting it...

PHPBB3-11696
 2013-07-14 10:10:05 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded 
PHPBB3-11696
 2013-07-14 10:10:05 -04:00
Nathan Guse
1e37d97909 Merge pull request #1559 from naderman/ticket/11698 
[WIP][ticket/11698] Moving all autoloadable files to phpbb/
 2013-07-13 22:47:41 -07:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/ 
PHPBB3-11698
 2013-07-14 01:32:34 -04:00
Nils Adermann
4186c05bb4 Merge pull request #1555 from EXreaction/ticket/11692 
[ticket/11692] Don't update search_type in dev migration if already appended
 2013-07-13 20:53:48 -07:00
David King
6946cea72d Merge remote-tracking branch 'cyberalien/ticket/11694' into develop 
* cyberalien/ticket/11694:
  [ticket/11694] Do not locate assets with root path
 2013-07-13 23:45:49 -04:00
Vjacheslav Trushkin
8d30322635 [ticket/11694] Do not locate assets with root path 
Do not locate assets that start with ./

PHPBB3-11694
 2013-07-13 23:15:26 -04:00
Nathaniel Guse
176729ab00 [ticket/11692] Don't update search_type in dev migration if already appended 
PHPBB3-11692
 2013-07-13 17:50:35 -05:00
Nils Adermann
71f6f5ad7e Merge pull request #1554 from EXreaction/ticket/11675 
[ticket/11675] Fix template loop
 2013-07-13 14:29:15 -07:00
Nathaniel Guse
e9cc1e9cd2 [ticket/11675] Fix template loop 
PHPBB3-11675
 2013-07-13 16:25:08 -05:00
Nathan Guse
346efbbb5b Merge pull request #1429 from cyberalien/ticket/11553 
Move bulletin points for linklist lists to pseudo classes
 2013-07-13 14:20:23 -07:00
Nathan Guse
47a611ab4f Merge pull request #1553 from naderman/ticket/11690 
[ticket/11690] Old module class names may get autoloaded by class_exists
 2013-07-13 14:09:38 -07:00
Nils Adermann
2aa58ee3b8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
 2013-07-13 17:06:17 -04:00
Nils Adermann
b0905cc1d2 Merge remote-tracking branch 'github-exreaction/ticket/11686' into develop-olympus 
* github-exreaction/ticket/11686:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
 2013-07-13 17:06:00 -04:00
Nils Adermann
9f5ee08bae [ticket/11690] Old module class names may get autoloaded by class_exists 
PHPBB3-11690
 2013-07-13 16:47:25 -04:00
Nathan Guse
fd2c309aa7 Merge pull request #1473 from marc1706/ticket/11600 
[ticket/11600] Increase code test coverage of avatar manager
 2013-07-13 13:27:06 -07:00
Nathan Guse
ea0ef00801 Merge pull request #1550 from nickvergessen/ticket/9649 
[ticket/9649] Display information on index for moderators on unapproved posts
 2013-07-13 12:03:33 -07:00
Joas Schilling
081350678d [ticket/9649] Display information on index for moderators on unapproved posts 
PHPBB3-9649
 2013-07-13 14:57:31 -04:00