mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Code Issues Releases Wiki Activity
30,722 Commits 10 Branches 193 Tags
5fccb54391f8eadd0ebe151380c6416f8478a4b0
Commit Graph

2032 Commits

Author SHA1 Message Date
Marc Alexander
663bdda53c Merge branch '3.2.x' 2017-01-07 00:20:22 +01:00
Marc Alexander
93ca17f07a Merge branch 'ticket/security-181' into ticket/security-181-rhea 2017-01-06 12:49:35 +01:00
Marc Alexander
1dea4625d0 [ticket/security-181] Update wording in INSTALL.html 
SECURITY-181
 2017-01-06 12:27:38 +01:00
Marc Alexander
743d3af3c5 [ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2 
PHPBB3-14961
 2017-01-06 12:06:39 +01:00
Marc Alexander
93567727fe Merge branch '3.2.x' 2017-01-04 22:16:47 +01:00
Marc Alexander
0c6c94e527 Merge branch '3.1.x' into 3.2.x 2017-01-04 22:16:24 +01:00
Marc Alexander
77b3f36992 Merge pull request #4532 from senky/ticket/14662 
[ticket/14662] Add memberlist_team_username_prepend/append
 2017-01-04 22:15:37 +01:00
Tristan Darricau
bab707a00d Merge branch '3.2.x' 2016-12-30 10:22:24 +01:00
Tristan Darricau
1f65f85b53 Merge branch '3.1.x' into 3.2.x 2016-12-30 10:21:17 +01:00
Tristan Darricau
4139e4f2b5 Merge pull request #4593 from javiexin/ticket/14940 
[ticket/14940] Add ACP template event acp_ext_details_end
 2016-12-30 10:21:00 +01:00
javiexin
87f82c404e [ticket/14940] Add ACP template event acp_ext_details_end 
PHPBB3-14940
 2016-12-27 02:07:46 +01:00
Jakub Senko
cc42c09a95 [ticket/14662] Add memberlist_team_username_prepend/append 
PHPBB3-14662
 2016-12-18 21:15:36 +01:00
Marc Alexander
9e998e1830 Merge branch '3.2.x' 2016-12-18 20:50:59 +01:00
Marc Alexander
60af11da9d Merge branch '3.1.x' into 3.2.x 2016-12-18 20:50:38 +01:00
Marc Alexander
956c7186ec Merge pull request #4534 from senky/ticket/14522 
[ticket/14522] Add ucp_register_buttons_before
 2016-12-18 20:49:53 +01:00
Marc Alexander
84d7371167 Merge branch '3.2.x' 2016-12-17 23:39:09 +01:00
Marc Alexander
5ecd9fb775 Merge branch '3.1.x' into 3.2.x 2016-12-17 23:39:03 +01:00
Marc Alexander
b6ea338309 Merge pull request #4529 from senky/ticket/14520 
[ticket/14520] Add ucp_pm_viewmessage_options_before
 2016-12-17 23:38:56 +01:00
Marc Alexander
20752848ff Merge branch '3.2.x' 2016-12-17 16:41:59 +01:00
Marc Alexander
544c7c4e08 Merge branch '3.1.x' into 3.2.x 2016-12-17 16:41:38 +01:00
Marc Alexander
fadec0d2b9 Merge pull request #4527 from senky/ticket/14390 
[ticket/14390] Add ucp_main_front_user_activity_append/prepend
 2016-12-17 16:40:17 +01:00
Marc Alexander
5dc31fd03d Merge branch '3.2.x' 2016-12-12 22:09:40 +01:00
Marc Alexander
37eb22a61d Merge branch '3.1.x' into 3.2.x 2016-12-12 22:09:21 +01:00
Marc Alexander
5235e6de53 Merge pull request #4520 from senky/ticket/14868 
[ticket/14868] Add mcp_forum_actions_options template event
 2016-12-12 22:07:59 +01:00
Tristan Darricau
d1959cb731 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14887] ACP profile step one lang specific event
 2016-12-11 20:43:42 +01:00
Tristan Darricau
b7597a347b Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14887] ACP profile step one lang specific event
 2016-12-11 20:43:39 +01:00
Marc Alexander
86257feb33 Merge branch '3.2.x' 2016-12-10 00:30:07 +01:00
Marc Alexander
af7dca6acd [prep-release-3.2.0-RC2] Update changelog 2016-12-09 20:52:35 +01:00
Marc Alexander
c494d8f53e [prep-release-3.2.0-RC2] Update changelog 2016-12-09 20:50:48 +01:00
javiexin
76ffd288fe [ticket/14887] ACP profile step one lang specific event 
PHPBB3-14887
 2016-12-08 12:16:07 +01:00
Jakub Senko
839987fa19 [ticket/14868] Add mcp_forum_actions_options template event 
PHPBB3-14868
 2016-12-04 17:24:19 +01:00
Tristan Darricau
c36ac7703a Merge branch '3.2.x' 
* 3.2.x: (47 commits)
  [ticket/14492] Add user service to installer & only instantiate if needed
  [ticket/14492] Fix redirection to help phpBB page
  [ticket/14492] Encode URI components in systemdata for stats
  [ticket/14492] Always update the time the stats were sent
  [ticket/14492] Update versions in files
  [ticket/14492] Add missing event variable
  [ticket/14492] Don't explicitly pass data providers by refs
  [ticket/14492] Update phpBB version and fix miscellaneous code issues
  [ticket/14492] Install all extensions if 'all' is specified for extensions
  [ticket/14492] Checkout master if viglink tag does not exist for latest version
  [ticket/14492] Add language variables for updating extensions
  [ticket/14492] Prevent timeouts in install & update extensions tasks
  [ticket/14492] Use same list for checking if extension should be updated
  [ticket/14492] Add missing config to schema_data.sql
  [ticket/14492] Unify version check for installing default extensions
  [ticket/14492] Use extension manager instead of finder and add try/catch
  [ticket/14492] Checkout viglink for each version depending on tags
  [ticket/14492] Remove unused use statement
  [ticket/14492] Redirect to help phpBB page after installation
  [ticket/14492] Properly retrieve version updating from
  ...
 2016-12-03 14:42:32 +01:00
Marc Alexander
c54838b25f [ticket/14492] Update versions in files 
PHPBB3-14492
 2016-12-03 14:23:34 +01:00
Marc Alexander
ffe900c72d [ticket/14492] Define extensions to install in config not via cli argument 
PHPBB3-14492
 2016-12-03 14:23:34 +01:00
Marc Alexander
c07ecb060d [ticket/14492] Add events for modifying help phpBB page 
PHPBB3-14492
 2016-12-03 14:20:28 +01:00
Jakub Senko
255368843c [ticket/14522] Add ucp_register_buttons_before 
PHPBB3-14522
 2016-11-21 16:45:56 +01:00
Jakub Senko
8e3a38e80d [ticket/14520] Add ucp_pm_viewmessage_options_before 
PHPBB3-14520
 2016-11-20 19:02:06 +01:00
Jakub Senko
34cfa5f885 [ticket/14390] Add ucp_main_front_user_activity_append/prepend 
PHPBB3-14390
 2016-11-20 18:53:59 +01:00
Marc Alexander
7aba483d61 Merge branch '3.2.x' 2016-11-20 09:46:37 +01:00
Marc Alexander
8f19d16b2a Merge branch '3.1.x' into 3.2.x 2016-11-20 09:46:32 +01:00
Marc Alexander
16c3b40b4e Merge pull request #4519 from michaelcullum/ticket/14872 
[ticket/14872] Remove sizeof/count restriction
 2016-11-20 09:46:27 +01:00
Michael Cullum
ad4889be4b [ticket/14872] Remove sizeof/count restriction 
PHPBB3-14872
 2016-11-19 22:11:09 -05:00
Marc Alexander
82960414f7 Merge branch '3.2.x' 2016-11-17 09:56:59 +01:00
Jakub Senko
e974f338af [ticket/14739] Remove SQLite 2.8.x database driver 
PHPBB3-14739
 2016-11-16 17:59:28 +01:00
Marc Alexander
a2953cb10c Merge branch 'ticket/security-181' into ticket/security-181-rhea 2016-11-13 12:29:28 +01:00
Marc Alexander
44dd1ef984 [ticket/security-181] Update INSTALL.html to ask for more secure apache config 
SECURITY-181
 2016-11-13 12:26:35 +01:00
Marc Alexander
7ba9b06881 [ticket/security-181] Port .htaccess changes to other webserver types 
SECURITY-181
 2016-11-13 11:50:23 +01:00
Marc Alexander
221a8beb07 Merge branch '3.2.x' 2016-11-12 17:14:42 +01:00
Marc Alexander
4a1e5df654 Merge branch '3.1.x' into 3.2.x 2016-11-12 17:14:39 +01:00
Marc Alexander
c77798b1a3 Merge pull request #4496 from senky/ticket/14848 
[ticket/14848] Add acp_ext_list_disabled/enabled_title_after
 2016-11-12 17:14:35 +01:00