mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-21 06:53:49 +02:00
Code Issues Releases Wiki Activity
19,105 Commits 18 Branches 192 Tags
Commit Graph

2300 Commits

Author SHA1 Message Date
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
Vjacheslav Trushkin
9174788762 [ticket/11800] Fix scripts variable in subsilver simple_footer 
PHPBB3-11800
 2013-08-17 19:21:10 +03:00
Vjacheslav Trushkin
487822d12f [ticket/11800] Fix JavaScript in simple_footer.html 
Include forum_fn.js via INCLUDEJS
Move $SCRIPTS after footer event, allowing extensions to include scripts
Use correct template variable for including scripts

PHPBB3-11800
 2013-08-17 19:18:25 +03:00
Vjacheslav Trushkin
0ed7bd8a5b [ticket/11800] Remove forum_fn from memberlist_search.html 
PHPBB3-11800
 2013-08-17 19:17:17 +03:00
Vjacheslav Trushkin
87dd739a84 [ticket/11796] Replace pagination with pagination.html 
PHPBB3-11796
 2013-08-16 18:52:07 +03:00
Joseph Warner
0ea3103a44 [feature/oauth] Don't allow external login methods on admin auth 
PHPBB3-11673
 2013-08-14 23:01:03 -04:00
Andreas Fischer
96789df962 Merge remote-tracking branch 'cyberalien/ticket/11770' into develop 
* cyberalien/ticket/11770:
  [ticket/11770] Fix class name for pm list
 2013-08-15 02:24:17 +02:00
Joseph Warner
d13a1788f0 [feature/oauth] Update language constants for ucp_auth_link 
PHPBB3-11673
 2013-08-14 17:08:08 -04:00
Joseph Warner
67b1ec5bb8 [feature/oauth] Start implementing link/unlink actions 
PHPBB3-11673
 2013-08-14 15:19:40 -04:00
Vjacheslav Trushkin
9c299b0e83 [ticket/11789] Remove colors from HTML code 
PHPBB3-11789
 2013-08-14 19:09:27 +03:00
Joseph Warner
836d3ba22e [feature/oauth] Handle hidden fields 
PHPBB3-11673
 2013-08-12 15:29:22 -04:00
Joseph Warner
4003e077c1 [feature/oauth] Get the OAuth template in place for ucp_auth_link 
PHPBB3-11673
 2013-08-12 14:43:35 -04:00
Joseph Warner
a479f919ff [feature/oauth] Error handling on page 
PHPBB3-11673
 2013-08-12 12:53:22 -04:00
Vjacheslav Trushkin
0b32a97c47 [ticket/11782] Apply line-height correctly 
Apply line-height only to bolded elements inside post notices
that are direct child elements of forms.

PHPBB3-11782
 2013-08-11 20:10:33 +03:00
Vjacheslav Trushkin
c63901fcb5 [ticket/11782] RTL support for post notices 
PHPBB3-11782
 2013-08-11 20:01:15 +03:00
Vjacheslav Trushkin
788238d7a9 [ticket/11782] Change p.rules to p.post-notice in CSS 
PHPBB3-11782
 2013-08-11 20:00:41 +03:00
Vjacheslav Trushkin
9a5363462b [ticket/11782] Change p.rules to p.post-notice in templates 
PHPBB3-11782
 2013-08-11 19:57:34 +03:00
Vjacheslav Trushkin
fe97611eac [ticket/11780] Remove references to unused images 
PHPBB3-11780
 2013-08-11 10:51:37 +03:00
Vjacheslav Trushkin
fe3b57a141 [ticket/11780] Remove unused images 
PHPBB3-11780
 2013-08-11 10:51:16 +03:00
Vjacheslav Trushkin
0aea5e48d8 [ticket/11779] Fix unapproved messages class name 
PHPBB3-11779
 2013-08-11 10:37:29 +03:00
Joseph Warner
69cb2e4c60 [feature/oauth] More template work 
PHPBB3-11673
 2013-08-09 05:26:44 -04:00
Joseph Warner
deb62d51fe [feature/oauth] Start building the template 
PHPBB3-11673
 2013-08-09 05:12:57 -04:00
Joseph Warner
786da260c0 [feature/oauth] Fix ucp_auth_link headers/footers 
PHPBB3-11673
 2013-08-09 04:37:08 -04:00
Vjacheslav Trushkin
3713ff71ea [ticket/11770] Fix class name for pm list 
PHPBB3-11770
 2013-08-06 21:47:35 +03:00
Joseph Warner
baa3a750c4 [feature/oauth] Start general auth linking page 
PHPBB3-11673
 2013-08-05 15:38:03 -04:00