mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 16:40:21 +01:00
Code Issues Releases Wiki Activity
29,061 Commits 18 Branches 191 Tags
Commit Graph

29061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
b1e4b232b9
Merge branch '3.1.x' into 3.2.x 2016-12-17 16:26:44 +01:00
Marc Alexander
3c223b3a5d
Merge pull request #4526 from senky/ticket/14239 
[ticket/14239] Add core.ucp_remind_modify_select_sql
 2016-12-17 16:20:29 +01:00
Marc Alexander
63f222ca90
Merge branch '3.1.x' into 3.2.x 2016-12-17 15:57:51 +01:00
Marc Alexander
daee389e53
Merge pull request #4518 from senky/ticket/14870 
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
 2016-12-17 15:55:24 +01:00
Jakub Senko
90b7d1fbda
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from 
PHPBB3-14870
 2016-12-16 12:23:21 +01:00
Jakub Senko
df96351244
[ticket/14239] Add core.ucp_remind_modify_select_sql 
PHPBB3-14239
 2016-12-13 11:26:45 +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
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
Tristan Darricau
8eda17f430
Merge pull request #4567 from javiexin/ticket/14887 
[ticket/14887] ACP profile step one lang specific event

* javiexin/ticket/14887:
  [ticket/14887] ACP profile step one lang specific event
 2016-12-11 20:43:37 +01:00
Tristan Darricau
809d73ca5e
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14889] Missing method in profile fields type interface
 2016-12-11 20:41:42 +01:00
Tristan Darricau
230e737790
Merge pull request #4558 from javiexin/ticket/14889 
[ticket/14889] Missing method in profile fields type interface

* javiexin/ticket/14889:
  [ticket/14889] Missing method in profile fields type interface
 2016-12-11 20:41:39 +01:00
Tristan Darricau
7d7aa9d119
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14893] Fix undefined variable on reporting PM notification
 2016-12-11 20:28:24 +01:00
Tristan Darricau
08d169c109
Merge pull request #4561 from rxu/ticket/14893 
[ticket/14893] Fix undefined variable on reporting PM notification

* rxu/ticket/14893:
  [ticket/14893] Fix undefined variable on reporting PM notification
 2016-12-11 20:28:21 +01:00
Tristan Darricau
3ed1104467
Merge pull request #4562 from rxu/ticket/14893-3.2.x 
[ticket/14893] Fix undefined variable on reporting PM notification

* rxu/ticket/14893-3.2.x:
  [ticket/14893] Fix undefined variable on reporting PM notification
 2016-12-11 20:26:43 +01:00
Tristan Darricau
8c9d6add2e
Merge pull request #4564 from VSEphpbb/ticket/14895 
[ticket/14895] CLI should use SymfonyStyle

* VSEphpbb/ticket/14895:
  [ticket/14895] Fix broken tests
  [ticket/14895] Fix issues in CLI classes
  [ticket/14895] Use SymfonyStyle in all CLI
  [ticket/14895] Use SymfonyIO styling
  [ticket/14895] CLI reparser:list should display proper list
 2016-12-11 20:25:09 +01:00
Tristan Darricau
0cf85c047e
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
 2016-12-11 20:16:25 +01:00
Tristan Darricau
e40afd8cd1
Merge pull request #4572 from javiexin/ticket/14855 
[ticket/14855] Update notification and PM alert bubbles

* javiexin/ticket/14855:
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
  [ticket/14855] Update notification and PM alert bubbles
 2016-12-11 20:11:17 +01:00
Tristan Darricau
27df2278ef
Merge pull request #4570 from Derky/ticket/14901 
[ticket/14901] Remove notice for extension without version check

* Derky/ticket/14901:
  [ticket/14901] Remove notice for extension without version check
 2016-12-11 20:09:16 +01:00
Tristan Darricau
3ba8e7bda3
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14906] Delete redundant sig key in user_cache_data array
 2016-12-11 19:51:56 +01:00
Tristan Darricau
ad3b7830b4
Merge pull request #4573 from rxu/ticket/14906 
[ticket/14906] Delete redundant sig key in user_cache_data array

* rxu/ticket/14906:
  [ticket/14906] Delete redundant sig key in user_cache_data array
 2016-12-11 19:51:53 +01:00
Tristan Darricau
bd6e5144dd
Merge pull request #4576 from Crizz0/ticket/14910 
[ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED

* Crizz0/ticket/14910:
  [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED
 2016-12-11 19:49:37 +01:00
Marc Alexander
dbd003a0d1
Merge branch '3.1.x' into 3.2.x 2016-12-11 15:59:08 +01:00
Marc Alexander
96adf7f0d6
Merge pull request #4514 from senky/ticket/14759 
[ticket/14759] Add core.mcp_main_modify_shadow_sql event
 2016-12-11 15:58:12 +01:00
Christian Schnegelberger
a0adf07453 [ticket/14910] Fixes typo PLease to Please in EXTENSION_NOT_INSTALLED 
PHPBB3-14910
 2016-12-11 14:11:55 +01:00
Marc Alexander
04e68c092b
Merge pull request #4574 from Crizz0/ticket/14908 
[ticket/14908] Uses lang-variable instead of english text
 2016-12-10 23:02:11 +01:00
Christian Schnegelberger
dfe42e9603 [ticket/14908] Uses lang-variable instead of english text 
PHPBB3-14908
 2016-12-10 21:50:09 +01:00
rxu
7d5d5b0f06 [ticket/14906] Delete redundant sig key in user_cache_data array 
PHPBB3-14906
 2016-12-11 00:52:32 +07:00
javiexin
daae2147c8 [ticket/14855] Update notification and PM alert bubbles 
Alternative implementation without removing notification from
the DOM, but changing the class.  So that style designers
might have more options (show/not show).
Fix tests better.

PHPBB3-14855
 2016-12-10 18:09:31 +01:00
Marc Alexander
f7049bd0dc
Merge branch '3.1.x' into 3.2.x 2016-12-10 13:37:56 +01:00
Marc Alexander
c084990a68
Merge pull request #4513 from senky/ticket/14760 
[ticket/14760] Add core.mcp_main_modify_fork_sql event
 2016-12-10 13:37:52 +01:00
javiexin
41b3450f2f [ticket/14855] Update notification and PM alert bubbles 
Alternative implementation without removing notification from
the DOM, but changing the class.  So that style designers
might have more options (show/not show).
Fix tests.

PHPBB3-14855
 2016-12-10 11:41:11 +01:00
javiexin
959e5fb79d [ticket/14855] Update notification and PM alert bubbles 
Alternative implementation without removing notification from
the DOM, but changing the class.  So that style designers
might have more options (show/not show).

PHPBB3-14855
 2016-12-10 00:51:41 +01:00
Marc Alexander
cff3dbf00e
[3.2.x] Update version numbers to 3.2.0-RC3-dev 2016-12-10 00:32:41 +01:00
Marc Alexander
886ec98dc7
Merge branch 'prep-release-3.2.0-RC2' into 3.2.x 2016-12-10 00:25:58 +01:00
Marc Alexander
af7dca6acd
[prep-release-3.2.0-RC2] Update changelog release-3.2.0-RC2 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
Marc Alexander
a35c8a924e
[prep-release-3.2.0-RC2] Add migration file for 3.2.0-RC2 2016-12-09 20:50:48 +01:00
Marc Alexander
9d72c4a66a
[prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 2016-12-09 20:50:48 +01:00
Marc Alexander
185bda094b
[prep-release-3.2.0-RC2] Update version numbers to 3.2.0-RC2 2016-12-09 20:50:48 +01:00
Marc Alexander
ddfc52a5f6
Merge pull request #4571 from marc1706/ticket/14894 
[ticket/14894] Use correct config name for conflicts archive extension
 2016-12-09 20:48:14 +01:00
Derky
a2793f24b1 [ticket/14901] Remove notice for extension without version check 
Extensions without version check should not display a notice on the
details page in the ACP.

PHPBB3-14901
 2016-12-09 20:03:00 +01:00
Marc Alexander
37a3bd131b
[ticket/14894] Use correct config name for conflicts archive extension 
PHPBB3-14894
 2016-12-09 19:54:58 +01:00
Máté Bartus
54751991ad Merge pull request #4569 from marc1706/ticket/14891 
[ticket/14891] Use own proxy instantiator for open_basedir compatibility
 2016-12-09 12:40:57 +01:00
Marc Alexander
90b59bb547 [ticket/14891] Don't rely on sys_get_temp_dir() being available 
Or actually returning a path. It might also return an empty string
or null.

PHPBB3-14891
 2016-12-09 11:32:13 +01:00
Marc Alexander
6a568719d0 [ticket/14891] Use filesystem classes for checking on tmp dir 
The cache dir will now also only be used if tmp dir does not exist
or if it's not writable.

PHPBB3-14891
 2016-12-09 11:10:28 +01:00