mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity
22,462 Commits 18 Branches 192 Tags
eeeb62b43381e087e09ab75cd5c6b4764d8338fb
Commit Graph

19418 Commits

Author SHA1 Message Date
Joas Schilling
9ff6358dc9 Merge branch 'ticket/10729' into ticket/10729-asc 
Conflicts:
	phpBB/includes/functions_user.php
 2014-09-23 09:31:13 +02:00
Joas Schilling
d48e4b680e [ticket/10729] Fix doc block for user_delete 
PHPBB3-10729
 2014-09-22 00:55:08 +02:00
Oliver Schramm
bef207e9b7 [ticket/10729] Update *_delete_user when user being deleted 
PHPBB3-10729
 2014-07-18 00:19:21 +02:00
Oliver Schramm
1e0775a3da Merge branch 'ticket/10729' into ticket/10729-2 
Conflicts:
	phpBB/includes/functions_user.php
 2014-07-18 00:17:20 +02:00
Oliver Schramm
da6b378e64 [ticket/10729] Update message_edit_user when user being deleted 
PHPBB3-10729
 2014-07-18 00:11:51 +02:00
Oliver Schramm
53f597b6d0 [ticket/10729] Update post_edit_user when user being deleted 
PHPBB3-10729
 2014-07-17 16:28:32 +02:00
Tristan Darricau
42477861a4 Merge pull request #2576 from carlo94it/ticket/12685 
[ticket/12685] New CLI container for load extensions

* carlo94it/ticket/12685:
  [ticket/12685] Setup class loader for extensions only if not in safe mode
  [ticket/12685] Replace getParameterOption with hasParameterOption
  [ticket/12685] Do not dump container
  [ticket/12685] Override getDefaultInputDefinition()
  [ticket/12685] Removed unused USE statement
  [ticket/12685] Inject console.command_collection instead of the container
  [ticket/12685] Add a new line
  [ticket/12685] Container is dumped by default
  [ticket/12685] Removed spaces
  [ticket/12685] Add --safe-mode
  [ticket/12685] We need extensions enabled
  [ticket/12685] Add space after foreach
  [ticket/12685] Add console collection and fixing CLI
 2014-07-17 16:03:55 +02:00
Joas Schilling
0d2a478076 Merge pull request #2747 from Elsensee/ticket/12860 
[ticket/12860] Add template events to mcp_ban.html

* Elsensee/ticket/12860:
  [ticket/12860] Fix typo
  [ticket/12860] Add template events mcp_ban_unban
  [ticket/12860] Add template events mcp_ban_fields
 2014-07-17 15:31:20 +02:00
Carlo
7f4d425006 [ticket/12685] Setup class loader for extensions only if not in safe mode 
PHPBB3-12685
 2014-07-17 00:05:33 +02:00
Oliver Schramm
b1df0cffb1 [ticket/12860] Fix typo 
PHPBB3-12860
 2014-07-17 00:00:02 +02:00
Joas Schilling
0332b68dbb Merge pull request #2739 from PayBas/ticket/12853 
[WIP][ticket/12853] Change navbar ACP from skip- to last-responsive

* PayBas/ticket/12853:
  [ticket/12853] Change navbar ACP from skip- to last-responsive
 2014-07-16 22:08:00 +02:00
Joas Schilling
9fede3baf4 Merge pull request #2740 from PayBas/ticket/12845 
[ticket/12845] Fix invalid ARIA role for breadcrumbs

* PayBas/ticket/12845:
  [ticket/12845] Remove invalid ARIA role for breadcrumbs
 2014-07-16 21:57:15 +02:00
Joas Schilling
99b60a2f5e Merge pull request #2741 from PayBas/ticket/12837 
[ticket/12837] Detect "viewing contact admin page" on viewonline

* PayBas/ticket/12837:
  [ticket/12837] Use else if instead of elseif
  [ticket/12837] Detect "viewing contact admin page" on viewonline
 2014-07-16 21:54:14 +02:00
Joas Schilling
9a369a9e14 Merge pull request #2743 from PayBas/ticket/12859 
[ticket/12859] Add template events ucp_pm_viewmessage_post_buttons

* PayBas/ticket/12859:
  [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
 2014-07-16 21:51:28 +02:00
Oliver Schramm
42308091ef [ticket/12860] Add template events mcp_ban_unban 
PHPBB3-12860
 2014-07-16 20:00:05 +02:00
Oliver Schramm
876c1f4f00 [ticket/12860] Add template events mcp_ban_fields 
PHPBB3-12860
 2014-07-16 19:59:06 +02:00
PayBas
0ed971d129 [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons 
PHPBB3-12859
 2014-07-16 18:04:54 +02:00
Joas Schilling
cd5fbd52c2 Merge pull request #2709 from rxu/ticket/12828 
[ticket/12828] Add ucp_prefs.php common core event

* rxu/ticket/12828:
  [ticket/12828] Add ucp_prefs.php common core event
 2014-07-16 16:15:30 +02:00
PayBas
a22549f247 [ticket/12837] Use else if instead of elseif 
PHPBB3-12837
 2014-07-16 11:19:28 +02:00
PayBas
09e5896cae [ticket/12837] Detect "viewing contact admin page" on viewonline 
PHPBB3-12837
 2014-07-16 10:39:40 +02:00
PayBas
1548b81cac [ticket/12845] Remove invalid ARIA role for breadcrumbs 
PHPBB3-12845
 2014-07-16 10:16:16 +02:00
PayBas
78315d824a [ticket/12853] Change navbar ACP from skip- to last-responsive 
PHPBB3-12853
 2014-07-16 09:49:06 +02:00
Andreas Fischer
496b34cd96 Merge pull request #2736 from Elsensee/ticket/12854 
[ticket/12854] Don't show contact page link if board emails are disabled

* Elsensee/ticket/12854:
  [ticket/12854] Don't show contact page link if board emails are disabled
 2014-07-15 23:19:52 +02:00
Oliver Schramm
1ee7df57ae [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG 
PHPBB3-12855
 2014-07-15 22:58:28 +02:00
Oliver Schramm
021adcc14f [ticket/12854] Don't show contact page link if board emails are disabled 
PHPBB3-12854
 2014-07-15 22:19:56 +02:00
Carlo
a4972bb338 [ticket/12685] Replace getParameterOption with hasParameterOption 
PHPBB3-12685
 2014-07-15 19:21:41 +02:00
Carlo
d95d6720bc [ticket/12685] Do not dump container 
PHPBB3-12685
 2014-07-15 17:51:23 +02:00
Carlo
7cffedf5e3 [ticket/12685] Override getDefaultInputDefinition() 
PHPBB3-12685
 2014-07-15 16:07:52 +02:00
Carlo
3eafeeb88d [ticket/12685] Removed unused USE statement 
PHPBB3-12685
 2014-07-15 13:31:34 +02:00
Carlo
15136e4f8e [ticket/12685] Inject console.command_collection instead of the container 
PHPBB3-12685
 2014-07-15 11:36:51 +02:00
Carlo
a54f1275d0 [ticket/12685] Add a new line 
PHPBB3-12685
 2014-07-15 11:27:58 +02:00
Carlo
7e6215fb7f [ticket/12685] Container is dumped by default 
PHPBB3-12685
 2014-07-15 10:22:39 +02:00
Carlo
0f41a8fc31 [ticket/12685] Removed spaces 
PHPBB3-12685
 2014-07-15 10:21:23 +02:00
Carlo
2ec50c0ff1 [ticket/12685] Add --safe-mode 
PHPBB3-12685
 2014-07-15 00:38:07 +02:00
Andreas Fischer
fcf426ad5c Merge pull request #2728 from lucifer4o/ticket/12846 
[ticket/12846] SQLite3 bug in profilefield_base_migration.php

* lucifer4o/ticket/12846:
  [ticket/12846] SQLite3 bug in profilefield_base_migration.php
 2014-07-14 19:45:43 +02:00
Andreas Fischer
f6039562ea Merge pull request #2731 from callumacrae/ticket/12849-2 
[ticket/12849] Fixed possible ReferenceError in core.js.

* callumacrae/ticket/12849-2:
  [ticket/12849] Fixed possible ReferenceError in core.js.
 2014-07-14 19:27:27 +02:00
Callum Macrae
581391c21e [ticket/12849] Fixed possible ReferenceError in core.js. 
PHPBB3-12849
 2014-07-13 23:18:21 +01:00
rxu
fe02caa8e0 [ticket/12828] Add ucp_prefs.php common core event 
Add common core event at the bottom of the includes/ucp/ucp_prefs.php
to allow additional actions (like template variable assignments etc.)
before the page load.

PHPBB3-12828
 2014-07-13 21:34:24 +08:00
Stanislav Atanasov
1043d1a27c [ticket/12846] SQLite3 bug in profilefield_base_migration.php 
Using profilefield_base_migration.php to create a custom profile
field with SQlite3 DBMS returns warning:

[phpBB Debug] PHP Warning: in file [ROOT]/phpbb/db/driver/sqlite3.php
on line 218: SQLite3Result::fetchArray(): Unable to execute statement:
constraint failed

This is due passing filed_id and lang_id to the DB driver in
unspecified format. As they are always int we should cast them
in int to prevent the error message appearance.

PHPBB3-12846
 2014-07-13 01:45:20 +03:00
Carlo
6082b5e3d3 [ticket/12685] We need extensions enabled 
PHPBB3-12685
 2014-07-12 17:48:53 +02:00
Carlo
1125fb3cab [ticket/12685] Add space after foreach 
PHPBB3-12685
 2014-07-12 17:20:33 +02:00
Carlo
b95ab44028 [ticket/12685] Add console collection and fixing CLI 
Added a commands service collection and removed CLI container

PHPBB3-12685
 2014-07-12 17:19:43 +02:00
Joas Schilling
b5492a07da [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development 2014-07-11 17:22:16 +02:00
Joas Schilling
4dc26274bf [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2 2014-07-11 16:07:09 +02:00
Joas Schilling
166c3988ff [prep-release-3.1.0-RC2] Prepare Changelog 2014-07-11 16:05:38 +02:00
Joas Schilling
4449793b07 [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2 2014-07-11 16:04:27 +02:00
Joas Schilling
c0e0011b10 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2 2014-07-11 16:03:44 +02:00
Andreas Fischer
35588c20bd Merge pull request #2713 from n-aleha/ticket/12768 
[ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation

* n-aleha/ticket/12768:
  [ticket/12768] More fixes in language files
  [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
 2014-07-11 12:11:14 +02:00
Andreas Fischer
1a1fb4a915 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12120] Remove imkingdavid from active authors

Conflicts:
	phpBB/docs/AUTHORS
 2014-07-11 12:03:02 +02:00
Andreas Fischer
a58cc394bc Merge pull request #2716 from marc1706/ticket/12120 
[ticket/12120] Remove imkingdavid from active authors

* marc1706/ticket/12120:
  [ticket/12120] Remove imkingdavid from active authors
 2014-07-11 12:00:02 +02:00