1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00

2451 Commits

Author SHA1 Message Date
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
Joas Schilling
370fce1651 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/posting_poll_body.html
2015-04-06 14:27:48 +02:00
Joas Schilling
7d08bf5b3e Merge pull request #3517 from Wolfsblvt/ticket/13739
[ticket/13739] Add template core event posting_poll_body_options_after
2015-04-06 14:26:35 +02:00
Wolfsblvt
1d34968967 [ticket/13739] Add template core event posting_poll_body_options_after
Fixing order of if statement and event

PHPBB3-13739
2015-04-03 19:20:16 +02:00
Wolfsblvt
284a5671c5 [ticket/13739] Add template core event posting_poll_body_options_after
Fixing if else construct in prosilver so that the event is placed correctly

PHPBB3-13739
2015-04-03 18:56:53 +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
Wolfsblvt
d5021aeda4 [ticket/13739] Add template core event posting_poll_body_options_after
Template event added for the poll options while posting a topic
so that you may add additional options for polls.

PHPBB3-13739
2015-04-03 17:02:43 +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
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
RMcGirr83
d4ca81f23f [ticket/13710] Allow template events near smilies display
PHPBB3-13710
2015-03-19 07:25:45 -04: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
Crizzo
0a52d732e4 [ticket/13701] Adds two new events to posting_pm_layout.html
These events wrap the includes of posting_pm_header.html to add some
content before and after it.

PHPBB3-13701
2015-03-13 23:37:07 +01: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