1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-30 11:11:23 +02:00

1737 Commits

Author SHA1 Message Date
Marc Alexander
36168b311e [ticket/11314] Fix issues mentioned in jshint report
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.

PHPBB3-11314
2013-03-26 10:31:28 +01:00
Marc Alexander
96b1cabcf2 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314 2013-02-27 21:40:02 +01:00
Nathaniel Guse
9b38c4579e Merge remote-tracking branch 'remotes/marc/ticket/11342' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11342:
  [ticket/11342] Fix "unexpected token" syntax error
  [ticket/11342] Mark active topics read when marking forums read
2013-02-25 13:17:27 -06:00
Marc Alexander
37093b6aa5 [ticket/11342] Fix "unexpected token" syntax error
PHPBB-11342
2013-02-20 23:19:25 +01:00
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
 - 460470229d972b93ef5a98b0d1d97a2a970d684f
 - 9affd6f7e7b95442f1ef14894858d8213f3fbd2a
which have been merged by d59431691c27c73fba8ae9934b84b34a13280dd2.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
Marc Alexander
a54128b3bc [ticket/11342] Mark active topics read when marking forums read
Marking forums read while viewing a category will also mark the active
topics inside that category read. Therefore, the active topics should also
be marked read. With this patch the ajax callback "mark_forums_read" will
check if the active topics id ("active_topics") exists and also mark
topics read if it does. As the active topics will only be displayed in
categories, which can't have any other topics, this is a proper approach.

PHPBB3-11342
2013-02-03 15:51:29 +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
80283646e2 [ticket/10050] removing prosilver edits
PHPBB3-10050
2013-01-24 22:54:12 +01:00
Senky
317964174e [ticket/10050] adding .topicrow to template condition
PHPBB3-10050
2013-01-22 20:24:27 +01:00
Nathan Guse
0e414f4880 Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11329:
  [ticket/11329] Moving colors to colours.css
2013-01-22 10:39:48 -06:00
Vjacheslav Trushkin
95c9095a1c [ticket/11329] Moving colors to colours.css
Moving color values from buttons.css to colours.css

PHPBB3-11329
2013-01-21 12:34:28 +02:00
Vjacheslav Trushkin
d68c4697be [ticket/11328] Replace long buttons text with short text
Replace long buttons text with short text, like it was on images

PHPBB3-11328
2013-01-16 11:37:50 +02:00
David Colón
4306a7641f [ticket/10786] Javascript toggle member search panel in memberlist.php
Search functions on the memberlist.php page are now rendered by default and displayed via javascript.  If javascript is disabled the page still works as it previously did.

PHPBB3-10786
2013-01-15 23:29:06 -06:00
David Colón
babe07caef [ticket/10786] Javascript toggle member search panel in memberlist.php
Search functions on the memberlist.php page are now rendered by default and displayed via javascript.  If javascript is disabled the page still works as it previously did.

PHPBB3-10786
2013-01-15 23:29:01 -06:00
David Colón
de541ac13b [ticket/10786] Javascript toggle member search panel in memberlist.php
PHPBB3-10786
2013-01-15 23:28:45 -06:00
Nathan Guse
6b895e0a02 Merge remote-tracking branch 'remotes/cyberalien/ticket/10431' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10431:
  [ticket/10431] Remove .left class from reply-all
  [ticket/10431] Remove reply-all custom css
  [ticket/10431] Adjustments for large buttons
  [ticket/10431] Changed fonts for Linux
  [ticket/10431] Adjustments for IE7
  [ticket/10431] Different font for iOS
  [ticket/10431] CSS3 buttons
2013-01-15 19:02:04 -06:00
Vjacheslav Trushkin
107a9016f1 [ticket/10431] Remove .left class from reply-all
Remove .left class from .reply-all button

PHPBB3-10431
2013-01-16 00:09:10 +02:00
Vjacheslav Trushkin
74b09c01ff [ticket/10431] Remove reply-all custom css
Remove CSS for reply-all button that is no longer used

PHPBB3-10431
2013-01-16 00:03:17 +02:00
Vjacheslav Trushkin
63b037b4bd [ticket/10431] Adjustments for large buttons
Changing CSS for large buttons to display better on Mac browsers.
Fixing tabs.

PHPBB3-10431
2013-01-15 23:12:44 +02: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
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
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
Marc Alexander
daf9de689a [ticket/10954] Add missing semi-colon
PHPBB3-10954
2012-12-18 16:24:58 +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