mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-10 02:44:38 +02:00
Code Issues Releases Wiki Activity
29,135 Commits 18 Branches 192 Tags
Commit Graph

3546 Commits

Author SHA1 Message Date
Marc Alexander
2019d750c4
Merge branch '3.2.x' 2016-12-01 13:23:11 +01:00
JoshyPHP
88c921be23 [ticket/14873] Added width/height attributes to smilies 
PHPBB3-14873
 2016-11-27 13:30:15 +01:00
Marc Alexander
82960414f7 Merge branch '3.2.x' 2016-11-17 09:56:59 +01:00
Marc Alexander
9343317121 Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x 2016-11-17 09:56:51 +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
3bde3cf45a
Merge branch '3.2.x' 2016-11-13 21:29:38 +01:00
Marc Alexander
8a3147faf8
Merge branch '3.1.x' into 3.2.x 2016-11-13 21:29:14 +01:00
Marc Alexander
6e6a2c5df8
Merge pull request #4488 from senky/ticket/14825 
Add core.auth_oauth_login_after and core.auth_oauth_link_after
 2016-11-13 21:27:51 +01:00
Jakub Senko
df0388ccc5 [ticket/14825] Add core.auth_oauth_(login/link)_after 
PHPBB3-14825
 2016-11-13 18:19:21 +01:00
Marc Alexander
fa9182c133
Merge branch '3.2.x' 2016-11-12 19:41:20 +01:00
Marc Alexander
9c7e8c2dc5
Merge branch '3.1.x' into 3.2.x 2016-11-12 19:41:10 +01:00
Marc Alexander
372324cead
Merge pull request #4504 from VSEphpbb/ticket/14855 
[ticket/14855] Update notification and PM alert bubbles
 2016-11-12 19:30:34 +01:00
Tristan Darricau
79dd364b9c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
 2016-11-06 15:42:05 +01:00
Tristan Darricau
cd348b200a Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
 2016-11-06 15:41:59 +01:00
Tristan Darricau
dc32b900c5 Merge pull request #4486 from marc1706/ticket/11483 
[ticket/11483] Generate user act key if database entry is empty

* github.com:phpbb/phpbb:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
 2016-11-06 15:41:46 +01:00
Marc Alexander
ac36cc25eb
[ticket/11483] Add tests for generating user act key on force reactivate 
PHPBB3-11483
 2016-11-06 11:58:31 +01:00
Matt Friedman
af2bf4ef36 [ticket/14855] Update notification functional test 
PHPBB3-14855
 2016-11-05 19:41:08 -07:00
Máté Bartus
65d09b1dce Merge branch '3.2.x' 2016-11-02 10:02:09 +01:00
JoshyPHP
33f1934b72 [ticket/14846] Updated s9e\TextFormatter 
PHPBB3-14846
 2016-11-02 09:19:35 +01:00
Marc Alexander
890fe72e48
Merge branch '3.2.x' 2016-10-28 21:06:54 +02:00
Marc Alexander
f658e062b2
Merge branch '3.1.x' into 3.2.x 2016-10-28 21:06:21 +02:00
Marc Alexander
85898d3d2c
Merge pull request #4489 from rxu/ticket/14830 
[ticket/14830] Fix FORM_INVALID error during some ACP setting operations
 2016-10-28 19:36:49 +02:00
Tristan Darricau
e1234a92be
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
 2016-10-24 22:24:28 +02:00
Tristan Darricau
b13910ee45
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
 2016-10-24 22:24:26 +02:00
rxu
cefbd39b82 [ticket/14830] Fix tests 
PHPBB3-14830
 2016-10-24 01:54:40 +07:00
rxu
849cd74700 [ticket/14831] Add more tests against UCP modules 
PHPBB3-14831
 2016-10-23 23:33:03 +07:00
rxu
51ef1ae346 [ticket/14831] Add more tests, better name for $e placeholder 
PHPBB3-14831
 2016-10-23 22:44:47 +07:00
rxu
8afa9fdf28 [ticket/14830] Fix FORM_INVALID error during AСP search index deletion 
PHPBB3-14830
 2016-10-21 01:23:45 +07:00
rxu
244ff0f969 [ticket/14830] Fix ACP search control functional tests 
PHPBB3-14830
 2016-10-21 01:23:45 +07:00
Marc Alexander
8f4ea4c495
Merge branch '3.2.x' 2016-10-10 21:39:21 +02:00
Marc Alexander
322b86da1f
Merge pull request #4476 from Nicofuma/ticket/14807 
[ticket/14807] Updates dependencies
 2016-10-10 21:30:13 +02:00
Tristan Darricau
35ad0f1249
[ticket/14807] Fix tests after symfony upgrade 
PHPBB3-14807
 2016-10-09 22:13:58 +02:00
Tristan Darricau
82105070ad
[ticket/14807] Updates s9e textformatter again 
PHPBB3-14807
 2016-10-09 22:10:16 +02:00
Tristan Darricau
d94c03d084
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:21:46 +02:00
Tristan Darricau
7bb4e88acd
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:20:54 +02:00
Daniel Sinn
bf8ee698f9 [ticket/14802] Add test for empty/blank lines in poll options 
PHPBB3-14802
 2016-10-03 12:24:02 -04:00
Tristan Darricau
a713f5159a
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
 2016-09-25 17:19:18 +02:00
Tristan Darricau
de2c70127f
Merge pull request #4265 from Senky/ticket/10809 
[ticket/10809] Remove MSSQL support

* Senky/ticket/10809:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
 2016-09-25 17:19:13 +02:00
Tristan Darricau
f9b7bbafac
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14484] Remove duplicate methods and no longer needed calls
  [ticket/14484] Remove invalid code caused by merge conflict
  [ticket/14484] Properly enable extensions in UI tests
  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  [ticket/14484] Move facebook webdriver to main composer.json
 2016-09-24 10:31:48 +02:00
Tristan Darricau
fdd4f68aea
Merge pull request #4455 from marc1706/ticket/14484-rhea 
[ticket/14484] Add possibility to use extensions in UI tests

* marc1706/ticket/14484-rhea:
  [ticket/14484] Remove duplicate methods and no longer needed calls
  [ticket/14484] Remove invalid code caused by merge conflict
  [ticket/14484] Properly enable extensions in UI tests
  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  [ticket/14484] Move facebook webdriver to main composer.json
 2016-09-24 10:31:27 +02:00
Tristan Darricau
cdd56c0505
Merge pull request #4394 from marc1706/ticket/14484 
[ticket/14484] Add possibility to use extensions in UI tests

* marc1706/ticket/14484:
  [ticket/14484] Properly enable extensions in UI tests
  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  [ticket/14484] Move facebook webdriver to main composer.json
 2016-09-24 10:31:06 +02:00
Máté Bartus
a94c4ce0dd Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14791] Get form tokens from correct button in search test base
 2016-09-22 10:16:22 +02:00
Marc Alexander
65ef56ed71
[ticket/14791] Get form tokens from correct button in search test base 
PHPBB3-14791
 2016-09-21 21:36:03 +02:00
Marc Alexander
2b22adbcac
[ticket/14484] Remove duplicate methods and no longer needed calls 
PHPBB3-14484
 2016-09-21 21:09:55 +02:00
Marc Alexander
6242698a84
[ticket/14484] Remove invalid code caused by merge conflict 
PHPBB3-14484
 2016-09-18 21:52:11 +02:00
Marc Alexander
229472cb07
Merge branch 'ticket/14484' into ticket/14484-rhea 2016-09-18 21:46:32 +02:00
Tristan Darricau
3c2b7d026b
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons
 2016-09-18 21:17:18 +02:00
Tristan Darricau
19bbbfe0f3
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons
 2016-09-18 21:14:47 +02:00
Marc Alexander
72f6241aa2
[ticket/14789] Add form tokens to tests and uncomment add_form_key 
PHPBB3-14789
 2016-09-18 15:30:25 +02:00
Tristan Darricau
d9aea27c75
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14774] Support partial downloads of attachments
 2016-09-11 13:59:08 +02:00