1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 20:19:13 +02:00

2435 Commits

Author SHA1 Message Date
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
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
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
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
Cesar G
9a9a665a0a Merge branch '3.1.x'
* 3.1.x:
  [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
2015-03-18 19:39:13 -07:00
Cesar G
4276f49efa Merge remote-tracking branch 'Senky/ticket/9457' into 3.1.x
* Senky/ticket/9457:
  [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
2015-03-18 19:37:29 -07:00
Dhruv
cf8e431334 Merge branch '3.1.x' 2015-03-15 16:59:58 +08:00
cyberalien
7e8274c345 [ticket/13702] Add initial-scale to viewport in page header
PHPBB3-13702
2015-03-14 10:00:28 +02:00
Marc Alexander
a2454285bd Merge branch '3.1.x' 2015-03-11 13:49:44 +01:00
Marc Alexander
e132e9ba76 Merge pull request #3428 from prototech/ticket/13463
[ticket/13463] Correctly position notification mark read icon in RTL.
2015-03-11 13:49:42 +01:00
Marc Alexander
72d9cf3a95 Merge branch '3.1.x' 2015-03-10 15:23:29 +01:00
n-aleha
aeafb90208 [ticket/13679] Add template event overall_header_searchbox_before
PHPBB3-13679
2015-03-08 21:54:01 +02:00
Dragos-Valentin Radulescu
4ccba99047 [ticket/13602] Adding event overall_header_navbar_before
PHPBB3-13602
2015-03-06 19:41:02 +02:00
Cesar G
c6b2039540 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
2015-03-05 08:42:08 -08:00
Cesar G
c0104d0243 Merge remote-tracking branch 'cyberalien/ticket/13667' into 3.1.x
* cyberalien/ticket/13667:
  [ticket/13667] Fix buttons alignment in Chrome for Windows
2015-03-05 08:41:33 -08:00
Marc Alexander
87ca5ef7e5 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
	phpBB/styles/subsilver2/theme/stylesheet.css
2015-03-05 14:23:50 +01:00
Marc Alexander
70f1741331 Merge pull request #3454 from RMcGirr83/ticket/13590
[ticket/13590] Headers of remember me login keys are not centered
2015-03-05 13:56:01 +01:00
RMcGirr83
c3720739cb [ticket/13590] Headers of remember me login keys are not centered
Corrected a few other files as well

PHPBB3-13590
2015-03-04 06:00:27 -05:00
cyberalien
5d8bea9060 [ticket/13667] Fix buttons alignment in Chrome for Windows
PHPBB3-13667
2015-03-03 16:47:30 +02:00
Marc Alexander
5d6f86800f Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-02-27 22:10:27 +01:00
Marc Alexander
a7b1b71921 Merge pull request #3451 from RMcGirr83/ticket/13510
[ticket/13510] Add template even viewtopic_body_pagination_after
2015-02-27 22:08:51 +01:00
RMcGirr83
8c73f63529 [ticket/13510] Add template even viewtopic_body_pagination_after
PHPBB3-13510
2015-02-26 18:29:02 -05:00
Joas Schilling
e5595ca216 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/forumlist_body.html
2015-02-26 22:53:26 +01:00
Cesar G
335d88cdbb [ticket/13649] Fix incorrect subforum tooltip title when unread.
PHPBB3-13649
2015-02-25 19:36:28 -08:00
Joas Schilling
33ea266daf Merge branch '3.1.x' 2015-02-20 20:55:55 +01:00
Joas Schilling
059790f386 Merge pull request #3425 from dragosvr92/patch-4
Update colours.css
2015-02-20 20:55:23 +01:00
Joas Schilling
61fa9dcb9f Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/search_results.html
2015-02-20 20:42:52 +01:00
Joas Schilling
461ce3f892 Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x 2015-02-20 20:41:55 +01:00
Wolfsblvt
cba12aca2a [ticket/13533] Add template core event to search results
PHPBB3-13533
2015-02-20 20:41:17 +01:00
Joas Schilling
a1ecb10c5c Merge branch '3.1.x' 2015-02-20 20:22:18 +01:00
Dragos-Valentin Radulescu
5c3ca7404d [ticket/13640] Rearrange css in a better order
PHPBB3-13640
2015-02-20 20:21:31 +01:00
Dragos-Valentin Radulescu
eff928c29b [ticket/13639] Update colours.css
The rule is a left over from development. it should be removed from colours.css

.icon-search-advanced { background-image: url("./images/icon_search_adv.gif");}

Area21 ticket: https://area51.phpbb.com/phpBB/viewtopic.php?f=81&p=275166

PHPBB3-13639
2015-02-20 20:26:33 +02:00
Scout4all
3f4dcc6920 [ticket/13463] Correctly position notification mark read icon in RTL.
PHPBB3-13463
2015-02-19 19:07:07 -08:00
Marc Alexander
21c6223eb3 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_profile_info.html
	phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
2015-02-18 17:35:03 +01:00
RMcGirr83
153d1691ae [ticket/13628] Allow ability for extension to add entries to user's profile
PHPBB3-13628
2015-02-18 16:35:10 +01:00
Jakub Senko
bf86553daa [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
PHPBB3-9457
2015-02-16 18:02:16 +01:00
Joas Schilling
7f8a726702 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/viewtopic_body.html
2015-02-02 23:07:33 +01:00
Joas Schilling
b1336ae016 Merge pull request #3302 from rxu/ticket/13512
[ticket/13512] Add template events before/after the post details
2015-02-02 23:05:50 +01:00
Matt Friedman
fc412a97ca [ticket/10388] Convert LA usages to L when not in javascript context
PHPBB3-10388
2015-01-29 01:40:54 -08:00
Joas Schilling
acfb9b9539 [prep-release-3.1.3] Update version to 3.1.2-RC1 2015-01-26 19:42:06 +01:00
Joas Schilling
54e3b14583 Merge branch 'develop-ascraeus' into develop 2015-01-19 21:37:25 +01:00
Joas Schilling
ff39ffacf6 Merge pull request #3296 from PayBas/ticket/13431
[ticket/13431] Fix responsive RTL media queries for <IE11
2015-01-19 21:37:14 +01:00
Joas Schilling
8e75133d79 Merge branch 'develop-ascraeus' into develop 2015-01-19 21:14:02 +01:00
rxu
10c67fe12a [ticket/13512] Add template events before/after the post details
Add template events to viewtopic_body.html to allow extensions adding content
before/after the post details.

PHPBB3-13512
2015-01-17 16:40:09 +07:00