mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00
Code Issues Releases Wiki Activity
22,941 Commits 17 Branches 190 Tags
Commit Graph

22941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
cf88a6453c Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
 2014-07-21 22:40:55 +02:00
Joas Schilling
58d91d1d54 Merge pull request #2757 from rxu/ticket/12871 
[ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation

* rxu/ticket/12871:
  [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation
 2014-07-21 22:40:02 +02:00
Tristan Darricau
f27102b454 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12861] Add event to modify the post, poster and attachment data
 2014-07-21 20:49:02 +02:00
Tristan Darricau
38100cc7c0 Merge pull request #2745 from nickvergessen/ticket/12861 
[ticket/12861] Add event to modify the post, poster and attachment data

* nickvergessen/ticket/12861:
  [ticket/12861] Add event to modify the post, poster and attachment data
 2014-07-21 20:48:30 +02:00
Dhruv
99cbfcb16d Merge branch 'develop-ascraeus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Dhruv Goel (1)
* develop-ascraeus:
  [ticket/12656] Pass user object into all console commands.
 2014-07-22 00:15:20 +05:30
Dhruv Goel
e11875527d Merge pull request #2752 from bantu/ticket/12656 
[ticket/12656] Pass user object into all console commands for translation
 2014-07-22 00:14:01 +05:30
Dhruv
b30bd79f72 Merge branch 'develop-ascraeus' into develop 
# By Joas Schilling
# Via Dhruv Goel (1) and Joas Schilling (1)
* develop-ascraeus:
  [ticket/12448] Fix null columns for MS SQL
  [ticket/12448] Fix null columns for postgres
  [ticket/12448] Allow null as default value for columns
 2014-07-22 00:11:32 +05:30
Dhruv Goel
1c8357a1cb Merge pull request #2651 from nickvergessen/ticket/12448 
[ticket/12448] Allow null as default value for columns
 2014-07-22 00:08:07 +05:30
Marc Alexander
5f1dd968ac Merge branch 'develop-ascraeus' into develop 2014-07-20 18:45:09 +02:00
Marc Alexander
449ffbe799 Merge remote-tracking branch 'tmbackoff/ticket/12872' into develop-ascraeus 2014-07-20 18:44:38 +02:00
Tabitha Backoff
247c5a1808 [ticket/12872] Add poster_id to viewtopic_modify_post_row 
Change "rc3" to "RC3".

PHPBB3-12872
 2014-07-19 05:33:42 -04:00
Tabitha Backoff
f6ad9d5fd2 [ticket/12872] Add poster_id to viewtopic_modify_post_row 
To allow extension authors to use the poster_id var.

PHPBB3-12872
 2014-07-19 03:26:33 -04:00
rxu
7b91b66b87 [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installation 
To make it consistent with another config.php constants,
PHPBB_DISPLAY_LOAD_TIME is to be put in config.php during installation as well.

PHPBB3-12871
 2014-07-19 14:09:22 +08:00
Andreas Fischer
d78dc0119e Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12748] Fix typo in terms of use
 2014-07-18 22:58:02 +02:00
Andreas Fischer
d5f87e6053 Merge pull request #2755 from Elsensee/ticket/12748 
[ticket/12748] Fix typo in terms of use

* Elsensee/ticket/12748:
  [ticket/12748] Fix typo in terms of use
 2014-07-18 22:58:01 +02:00
Andreas Fischer
88a8176d3a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12663] Have cli.php language file at top level; unrelated to ACP.
  [ticket/12663] Extract CLI language string into their own file
 2014-07-18 00:57:53 +02:00
Andreas Fischer
65544066c2 Merge pull request #2751 from bantu/ticket/12663 
[ticket/12663] Extract CLI language string into their own file

* bantu/ticket/12663:
  [ticket/12663] Have cli.php language file at top level; unrelated to ACP.
  [ticket/12663] Extract CLI language string into their own file
 2014-07-18 00:57:53 +02:00
Andreas Fischer
faabf7787f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12814] Replace email type with text type
 2014-07-18 00:54:22 +02:00
Andreas Fischer
1a66ad8483 Merge pull request #2735 from carlo94it/ticket/12814 
[ticket/12814] Fix field type for LDAP email attribute

* carlo94it/ticket/12814:
  [ticket/12814] Replace email type with text type
 2014-07-18 00:54:21 +02:00
Oliver Schramm
8a5ec8d9d1 [ticket/12748] Fix typo in terms of use 
PHPBB3-12748
 2014-07-18 00:28:24 +02:00
Andreas Fischer
07ce29c081 [ticket/12656] Pass user object into all console commands. 
PHPBB3-12656
 2014-07-17 20:37:24 +02:00
Andreas Fischer
e78a6046ca [ticket/12663] Have cli.php language file at top level; unrelated to ACP. 
PHPBB3-12663
 2014-07-17 16:54:42 +02:00
Carlo
f784510494 [ticket/12663] Extract CLI language string into their own file 
PHPBB3-12663
 2014-07-17 16:53:33 +02:00
Tristan Darricau
d6d02188ad Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:07:42 +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
5dd8a759be Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:26 +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
304e459878 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12853] Change navbar ACP from skip- to last-responsive
 2014-07-16 22:08:10 +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
44a9876c17 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12845] Remove invalid ARIA role for breadcrumbs
 2014-07-16 21:57:17 +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
ec4886a266 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12837] Use else if instead of elseif
  [ticket/12837] Detect "viewing contact admin page" on viewonline
 2014-07-16 21:54:17 +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
b0c307b772 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
 2014-07-16 21:51:36 +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
Joas Schilling
ab4a77aa0f [ticket/12861] Add event to modify the post, poster and attachment data 
PHPBB3-12861
 2014-07-16 19:26:05 +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
ab237e16d3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12828] Add ucp_prefs.php common core event
 2014-07-16 16:18:01 +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
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