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
Matt Friedman
20c50e55b1
[ticket/12864] Add template event to header after stylesheets
...
https://tracker.phpbb.com/browse/PHPBB3-12864
PHPBB3-12864
2014-07-18 10:13:19 -07: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
PayBas
2913b44080
[ticket/12857] Add missing template events breadcrumb_prepend
...
To insert links after site-home
PHPBB3-12857
2014-07-16 22:15:31 +02:00
PayBas
c7be452861
[ticket/12857] Add template events breadcrumbs_before/after
...
PHPBB3-12857
2014-07-16 22:15:30 +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
PayBas
8d8e0aae68
[ticket/12838] Update RC2 to RC3
...
PHPBB3-12838
2014-07-16 22:05:28 +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
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