Commit graph

100 commits

Author SHA1 Message Date
Marc Alexander
316b69805b Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
2016-09-11 11:08:24 +02:00
David King
1455be2260 [ticket/14695] Put posting_editor_subject_append/prepend events on newlines
As per request in the PR.

PHPBB3-14695
2016-08-09 21:14:03 -04:00
David King
e4336de68d [ticket/14695] Add posting_editor_subject_prepend/append template events
PHPBB3-14695
2016-06-25 21:16:54 +01:00
Marc Alexander
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
2016-03-27 09:59:25 +02:00
Matt Friedman
93a25893d5 [ticket/14447] Remove trailing white spaces in Prosilver
PHPBB3-14447
2016-02-02 08:42:53 -08:00
Marc Alexander
aca6e64669 [ticket/14272] Only use maxlength and size for allowed input elements
PHPBB3-14272
2015-11-06 10:20:05 +01:00
Marc Alexander
d1b7101fed Merge pull request #3896 from Zoddo/ticket/14157
[ticket/14157] Allow to set the alt/title attribute on post icons
2015-10-10 16:43:15 +02:00
Zoddo
3937f1f4ae [ticket/14157] Allow to set the alt/title attribute on post icons
PHPBB3-14157
2015-10-10 15:29:31 +02:00
Michael Miday
70f1b08c69 [ticket/14139] Add class of IDs to html tags 2015-09-14 16:25:36 +02:00
Zoddo
a606b1c480 [ticket/7362] Add alt attribute on topic icons
PHPBB3-7362
2015-08-30 14:37:28 +02:00
Zoddo
166e0b5961 [ticket/13997] Add posting_editor_submit_buttons template event
PHPBB3-13997
2015-08-09 11:36:49 +02:00
alf007
8b21e7c0d9 [ticket/13843] Add templates events to insert custom panel in posting
Events added in events.md
Add in template posting_editor.html for link to custom panel
Add in template posting_layout.html for include of custom panel template body

PHPBB3-13843
2015-07-22 09:43:59 +02:00
RMcGirr83
d4ca81f23f [ticket/13710] Allow template events near smilies display
PHPBB3-13710
2015-03-19 07:25:45 -04:00
Jakub Senko
10e72a36a3 [ticket/13346] Remove unnecessary divs
PHPBB3-13346
2015-01-10 21:05:30 +01:00
Jakub Senko
d24fa2e777 [ticket/13346] Fix indentation, spacing and missing divs
PHPBB3-13346
2014-11-24 20:41:01 +01:00
hanakin
913b363126 [ticket/12862] Resize popups consistently
PHPBB3-12862
2014-07-30 17:48:23 +02:00
PayBas
8547fd4c2e [ticket/12648] Fix poll tab and revert unrelated color change
PHPBB3-12648
2014-06-24 00:02:25 +02:00
PayBas
1189fc9e51 [ticket/12648] Fix poll tab display error
PHPBB3-12648
2014-06-24 00:02:25 +02:00
PayBas
1cf6a0e124 [ticket/12648] Added ARIA functionality
PHPBB3-12648
2014-06-24 00:02:24 +02:00
PayBas
eda3c36b1c [ticket/12648] Improve UCP/MCP/Posting tabs
PHPBB3-12648
2014-06-24 00:02:22 +02:00
Cesar G
95b9c93892 [ticket/12640] Preserve the active tab when previewing in posting page.
PHPBB3-12640
2014-05-31 10:12:24 -07:00
Crizzo
47ad92ae31 [ticket/8785] Fixed problem with add empty.png and travis will now pass
PHPBB3-8785
2014-03-09 22:14:40 +01:00
Crizzo
b4a65da2ed [ticket/8785] pm_layout.html back to more standard code
PHPBB3-8785
2014-03-09 19:37:45 +01:00
Crizzo
f2321af9ed [ticket/8785] Adds blank lines at file end
PHPBB3-8785
2014-03-09 14:21:17 +01:00
Crizzo
9ef79776a9 [ticket/8785] Adds a new optical improvement, new file and fixes html bugs
PHPBB3-8785
2014-03-09 13:20:49 +01:00
Crizzo
60ca7f91e2 [ticket/8785] Adds two <hr /> to seperate recipients and BCC
PHPBB3-8785
2014-03-04 10:26:22 +01:00
Crizzo
d40fb32dcd [ticket/8785] Rebuilding posting_editor pm head + new language vars
PHPBB3-8785
2014-03-03 21:11:06 +01:00
Cesar G
688ca7fade [ticket/11915] Add the new uploader.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
Cesar G
4361c1c9ac [ticket/11915] Move the uploaded attachment list under the attachments tab.
PHPBB3-11915
2014-01-17 19:20:35 -08: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
fbd57b9369 [ticket/11552] Responsive PM editor
Responsive PM editor, fix quickmod tools

PHPBB3-11552
2013-10-19 16:20:34 +03:00
Vjacheslav Trushkin
ea874c2ffb [ticket/11552] Responsive forms
PHPBB3-11552
2013-10-18 23:47:03 +03:00
Nathan Guse
9d86385a36 Merge pull request #1436 from cyberalien/ticket/11563
Fix subPanels() in forum_fn.js
2013-07-13 10:49:04 -07:00
Vjacheslav Trushkin
a9259b12aa [ticket/11563] Dynamically generate panels list
PHPBB3-11563
2013-07-11 10:58:18 -04:00
Vjacheslav Trushkin
7a34c7eabe [ticket/11563] Fix subPanels()
Fix subPanels() code
Modernize subPanels() with jQuery
Use HTML5 data attributes instead of including JS

PHPBB3-11563
2013-07-11 10:38:54 -04:00
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
Senky
beafabbcb3 [ticket/11010] adding type="number" and type="date" to prosilver
PHPBB3-11010
2013-05-20 18:39:59 +02:00
Vjacheslav Trushkin
c29257f732 [ticket/11556] Load apply_onkeypress_event() correctly
PHPBB3-11556
2013-05-20 10:04:03 +03:00
Joas Schilling
e34b8ed094 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php
2012-12-20 22:51:38 +01:00
David King
d22f171ad0 [feature/events] Append "_prepend" to posting_editor_options
PHPBB3-9550
2012-12-17 11:38:16 -05:00
Michael Cullum
8dcc2cded6 [feature/events] Rename RUNHOOKS to EVENT
Apply change to existing ledges

PHPBB3-9550
2012-12-17 11:37:11 -05:00
Michael Cullum
f2ee104291 [feature/events] Add posting_editor_options template ledge
This is needed for options for posts and is used by topic as link MOD

PHPBB3-9550
2012-12-17 11:36:55 -05:00
Andreas Fischer
607865d97a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10879] Remove arrow icon from attachment link in editor
2012-11-13 20:36:18 +01:00
Marc Alexander
170967c48a [ticket/10879] Remove arrow icon from attachment link in editor
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
2012-11-13 20:26:49 +01:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
Nathan Guse
6e7e70a18a [ticket/10780] Replace colon usage in template output with {L_COLON}
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.

PHPBB3-10780
2012-11-10 00:23:03 +01:00
Oleg Pudeyev
17c43fcd70 Merge PR #717 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10661] Added &nbsp; to enumerated recipients (prosilver)
2012-11-06 20:34:01 -05:00