Commit graph

3029 commits

Author SHA1 Message Date
Joas Schilling
0baa36f6ba [ticket/11166] Add caption to AJAX confirm box default template
PHPBB3-11166
2013-01-15 13:11:01 +01:00
Matt Friedman
44fcec520f [ticket/11103] CSS fixes to address text inside notifications drop down.
PHPBB3-11103
2013-01-15 00:57:18 -06:00
Matt Friedman
ce1fca2332 [ticket/11103] Clean up some notifications CSS
PHPBB3-11103
2013-01-15 00:57:18 -06:00
Matt Friedman
918053e478 [ticket/11103] Fix notifications link to handle non-JS fallback
PHPBB3-11103
2013-01-15 00:57:17 -06:00
Marc Alexander
2f6b072bb1 [ticket/11314] Add missing radix parameters
PHPBB3-11314
2013-01-13 23:00:48 +01:00
Marc Alexander
49edfa49ab [ticket/11314] Fix whitespace issues
PHPBB3-11314
2013-01-12 19:08:34 +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
Marc Alexander
c31f489cce [ticket/11314] Add missing "use strict" to timezone.js files
PHPBB3-11314
2013-01-10 11:15:19 +01:00
Marc Alexander
f7af4eb2e9 [ticket/11314] Use return variable instead of overusing the return keyword
Use a return variable and modify it to our needs.

PHPBB3-11314
2013-01-10 11:11:30 +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
be77194435 [ticket/10949] Remove not needed comma
This comma might actually cause issues in browser. Therefore remove it.

PHPBB3-10949
2013-01-05 11:40:41 +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
Marc Alexander
46c33e08b5 Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949
Conflicts:
	phpBB/assets/javascript/core.js
2013-01-04 20:46:56 +01:00
Marc Alexander
a342e47038 [feature/avatars] Change avatar javascript to conform to new coding guidelines
PHPBB3-10018
2013-01-04 18:13:49 +01:00
Marc Alexander
5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/includes/ucp/ucp_groups.php
2013-01-04 10:49:57 +01:00
Marc Alexander
4a8b1a6e05 [feature/avatars] Inform user of no available local avatars
Rather than showing the user an empty drop-down list for the local avatar
categories, inform him/her that there are currently no (local) avatars
available.

PHPBB3-10018
2013-01-04 10:25:08 +01:00
Marc Alexander
e211009eb7 [ticket/11302] Correctly select first timezone or selected timezone
While registering, we should default to a given timezone. By selecting the
first timezone by default, this is fulfilled. This doesn't happen
currently, as only the "Select a timezone" selection appears.
If a user selects a timezone during the registration process we should
also make sure that the selected element is still selected; even if we
have to return to the registration page, i.e. if there was an error while
submitting the form. This is currently not the case.
With this patch the javascript code will behave correctly.
Additionally, a duplicate inclusion of timezone.js has been removed as it
was not needed.

PHPBB3-11302
2013-01-02 22:05:14 +01:00
Matt Friedman
e3b11c4ecf [ticket/11103-VSE] Updated notification AJAX styling
PHPBB3-11103
2012-12-25 09:49:05 -08:00
Marc Alexander
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01: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
Oleg Pudeyev
31b5f91ea1 Merge PR #1148 branch 'imkingdavid/feature/events' into develop
* imkingdavid/feature/events: (65 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
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [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
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  [feature/events] Append "_append" to viewtopic_print_head
  [feature/events] ucp_pm_viewmessage_print_head_append
  [feature/events] simple_footer_end -> simple_footer_after
  [feature/events] Append "_prepend" to posting_editor_options
  [feature/events] Fix events in prosilver overall_header.html
  [feature/events] Fix events in prosilver overall_footer.html
  [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before
  ...
2012-12-20 15:10:46 -05:00
Joas Schilling
1a07cd63a1 [feature/soft-delete] Fix "Mark all" and "Unmark all" links on topic list
PHPBB3-9657
2012-12-20 19:24:26 +01:00
Marc Alexander
daf9de689a [ticket/10954] Add missing semi-colon
PHPBB3-10954
2012-12-18 16:24:58 +01:00
Joas Schilling
63f3cd45bb [feature/soft-delete] Add delete information to approve deatils page
PHPBB3-9657
2012-12-18 15:08:05 +01:00
Joas Schilling
4300d06a17 [feature/soft-delete] Add "Restore" to the mcp forum quick moderation
PHPBB3-9657
2012-12-18 14:51:05 +01:00
Joas Schilling
b917e5a4bb [feature/soft-delete] Use new custom template system for AJAX confirm_box
PHPBB3-9657
2012-12-18 13:57:58 +01:00
Joas Schilling
0d7f61dc7a [ticket/11166] Use provided custom templates on AJAX confirm box
PHPBB3-11166
2012-12-18 13:50:56 +01:00
Marc Alexander
55b5336b02 [ticket/10954] Make sure to mark subforums unread and add small fixes
PHPBB3-10954
2012-12-18 09:55:22 +01:00
Marc Alexander
fb60f603ba [ticket/10954] Miscellaneous coding fixes
Remove obsolete or unneeded code. Also fix the behavior of removing
icon_topic_newest by actually removing the link to the first unread post
instead of just removing the icon.

PHPBB3-10954
2012-12-18 00:48:50 +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
3667ba7a09 [feature/events] Fix typo in event name
PHPBB3-9550
2012-12-17 17:39:25 -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
David King
8526dc14f0 [feature/events] Append "_append" to viewtopic_print_head
PHPBB3-9550
2012-12-17 11:52:37 -05:00
David King
cb3db020f0 [feature/events] ucp_pm_viewmessage_print_head_append
PHPBB3-9550
2012-12-17 11:51:07 -05:00
David King
d3db491e09 [feature/events] simple_footer_end -> simple_footer_after
PHPBB3-9550
2012-12-17 11:40:42 -05:00
David King
d22f171ad0 [feature/events] Append "_prepend" to posting_editor_options
PHPBB3-9550
2012-12-17 11:38:16 -05:00
David King
c6f9e4522b [feature/events] Fix events in prosilver overall_header.html
PHPBB3-9550
2012-12-17 11:38:00 -05:00
David King
9015a76cf6 [feature/events] Fix events in prosilver overall_footer.html
PHPBB3-9550
2012-12-17 11:37:46 -05:00
David King
37ac2c9aae [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before 2012-12-17 11:37:45 -05:00
Oleg Pudeyev
de54bccc58 [feature/events] There is nothing between head and body.
PHPBB3-9550
2012-12-17 11:37:36 -05:00
Michael Cullum
c527403ef7 [feature/events] Add location (prepend) to event name
PHPBB3-9550
2012-12-17 11:37:34 -05:00
Michael Cullum
a6122228eb [feature/events] Adjust to use prepend, not before
PHPBB3-9550
2012-12-17 11:37:33 -05:00
Michael Cullum
0b35136894 [feature/events] Add overall_footer_copyright_after template event
PHPBB3-9550
2012-12-17 11:37:31 -05:00
Michael Cullum
336f0c5641 [feature/events] Rename event to show location around copyright
PHPBB3-9550
2012-12-17 11:37:30 -05:00
Michael Cullum
c81d49c969 [feature/events] Add append to event name
PHPBB3-9550
2012-12-17 11:37:29 -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