1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

1368 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Vjacheslav Trushkin
3713ff71ea [ticket/11770] Fix class name for pm list
PHPBB3-11770
2013-08-06 21:47:35 +03:00
rechosen
075f491cb8 [ticket/9550] Add template event memberlist_body_username_prepend
Adds the prepend counterpart of a template event required for the karma
extension. It allows adding information before every username in the
memberlist.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
ee251fe45b [ticket/9550] Add template event memberlist_body_username_append
Adds a template event required for the karma extension. It allows adding
information after every username in the memberlist.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows other
users to see how respected every listed user is.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
cd0b1be208 [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_after
Adds the append counterpart of a template event required for the karma
extension. It allows adding data after the custom fields under the username
and avatar next to every private message in prosilver.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
2f1635116c [ticket/9550] Add template event ucp_pm_viewmessage_custom_fields_before
Adds a template event required for the karma extension. It allows adding data
before the custom fields under the username and avatar next to every private
message in prosilver.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows users
to see how respected the pm sender is.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
8468968014 [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_after
Adds the append counterpart of a template event required for the karma
extension. It allows adding data after the custom fields under the username
and avatar next to every post.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
c049c8d6f0 [ticket/9550] Add template event viewtopic_body_postrow_custom_fields_before
Adds a template event required for the karma extension. It allows adding data
before the custom fields, under the username and avatar next to every post.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows users
to see how respected the post author is.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
fd8ab92559 [ticket/9550] Add template event viewtopic_body_post_buttons_before
Adds the prepend counterpart of a template event required for the karma
extension. It allows adding post buttons to posts (next to the quote and edit
buttons).

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
ef7861bffc [ticket/9550] Add template event viewtopic_body_post_buttons_after
Adds a template event required for the karma extension. It allows adding
post buttons to posts (next to the quote and edit buttons).

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add thumbs up/down icons that allow users to
give karma on posts.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
a10ab3e7d9 [ticket/9550] Add template event memberlist_view_user_statistics_after
Adds the append counterpart of a template event required for the karma
extension. It allows adding entries to the user statistics part of any user
profile.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Per suggestion of nickvergessen, add a counterpart for every append or prepend
event.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
rechosen
d7e048da10 [ticket/9550] Add template event memberlist_view_user_statistics_before
Adds a template event required for the karma extension. It allows adding
entries to the user statistics part of any user profile.

Explanation from http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=44379:
Used by the karma extension to add a karma score indication that allows other
users to see how respected this user is. Prepend because karma score is often
a more meaningful statistic than the bottom statistics (like "Most active
topic"), and should therefore be more prominent.

PHPBB3-9550
2013-08-02 11:16:02 +02:00
Joas Schilling
ca07be9c57 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10037] Fix table in subsilver2
  [ticket/10037] Apply attached patch with a few changes
2013-07-31 23:40:35 +02:00
Joas Schilling
bbc04e8607 Merge remote-tracking branch 'Elsensee/ticket/8228' into develop
* Elsensee/ticket/8228:
  [ticket/8228] Fix still existing problems with code in firefox
  [ticket/8228] Fix whitespaces before code in Firefox
2013-07-31 02:20:27 +02:00
Oliver Schramm
95c603d545 [ticket/8228] Fix still existing problems with code in firefox
A user of a board mentioned that there are still some problems
in firefox if php-highlighting is on. So I used a snippet which
they worked on for weeks. Link to the snippet (in german):
http://www.ongray-design.de/forum/viewtopic.php?t=541

PHPBB3-8228
2013-07-30 18:00:47 +02:00
Vjacheslav Trushkin
c335edc038 [ticket/11754] Remove styleswitcher leftovers
PHPBB3-11754
2013-07-30 12:21:34 +03:00
Matt Friedman
8e636e4572 [ticket/11749] Template events for topic_list_row_pre/append
PHPBB3-11749
2013-07-27 10:48:40 -07:00
Oliver Schramm
866e475f96 [ticket/10037] Apply attached patch with a few changes
PHPBB3-10037
2013-07-25 15:47:55 +02:00
Oliver Schramm
0dcf24acc1 [ticket/8228] Fix whitespaces before code in Firefox
Based on the "[code] enhancements" modification by TerraFrost

PHPBB3-8228
2013-07-24 13:31:12 +02:00
Andreas Fischer
29322e85ff Merge remote-tracking branch 'cyberalien/ticket/11712' into develop
* cyberalien/ticket/11712:
  [ticket/11712] Fixing typo in editor.js
2013-07-18 18:14:03 +02:00
Vjacheslav Trushkin
d05c04ae40 [ticket/11712] Fixing typo in editor.js
PHPBB3-11712
2013-07-18 19:10:36 +03:00
Vjacheslav Trushkin
0759b606c2 [ticket/11708] Fix bulletin points in notifications
PHPBB3-11708
2013-07-16 20:11:28 +03:00
Nathan Guse
346efbbb5b Merge pull request #1429 from cyberalien/ticket/11553
Move bulletin points for linklist lists to pseudo classes
2013-07-13 14:20:23 -07:00
Nathan Guse
ea0ef00801 Merge pull request #1550 from nickvergessen/ticket/9649
[ticket/9649] Display information on index for moderators on unapproved posts
2013-07-13 12:03:33 -07:00
Joas Schilling
081350678d [ticket/9649] Display information on index for moderators on unapproved posts
PHPBB3-9649
2013-07-13 14:57:31 -04:00
Nathan Guse
9d86385a36 Merge pull request #1436 from cyberalien/ticket/11563
Fix subPanels() in forum_fn.js
2013-07-13 10:49:04 -07:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Andreas Fischer
6f14c8375e [develop-olympus] Bumping version numbers to final for 3.0.12 releases. 2013-07-12 21:10:05 +02:00
Nathaniel Guse
159f018056 [ticket/11388] INCLUDECSS
PHPBB3-11388
2013-07-11 15:31:55 -05:00
Vjacheslav Trushkin
9b194ddb1e [ticket/11553] Typo
PHPBB3-11553
2013-07-11 13:18:01 -04:00
Vjacheslav Trushkin
5362f2a1c1 [ticket/11553] Replace bullet with unicode
PHPBB3-11553
2013-07-11 11:11:38 -04:00
Vjacheslav Trushkin
600d3bd1f6 [ticket/11553] Move bulletin points to pseudo class
Move bulletin points for .linklist lists to pseudo class
Group pseudo classes for .linklist.bulletin and .icon-notification

PHPBB3-11553
2013-07-11 11:11:38 -04:00
Vjacheslav Trushkin
1d97945593 [ticket/11563] Remove duplicate code
PHPBB3-11563
2013-07-11 11:00:04 -04:00
Vjacheslav Trushkin
a9259b12aa [ticket/11563] Dynamically generate panels list
PHPBB3-11563
2013-07-11 10:58:18 -04:00
Vjacheslav Trushkin
6599cabed7 [ticket/11563] Remove unused JS variables
Remove unused JS variables from posting_buttons

PHPBB3-11563
2013-07-11 10:38:55 -04:00
Vjacheslav Trushkin
7a34c7eabe [ticket/11563] Fix subPanels()
Fix subPanels() code
Modernize subPanels() with jQuery
Use HTML5 data attributes instead of including JS

PHPBB3-11563
2013-07-11 10:38:54 -04:00