mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 19:24:13 +02:00
Code Issues Releases Wiki Activity
25,643 Commits 18 Branches 192 Tags
Commit Graph

25643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
03eae6fddd Merge branch '3.1.x' 2015-04-26 09:24:09 +02:00
Marc Alexander
59a178f3cb Merge pull request #3532 from prototech/ticket/13755 
[ticket/13755] Ignore dots in path when determining file extension.
 2015-04-26 09:24:03 +02:00
Andreas Fischer
3305885fc8 Merge branch '3.1.x' 
* 3.1.x:
 2015-04-25 18:19:49 +02:00
Andreas Fischer
887f83589f Merge branch 'prep-release-3.1.4' into 3.1.x 
* prep-release-3.1.4:
 2015-04-25 18:19:43 +02:00
Andreas Fischer
eae592691c Merge pull request #3550 from bantu/ticket/13765-3.1.4 
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
 2015-04-25 18:19:24 +02:00
Andreas Fischer
80d4fb1847 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
 2015-04-25 18:11:19 +02:00
Andreas Fischer
196eb98ba8 Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
 2015-04-25 18:11:12 +02:00
Andreas Fischer
0fc70d4b15 Merge pull request #3550 from bantu/ticket/13765-3.1.4 
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765-3.1.4:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
 2015-04-25 18:11:07 +02:00
Andreas Fischer
4d63032024 Merge pull request #3549 from bantu/ticket/13765 
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

* bantu/ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
 2015-04-25 18:10:45 +02:00
Andreas Fischer
901875a1fb Merge branch 'ticket/13765' into ticket/13765-3.1.4 
* ticket/13765:
  [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

Conflicts:
	phpBB/includes/functions.php
	phpBB/includes/startup.php
 2015-04-25 17:41:17 +02:00
Joas Schilling
463c62df18 [ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it. 
PHPBB3-13765
 2015-04-25 17:22:10 +02:00
Andreas Fischer
746a33b57b Merge pull request #3541 from s9e/ticket/13767 
[ticket/13767] Remove vendor/s9e/text-formatter/.git during build

* s9e/ticket/13767:
  [ticket/13767] Remove vendor/s9e/text-formatter/.git during build
 2015-04-22 23:31:40 +02:00
Andreas Fischer
b334121eeb Merge pull request #3547 from s9e/ticket/13774 
[ticket/13774] Update s9e\TextFormatter

* s9e/ticket/13774:
  [ticket/13774] Updated s9e\TextFormatter
 2015-04-22 23:22:19 +02:00
JoshyPHP
72596429bd [ticket/13774] Updated s9e\TextFormatter 
PHPBB3-13774
 2015-04-22 22:35:47 +02:00
Andreas Fischer
eba5b59533 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
 2015-04-22 15:15:09 +02:00
Andreas Fischer
552f35952a Merge pull request #3546 from brunoais/ticket/13772 
[ticket/13772] Fix typo in phpbb\passwords\manager::__construct()

* brunoais/ticket/13772:
  [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()
 2015-04-22 15:15:08 +02:00
Andreas Fischer
6381c5a731 Merge pull request #3544 from Nicofuma/ticket/13768 
[ticket/13768] Update to symfony 2.8.*@dev

* Nicofuma/ticket/13768:
  [ticket/13768] Fix deprecations
  [ticket/13768] Update to symfony 2.8.*@dev
 2015-04-22 14:01:20 +02:00
brunoais
8769f185f5 [ticket/13772] Fix typo in phpbb\passwords\manager::__construct() 
PHPBB3-13772
 2015-04-21 10:00:30 +01:00
Tristan Darricau
de5a5c41f8 [ticket/13768] Fix deprecations 
PHPBB3-13768
 2015-04-19 17:41:29 +02:00
Tristan Darricau
9939ced81f [ticket/13768] Update to symfony 2.8.*@dev 
PHPBB3-13768
 2015-04-19 17:33:06 +02:00
JoshyPHP
14333f6ebc [ticket/13767] Remove vendor/s9e/text-formatter/.git during build 
PHPBB3-13767
 2015-04-19 13:54:21 +02:00
Tristan Darricau
ecc65f564d Merge pull request #3539 from MateBartus/ticket/13766 
[ticket/13766] Add style_parent_id in textformater's data_access::get_st...
 2015-04-17 00:07:04 +02:00
MateBartus
f23fe9e69d [ticket/13766] Add style_parent_id in textformater's data_access::get_styles() 
PHPBB3-13766
 2015-04-16 23:28:52 +02:00
Tristan Darricau
c89384eb86 Merge pull request #3446 from MateBartus/ticket/13654 
[ticket/13654] Moving reporting into controller
 2015-04-16 21:30:52 +02:00
Tristan Darricau
f077b72d0d Merge pull request #3487 from MateBartus/ticket/13697 
[ticket/13697] Moving filesystem related functions to filesystem service
 2015-04-16 20:44:02 +02:00
Andreas Fischer
c46024bfa2 Merge pull request #3537 from RMcGirr83/ticket/13763 
[ticket/13763] Fix typo in extension lang file

* RMcGirr83/ticket/13763:
  [ticket/13763] Fix typo in extension lang file
 2015-04-16 13:38:48 +02:00
Andreas Fischer
db9ef52fdd Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13763] Fix typo in extension lang file
 2015-04-16 13:38:48 +02:00
MateBartus
4bdef6fd21 [ticket/13697] Moving filesystem related functions to filesystem service 
* Moving filesystem service to \phpbb\filesystem namespace
 * Wraping Symfony's Filesystem component
 * Moving filesystem related functions from includes/functions.php
   into \phpbb\filesystem\filesystem
   Functions moved (and deprecated):
     - phpbb_chmod
     - phpbb_is_writable
     - phpbb_is_absolute
     - phpbb_own_realpath
     - phpbb_realpath
 * Adding interface for filesystem service

PHPBB3-13697
 2015-04-16 13:24:10 +02:00
MateBartus
a089ff5eb0 [ticket/13654] Moving reporting into controller 
Moving report.php's content into different services and controllers to
better comply with the MVC model.

Also implementing:
 * Replacement for reasons_display()
 * Adding assign_meta_refresh_var() to \controller\helper
 * Adding separate routes for easy configuration
 * Updating unit tests to expect to correct results
 * Add BC tests

PHPBB3-13654
 2015-04-16 11:29:11 +02:00
Richard McGirr
60f31d48e2 [ticket/13763] Fix typo in extension lang file 
PHPBB3-13763
 2015-04-15 07:35:42 -04:00
Dhruv
2c0b1252c8 Merge branch '3.1.x' 2015-04-14 09:10:47 +05:30
Dhruv Goel
ba1e3fd661 Merge pull request #3533 from Elsensee/ticket/13756 
[ticket/13756] Fix resize after upload with plupload
 2015-04-14 09:09:14 +05:30
Oliver Schramm
366dfce846 [ticket/13756] Add test for generate_resize_string() 
PHPBB3-13756
 2015-04-12 14:20:07 +02:00
Oliver Schramm
70c74df009 [ticket/13756] Fix resize after upload with plupload 
PHPBB3-13756
 2015-04-11 23:08:45 +02:00
Cesar G
47514ca2df [ticket/13755] Ignore dots in path when determining file extension. 
PHPBB3-13755
 2015-04-10 16:23:51 -07:00
Joas Schilling
bf107ba1af Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-04-10 10:06:07 +02:00
Joas Schilling
a151ad912a [3.1.x] Update development version to 3.1.5-dev 2015-04-10 09:56:20 +02:00
Joas Schilling
fcc7e7d333 Merge branch 'prep-release-3.1.4' into 3.1.x 2015-04-10 09:53:58 +02:00
Joas Schilling
073f3e4470 [prep-release-3.1.4] Add changelog for 3.1.4-RC1 release-3.1.4-RC1 2015-04-09 21:11:08 +02:00
Joas Schilling
bc04581b80 [prep-release-3.1.4] Add migration for 3.1.4-RC1 2015-04-09 20:28:28 +02:00
Joas Schilling
313a224c68 Update version to 3.1.4-RC1 2015-04-09 20:26:12 +02:00
Oliver Schramm
afc3730cca Merge branch '3.1.x' 2015-04-06 23:54:40 +02:00
Oliver Schramm
17620bba46 Merge pull request #3525 from marc1706/ticket/13749 
[ticket/13749] Add missing slash to base uri in helper route tests
 2015-04-06 23:54:27 +02:00
Marc Alexander
9d181daa71 [ticket/13749] Add missing slash to base uri in helper route tests 
PHPBB3-13749
 2015-04-06 22:59:34 +02:00
Joas Schilling
201f5cb3fb Merge branch '3.1.x' 2015-04-06 16:54:54 +02:00
Joas Schilling
53ed8a3cd9 Merge pull request #3392 from marc1706/ticket/13493 
[ticket/13493] Append page name to base url if it doesn't contain it
 2015-04-06 16:54:35 +02:00
Joas Schilling
a11994d424 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-04-06 14:45:20 +02:00
Joas Schilling
02202b1503 Merge pull request #3492 from RMcGirr83/ticket/13710 
[ticket/13710] Allow template events near smilies display
 2015-04-06 14:44:37 +02:00
Joas Schilling
4ce0d88ffd Merge branch '3.1.x' 2015-04-06 14:43:11 +02:00
Joas Schilling
b16a56394b Merge pull request #3488 from Crizz0/ticket/13701 
[ticket/13701] Adds two new events to posting_pm_layout.html

Conflicts:
	phpBB/docs/events.md
 2015-04-06 14:42:59 +02:00