Commit graph

16155 commits

Author SHA1 Message Date
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
Joas Schilling
958f3e9503 Merge remote-tracking branch 'imkingdavid/ticket/11824' into develop 2013-09-13 16:48:28 +02:00
David King
ee44dff3be [ticket/11824] Fix comment wording
PHPBB3-11824
2013-09-13 07:28:00 -07:00
rechosen
42884546cc [ticket/11843] The twig lexer fixes DEFINE variables with underscores again
https://github.com/phpbb/phpbb3/pull/1708 accidentally stopped the twig lexer
from fixing DEFINE variables with underscores in them. This commit restores
that functionality.

PHPBB3-11843
2013-09-13 12:05:20 +02:00
David King
fc7a35be38 Merge pull request #1622 from EXreaction/ticket/11373
[ticket/11373] Prune old read notifications with cron
2013-09-12 22:01:11 -07:00
David King
5925ea1f45 Merge pull request #1689 from EXreaction/ticket/11727
[ticket/11727] Mark style directories safe to load from
2013-09-12 21:35:17 -07:00
Nathan Guse
f723491527 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373
# By Joseph Warner (188) and others
# Via Andreas Fischer (41) and others
* 'develop' of github.com:phpbb/phpbb3: (435 commits)
  [ticket/11745] Correct language, coding guidelines
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
  [ticket/11833] Fix bad template loop
  [feature/oauth] Fix tabindex
  [ticket/11816] !$DOESNT_EXIST test
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  ...
2013-09-12 23:34:34 -05:00
Nathan Guse
288649dd5e [ticket/11727] Fix indentation
PHPBB3-11727
2013-09-12 23:32:45 -05:00
Nathan Guse
088dfc1200 [ticket/11727] Fix indentation
PHPBB3-11727
2013-09-12 23:32:08 -05:00
David King
f22b959257 Merge pull request #1620 from EXreaction/ticket/11745
Group join approved notification
2013-09-12 21:25:00 -07:00
David King
d629738675 Merge pull request #1617 from EXreaction/ticket/11744
[ticket/11744] Group join request notification
2013-09-12 21:24:11 -07: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
32b9254740 [ticket/11745] Correct language, coding guidelines
PHPBB3-11745
2013-09-12 22:59:42 -05:00
Nathan Guse
bcb1392351 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By Joseph Warner (187) and others
# Via Nathan Guse (6) and others
* 'develop' of github.com:phpbb/phpbb3: (195 commits)
  [ticket/11828] Fix greedy operators in lexer
  [ticket/11835] Fix ucp_auth_link adding in migration
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
  [ticket/develop/11832] Fix path detection
  [feature/oauth] Fix tabindex
  [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
  [ticket/11829] Use report_closed to determine status in MCP report_details
  [feature/oauth] Fix bug on ucp_auth_link related to error display
  [feature/oauth] More small fixes
  [feature/oauth] More minor changes from review
  [feature/oauth] Fix small bug introduced by update in OAuth library
  [feature/oauth] Fix small issues on ucp pages
  [feature/oauth] Fix typo in OAuth logout method
  [feature/oauth] Make token storage service ignorant
  [feature/oauth] Update oauth::logout() to use clearAllTokens()
  [feature/oauth] Update storage implementation due to inteface change
  [feature/oauth] Update lusitanian/oauth to stable branch
  [ticket/11822] Use namespace lookup order for asset loading
  [feature/oauth] Update comment on oauth service exception
  [feature/oauth] Forgot to remove placeholder comment
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-12 22:56:54 -05:00
David King
12ede5f2a7 Merge pull request #1708 from EXreaction/ticket/11828
[ticket/11828] Fix greedy operators in lexer
2013-09-12 20:51:29 -07:00
David King
484d457363 Merge pull request #1690 from EXreaction/ticket/11822
[ticket/11822] Use namespace lookup order for asset loading
2013-09-12 20:49:27 -07:00
Nathan Guse
a7ea874c0d Merge pull request #1640 from brunoais/ticket/11637
[ticket/11637] generate_text_for_display on search.php
2013-09-12 19:30:43 -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
Nathan Guse
4d14bdbf13 Merge pull request #1698 from rechosen/ticket/11829
[ticket/11829] Use report_closed to determine status in MCP report_details
2013-09-12 12:53:06 -07:00
Nathan Guse
e3dfe4f046 Merge pull request #1699 from rechosen/ticket/9550
[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
2013-09-12 12:50:15 -07:00
Nathan Guse
8c2f73bb09 [ticket/11828] Fix greedy operators in lexer
Use lazy operators and use stricter validation

PHPBB3-11828
2013-09-12 14:15:41 -05:00
David King
310844fb7d [ticket/11824] Revert changes in functions.php
These will be added in another PR

PHPBB3-11824
2013-09-12 09:27:54 -07:00
David King
6f4ad0bcfa [ticket/11824] Update language string for board settings
PHPBB3-11824
2013-09-12 09:21:40 -07:00
David King
8e9ee0a4dc [ticket/11824] Revert changes to functions_content.php
These will be fixed in another PR

PHPBB3-11824
2013-09-12 09:18:18 -07:00
Nathan Guse
7435c40b5c [ticket/11835] Fix ucp_auth_link adding in migration
PHPBB3-11835
2013-09-10 21:31:19 -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
Andreas Fischer
71aeec40f6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
2013-09-10 02:53:33 +02:00
Andreas Fischer
c1557cf78d Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
2013-09-10 02:53:19 +02:00
Andreas Fischer
38afdd792f [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
A wrong fix version was assigned to PHPBB3-11288.
2013-09-10 02:17:41 +02:00
Vjacheslav Trushkin
07632d46fc [ticket/develop/11832] Fix path detection
Clean up path, do not count first /

PHPBB3-11832
2013-09-09 20:52:29 +03:00
Nathan Guse
5166240d62 [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
PHPBB3-11833
2013-09-09 11:26:40 -05: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
David King
d1c0e93895 [ticket/11824] Correct a comment
PHPBB3-11824
2013-09-06 13:08:35 -07:00
David King
50b24662bd [ticket/11824] Change copyright year in migration file
PHPBB3-11824
2013-09-06 13:07:02 -07:00
David King
ceaf1ba0bc [ticket/11824] Remove unused globals
PHPBB3-11824
2013-09-06 12:59:01 -07:00
David King
bbcd3967ef [ticket/11824] Fix smilies
PHPBB3-11824
2013-09-06 12:53:34 -07:00
David King
2ccc992da1 [ticket/11824] Fix logic
PHPBB3-11824
2013-09-06 12:48:09 -07:00
Nathan Guse
65f52d7575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-06 09:08:53 -05:00
rechosen
3dfad1f01e [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
To allow extra fields added to the query retrieving post data to be used for
setting template variables, they need to be added to the post rowset. This
commit adds the core.viewtopic_post_rowset_data event that enables extension
developers to modify the post rowset when the database row is still available.

PHPBB3-9550
2013-09-06 15:04:52 +02: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
f71b6c8ea5 Merge pull request #1695 from dhruvgoel92/ticket/11825
[ticket/11825] Move schema_data.php into includes/ instead of phpbb/
2013-09-05 11:17:31 -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
Andreas Fischer
462355d654 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php
2013-09-05 00:40:59 +02:00
Andreas Fischer
fcb9476615 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2013-09-05 00:37:40 +02:00