Marc Alexander
c900dcdc2a
Merge branch '3.1.x'
2015-04-04 11:04:31 +02:00
Marc Alexander
558d604d83
Merge pull request #3518 from marc1706/ticket/13703
...
[ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
2015-04-04 11:04:29 +02:00
Marc Alexander
2ebab2ed5f
Merge branch '3.1.x'
2015-04-04 11:02:06 +02:00
Marc Alexander
55907c1724
Merge pull request #3519 from marc1706/ticket/13742
...
[ticket/13742] Use correct avatar path for local avatar
2015-04-04 11:02:03 +02:00
Kevin Roy
ddff81c21f
[ticket/13742] Use correct avatar path for local avatar
...
Prior to this change, the path might have been incorrect when using
PHPBB_USE_BOARD_URL_PATH.
PHPBB3-13742
2015-04-03 23:08:26 +02:00
Kevin Roy
a875802c06
[ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATH
...
This change makes the uploaded avatars use the PHPBB_USE_BOARD_URL_PATH
constant, which is needed when trying to use the get_user_avatar()
function in a listener for index changes.
PHPBB3-13703
2015-04-03 23:04:52 +02:00
Joas Schilling
7541fab408
Merge branch '3.1.x'
2015-04-03 18:56:23 +02:00
Joas Schilling
71177c38dc
Merge pull request #3515 from cyberalien/ticket/13741
...
Ticket/13741 Remove outdated comments and references in css files
2015-04-03 18:56:15 +02:00
Joas Schilling
6889248cdf
Merge branch '3.1.x'
2015-04-03 18:42:25 +02:00
Joas Schilling
81c92a7de9
Merge branch '3.0.x' into 3.1.x
2015-04-03 18:42:06 +02:00
Joas Schilling
35d2467c94
Merge pull request #3512 from bantu/ticket/13738
...
[ticket/13738] Use new branch names in sami-all.conf.php.
2015-04-03 18:41:41 +02:00
Marc Alexander
ca1ac36c20
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/overall_header.html
2015-04-03 16:50:20 +02:00
Marc Alexander
55f6329c1d
Merge pull request #3467 from dragosvr92/patch-5
...
[ticket/13602] Adding a new event overall_header_navbar_before
2015-04-03 16:48:26 +02:00
cyberalien
e120e6ac97
[ticket/13741] Remove outdated references to tweaks.css
...
PHPBB3-13741
2015-04-03 11:14:20 +03:00
cyberalien
9f54d2b590
[ticket/13741] Remove reference to unused body font-size declaration
...
Remove reference to font-size declaration that is no longer used in prosilver
PHPBB3-13741
2015-04-03 11:04:47 +03:00
cyberalien
6c308d81bd
[ticket/13741] Remove reference to oudated rollover code that no longer exists
...
Rollover code referenced in that comment has been removed in 3.1
PHPBB3-13741
2015-04-03 11:03:47 +03:00
Marc Alexander
f86c5d905b
Merge branch '3.1.x'
2015-04-02 21:22:15 +02:00
Marc Alexander
418aabb46e
Merge pull request #3508 from cyberalien/ticket/13726
...
[ticket/13726] Fix function that calculates responsive breadcrumbs width
2015-04-02 21:22:12 +02:00
Marc Alexander
8546ed0fbc
Merge branch '3.1.x'
2015-04-02 20:03:02 +02:00
Marc Alexander
335520fc45
Merge pull request #3509 from cyberalien/ticket/13727
...
[ticket/13727] Fix JS that resizes breadcrumbs
2015-04-02 20:01:47 +02:00
Andreas Fischer
eb7e6d7c23
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13736] Missing four colon in Contact us page
2015-04-02 13:31:31 +02:00
Andreas Fischer
5fc92a03b2
Merge pull request #3513 from bantu/ticket/13736
...
[ticket/13736] Missing four colon in Contact us page
* bantu/ticket/13736:
[ticket/13736] Missing four colon in Contact us page
2015-04-02 13:31:31 +02:00
Raphaël M
40c79f2a26
[ticket/13736] Missing four colon in Contact us page
...
Replacing of four ```:``` with four {L_COLON} in Contact us page.
PHPBB3-13736
2015-04-02 12:48:31 +02:00
Andreas Fischer
18d3dd54a1
Merge pull request #3507 from VSEphpbb/ticket/13725
...
[ticket/13725] Coding guidelines: static public
* VSEphpbb/ticket/13725:
[ticket/13725] Coding guidelines: static public
2015-04-02 12:37:34 +02:00
Andreas Fischer
d6d9ff51b2
[ticket/13738] Use new branch names in sami-all.conf.php.
...
PHPBB3-13738
2015-04-02 12:30:39 +02:00
Marc Alexander
fbfcbd5aa7
Merge branch '3.1.x'
2015-04-01 15:51:30 +02:00
Marc Alexander
42d831f472
Merge pull request #3510 from Nicofuma/ticket/13732
...
[ticket/13732] Update composer to be php7 compliant
2015-04-01 15:51:26 +02:00
Tristan Darricau
be472cc7bb
[ticket/13732] Update composer to be php7 compliant
...
Updated to Composer version 1.0-dev
(f10c71475167a4661225b14560ca0a400d730829) 2015-03-29 14:37:42
PHPBB3-13732
2015-03-30 21:48:28 +02:00
Nicofuma
a3f7e0f441
Merge branch '3.1.x'
2015-03-29 19:50:58 +02:00
Nicofuma
1a484f08bb
Merge branch '3.0.x' into 3.1.x
2015-03-29 19:50:38 +02:00
Nicofuma
d9f4964d91
Merge pull request #3376 from marc1706/ticket/13568-asc
...
[ticket/13568] Validate imagick path as readable absolute path
closes #3376
2015-03-29 19:50:19 +02:00
Nicofuma
b9db47e3f5
Merge pull request #3359 from marc1706/ticket/13568
...
[ticket/13568] Validate imagick path as readable absolute path
closes #3359
2015-03-29 19:41:13 +02:00
cyberalien
0b52eb2298
[ticket/13727] Fix JS that resizes breadcrumbs
...
PHPBB3-13727
2015-03-28 19:59:38 +02:00
cyberalien
90b82d1a5f
[ticket/13726] Fix function that calculates responsive breadcrumbs width
...
Do not calculate width of hidden elements.
Set minimum width to make sure breadcrumbs are always shown.
PHPBB3-13726
2015-03-28 11:36:15 +02:00
Matt Friedman
dbb538afbd
[ticket/13725] Coding guidelines: static public
...
PHPBB3-13725
2015-03-27 00:02:20 -07:00
Andreas Fischer
67d81a1ce6
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13555] Render poll options separately when previewing.
2015-03-26 11:15:37 +01:00
Andreas Fischer
499088b62f
Merge branch '3.0.x' into 3.1.x
...
* 3.0.x:
[ticket/13555] Render poll options separately when previewing.
2015-03-26 11:15:37 +01:00
Andreas Fischer
1efbb5b3bb
Merge pull request #3493 from prototech/ticket/13555
...
[ticket/13555] Render poll options separately when previewing.
* prototech/ticket/13555:
[ticket/13555] Render poll options separately when previewing.
2015-03-26 11:15:36 +01:00
Oliver Schramm
784ccdf0b0
Merge branch '3.1.x'
2015-03-25 22:03:15 +01:00
Oliver Schramm
9d75f3fca8
Merge branch '3.0.x' into 3.1.x
2015-03-25 21:49:11 +01:00
Oliver Schramm
407b9d3c6b
Merge pull request #3506 from Nicofuma/ticket/13723-31x
...
[ticket/13723-Ascraeus] Add Elsensee to authors list
2015-03-25 21:48:05 +01:00
Oliver Schramm
84d77d6cd5
Merge pull request #3505 from Nicofuma/ticket/13723
...
[ticket/13723] Add Elsensee to authors list
2015-03-25 21:44:09 +01:00
Nicofuma
7f2b932a1b
[ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31x
...
Conflicts:
phpBB/docs/AUTHORS
PHPBB3-13723
2015-03-25 21:40:12 +01:00
Nicofuma
44540b6112
[ticket/13723] Add Elsensee to authors list
...
PHPBB3-13723
2015-03-25 21:31:50 +01:00
Nicofuma
9e66a10bac
Merge branch '3.1.x'
2015-03-24 23:57:26 +01:00
Nicofuma
50b3c2b49e
Merge pull request #3398 from marc1706/ticket/13612
...
[ticket/13612] Run meta refresh until extension is fully enabled
2015-03-24 23:32:29 +01:00
Nicofuma
9a5aefd4c2
Merge branch '3.1.x'
2015-03-24 23:20:03 +01:00
Nicofuma
4a08d74571
Merge pull request #3501 from prototech/ticket/13698
...
[ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
2015-03-24 23:19:46 +01:00
Nicofuma
673435a0fc
Merge branch '3.1.x'
2015-03-24 22:37:01 +01:00
Nicofuma
285e35992a
Merge pull request #3410 from Senky/ticket/13467
...
[ticket/13467] Add a CONTRIBUTING file to the project on Github
2015-03-24 22:35:34 +01:00
