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

23128 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Andreas Fischer
29cd7f8aec Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12854] Don't show contact page link if board emails are disabled
 2014-07-15 23:19:52 +02:00
Andreas Fischer
06386990d1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
 2014-07-15 23:10:54 +02:00
Andreas Fischer
389d8e844e Merge pull request #2737 from Elsensee/ticket/12855 
[ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG

* Elsensee/ticket/12855:
  [ticket/12855] Dump the container based on DEBUG_CONTAINER instead of DEBUG
 2014-07-15 23:10:53 +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
81905158a1 [ticket/12814] Replace email type with text type 
PHPBB3-12814
 2014-07-15 19:36:35 +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
a6ce8ed7df Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12846] SQLite3 bug in profilefield_base_migration.php
 2014-07-14 19:45:43 +02:00
Andreas Fischer
bc6f92dc15 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12849] Fixed possible ReferenceError in core.js.
 2014-07-14 19:27:28 +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
Tristan Darricau
519e64205a [ticket/12847] Allow the extensions to say if they can be enabled 
PHPBB3-12847
 2014-07-13 18:09:34 +02: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
Andreas Fischer
1331f66fa8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12844] Don't clear $dbpasswd early in connection manager
 2014-07-13 01:17:56 +02:00
Andreas Fischer
aadcbb765a Merge pull request #2727 from Nicofuma/ticket/12844 
[ticket/12844] Don't clear $dbpasswd early in connection manager

* Nicofuma/ticket/12844:
  [ticket/12844] Don't clear $dbpasswd early in connection manager
 2014-07-13 01:17:55 +02: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
Tristan Darricau
c4cd1c58c1 [ticket/12844] Don't clear $dbpasswd early in connection manager 
PHPBB3-12844
 2014-07-13 00:25:25 +02:00
Carlo
6082b5e3d3 [ticket/12685] We need extensions enabled 
PHPBB3-12685
 2014-07-12 17:48:53 +02:00
Joas Schilling
0bc618ddc5 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12842] Skip parameters without exlicit type
 2014-07-12 17:30:50 +02:00
Joas Schilling
3e004d22cb Merge pull request #2725 from Nicofuma/ticket/12842 
[ticket/12842] Out of memory issue in code sniffer call for extensions

* Nicofuma/ticket/12842:
  [ticket/12842] Skip parameters without exlicit type
 2014-07-12 17:30:25 +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
Tristan Darricau
57f7fdf989 [ticket/12842] Skip parameters without exlicit type 
PHPBB3-12842
 2014-07-12 16:55:14 +02:00
Joas Schilling
9c1ca732db Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
  [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Prepare Changelog
  [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
 2014-07-11 17:24:00 +02:00
Joas Schilling
0d6fe20372 Merge branch 'prep-release-3.1.0-RC2' into develop-ascraeus 
* prep-release-3.1.0-RC2:
  [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development
  [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Prepare Changelog
  [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2
  [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2
 2014-07-11 17:23:53 +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
Tristan Darricau
b8c10dcdec Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12839] Include update related templates and assets in the package
 2014-07-11 15:54:02 +02:00
Tristan Darricau
dd78b564e5 Merge pull request #2723 from nickvergessen/ticket/12839 
[ticket/12839] Include update related templates and assets in the package

* nickvergessen/ticket/12839:
  [ticket/12839] Include update related templates and assets in the package
 2014-07-11 15:53:37 +02:00
Andreas Fischer
62322698ae Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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
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
9cd327e127 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12120] Remove imkingdavid from active authors
 2014-07-11 12:03:12 +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