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

648 Commits

Author SHA1 Message Date
Joas Schilling
8f504b1ca5 Merge remote-tracking branch 'cyberalien/ticket/11969' into develop
* cyberalien/ticket/11969:
  [ticket/11969] Change topic link to unread post in subsilver2
  [ticket/11969] Change topic link to unread post in prosilver
  [ticket/11969] New language strings for first and last post links
2013-12-03 18:29:10 +01:00
Joas Schilling
8a6d01591b Merge remote-tracking branch 'vsephpbb/ticket/12014' into develop
* vsephpbb/ticket/12014:
  [ticket/12014] Change event date in docs
  [ticket/12014] Fix version number in event docs
  [ticket/12014] Template Event index_body.html before forumlist
2013-12-03 18:18:09 +01:00
s9e
263f213ffe [ticket/12028] Replace L_COLON with literal colon
Replace L_COLON with literal colon in JavaScript context.

[ci skip]

PHPBB3-12028
2013-11-21 23:20:16 +01:00
Nathan Guse
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005
[ticket/12005] Remove code responsible for PM popup completely
2013-11-21 14:01:23 -08:00
Nathan Guse
6f419b0049 Merge pull request #1869 from prototech/ticket/10810
[ticket/10810] Move color swatches from popup windows to inline blocks.
2013-11-21 13:41:03 -08:00
Nathan Guse
6403d6848e Merge pull request #1878 from blitze/ticket/12024
[ticket/12024] Template event overall_header_content_before
2013-11-21 13:26:24 -08:00
OpenShift guest
55670d75b0 [ticket/12024] Add new line
PHPBB3-12024
2013-11-19 09:55:58 -05:00
OpenShift guest
bc47455dfb [ticket/12024] Replace newline
PHPBB3-12024
2013-11-18 23:43:39 -05:00
OpenShift guest
9d39457e35 [ticket/12024] Template event overall_header_content_before
http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44959
http://tracker.phpbb.com/browse/PHPBB3-12024

PHPBB3-12024
2013-11-18 23:17:03 -05:00
Joas Schilling
6ee05d369e [prep-release-3.1.0-a2] Update version to 3.1.0-a2 2013-11-19 01:18:21 +01:00
Cesar G
c5680ca822 [ticket/10810] Update all palettes.
PHPBB3-10810
2013-11-13 01:24:37 -08:00
Cesar G
13d2d7d036 [ticket/11472] Expand palette cell links to the full block size.
PHPBB3-11472
2013-11-12 18:15:16 -08:00
Cesar G
1ea07e2270 [ticket/11472] Use {T_ASSETS_PATH}.
PHPBB3-11472
2013-11-12 18:15:16 -08:00
Cesar G
79b5e96896 [ticket/11472] Make the color swatch configurable and fix it in subsilver2
PHPBB3-11472
2013-11-12 18:11:56 -08:00
Cesar G
c386bf7911 [ticket/11472] Make prosilver's editor.js an asset used by all styles.
PHPBB3-11472
2013-11-12 18:11:56 -08:00
Matt Friedman
e74f1c1790 [ticket/12014] Template Event index_body.html before forumlist
Add content above the forums list (on forum index only)

PHPBB3-12014
2013-11-11 15:28:18 -08:00
Lukasz
9328d42809 [ticket/12005] Delete templates files
PHPBB3-12005
2013-11-08 21:57:11 +01:00
David King
abd035fcc9 [ticket/11975] Add ACP link next to MCP link in header
PHPBB3-11975
2013-11-02 15:34:18 -07:00
David King
835900123e [ticket/11972] Add posting_editor_message_after template event
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
b8eeca7048 [ticket/11972] Add posting_editor_message_before template event
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
3be5fe5354 [ticket/11972] Add posting_editor_subject_before template event
PHPBB3-11972
2013-11-02 15:27:53 -07:00
David King
069f806169 [ticket/11972] Add posting_editor_subject_after template event
PHPBB3-11972
2013-11-02 15:27:52 -07:00
Vjacheslav Trushkin
dbd4b5bdbc [ticket/11969] Change topic link to unread post in subsilver2
PHPBB3-11969
2013-10-25 14:18:53 +03:00
Vjacheslav Trushkin
cb21c33a14 [ticket/11872] Template syntax typos in oauth templates
PHPBB3-11872
2013-10-23 19:12:37 +03:00
Matt Friedman
b9358e75bf [ticket/11936] Update color scheme of new no_avatar.gif
PHPBB3-11936
2013-10-20 14:53:44 -07:00
Matt Friedman
802d2add97 [ticket/11936] Replace Notifications icon with a custom bell design
PHPBB3-11936
2013-10-18 23:15:18 -07:00
Matt Friedman
613fa70948 [ticket/11936] Make UCP Notifications page look even better
Make only the Notification Title/Text the href link. Use a font family
and size consistent with rest of phpBB. Make Notification date
smaller too.

PHPBB3-11936
2013-10-18 20:04:01 -07:00
Matt Friedman
59e175906e [ticket/11936] Update no avatar image in Prosilver/Subsilver2
PHPBB3-11936
2013-10-18 10:28:41 -07:00
Matt Friedman
1f2714e695 [ticket/11936] Remove "px" from html syntax
PHPBB3-11936
2013-10-16 18:02:18 -07:00
Matt Friedman
7c0e839fe3 [ticket/11936] Add no_avatars to UCP list Notifications too
PHPBB3-11936
2013-10-16 17:33:01 -07:00
Matt Friedman
25f287a991 [ticket/11936] Use "no_avatar.gif" if needed in Notification window 2013-10-16 17:23:25 -07:00
Nathan Guse
852b707b48 Merge pull request #1781 from VSEphpbb/ticket/11921
Ticket/11921 - Streamline PMs and Notifications in Header Link List
2013-10-16 10:50:17 -07:00
Matt Friedman
2867831232 [ticket/11921] Move any HTML for Notifications to the templates
PHPBB3-11921
2013-10-16 10:07:54 -07:00
Matt Friedman
8608204097 [ticket/11921] Improve appearance of PM notifications in linklist
PHPBB3-11921
2013-10-15 10:29:15 -07:00
Matt Friedman
9363986f43 [ticket/11921] Improve appearance of Notifications in linklist
PHPBB3-11921
2013-10-15 10:27:00 -07:00
Joas Schilling
4709cbbed3 [prep-release-3.1.0-a1] Update version to 3.1.0-a1 2013-10-14 12:04:18 +02:00
Andreas Fischer
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
2013-10-10 23:26:03 +02:00
Dhruv
a3b0590f68 [ticket/11735] Display disabled checkbox in subsilver for read notifications
PHPBB3-11735
2013-09-16 00:34:22 +05:30
Vjacheslav Trushkin
d27bc857f3 [ticket/11795] Remove PM popup
PHPBB3-11795
2013-09-14 10:10:45 +03:00
Vjacheslav Trushkin
e4874c180a [ticket/11795] Use phpBB template syntax instead of TWIG
PHPBB3-11795
2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
22c8df5403 [ticket/11795] Move PM popup JS to forum_fn.js
Move PM popup JavaScript from overall_header to forum_fn.js
Use TWIG to escape PM popup URL

PHPBB3-11795
2013-09-14 10:10:43 +03:00
Vjacheslav Trushkin
4c2aad4ca9 [ticket/11795] Get rid of pagination JS variables
Move pagination variables to data attributes
Replace A_BASE_URL with BASE_URL and use TWIG to escape it

PHPBB3-11795
2013-09-14 10:10:43 +03:00
Vjacheslav Trushkin
f3bbca4fa0 Merge branch 'ticket/11811' into ticket/develop-2/11811
* ticket/11811:
  [ticket/11811] Remove outline on :focus

Conflicts:
	phpBB/adm/style/admin.css
	phpBB/styles/prosilver/theme/forms.css
2013-09-14 00:19:48 +03:00
Vjacheslav Trushkin
3cd445d055 [ticket/11811] Remove outline on :focus
PHPBB3-11811
2013-09-13 23:41:07 +03:00
Joseph Warner
c8bd2288d1 [ticket/11836] Fix subsilver fatal error
PHPBB3-11836
2013-09-13 16:34:52 -04:00
Nathan Guse
e31082b82c Merge pull request #1675 from marc1706/ticket/11809
[ticket/11809] Ensure code.js is first script included after jQuery
2013-09-13 08:12:23 -07:00
Marc Alexander
1c1eecb376 [ticket/11809] Ensure code.js is first script included after jQuery
The file core.js sets up most of the AJAX and jQuery related framework for
phpBB. Due to this, it needs to be included before any other javascript file
in order to ensure that subsequent files can use the phpBB variables and
functions. Currently, it is however loaded with INCLUDEJS in overall_footer
which causes it to be loaded after every other javascript file except for the
style specific ajax.js. This causes every javascript file that is included
before core.js and is using the phpBB AJAX functions or variables to break.

PHPBB3-11809
2013-09-13 17:07:33 +02:00
Nathan Guse
94b3d38392 Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
  [ticket/11829] Use report_closed to determine status in MCP report_details

Conflicts:
	phpBB/styles/prosilver/template/mcp_post.html
2013-09-12 14:57:26 -05:00
Joseph Warner
18f6a16101 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-10 16:19:39 -04:00
Joseph Warner
3f81057f96 [feature/oauth] Fix tabindex
PHPBB3-11673
2013-09-09 11:40:29 -04:00