Andreas Fischer
336187151a
[ticket/11201] Revert WLM dropping because it is still used in China.
...
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.
This commit reverts commits
- 460470229d
- 9affd6f7e7
which have been merged by d59431691c
.
PHPBB3-11201
2013-02-04 01:31:43 +01:00
Nathaniel Guse
67c85fa4d3
Merge branch 'develop-olympus' into develop
...
# By Senky
# Via Nathaniel Guse (1) and Senky (1)
* develop-olympus:
[ticket/10050] removing prosilver edits
[ticket/10050] adding .topicrow to template condition
Conflicts:
phpBB/styles/subsilver2/template/viewforum_body.html
2013-01-30 16:56:16 -06:00
Nathaniel Guse
5154c6960d
Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympus
...
# By Senky
# Via Senky
* remotes/Senky/ticket/10050:
[ticket/10050] removing prosilver edits
[ticket/10050] adding .topicrow to template condition
2013-01-30 16:51:50 -06:00
Senky
317964174e
[ticket/10050] adding .topicrow to template condition
...
PHPBB3-10050
2013-01-22 20:24:27 +01:00
Joas Schilling
9affd6f7e7
[ticket/11201] Remove MSN/WLM fields
...
WLM will be shutdown in March 2013. Skype is the new replacement. But as Skype
uses a different login ID and service, the values in this field are useless.
So we can safely remove the field and the links/functions we create.
PHPBB3-11201
2013-01-11 14:32:44 +01:00
Oleg Pudeyev
b96a2fce28
Merge PR #1178 branch 'marc1706/ticket/10949' into develop
...
# By Marc Alexander (2) and Callum Macrae (1)
# Via Marc Alexander
* marc1706/ticket/10949:
[ticket/10949] Remove not needed comma
[ticket/10949] Converted missing code to new JS coding guidelines
[ticket/10949] Converted AJAX coding standards to new guidelines.
2013-01-08 16:36:35 -05:00
Marc Alexander
4773eb3583
[ticket/11311] Include asset core.js in subsilver2 overall_footer.html
...
Without the inclusion of core.js the timezone functions will not properly
work. They refer to phpbb which is defined in core.js.
PHPBB3-11311
2013-01-05 11:42:58 +01:00
Marc Alexander
b5cc1ed683
[ticket/10949] Converted missing code to new JS coding guidelines
...
A few missing semi-colons were also added where needed.
PHPBB3-10949
2013-01-04 22:46:12 +01:00
David King
636227491d
[feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
...
PHPBB3-9550
2012-12-17 17:59:41 -05:00
David King
8d6a4559ba
[feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
...
PHPBB3-9550
2012-12-17 17:48:15 -05:00
David King
4ad2747ccf
[feature/events] Fix more subsilver2 events
...
PHPBB3-9550
2012-12-17 11:59:23 -05:00
David King
d25dffbb2d
[feature/events] Fix some subsilver2 events
...
PHPBB3-9550
2012-12-17 11:57:18 -05:00
Oleg Pudeyev
de54bccc58
[feature/events] There is nothing between head and body.
...
PHPBB3-9550
2012-12-17 11:37:36 -05:00
Erik Frèrejean
b95549a7a7
[feature/events] Correct template calls
...
There where two `<!-- LEDGE ... -->` calls in the templates left.
Replace those two calls with the proper `<!-- EVENT ... -->`
call
PHPBB3-9550
2012-12-17 11:37:27 -05:00
Michael Cullum
ce7d440a6e
[feature/events] Adding viewtopic_topic_title_prepend template event
...
PHPBB3-9550
2012-12-17 11:37:26 -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
Joas Schilling
c0f900f695
[feature/events] Add forumlist_body_last_post in subsilver2
...
Used by NV Advanced Last Topic Titles
PHPBB3-9550
2012-12-17 11:37:09 -05:00
Michael Cullum
47c1834382
[feature/events] Adding viewtopic_print_head_body template ledge
...
Needed by ReIMG Resizer
PHPBB3-9550
2012-12-17 11:37:07 -05:00
Michael Cullum
9b4ea94630
[feature/events] Adding ucp_pm_viewmessage_head_body template ledge
...
Needed by ReIMG Resizer
PHPBB3-9550
2012-12-17 11:37:06 -05:00
Michael Cullum
e865ee1bef
[feature/events] Adding overall_head_head_body template ledge
...
Required by ReIMG Resizer
PHPBB3-9550
2012-12-17 11:37:05 -05:00
Michael Cullum
bc2f777b27
[feature/events] Adding simple_footer_end template ledge
...
PHPBB3-9550
2012-12-17 11:37:03 -05:00
Michael Cullum
244978cdb4
[feature/events] Adding overall_footer_end template ledge
...
Helpful for JS scripts that need to work with the DOM.
PHPBB3-9550
2012-12-17 11:37:02 -05:00
Michael Cullum
18af6dd664
[feature/events] Adding index_body_info_blocks template ledge
...
PHPBB3-9550
2012-12-17 11:37:01 -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
Michael Cullum
fc2ebc34df
[feature/events] Adds overall_footer_copyright template ledge
...
This allows people to add copyright information to the footer
PHPBB3-9550
2012-12-17 11:36:54 -05:00
Oleg Pudeyev
38e146c8bd
[feature/events] Added overall_header_head ledge.
...
This will be used by the trivial-css mod.
PHPBB3-9550
2012-12-17 11:36:52 -05:00
Andreas Fischer
bd987b6e14
Merge remote-tracking branch 'p/ticket/11095-develop' into develop
...
* p/ticket/11095-develop:
[ticket/11095] Restore brace on previous line.
[ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.
[ticket/11095] Forward GET parameters into hidden fields for jumpbox.
[ticket/11095] Python quoteattr port.
[ticket/11095] Use get method in jumpboxes.
2012-12-08 16:14:42 +01:00
Oleg Pudeyev
b07ae3fe59
Merge PR #1053 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
Conflicts:
phpBB/includes/ucp/ucp_prefs.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
2012-12-05 12:21:25 -05:00
Oleg Pudeyev
0793f8e2e6
[ticket/10841] Revert whitespace changes.
...
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
af064cdaad
[ticket/10841] Modifying style and language selectors in UCP
...
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Oleg Pudeyev
2a39df1a53
[ticket/11095] Forward GET parameters into hidden fields for jumpbox.
...
PHPBB3-11095
2012-11-29 13:36:00 -05:00
Oleg Pudeyev
83e85810aa
[ticket/11095] Use get method in jumpboxes.
...
PHPBB3-11095
2012-11-29 01:14:58 -05:00
Oleg Pudeyev
9c86f70b4a
Merge PR #1041 branch 'cyberalien/ticket/11175' into develop
...
* cyberalien/ticket/11175:
[ticket/11175] Add microdata to prosilver
[ticket/11175] Add microdata to subsilver2
2012-11-15 22:09:52 -05:00
Vjacheslav Trushkin
9b2024a48e
[ticket/11175] Add microdata to subsilver2
...
Add breadcrumb data to subsilver2
PHPBB3-11175
2012-11-11 11:11:47 +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
Andreas Fischer
ee29cc1678
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11081] Drop duplicated </td> in subsilver captcha qa template.
2012-11-07 22:57:40 +01:00
Oleg Pudeyev
87a80e70da
[ticket/11081] Drop duplicated </td> in subsilver captcha qa template.
...
PHPBB3-11081
2012-11-06 17:46:54 -05:00
Joas Schilling
7ce43d49d8
[ticket/11014] Fix IF statements for new template pagination
...
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Joas Schilling
7675d72622
[ticket/11014] Fix text for previous/next links in Subsilver2
...
PHPBB3-11014
2012-10-17 23:34:37 +02:00
Oleg Pudeyev
59281f1b0a
Merge PR #973 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:38 -04:00
Oleg Pudeyev
68641aab93
Merge PR #973 branch 'bantu/ticket/11069' into develop-olympus
...
* bantu/ticket/11069:
[ticket/11069] Add closing span back to credit line in subsilver2 simple footer
2012-10-10 00:22:17 -04:00
Andreas Fischer
a38de9a232
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/11135] Full replacement of credit link to https
Conflicts:
phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac
[ticket/11135] Full replacement of credit link to https
...
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Andreas Fischer
9a92c45ad3
Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
...
* EXreaction/ticket/11021:
[ticket/11021] Fix the language changes that were lost previously
2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a
[ticket/11021] Fix the language changes that were lost previously
...
Change U_HOME to U_SITE_HOME
PHPBB3-11021
2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f
Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
...
* EXreaction/ticket/11021:
[ticket/11021] Remove unnecessary line spacing in functions.php
[ticket/11021] Use L_SITE_HOME instead of L_HOME
[ticket/11021] Better language strings for site home url/text
[ticket/11021] subsilver2 support
[ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
Nathan Guse
7a47013994
[ticket/11021] Use L_SITE_HOME instead of L_HOME
...
Check site home url against !== '', not empty
PHPBB3-11021
2012-09-15 10:44:18 -05:00
Andreas Fischer
c83ca457a0
[ticket/11069] Add closing span back to credit line in subsilver2 simple footer
...
Regression from 0ceb77fb99
.
PHPBB3-11069
2012-08-26 17:20:45 +02:00
Andreas Fischer
fa06b779ad
Merge remote-tracking branch 'nickvergessen/ticket/11004' into develop
...
* nickvergessen/ticket/11004:
[ticket/11004] Always update suggestion button in timezone_preselect_select
[ticket/11003] Ability to show full list of timezones with JavaScript enabled
[ticket/11004] Make suggestion button a real button and fix it's value
2012-08-02 12:10:26 +02:00
Matt Friedman
4ff644890a
[ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
...
PHPBB3-11025
2012-07-23 18:43:28 -07:00