mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
18,335 Commits 17 Branches 190 Tags
Commit Graph

2119 Commits

Author SHA1 Message Date
Andreas Fischer
717e2337b9 Merge remote-tracking branch 'cyberalien/ticket/11846' into develop 
* cyberalien/ticket/11846:
  [ticket/11846] Replace empty p with margin-top
 2013-09-23 12:52:43 +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
7c5675942b [ticket/11846] Replace empty p with margin-top 
PHPBB3-11846
 2013-09-15 21:22:06 +03:00
Dhruv
41282c5065 [ticket/11735] Display disabled checkbox when notification is already read 
PHPBB3-11735
 2013-09-15 20:29:45 +05:30
Vjacheslav Trushkin
d27bc857f3 [ticket/11795] Remove PM popup 
PHPBB3-11795
 2013-09-14 10:10:45 +03:00
Vjacheslav Trushkin
973f4bc887 [ticket/11795] Remove outdated comment from forum_fn.js 
This comment is no longer relevant because function was rewritten

PHPBB3-11795
 2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
e6d87c5bc0 [ticket/11795] Move find user JS to forum_fn 
Move JavaScript from user search results to forum_fn.js

PHPBB3-11795
 2013-09-14 10:10:44 +03:00
Vjacheslav Trushkin
4b27ec441a [ticket/11795] Move MSN scripts to forum_fn.js 
Move MSN scripts to forum_fn.js
Rewrite MSN scripts to remove duplicate code

PHPBB3-11795
 2013-09-14 10:10:44 +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
253890520d [ticket/11795] Get rid of onload_functions 
Get rid of onload_functions and onunload_functions
Scripts should use $(document).ready() instead

PHPBB-11795
 2013-09-14 10:10:42 +03:00
Vjacheslav Trushkin
a92a3cfeb9 [ticket/11795] Use data-reset-on-edit attr to reset elements 
Use data-reset-on-edit attribute to reset other inputs
when editing input with data.

Do not unbind event (old code unbound it after one use for
no reason)

PHPBB3-11795
 2013-09-14 10:10:42 +03:00
Vjacheslav Trushkin
605cd0cafb [ticket/11795] Redo form elements auto-focus 
Use data-focus attribute for forms to focus elements
when document is loaded instead of adding JavaScript

PHPBB3-11795
 2013-09-14 10:10:42 +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
Joseph Warner
0737c4bd6d [ticket/11836] Fix fatal error on unsupported provider for auth link 
PHPBB3-11836
 2013-09-13 11:53:10 -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
David King
f02a8cf0e6 Merge pull request #1705 from EXreaction/ticket/11833 
Fix invalid template loop & prevent Twig from throwing errors in invalid uses of BEGINELSE
 2013-09-12 21:17:22 -07: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
Nathan Guse
0cb4ceabf4 [ticket/11833] Fix bad template loop 
PHPBB3-11833
 2013-09-09 11:24:12 -05:00
Joseph Warner
3f81057f96 [feature/oauth] Fix tabindex 
PHPBB3-11673
 2013-09-09 11:40:29 -04:00
Joseph Warner
3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 
Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673
 2013-09-06 20:35:54 -04:00
Nathan Guse
dd86e8d0ae Merge pull request #1618 from VSEphpbb/ticket/11747 
[ticket/11747] UCP Prefs Core and Template Events
 2013-09-05 11:36:25 -07:00
Nathan Guse
9d5ab7615f Merge pull request #1435 from cyberalien/ticket/11562 
forum_fn.js cleanup
 2013-09-05 11:27:42 -07:00
Nathan Guse
ab0af38629 Merge pull request #1651 from cyberalien/ticket/11782 
Fix layout of notices in posts
 2013-09-05 08:26:29 -07:00
rechosen
77845e366e [ticket/11829] Use report_closed to determine status in MCP report_details 
Instead of using post_reported of the post or message_reported of the pm, use
report_closed of the report itself to reliably determine whether this
particular report is closed or not in the report_details view of the MCP.
This fixes a bug where the report_details view would not show that the report
shown was closed and display a "Close report" button that had no effect.

PHPBB3-11829
 2013-09-04 13:37:39 +02:00
Joseph Warner
ae18f921ea [feature/oauth] More small fixes 
PHPBB3-11673
 2013-09-02 16:52:41 -04:00
Vjacheslav Trushkin
2624d1ea14 [ticket/11562] Use jQuery in subPanels 
PHPBB-11562
 2013-08-30 14:52:45 +03:00
Vjacheslav Trushkin
d091c4f829 [ticket/11562] Remove submit_default_button from forum_fn 
Remove submit_default_button() and related functions
from forum_fn.js

PHPBB3-11562
 2013-08-30 14:52:45 +03:00
Vjacheslav Trushkin
2c4fc9c8bd [ticket/11562] Convert marklist() to jQuery 
PHPBB3-11562
 2013-08-30 14:52:45 +03:00
Nathan Guse
dcf82d9a5a Merge remote-tracking branch 'remotes/brunoais/ticket/11803' into develop 
* remotes/brunoais/ticket/11803:
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
 2013-08-28 12:49:44 -05:00
brunoais
cc93f189a0 [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 
When it was made the min number of options allowed to a user was 1 but 0 can also be used as it means unlimited.

PHPBB3-11803
 2013-08-26 19:56:27 +01:00
Joseph Warner
de17d5bdcc [feature/oauth] Subsilver2 ucp_login_link 
PHPBB3-11673
 2013-08-24 17:07:53 -04:00
Joseph Warner
cbd5bbbeb8 [feature/oauth] Subsilver2 ucp_auth_link templates 
PHPBB3-11673
 2013-08-24 16:36:31 -04:00
Joseph Warner
dbf97fdd52 [feature/oauth] Subsilver 2 login_body updates 
PHPBB3-11673
 2013-08-22 19:38:09 -04:00
Joseph Warner
8f75edb8a1 [feature/oauth] Add newline at end of file 
PHPBB3-11673
 2013-08-22 19:10:57 -04:00
Marcus Vinny
83092e0269 [ticket/11804] Remove </li> from overall_header which was not open 
PHPBB3-11804
 2013-08-20 04:25:06 -03:00
Andreas Fischer
c6f56f5149 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11801] removed some whitespace and added missing semi colon's in css

Conflicts:
	phpBB/styles/prosilver/theme/colours.css
 2013-08-19 20:48:17 +02:00
Prosk8er
f61db86b8d [ticket/11801] removed some whitespace and added missing semi colon's in css 
PHPBB3-11801
 2013-08-19 13:31:30 -04:00
Andreas Fischer
3cc0a4149f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11789] Remove inline color in memberlist_view

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_view.html
 2013-08-18 17:10:26 +02:00
Vjacheslav Trushkin
6f566fdaf0 [ticket/11789] Remove inline color in memberlist_view 
PHPBB3-11789
 2013-08-18 10:56:16 +03:00
Andreas Fischer
09f547e373 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11789] Remove colors from HTML code

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_history.html
 2013-08-18 03:07:32 +02:00
Andreas Fischer
8fd49f9df8 Merge remote-tracking branch 'cyberalien/ticket/11796' into develop 
* cyberalien/ticket/11796:
  [ticket/11796] Replace pagination with pagination.html
 2013-08-18 02:50:32 +02:00
Andreas Fischer
5bb02647e6 Merge remote-tracking branch 'cyberalien/ticket/11779' into develop 
* cyberalien/ticket/11779:
  [ticket/11779] Fix unapproved messages class name
 2013-08-18 02:37:07 +02:00
Andreas Fischer
a808c4f9c9 Merge remote-tracking branch 'cyberalien/ticket/11800' into develop 
* cyberalien/ticket/11800:
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
 2013-08-18 02:02:44 +02:00
Andreas Fischer
55d911a2fd Merge remote-tracking branch 'cyberalien/ticket/11754' into develop 
* cyberalien/ticket/11754:
  [ticket/11754] Remove styleswitcher leftovers
 2013-08-18 01:55:56 +02:00