1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-18 02:06:12 +02:00
Commit Graph

7914 Commits

Author SHA1 Message Date
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
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
Bruno Ais
d183431894 [ticket/11653] generate_text_for_display on mcp/mcp_topic.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11653
2013-07-16 21:28:06 +01:00
Bruno Ais
596e9bb69d [ticket/11643] generate_text_for_display on mcp/mcp_queue.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11643
2013-07-16 21:20:22 +01:00
Bruno Ais
e7bf3abd1a [ticket/11642] generate_text_for_display on mcp/mcp_post.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11642
2013-07-16 21:15:59 +01:00
Bruno Ais
e1e8d4ed34 [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11641
2013-07-16 21:01:47 +01: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
Bruno Ais
5f19ca6a6f [ticket/11639] Whitespace fixing
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:09:59 +01:00
Bruno Ais
dde9a1fb27 [ticket/11639] Added an useful comment.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:08:17 +01:00
Bruno Ais
f96f2a9e23 [ticket/11639] generate_text_for_display on functions_posting.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:06:54 +01:00
Igor Wiedler
8928240dc3 [ticket/11574] Fix more issues in the updater
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots

The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.

PHPBB3-11574
2013-07-14 15:40:19 -04:00
Joas Schilling
9c72bbe284 [ticket/11582] Move file to new directory
PHPBB3-11582
2013-07-14 12:04:04 -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
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
Igor Wiedler
f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04: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
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded
PHPBB3-11696
2013-07-14 10:10:05 -04:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00
Igor Wiedler
e6e2a50062 [ticket/11574] Add trailing slash for consistency
PHPBB3-11574
2013-07-14 01:29:49 -04:00
Igor Wiedler
d6de892ee4 [ticket/11574] Fix various path issues in the updater
PHPBB3-11574
2013-07-14 01:06:10 -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
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
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
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
Nathan Guse
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
Nathan Guse
b6c3939c32 Merge pull request #1543 from nickvergessen/ticket/11685
[ticket/11685] Remove logout confirmation page
2013-07-13 10:37:43 -07:00
Vjacheslav Trushkin
c1bb179914 [ticket/10999] Fix assets_version in ACP
PHPBB3-10999
2013-07-13 13:30:33 -04:00
Nils Adermann
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
Nils Adermann
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
Joas Schilling
8f95ef55a6 [ticket/11685] Remove logout confirmation page
PHPBB3-11685
2013-07-13 12:27:00 -04:00
Joas Schilling
7d0c1d02ca [ticket/11684] Remove useless confirmation page after login and admin login
PHPBB3-11684
2013-07-13 12:02:49 -04:00
Nathan Guse
87795eba55 Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission
Soft delete
2013-07-13 08:57:20 -07:00
Nathan Guse
d879acb7cc Merge pull request #1519 from cyberalien/ticket/11647
Fix INCLUDEJS URLs handling
2013-07-13 08:46:46 -07:00
Joas Schilling
1584fdd26d Merge remote-tracking branch 'EXreaction/ticket/11420' into develop
* EXreaction/ticket/11420:
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Use !==, === when comparing strings
  [ticket/11420] Fix comments, license link
  [ticket/11420] Rename migrations file to something more helpful
  [ticket/11420] Forgot to include mock sql_insert_buffer
  [ticket/11420] Fix notification options conversion
2013-07-13 11:15:53 -04:00
Joas Schilling
6cde302ffa [ticket/9657] Remove old code
PHPBB3-9657
2013-07-13 10:47:42 -04:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Igor Wiedler
51ab2c710e [ticket/11574] Make install language filename less crazy
PHPBB3-11574
2013-07-13 09:57:57 +02:00