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

17661 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
2eb32ef515 [ticket/11531] Check if uploaded avatar is properly displayed in tests 
PHPBB3-11531
 2013-07-22 13:38:19 +02: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
Marc Alexander
effafa4b4d [ticket/11717] Add 'has' to boolean variable and reduce line length 
PHPBB3-11717
 2013-07-22 10:42:46 +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
Marc Alexander
603dc1f786 [ticket/11717] Use topic_posts_approved instead of topic_replies 
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
 2013-07-20 21:21:36 +02:00
Marc Alexander
e48f0555e9 [ticket/11531] Reduced amount of avatar functional tests to minimum 
The tests were reduced to only test one case that should be correct and one
that should fail. Different test cases have been split up over the specific
test files for the acp groups, acp users, ucp groups, and ucp users page.

PHPBB3-11531
 2013-07-20 14:36:38 +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
Nathaniel Guse
1c59ad87b0 [ticket/11718] Quick test for fixes in ELSEIF 
PHPBB3-11718
 2013-07-19 13:34:08 -05:00
Nathaniel Guse
b92f660ed3 [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF 
PHPBB3-11718
 2013-07-19 13:08:41 -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
Marc Alexander
96989e536d [ticket/11531] Use abstract class for avatar tests and unify test cases 
PHPBB3-11531
 2013-07-17 23:55:20 +02:00
Joas Schilling
d6a747fbd0 [ticket/11582] Correctly add all required fixtures 
PHPBB3-11582
 2013-07-17 17:27:15 +02: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
Marc Alexander
bc6122b64f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531 2013-07-14 16:51:46 -04: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
Joas Schilling
a9a6305d93 [ticket/11582] Fix little typo 
PHPBB3-11582
 2013-07-14 13:20:58 -04:00
Joas Schilling
e4a5ce307d [ticket/11582] Test the event and and fix it. 
PHPBB3-11582
 2013-07-14 12:55:03 -04:00
Joas Schilling
9c72bbe284 [ticket/11582] Move file to new directory 
PHPBB3-11582
 2013-07-14 12:04:04 -04:00
Joas Schilling
cfb13bb547 [ticket/11582] Fix extension permission tests 
PHPBB3-11582
 2013-07-14 12:02:48 -04:00
Joas Schilling
060754fd6c [ticket/11582] Fix missing closing bracket 
PHPBB3-11582
 2013-07-14 12:02:47 -04:00
Joas Schilling
4b7b7e895b [ticket/11582] Fix missing @params in the doc blocks 
PHPBB3-11582
 2013-07-14 12:02:46 -04:00
Joas Schilling
aaa44eda2b [ticket/11582] Remove useless prefix 
PHPBB3-11582
 2013-07-14 12:02:44 -04:00
Joas Schilling
4a64e2c2b3 [ticket/11582] Fix documentation for adding permissions 
PHPBB3-11582
 2013-07-14 12:02:43 -04:00
Joas Schilling
0e86c02473 [ticket/11582] Split permission language strings from logic 
PHPBB3-11582
 2013-07-14 12:02:38 -04:00
Joas Schilling
aadff800dc [ticket/11582] Remove left over calls to lang['acl_*'] 
PHPBB3-11582
 2013-07-14 11:51:39 -04:00
Joas Schilling
22ba3de1a2 [ticket/11582] Use member isntead of a new variable everytime 
PHPBB3-11582
 2013-07-14 11:51:37 -04:00
Joas Schilling
9c653341e4 [ticket/11582] Use new methods and remove duplicated entries 
PHPBB3-11582
 2013-07-14 11:51:36 -04:00
Joas Schilling
ce0a182c7f [ticket/11582] Add methods to return the language string 
PHPBB3-11582
 2013-07-14 11:51:34 -04:00
Joas Schilling
7f9a1c8116 [ticket/11582] Add event in constructor and add docs 
PHPBB3-11582
 2013-07-14 11:51:33 -04:00
Joas Schilling
137cec5895 [ticket/11582] Fix event dispatcher class name 
PHPBB3-11582
 2013-07-14 11:51:32 -04:00
Joas Schilling
e8d2a2fd88 [ticket/11582] Use new class for categories 
PHPBB3-11582
 2013-07-14 11:51:30 -04:00