makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 11:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
30350 commits 18 branches 192 tags 207 MiB
Commit graph

30350 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tristan Darricau
c43fabf502
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea
 2016-05-02 21:19:58 +02:00
Tristan Darricau
ef226138c8
Merge pull request #4310 from Crizz0/ticket/14619 
[ticket/14619] Updates "docs" from 3.1.x/ascraeus to 3.2.x/rhea

* Crizz0/ticket/14619:
  [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea
 2016-05-02 21:18:47 +02:00
Tristan Darricau
7c8f383bf2
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14607] Add missing auto_increment to report_id
 2016-05-02 21:14:35 +02:00
Tristan Darricau
43c16ca4c3
Merge pull request #4308 from marc1706/ticket/14607 
[ticket/14607] Add missing auto_increment to report_id

* marc1706/ticket/14607:
  [ticket/14607] Add missing auto_increment to report_id
 2016-05-02 21:14:18 +02:00
Crizzo
e9b7cb1324 [ticket/14619] Updates 3.1.x/ascraeus to 3.2.x/rhea 
PHPBB3-14619
 2016-05-01 22:31:39 +02:00
Marc Alexander
6eda942a7f [ticket/14607] Add missing auto_increment to report_id 
PHPBB3-14607
 2016-05-01 17:29:10 +02:00
Tristan Darricau
21bd3b7c0a
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/13969] Remove obsolute language files
 2016-04-29 20:16:48 +02:00
Tristan Darricau
c941041963
Merge pull request #4303 from paul999/ticket/13969 
[ticket/13969] Remove obsolute language files

* paul999/ticket/13969:
  [ticket/13969] Remove obsolute language files
 2016-04-29 20:15:40 +02:00
Tristan Darricau
d70a9fb81e
Merge branch '3.2.x' 
* 3.2.x:
 2016-04-29 20:11:42 +02:00
Tristan Darricau
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:58:16 +02:00
Tristan Darricau
6949ee162d
erge branch 'prep-release-3.2.0-b2' 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:51:23 +02:00
Paul Sohier
39c4590f01
[ticket/13969] Remove obsolute language files 
These help_*.php files have been moved to help/

PHPBB3-13969
 2016-04-28 21:33:36 +02:00
Matt Friedman
40aac1cd57 [ticket/14547] Ignore backup config.php files 
PHPBB3-14547
 2016-04-28 08:36:49 -07:00
Matt Friedman
3cd0c53118 [ticket/14547] Use package compatible with phpBB requirements 
PHPBB3-14547
 2016-04-28 08:36:49 -07:00
Matt Friedman
6196e4ae4d [ticket/14547] Add Vagrant to phpBB 
PHPBB3-14547
 2016-04-28 08:36:49 -07:00
Marc Alexander
682c44cee4 Merge branch '3.2.x' 2016-04-23 23:04:13 +02:00
Marc Alexander
ead261e6db Merge pull request #4286 from VSEphpbb/ticket/14569 
[ticket/14569] Extract CLI progress bar creation to a method
 2016-04-23 23:04:05 +02:00
cyberalien
877188c114 [ticket/14612] Fix incorrect class for fieldset in mcp_approve.html 
PHPBB3-14612
 2016-04-23 22:46:52 +03:00
3Di
269e253524 [ticket/14596] Deny installation of Ascraeus under PHP 7 
PHPBB3-14596
 2016-04-23 07:11:34 +02:00
Tristan Darricau
23bdb2eede
[ticket/security-196] Escapes the exception messages before displaying them 
SECURITY-196
 2016-04-19 12:03:32 +02:00
Joas Schilling
4b51590520 Merge branch '3.2.x' 2016-04-16 12:51:06 +02:00
Joas Schilling
29bb1ab72d Merge branch '3.1.x' into 3.2.x 2016-04-16 12:50:31 +02:00
Joas Schilling
4cdec74e94 Merge branch 'prep-release-3.1.9' into 3.1.x 2016-04-16 12:48:56 +02:00
Joas Schilling
1b01667c7b [prep-release-3.1.9] Add migration for 3.1.9 2016-04-16 12:16:23 +02:00
Joas Schilling
fdcedb262f [prep-release-3.1.9] Update version for 3.1.9 final 2016-04-16 12:13:36 +02:00
Tristan Darricau
36c87313a4
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14589] Fix @var usage
 2016-04-13 19:14:18 +02:00
Tristan Darricau
1b0b78dabc
Merge pull request #4289 from CHItA/ticket/14589 
[ticket/14589] Fix @var usage

* CHItA/ticket/14589:
  [ticket/14589] Fix @var usage
 2016-04-13 19:13:25 +02:00
Tristan Darricau
3a028ef067
Merge pull request #4288 from CHItA/ticket/14601 
[ticket/14601] Fix composer.lock

* CHItA/ticket/14601:
  [ticket/14601] Fix composer.lock
 2016-04-13 19:06:46 +02:00
Máté Bartus
4614cc972f [ticket/14589] Fix @var usage 
PHPBB3-14589
 2016-04-13 19:02:43 +02:00
Máté Bartus
caf63ba86b [ticket/14601] Fix composer.lock 
PHPBB3-14601
 2016-04-13 10:52:12 +02:00
Máté Bartus
3a44ac1690 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14598] Support vars docblock in sniffer
 2016-04-13 10:20:39 +02:00
Máté Bartus
68645d38ef Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14598] Support vars docblock in sniffer
 2016-04-13 10:20:07 +02:00
Máté Bartus
ed378a2ec3 Merge pull request #4287 from Nicofuma/ticket/14598 
[ticket/14598] Support vars docblock in sniffer
 2016-04-13 10:18:34 +02:00
Máté Bartus
13a3e99848 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/13616] Fix CS + constant in the core extension
  [ticket/13616] Fix UI tests
  [ticket/13616] Cleanup globals after installing the board in func tests
  [ticket/13616] Updates direct call to twig environment constructor
  [ticket/13616] Uses a php 5.4 compatible version
  [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer

Conflicts:
	phpBB/composer.lock
 2016-04-13 10:14:47 +02:00
Máté Bartus
4c257d47a6 Merge pull request #4236 from Nicofuma/ticket/13616 
[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
 2016-04-13 10:11:24 +02:00
Tristan Darricau
96bdcedacd
[ticket/14598] Support vars docblock in sniffer 
PHPBB3-14598
 2016-04-12 22:26:57 +02:00
Matt Friedman
d713ce94ff [ticket/14569] Extract CLI progress bar creation to a method 
PHPBB3-14569
 2016-04-12 10:56:23 -07:00
Tristan Darricau
94853ba2dd
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14589] Fix grammatical errors in language strings
  [ticket/14589] Add error messages for failable installer requirements
 2016-04-12 11:27:03 +02:00
Tristan Darricau
560bee1be4
Merge pull request #4284 from CHItA/ticket/14589 
[ticket/14589] Add error messages for failable installer requirements

* CHItA/ticket/14589:
  [ticket/14589] Fix grammatical errors in language strings
  [ticket/14589] Add error messages for failable installer requirements
 2016-04-12 11:27:03 +02:00
Richard McGirr
c938077172 [ticket/13716] Fix verboseness 
PHPBB3-13716
 2016-04-12 05:17:02 -04:00
Marc Alexander
ffcde0c95a Merge branch '3.2.x' 2016-04-11 21:27:20 +02:00
Marc Alexander
336f5b49a7 Merge pull request #4285 from CHItA/ticket/14590 
[ticket/14590] Prevent refresh requests after the last tasks in modules
 2016-04-11 21:27:12 +02:00
Máté Bartus
972255247b [ticket/14589] Fix grammatical errors in language strings 
PHPBB3-14589
 2016-04-11 19:42:40 +02:00
Máté Bartus
f41c7bd2b1 [ticket/14590] Prevent refresh requests after the last tasks in modules 
PHPBB3-14590
 2016-04-11 18:18:09 +02:00
Máté Bartus
9163cc2864 [ticket/14589] Add error messages for failable installer requirements 
PHPBB3-14589
 2016-04-10 10:30:15 +02:00
Joas Schilling
4a1d1dd6a5 Merge branch '3.2.x' 2016-04-09 19:53:57 +02:00
Joas Schilling
d89b75bd36 Merge branch '3.1.x' into 3.2.x 2016-04-09 19:53:39 +02:00
Joas Schilling
58dfff38fa [3.1.x] Increase version for 3.1.10 development 2016-04-09 19:50:00 +02:00
Joas Schilling
c4ef83e4d2 Merge branch 'prep-release-3.1.9' into 3.1.x 2016-04-09 19:48:35 +02:00
Joas Schilling
e7043dc044 [prep-release-3.1.9] Add changelog for 3.1.9-RC1 2016-04-09 08:19:34 +02:00