db78c11702
Merge pull request #1625 from brunoais/ticket/11640
...
[ticket/11640] removed the space that I wonder what it was doing there.
2013-07-29 09:09:46 -07:00
b8fef3b33a
[ticket/11640] removed the space that I wonder what it was doing there.
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11640
2013-07-29 16:55:58 +01:00
6da63f3ad8
Merge pull request #1597 from marc1706/ticket/11723
...
[ticket/11723] Correctly redirect user to agreement page and let him leave
2013-07-29 07:45:51 -07:00
8cc2725703
Merge pull request #1576 from brunoais/ticket/11640
...
[ticket/11640] generate_text_for_display on functions_privmsgs.php
2013-07-29 07:29:25 -07:00
7003f98d03
Merge pull request #1586 from brunoais/ticket/11654
...
[ticket/11654] generate_text_for_display on mcp/mcp_warn.php
2013-07-29 07:26:15 -07:00
c366998112
[ticket/11654] Moved some code to reduce line width.
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11654
2013-07-23 12:47:18 +01:00
c2d919f12d
Merge remote-tracking branch 'asperous/ticket/11731' into develop
...
* asperous/ticket/11731:
[ticket/11731] Remove static calls to captcha garbage collector
2013-07-23 00:07:38 +02:00
80f81dd0d2
[ticket/11731] Remove static calls to captcha garbage collector
...
PHPBB3-11731
2013-07-22 15:04:30 -07:00
974da6449c
[ticket/11723] Correctly redirect user to agreement page and let him leave
...
This patch consists of two changes. The first one will make sure that $agree
is correctly reset to 0 and the user redirected back to the agreement page
after changing the display language. Secondly, by reseting 'change_lang',
the user will be able to agree to the terms on the agreement page again.
The changed language will still be kept, as this is correctly saved in the
'lang' field that is passed to the ucp_register page.
The variable $agree has also been changed to be boolean. It is not used as
an integer anywere in the ucp_register file.
PHPBB3-11723
2013-07-22 22:20:55 +02:00
127ee62edd
Merge pull request #1589 from marc1706/ticket/11717
...
[ticket/11717] Use topic_posts_approved instead of topic_replies
2013-07-22 12:20:17 -07:00
b71038486e
Merge pull request #1513 from nickvergessen/ticket/11582
...
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
0f70864624
[ticket/11582] Move global declaration to beginning of block
...
PHPBB3-11582
2013-07-22 20:06:30 +02:00
580131b5c3
[ticket/11640] removed the unset
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11640
2013-07-22 11:16:47 +01:00
effafa4b4d
[ticket/11717] Add 'has' to boolean variable and reduce line length
...
PHPBB3-11717
2013-07-22 10:42:46 +02:00
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
67ba959d9b
[ticket/11654] first parameter fail
...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*
PHPBB3-11654
2013-07-20 16:35:28 +01:00
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
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
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
9c72bbe284
[ticket/11582] Move file to new directory
...
PHPBB3-11582
2013-07-14 12:04:04 -04:00
060754fd6c
[ticket/11582] Fix missing closing bracket
...
PHPBB3-11582
2013-07-14 12:02:47 -04:00
4b7b7e895b
[ticket/11582] Fix missing @params in the doc blocks
...
PHPBB3-11582
2013-07-14 12:02:46 -04:00
aaa44eda2b
[ticket/11582] Remove useless prefix
...
PHPBB3-11582
2013-07-14 12:02:44 -04:00
0e86c02473
[ticket/11582] Split permission language strings from logic
...
PHPBB3-11582
2013-07-14 12:02:38 -04:00
aadff800dc
[ticket/11582] Remove left over calls to lang['acl_*']
...
PHPBB3-11582
2013-07-14 11:51:39 -04:00
22ba3de1a2
[ticket/11582] Use member isntead of a new variable everytime
...
PHPBB3-11582
2013-07-14 11:51:37 -04:00
9c653341e4
[ticket/11582] Use new methods and remove duplicated entries
...
PHPBB3-11582
2013-07-14 11:51:36 -04:00
ce0a182c7f
[ticket/11582] Add methods to return the language string
...
PHPBB3-11582
2013-07-14 11:51:34 -04:00
7f9a1c8116
[ticket/11582] Add event in constructor and add docs
...
PHPBB3-11582
2013-07-14 11:51:33 -04:00
137cec5895
[ticket/11582] Fix event dispatcher class name
...
PHPBB3-11582
2013-07-14 11:51:32 -04:00
e8d2a2fd88
[ticket/11582] Use new class for categories
...
PHPBB3-11582
2013-07-14 11:51:30 -04:00
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
f302cbe175
[ticket/11696] Move file to new directory
...
PHPBB3-11696
2013-07-14 10:16:15 -04:00
131194d216
[ticket/11696] Rename constructor to __construct()
...
PHPBB3-11696
2013-07-14 10:12:49 -04:00
057d860d07
[ticket/11696] Rename db_tools.php so it can be autoloaded
...
PHPBB3-11696
2013-07-14 10:10:05 -04:00
7030578bbe
[ticket/11698] Moving all autoloadable files to phpbb/
...
PHPBB3-11698
2013-07-14 01:32:34 -04:00
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
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
176729ab00
[ticket/11692] Don't update search_type in dev migration if already appended
...
PHPBB3-11692
2013-07-13 17:50:35 -05:00
9f5ee08bae
[ticket/11690] Old module class names may get autoloaded by class_exists
...
PHPBB3-11690
2013-07-13 16:47:25 -04:00
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
081350678d
[ticket/9649] Display information on index for moderators on unapproved posts
...
PHPBB3-9649
2013-07-13 14:57:31 -04:00
e10cbbf023
Merge pull request #1541 from nickvergessen/ticket/11684
...
[ticket/11684] Remove useless confirmation page after login and admin login
2013-07-13 10:38:24 -07:00
b6c3939c32
Merge pull request #1543 from nickvergessen/ticket/11685
...
[ticket/11685] Remove logout confirmation page
2013-07-13 10:37:43 -07:00
c1bb179914
[ticket/10999] Fix assets_version in ACP
...
PHPBB3-10999
2013-07-13 13:30:33 -04:00
0ef95a7009
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
2013-07-13 13:16:58 -04:00
0341555314
Merge branch 'prep-release-3.0.12' into develop-olympus
...
* prep-release-3.0.12:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
2013-07-13 13:14:48 -04:00
8f95ef55a6
[ticket/11685] Remove logout confirmation page
...
PHPBB3-11685
2013-07-13 12:27:00 -04:00
7d0c1d02ca
[ticket/11684] Remove useless confirmation page after login and admin login
...
PHPBB3-11684
2013-07-13 12:02:49 -04:00
87795eba55
Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission
...
Soft delete
2013-07-13 08:57:20 -07:00
