mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 10:39:19 +02:00
Code Issues Releases Wiki Activity
12,200 Commits 18 Branches 192 Tags
Commit Graph

12200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
b71cf56bda Merge pull request #3047 from Elsensee/ticket/13168 
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility

* Elsensee/ticket/13168:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:42 +02:00
Nils Adermann
d4faeb064b Merge pull request #3039 from nickvergessen/ticket/13138 
[ticket/13138] Only use cookie data when we do not force a user_id
 2014-10-20 14:49:29 -04:00
Oliver Schramm
53f166274a [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility 
PHPBB3-13168
 2014-10-20 16:47:52 +02:00
Joas Schilling
e7e016637b [ticket/13138] Do not use cookie data and autologin while forcing a user_id 
PHPBB3-13138
 2014-10-16 12:32:48 +02:00
Joas Schilling
a12a7d0b90 Merge pull request #2460 from Nicofuma/ticket/11224 
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
 2014-10-06 23:20:50 +02:00
Andreas Fischer
ce0c33f62a Merge pull request #2994 from Skouat/ticket/13086-olympus 
[ticket/13086] Update ACP_MASS_EMAIL_EXPLAIN language key

* Skouat/ticket/13086-olympus:
  [ticket/13086] String replaces 50 with 20
 2014-09-24 21:21:53 +02:00
Mario Skouat
077db77259 [ticket/13086] String replaces 50 with 20 
PHPBB3-13086
 2014-09-24 19:03:33 +02:00
Tristan Darricau
74a96bf7c2 [ticket/11224] Adds a test case 
PHPBB3-11224
 2014-09-24 16:16:47 +02:00
Andreas Fischer
2f773fca18 Merge pull request #2989 from Senky/ticket/13096 
[ticket/13096] ldap_escape() added to PHP 5.6.0

* Senky/ticket/13096:
  [ticket/13096] Add phpbb_ prefix to ldap_escape()
 2014-09-23 22:54:27 +02:00
Jakub Senko
ba464ec93a [ticket/13096] Add phpbb_ prefix to ldap_escape() 
PHPBB3-13096
 2014-09-23 22:43:52 +02:00
Marc Alexander
8bd1853b56 Merge pull request #2981 from nickvergessen/ticket/10729 
Ticket/10729 Update editor information when user being deleted
 2014-09-23 11:08:56 +02:00
Joas Schilling
bea5f94de6 [ticket/10729] Use mocked null cache for phpunit 3.6 on travis with php 5.2 
PHPBB3-10729
 2014-09-23 09:03:44 +02:00
Joas Schilling
e28b93e0cc [ticket/10729] Ensure that no bans exist before testing create_session 
PHPBB3-10729
 2014-09-22 23:56:31 +02:00
Joas Schilling
7fca351e05 [ticket/10729] Add assert messages and finish up tests 
PHPBB3-10729
 2014-09-22 02:01:54 +02:00
Joas Schilling
d7c12ccd60 [ticket/10729] Add tests for some special tables with unique conditions 
PHPBB3-10729
 2014-09-22 01:42:36 +02:00
Joas Schilling
74854ac65d [ticket/10729] Add tests for user posts, reports and attachments 
PHPBB3-10729
 2014-09-22 00:55:34 +02:00
Joas Schilling
d48e4b680e [ticket/10729] Fix doc block for user_delete 
PHPBB3-10729
 2014-09-22 00:55:08 +02:00
Andreas Fischer
f01b602e9f Merge pull request #2808 from nickvergessen/ticket/12917 
[ticket/12917] Check commit message and image ICC profile on 5.3.3

* nickvergessen/ticket/12917:
  [ticket/12917] Check commit message and image ICC profile on 5.3.3
 2014-08-07 14:30:41 +02:00
Joas Schilling
b700e871cf [ticket/12917] Check commit message and image ICC profile on 5.3.3 
PHPBB3-12917
 2014-08-07 13:40:31 +02:00
Joas Schilling
122898d221 Merge pull request #2350 from Nicofuma/ticket/11480 
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full

* Nicofuma/ticket/11480:
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
 2014-08-01 22:17:17 +02:00
Tristan Darricau
8bdfda723c [ticket/11480] Move the test into get_folder() 
PHPBB3-11480
 2014-07-30 15:28:02 +02:00
Joas Schilling
9a3af2a052 Merge pull request #2425 from Zoddo/ticket/12492 
[ticket/12492] Add support of special chars

* Zoddo/ticket/12492:
  [ticket/12492] Add support of special chars
 2014-07-30 15:00:32 +02:00
Oliver Schramm
da6b378e64 [ticket/10729] Update message_edit_user when user being deleted 
PHPBB3-10729
 2014-07-18 00:11:51 +02:00
Oliver Schramm
53f597b6d0 [ticket/10729] Update post_edit_user when user being deleted 
PHPBB3-10729
 2014-07-17 16:28:32 +02:00
Andreas Fischer
a58cc394bc Merge pull request #2716 from marc1706/ticket/12120 
[ticket/12120] Remove imkingdavid from active authors

* marc1706/ticket/12120:
  [ticket/12120] Remove imkingdavid from active authors
 2014-07-11 12:00:02 +02:00
Tristan Darricau
3a11fec5de Merge pull request #2722 from marc1706/ticket/12695 
[ticket/12695] Add viewtopic language file for parse_attachments in mcp_...

* marc1706/ticket/12695:
  [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
 2014-07-10 15:25:00 +02:00
Marc Alexander
83f4bd9ee7 [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post 
PHPBB3-12695
 2014-07-10 14:39:53 +02:00
Marc Alexander
e68094679e [ticket/12120] Remove imkingdavid from active authors 
PHPBB3-12120
 2014-07-08 21:20:51 +02:00
Tristan Darricau
a6d66b2ab0 Merge pull request #2685 from nickvergessen/ticket/12120 
[ticket/12120] Add nicofuma to the developers

* nickvergessen/ticket/12120:
  [ticket/12120] Add nicofuma to the developers
 2014-07-02 22:43:12 +02:00
Joas Schilling
eff07032c0 [ticket/12120] Add nicofuma to the developers 
PHPBB3-12120
 2014-07-02 22:26:32 +02:00
Tristan Darricau
0ce27eacb1 [ticket/11480] Fix the double spaces in phpbb_functional_test_case 
PHPBB3-11480
 2014-06-30 00:33:33 +02:00
Andreas Fischer
66efb1889d Merge pull request #2662 from dhruvgoel92/ticket/12196 
[ticket/12196] Revert Fix typo "referer" in acp/attachments

* dhruvgoel92/ticket/12196:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
 2014-06-26 23:33:46 +02:00
Dhruv
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments 
This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
 2014-06-27 00:07:15 +05:30
Dhruv
fbbf210747 Merge remote-tracking branch 'nickvergessen/ticket/12196' into develop-olympus 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12196:
  [ticket/12196] Fix typo "referer" in acp/attachments
 2014-06-26 23:23:33 +05:30
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments 
PHPBB3-12196
 2014-06-25 23:17:02 +02:00
Andreas Fischer
2596dbc850 Merge pull request #2633 from marc1706/ticket/12755 
[ticket/12755] Add timeout to remote upload to prevent infinite loop

* marc1706/ticket/12755:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
 2014-06-24 20:59:10 +02:00
Marc Alexander
8b3cc9a6c4 [ticket/12755] Apply de morgan to conditional 
PHPBB3-12755
 2014-06-24 19:53:52 +02:00
Marc Alexander
309dbb4ef9 [ticket/12755] Terminate upload loop if upload reaches filesize 
Terminate the upload loop if the expected filesize has been reached instead
of trying to read more bytes until the timeout has been reached.

PHPBB3-12755
 2014-06-24 19:07:49 +02:00
Marc Alexander
5ee1e07e17 [ticket/12755] Change upload in remote_upload() method to fit get_remote_file 
PHPBB3-12755
 2014-06-24 11:53:32 +02:00
Marc Alexander
8817b59377 [ticket/12755] Add language string for timed out remote upload 
PHPBB3-12755
 2014-06-23 20:35:36 +02:00
Marc Alexander
0499655ba4 [ticket/12755] Add timeout to remote upload to prevent infinite loop 
PHPBB3-12755
 2014-06-21 11:55:54 +02:00
Andreas Fischer
51b2cc14f8 Merge pull request #2622 from Nicofuma/ticket/12741 
[ticket/12741] Functional tests on Travis fail since php update last night

* Nicofuma/ticket/12741:
  [ticket/12741] Change the mode of the socket file
 2014-06-19 19:32:21 +02:00
Tristan Darricau
f62ec14926 [ticket/12741] Change the mode of the socket file 
Since php 5.4.29, by default, php-fpm creates the socket with the 0600 mode
instead of 0666.

PHPBB3-12741
 2014-06-19 18:44:44 +02:00
Andreas Fischer
d2aee6d2ea Merge pull request #2608 from dhruvgoel92/ticket/12720 
[ticket/12720] Allow commit heading to begin with lowercase letters

* dhruvgoel92/ticket/12720:
  [ticket/12720] Allow commit heading to begin with lowercase letters
 2014-06-16 15:28:25 +02:00
Dhruv
6db849cba5 [ticket/12720] Allow commit heading to begin with lowercase letters 
PHPBB3-12720
 2014-06-16 18:55:19 +05:30
Dhruv Goel
233cdbfd66 Merge pull request #2548 from bantu/ticket/12660 
[ticket/12660] Improve check for when phpinfo() is disabled.
 2014-06-09 13:22:15 +05:30
Andreas Fischer
a0c442d16e [ticket/12660] Improve check for when phpinfo() is disabled. 
PHPBB3-12660
 2014-06-09 03:28:57 +02:00
Tristan Darricau
5762af6180 [ticket/11480] Fix typos 
PHPBB3-11480
 2014-05-29 22:45:34 +02:00
Tristan Darricau
9c8e843def [ticket/11480] Add functionnal test 
PHPBB3-11480
 2014-05-29 14:56:45 +02:00
Joas Schilling
a396b647f3 Merge pull request #2282 from bantu/ticket/12384 
[ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.

* bantu/ticket/12384:
  [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
 2014-05-28 23:30:03 +02:00