mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 13:05:44 +02:00
Code Issues Releases Wiki Activity
27,234 Commits 18 Branches 192 Tags
Commit Graph

27234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mate Bartus
8f5a0ad6f7 [ticket/14039] Revamp updater 
PHPBB3-14039
 2015-10-17 23:05:57 +02:00
Máté Bartus
f1047ac854 Merge pull request #3992 from Nicofuma/ticket/14243 
[ticket/14243] Exclude every .git directory from the pakages
 2015-10-17 18:55:45 +02:00
Tristan Darricau
d64accd72c [ticket/14243] Exclude every .git directory from the pakages 
PHPBB3-14243
 2015-10-17 18:50:14 +02:00
Máté Bartus
24e8a30993 Merge pull request #3991 from Nicofuma/ticket/14243 
[ticket/14243] Exclude every .git directory from the pakages
 2015-10-17 18:05:59 +02:00
Tristan Darricau
e9f262611d [ticket/14243] Exclude every .git directory from the pakages 
PHPBB3-14243
 2015-10-17 18:04:06 +02:00
Tristan Darricau
59d39dce3b Merge pull request #3986 from CHItA/ticket/14240 
[ticket/14240] Fix packaging script for 3.2

* CHItA/ticket/14240:
  [ticket/14240] Fix packaging script for 3.2
 2015-10-17 15:40:43 +02:00
Tristan Darricau
a928b109d3 Merge pull request #3990 from CHItA/ticket/13371 
[ticket/13371] Fix language loading for the old installer

* CHItA/ticket/13371:
  [ticket/13371] Add language files to the service as well
  [ticket/13371] Use user selected language in old installer
  [ticket/13371] Fix language loading for the old installer
 2015-10-17 15:36:19 +02:00
Mate Bartus
22b9f35bdf [ticket/13371] Add language files to the service as well 
PHPBB3-13371
 2015-10-17 15:02:09 +02:00
Mate Bartus
fb434adf88 [ticket/13371] Use user selected language in old installer 
PHPBB3-13371
 2015-10-17 14:55:14 +02:00
Mate Bartus
2efbf59f97 [ticket/13371] Fix language loading for the old installer 
PHPBB3-13371
 2015-10-17 14:51:40 +02:00
Marc Alexander
7d4bbeef3f Merge branch '3.1.x' 
Conflicts:
	phpBB/phpbb/notification/type/bookmark.php
	phpBB/phpbb/notification/type/post.php
	phpBB/phpbb/notification/type/quote.php
 2015-10-17 12:13:32 +02:00
Marc Alexander
3a5336452c Merge pull request #3985 from prototech/ticket/13892 
[ticket/13892] Respect "Someone reports a post" notification setting.
 2015-10-17 12:06:27 +02:00
Marc Alexander
3f4abbd5ce Merge branch '3.1.x' 2015-10-17 12:02:14 +02:00
Marc Alexander
6fba5613f8 Merge pull request #3987 from prototech/ticket/13945 
[ticket/13945] Send reactivation requests to admins using notifications system.
 2015-10-17 12:02:10 +02:00
Cesar G
c7d7967a91 [ticket/13945] Send reactivation requests to admins using notifications system. 
PHPBB3-13945
 2015-10-15 22:26:14 -07:00
Mate Bartus
f6171f0391 [ticket/14240] Fix packaging script for 3.2 
PHPBB3-14240
 2015-10-15 18:24:41 +02:00
Cesar G
aaca64e13e [ticket/13892] Replace other uses of self with static. 
PHPBB3-13892
 2015-10-15 02:39:55 -07:00
Cesar G
9de5668b80 [ticket/13892] Respect "Someone reports a post" notification setting. 
report_post inherits from post_in_queue, therefore using self:: instead of
static:: results in the incorrect notification type being used to determine
which users to exclude from the notification.

PHPBB3-13892
 2015-10-15 02:28:55 -07:00
Marc Alexander
2974353101 Merge branch '3.1.x' 2015-10-15 11:02:02 +02:00
Marc Alexander
bc6a4c4583 Merge pull request #3984 from prototech/ticket/12616 
[ticket/12616] Remove report notifications when post is deleted/disapproved.
 2015-10-15 11:01:59 +02:00
Marc Alexander
16ff320340 Merge pull request #3970 from prototech/ticket/13789 
[ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
 2015-10-15 08:59:34 +02:00
Cesar G
e634d2902d [ticket/12616] Remove report notifications when post is deleted/disapproved. 
PHPBB3-12616
 2015-10-14 22:50:50 -07:00
Cesar G
86d1b35a00 [ticket/13789] Update composer.lock. 
PHPBB3-13789
 2015-10-14 19:05:27 -07:00
Cesar G
90038e32cd [ticket/13789] Upgrade reCaptcha plugin to 2.0 API. 
PHPBB3-13789
 2015-10-14 19:05:27 -07:00
Cesar G
2781623185 Merge pull request #3982 from Nicofuma/ticket/13652 
[ticket/13652] Fix coding style
 2015-10-14 09:10:08 -07:00
Tristan Darricau
84150d0d44 [ticket/13652] Fix coding style 
PHPBB3-13652
 2015-10-14 17:15:09 +02:00
Tristan Darricau
d26fcdda8d Merge pull request #3981 from ErnadoO/ticket/14235 
[ticket/14235] Font Awesome in simple_header.html

* ErnadoO/ticket/14235:
  [ticket/14235] Font Awesome in simple_header.html
 2015-10-14 17:12:38 +02:00
Erwan Nader
7dec0a6707 [ticket/14235] Font Awesome in simple_header.html 
PHPBB3-14235
 2015-10-14 16:58:35 +02:00
Tristan Darricau
886fb7c3f4 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14159] Hide version info on ACP if we don't have the permission
 2015-10-14 16:56:44 +02:00
Tristan Darricau
240d07d0cf Merge pull request #3900 from Zoddo/ticket/14159 
[ticket/14159] Hide version info on ACP if we don't have the permission

* Zoddo/ticket/14159:
  [ticket/14159] Hide version info on ACP if we don't have the permission
 2015-10-14 16:40:06 +02:00
Tristan Darricau
9ac79453e1 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14192] Add core.memberlist_memberrow_before event
 2015-10-14 16:36:52 +02:00
Tristan Darricau
f6776c1017 Merge pull request #3926 from Senky/ticket/14192 
[ticket/14192] Add core.memberlist_memberrow_before event

* Senky/ticket/14192:
  [ticket/14192] Add core.memberlist_memberrow_before event
 2015-10-14 16:35:24 +02:00
Tristan Darricau
df723c388a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
 2015-10-14 16:32:37 +02:00
Tristan Darricau
bab85da820 Merge pull request #3935 from Zoddo/ticket/10343 
[ticket/10343] Allows a_user to show inactive accounts in memberlist

* Zoddo/ticket/10343:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
 2015-10-14 16:32:33 +02:00
Tristan Darricau
1e36c6d16c Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13851] Fix ignore flood limit check
 2015-10-14 16:27:02 +02:00
Tristan Darricau
bc11e648af Merge pull request #3978 from RMcGirr83/ticket_13851 
[ticket/13851] Fix ignore flood limit check

* RMcGirr83/ticket_13851:
  [ticket/13851] Fix ignore flood limit check
 2015-10-14 16:26:54 +02:00
Tristan Darricau
e94f9d7830 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
 2015-10-14 16:25:15 +02:00
Tristan Darricau
669618b5a0 Merge pull request #3979 from prototech/ticket/9153 
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's

* prototech/ticket/9153:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
 2015-10-14 16:25:08 +02:00
Tristan Darricau
cd114a68e9 Merge pull request #3441 from brunoais/feature/sql-bool-builder 
[feature/sql-bool-builder] Extending DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Improved tests output to show the SQL error.
  [feature/sql-bool-builder] Adding the IS operator to predicted operators
  [feature/sql-bool-builder] test_single_not_like
  [feature/sql-bool-builder] test_single_like
  [feature/sql-bool-builder] test_single_not_in
  [feature/sql-bool-builder] test_single_in
  [feature/sql-bool-builder] test_and_of_or_of_and
  [feature/sql-bool-builder] test_triple_and_with_in
  [feature/sql-bool-builder] test_double_and_with_not_of_and
  [feature/sql-bool-builder] test_triple_and_with_is_null
  [feature/sql-bool-builder] Prepare testing class
  [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations
  [feature/sql-bool-builder] Explain better the code in the first
  [feature/sql-bool-builder] Also use parenthesis for the NOT operator
  [feature/sql-bool-builder] AS keyword must be lowercase;
  [feature/sql-bool-builder] Added code to use this feature for the WHERE clause
  [feature/sql-bool-builder] Removed non-necessary spaces
  [feature/sql-bool-builder] First working version
 2015-10-14 16:18:46 +02:00
Máté Bartus
4682b5abdd Merge pull request #3980 from marc1706/ticket/10572 
[ticket/10572] Remove excessive new line
 2015-10-14 15:53:55 +02:00
Marc Alexander
bf72a27c5f [ticket/10572] Remove excessive new line 
PHPBB3-10572
 2015-10-14 15:50:15 +02:00
Cesar G
9ec8faff32 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13684] Prevent horizontal resize of attach comment textarea
 2015-10-14 04:29:50 -07:00
Cesar G
50bf3411d4 Merge pull request #3959 from marc1706/ticket/13684 
[ticket/13684] Prevent horizontal resize of attach comment textarea
 2015-10-14 04:28:34 -07:00
Richard McGirr
a49a3091f9 [ticket/13851] Fix ignore flood limit check 
PHPBB3-13851
 2015-10-14 07:25:35 -04:00
Cesar G
fb3073029f [ticket/9153] Allow users without u_sendpm permission to delete existing PM's. 
The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the
error message within the UCP template. Otherwise it could be removed as
compose_pm() will check the appropriate permission pertaining to the attempted
action.

PHPBB3-9153
 2015-10-14 03:09:06 -07:00
Marc Alexander
57a2e63300 Merge branch '3.1.x' 
Conflicts:
	.travis.yml
 2015-10-14 12:04:58 +02:00
Marc Alexander
3367f0036a Merge pull request #3977 from Nicofuma/ticket/14236 
[ticket/14236] Don't dump Opcache config in Travis
 2015-10-14 12:04:12 +02:00
Tristan Darricau
69b57eab5e [ticket/14236] Don't dump Opcache config in Travis 
PHPBB3-14236
 2015-10-14 11:46:47 +02:00
Marc Alexander
6bcec956ba [ticket/13684] Prevent horizontal resize of attach comment textarea 
PHPBB3-13684
 2015-10-14 11:13:15 +02:00
Marc Alexander
fd0ddd6b76 Merge pull request #3974 from Nicofuma/ticket/14238 
[ticket/14238] Updates Symfony
 2015-10-14 10:57:00 +02:00