makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
17704 commits 18 branches 192 tags 207 MiB
Commit graph

17704 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bruno Ais
16b4116165 [ticket/11654] generate_text_for_display on mcp/mcp_warn.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11654
 2013-07-18 16:15:36 +01: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
Bruno Ais
fc6bed2856 [ticket/11640] generate_text_for_display on functions_privmsgs.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11640
 2013-07-16 20:32:57 +01: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
Joas Schilling
573987d2d2 [ticket/11582] Add new service for permissions 
Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
 2013-07-14 11:51:29 -04: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