makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
21562 commits 18 branches 192 tags 207 MiB
Commit graph

21562 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
David King
010da72f64 [ticket/11824] Add option for mod_rewrite 
PHPBB3-11824
 2013-09-03 16:57:27 -07: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
Joseph Warner
d5808f13e5 [feature/oauth] Fix bug on ucp_auth_link related to error display 
PHPBB3-11673
 2013-09-02 16:54:30 -04:00
Joseph Warner
ae18f921ea [feature/oauth] More small fixes 
PHPBB3-11673
 2013-09-02 16:52:41 -04:00
Nathan Guse
8ee86b7590 [ticket/11791] Load adm/ events from styles/adm/event/ 
PHPBB3-11791
 2013-09-02 15:51:20 -05:00
Nathan Guse
0c5a39a3ed [ticket/11816] Test !$DEFINITION 
PHPBB3-11816
 2013-09-02 15:50:34 -05:00
Joseph Warner
29e3768ecc [feature/oauth] More minor changes from review 
PHPBB3-11673
 2013-09-02 16:47:53 -04:00
Joseph Warner
63ba064065 [feature/oauth] Fix small bug introduced by update in OAuth library 
PHPBB3-11673
 2013-09-02 16:32:40 -04:00
Joseph Warner
51f06f36f1 [feature/oauth] Fix small issues on ucp pages 
PHPBB3-11673
 2013-09-02 16:31:21 -04:00
Joseph Warner
6420fdcc05 [feature/oauth] Fix typo in OAuth logout method 
PHPBB3-11673
 2013-09-02 16:04:46 -04:00
Joseph Warner
4348fd8350 [feature/oauth] Make token storage service ignorant 
PHPBB3-11673
 2013-09-02 16:04:35 -04:00
Joseph Warner
a2be0aab5f [feature/oauth] Update oauth::logout() to use clearAllTokens() 
PHPBB3-11673
 2013-09-02 16:04:24 -04:00
Joseph Warner
6df2bd4fd3 [feature/oauth] Update storage implementation due to inteface change 
PHPBB3-11673
 2013-09-02 16:04:15 -04:00
Joseph Warner
d04def0558 [feature/oauth] Update lusitanian/oauth to stable branch 
PHPBB3-11673
 2013-09-02 16:03:59 -04:00
David King
a1b4c6f82a [ticket/11215] Fix helper_url_test.php tests 
PHPBB3-11215
 2013-09-02 12:53:37 -07:00
Nathan Guse
4233575814 [ticket/11822] Use namespace lookup order for asset loading 
PHPBB3-11822
 2013-09-02 14:01:51 -05: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
Nathan Guse
5e86f5687b [ticket/11727] Template loader support for safe directories to load files from 
PHPBB3-11727
 2013-09-02 12:13:20 -05: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