Commit graph

18005 commits

Author SHA1 Message Date
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
Dhruv
19074a3420 [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
PHPBB3-11825
2013-09-03 19:44:07 +05:30
David King
8d6b03c438 Merge remote-tracking branch 'EXreaction/ticket/11791' into develop 2013-09-02 16:45:12 -07:00
David King
cc2302b537 Merge remote-tracking branch 'EXreaction/ticket/11818' into develop 2013-09-02 16:36:28 -07:00
David King
6e028a5ecc Merge remote-tracking branch 'EXreaction/ticket/11755' into develop 2013-09-02 16:12:30 -07:00
Nathan Guse
4fd99a7b2e Merge pull request #1102 from imkingdavid/ticket/11215
[ticket/11215] Correct paths when path info is used for controller access
2013-09-02 15:55:22 -07:00
David King
918ffc10e1 [ticket/11215] Remove unnecessary comment
PHPBB3-11215
2013-09-02 15:34:14 -07:00
Andreas Fischer
67f89cc319 Merge remote-tracking branch 'EXreaction/ticket/11812' into develop
* EXreaction/ticket/11812:
  [ticket/11812] Fix empty define
2013-09-03 00:15:37 +02:00
Nathan Guse
536eeb7afa [ticket/11755] MySQL upgrader out of date
De-duplicating code from create_schema_files, mysql_upgrader.

New file phpbb/db/schema_data which contains all the current schema data.

New function in db_tools public static function get_dbms_type_map() to make the
type map available everywhere (without requiring $db be setup already)

PHPBB3-11755
2013-09-02 16:58:34 -05:00
David King
a057349e40 Merge branch 'develop' into ticket/11215 2013-09-02 14:43:05 -07:00
Andreas Fischer
50818a342b [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. 2013-09-02 23:42:45 +02:00
Andreas Fischer
f9c3d78e8c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
2013-09-02 23:40:11 +02:00
Andreas Fischer
f446afa06b Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympus
* imkingdavid/ticket/11823:
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
2013-09-02 23:39:45 +02:00
Andreas Fischer
ed0d7e9ea0 [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. 2013-09-02 23:38:42 +02:00
David King
f317d6d8c5 [ticket/11823] Set up nginx server to match PHP files with characters after .php
PHPBB3-11823
2013-09-02 14:36:40 -07:00
Nathan Guse
c8d5ec8927 [ticket/11812] Fix empty define
PHPBB3-11812
2013-09-02 16:35:42 -05:00
Nathan Guse
fe6688ff49 [ticket/11818] Update Symfony dependencies to 2.3.*
PHPBB3-11818
2013-09-02 16:23:05 -05:00
Nathan Guse
8ee86b7590 [ticket/11791] Load adm/ events from styles/adm/event/
PHPBB3-11791
2013-09-02 15:51:20 -05:00
David King
a1b4c6f82a [ticket/11215] Fix helper_url_test.php tests
PHPBB3-11215
2013-09-02 12:53:37 -07:00
David King
5ed5f43afe [ticket/11215] Add newline back to .htaccess, fix wording
PHPBB3-11215
2013-09-02 11:53:52 -07:00
David King
5c50dc721d [ticket/11215] Update comment in .htaccess
PHPBB3-11215
2013-09-02 11:51:52 -07:00
David King
1e64095e17 [ticket/11215] Uncomment rewrite rules in .htaccess
Because we check to see if the rewrite module is available
we don't have to comment the rewrite lines

PHPBB3-11215
2013-09-02 11:49:36 -07:00
David King
913e5a1f2e [ticket/11215] Make controller helper url() method use correct format
PHPBB3-11215
2013-09-02 10:54:55 -07:00
David King
9d48ee446b [ticket/11215] Add commented-out URL rewrite capability to .htaccess
PHPBB3-11215
2013-09-02 09:43:41 -07:00
David King
1b1dd01391 Merge remote-tracking branch 'upstream/develop' into ticket/11215 2013-09-02 09:14:19 -07:00
Andreas Fischer
5ddb0ba629 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/includes/functions_posting.php
2013-09-02 12:31:27 +02:00
Andreas Fischer
68555d2d51 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
2013-09-02 12:30:10 +02:00
Andreas Fischer
5ab378f1ee Merge remote-tracking branch 'nickvergessen/ticket/11769' into prep-release-3.0.12
* nickvergessen/ticket/11769:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php
2013-09-02 12:28:33 +02:00
Joas Schilling
da373ea8a0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
2013-09-02 12:07:06 +02:00
Joas Schilling
fe12093ddf Merge remote-tracking branch 'bantu/ticket/11821' into develop-olympus
* bantu/ticket/11821:
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
2013-09-02 12:06:40 +02:00
Andreas Fischer
48825975d1 [ticket/11821] Fix comma usage next to "You are receiving this notification".
This is a partial backport of 31502cdd6c.

PHPBB3-11821
2013-09-02 11:41:31 +02:00
Joas Schilling
cd9711b7c9 [ticket/11769] Allow using 0 as poster name
PHPBB3-11769
2013-09-02 11:29:50 +02:00
Joas Schilling
42b9c3c479 [ticket/11769] Allow '0' as username
PHPBB3-11769
2013-09-02 01:11:40 +02:00
Andreas Fischer
ba3786d3b4 Merge remote-tracking branch 'Hardolaf/ticket/11813' into develop
* Hardolaf/ticket/11813:
  [ticket/11813] Change mock auth provider to implement base provider
2013-09-01 00:34:04 +02:00
David King
73859da481 [ticket/11215] Use new URL structure for controllers
In tests, the old app.php?controller=foo structure was used. Instead
it should be app.php/foo.

PHPBB3-11215
2013-08-31 14:51:28 -07:00
David King
ffee476047 [ticket/11215] Everything appears to be working...
PHPBB3-11215
2013-08-31 14:31:50 -07:00
David King
af1eb7466f Merge branch 'develop' into ticket/11215 2013-08-31 13:37:11 -07:00
Joas Schilling
9d6370751f Merge remote-tracking branch 'EXreaction/ticket/11724' into develop
* EXreaction/ticket/11724:
  [ticket/11724] Handle ELSE IF separately
  [ticket/11724] Replace spaces with tabs
  [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same way
2013-08-30 19:53:54 +02: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
David King
afc12906b9 Merge remote-tracking branch 'EXreaction/ticket/11628' into develop 2013-08-29 14:25:46 -07:00
Nathan Guse
aae7677d71 [ticket/11628] Create base template class with common functions
E.g. assign_vars

PHPBB3-11628
2013-08-28 15:23:38 -05:00
Nathan Guse
68ed2b6035 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628
# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
  [ticket/11799] Send anti abuse headers in "new password" emails.
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11804] Remove </li> from overall_header which was not open
  [ticket/11802] replace $browser with $user->browser
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
  [ticket/11789] Remove inline color in memberlist_view
  [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
  [ticket/11796] Replace pagination with pagination.html
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11789] Remove colors from HTML code
  [ticket/11784] Remove naming redundancy for event listeners
  [ticket/11775] Split test into multiple steps
  [ticket/11777] Fix new test for loop variables in extension template listeners
  ...

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2013-08-28 13:30:48 -05:00