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

26588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
92b23df864 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
 2015-08-10 13:20:04 +02:00
Andreas Fischer
3bd5fe6be8 Merge pull request #3811 from marcovo/ticket/14069 
[ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration

* marcovo/ticket/14069:
  [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration
 2015-08-10 13:20:03 +02:00
Marc Alexander
32c3267295 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-08-09 20:59:14 +02:00
Marc Alexander
edeeff597f Merge pull request #3766 from Zoddo/ticket/14019 
[ticket/14019] Add posting_topic_title_before template event
 2015-08-09 20:58:17 +02:00
Zoddo
9a2c74a68c [ticket/14019] Add posting_topic_title_before template event 
Allows to add some information on the left of the topic title
in the posting form

PHPBB3-14019
 2015-08-09 13:42:34 +02:00
Marc Alexander
1956bd4bba Merge branch '3.1.x' 2015-08-09 10:31:43 +02:00
Marc Alexander
668defcf57 Merge pull request #3784 from Senky/ticket/14043 
[ticket/14043] Add core.get_avatar_after php event
 2015-08-09 10:31:37 +02:00
Marc Alexander
03c64d3384 Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/mcp/mcp_forum.php
 2015-08-09 10:15:02 +02:00
Marc Alexander
5f4943c183 Merge pull request #3760 from Zoddo/ticket/14014 
[ticket/14014] Add core.mcp_forum_view_before event
 2015-08-09 10:13:24 +02:00
Marc Alexander
7b8f8d7d90 Merge branch '3.1.x' 2015-08-09 10:08:06 +02:00
Marc Alexander
9e38f412ea Merge pull request #3756 from rxu/ticket/14005 
[ticket/14005] Allow extensions control post buttons displaying
 2015-08-09 10:08:00 +02:00
Marc Alexander
b1d8f8a22c Merge branch '3.1.x' 2015-08-09 10:00:34 +02:00
Marc Alexander
8d54f06d19 Merge pull request #3822 from brunoais/ticket/14083 
[ticket/14083] Fix wrong variables from previous commit
 2015-08-09 10:00:29 +02:00
Marc Alexander
994b9c2c77 Merge branch '3.1.x' 2015-08-09 09:56:40 +02:00
Marc Alexander
4d2940dd2f Merge pull request #3821 from brunoais/ticket/14082 
[ticket/14082] Fix wrong variables from previous commit
 2015-08-09 09:56:34 +02:00
brunoais
7a2f72df75 [ticket/14083] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13693

PHPBB3-14083
 2015-08-08 22:45:38 +01:00
brunoais
84a40b6ad1 [ticket/14082] Fix wrong variables from previous commit 
Fixing variables wrongly attributed in PHPBB3-13686

PHPBB3-14082
 2015-08-08 22:23:17 +01:00
Marc Alexander
e41fcab3de Merge branch '3.1.x' 2015-08-08 22:40:40 +02:00
Marc Alexander
8e80425c82 Merge pull request #3759 from Zoddo/ticket/14013 
[ticket/14013] Add acp_forums_custom_settings event
 2015-08-08 22:40:35 +02:00
Marc Alexander
47b32f1da9 Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/avatar/driver/upload.php
	tests/avatar/manager_test.php
 2015-08-08 22:23:03 +02:00
Marc Alexander
b7e4d0b0a5 Merge pull request #3738 from javiexin/ticket/13981 
[ticket/13981] Add events to capture avatar deletion or overwriting
 2015-08-08 22:21:11 +02:00
Marc Alexander
46ffafd0c6 Merge branch '3.1.x' 2015-08-08 22:17:29 +02:00
Marc Alexander
3dcba7000b Merge pull request #3757 from Zoddo/ticket/14006 
[ticket/14006] Add core.ucp_register_agreement event
 2015-08-08 22:17:21 +02:00
Máté Bartus
962fb6b19b Merge pull request #3819 from Nicofuma/ticket/14079 
[ticket/14079] Correctly mark notifications as read
 2015-08-08 19:53:34 +02:00
Tristan Darricau
05d583bba7 [ticket/14079] Correctly mark notifications as read 
PHPBB3-14079
 2015-08-08 19:18:18 +02:00
Máté Bartus
ec270713d0 Merge pull request #3817 from Nicofuma/ticket/14076 
[ticket/14076] Fix notification settings
 2015-08-07 16:39:55 +02:00
Tristan Darricau
7e62b3a4b0 [ticket/14076] Fix notification settings 
PHPBB3-14076
 2015-08-07 16:38:53 +02:00
Máté Bartus
e4e3f595ec Merge pull request #3816 from Nicofuma/ticket/14074 
[ticket/14074] Fix mark notifications as read in the ucp
 2015-08-07 16:34:15 +02:00
Tristan Darricau
2260533d47 [ticket/14074] Fix mark notifications as read in the ucp 
PHPBB3-14074
 2015-08-07 16:14:40 +02:00
Marc Alexander
b55361e89b Merge remote-tracking branch 'Nicofuma/ticket/12692' 2015-08-07 10:07:45 +02:00
Tristan Darricau
618065ec16 [ticket/12692] Fix tests and update style 
PHPBB3-12692
 2015-08-06 13:26:14 +02:00
Marco Kubuntu
32f5dc3d8b [ticket/14069] Corrected sql_fetchfield() in style_update_p1 migration 
Changed the sql_fetchfield() call to comply to the function definition.

PHPBB3-14069
 2015-08-05 19:07:02 +02:00
Andreas Fischer
4aac578908 Merge pull request #3782 from RMcGirr83/ticket/13711 
[ticket/13711] Notifications are sent to inactive users

* RMcGirr83/ticket/13711:
  [ticket/13711] Notifications are sent to inactive users
 2015-08-05 13:45:02 +02:00
Andreas Fischer
452c8bef28 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13711] Notifications are sent to inactive users
 2015-08-05 13:45:02 +02:00
Andreas Fischer
50cf610eb6 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14049] Use headers from config when sending Plupload delete request.
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
 2015-08-05 13:41:59 +02:00
Andreas Fischer
b34e74254a Merge pull request #3790 from prototech/ticket/14010 
[ticket/14010] Update Plupload from 2.1.2 to 2.1.8.

* prototech/ticket/14010:
  [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.
 2015-08-05 13:40:40 +02:00
Andreas Fischer
e7c6c3f02b Merge pull request #3791 from prototech/ticket/14049 
[ticket/14049] Use headers from config when sending Plupload delete request.

* prototech/ticket/14049:
  [ticket/14049] Use headers from config when sending Plupload delete request.
 2015-08-05 13:39:44 +02:00
Tristan Darricau
cbe74844b0 Merge pull request #3698 from s9e/ticket/13935 
[ticket/13935] Allow more admin-configurable schemes in post links

* s9e/ticket/13935:
  [ticket/13935] Removed cache invalidation from acp_board
  [ticket/13935] Removed UI
  [ticket/13935] Allow more admin-configurable schemes in post links
 2015-08-05 12:59:55 +02:00
Jakub Senko
7cb7ca57c2 [ticket/14043] Add more parameters to the event 
PHPBB3-14043
 2015-08-02 20:27:05 +02:00
Tristan Darricau
e70373a820 Merge pull request #3799 from CHItA/ticket/14056 
[ticket/14056] Keep install schema resources in the install folder

* CHItA/ticket/14056:
  [ticket/14056] Fix remaining schema path
  [ticket/14056] Keep install schema resources in the install folder
 2015-07-30 09:58:34 +02:00
Mate Bartus
4ae83e4266 [ticket/14056] Fix remaining schema path 
PHPBB3-14056
 2015-07-29 22:08:37 +02:00
Mate Bartus
6eb284b23a [ticket/14056] Keep install schema resources in the install folder 
PHPBB3-14056
 2015-07-29 20:24:52 +02:00
Tristan Darricau
979e125c7c Merge pull request #3795 from CHItA/ticket/14053 
[ticket/14053] Fix tests for installer config

* CHItA/ticket/14053:
  [ticket/14053] Fix tests for installer config
 2015-07-27 16:13:54 +02:00
Mate Bartus
172b021c89 [ticket/14053] Fix tests for installer config 
@covers annotations causing build failures on bamboo, so removed them

PHPBB3-14053
 2015-07-27 16:04:34 +02:00
Máté Bartus
3cfaa61560 Merge pull request #3793 from Nicofuma/ticket/14052 
[ticket/14052] Translate installer commands
 2015-07-27 13:55:55 +02:00
RMcGirr83
771090f13e [ticket/13711] Notifications are sent to inactive users 
PHPBB3-13711
 2015-07-27 06:27:25 -04:00
Tristan Darricau
6499a8a6c0 [ticket/14052] Translate installer commands 
PHPBB3-14052
 2015-07-27 11:40:12 +02:00
Tristan Darricau
a0258ae25c Merge pull request #3514 from CHItA/ticket/13740 
[ticket/13740] Refactoring installer

* CHItA/ticket/13740: (75 commits)
  [ticket/13740] Reduce number of references in nav provider
  [ticket/13740] Move handle_language_select calls to the controllers
  [ticket/13740] Fix infinite config.php check loop
  [ticket/13740] Move default data settings out of constructors
  [ticket/13740] Deduplicate container builder's checks
  [ticket/13740] Use JSON for installer config
  [ticket/13740] Fix comment
  [ticket/13740] Use language service in console application
  [ticket/13740] Fix CS in compatibilty_globals.php
  [ticket/13740] Fix message element creation in JS
  [ticket/13740] Replace more spaces with tabs
  [ticket/13740] Fix CS
  [ticket/13740] Filter basic directory change attempts in lang change
  [ticket/13740] Use tabs instead of spaces in JS file
  [ticket/13740] Add success message when install finished
  [ticket/13740] Fix $script_path in obtain_data
  [ticket/13740] Fix is_phpbb_installed() method
  [ticket/13740] Login admin when install finished
  [ticket/13740] Enhance server output buffer bypass
  [ticket/13740] Secure installer config against corrupted config data
  ...
 2015-07-27 11:24:43 +02:00
Mate Bartus
11dfe503aa [ticket/13740] Reduce number of references in nav provider 
PHPBB3-13740
 2015-07-26 23:00:40 +02:00
Mate Bartus
495c0c6fb3 [ticket/13740] Move handle_language_select calls to the controllers 
PHPBB3-13740
 2015-07-26 22:20:32 +02:00