mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity
11,942 Commits 17 Branches 190 Tags
Commit Graph

11942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
be338864ef Merge remote-tracking branch 'prototech/ticket/12048' into develop-olympus 
* prototech/ticket/12048:
  [ticket/12048] Fix the regexp for language keys in custom bbcodes.
 2013-12-02 10:07:06 +01:00
Cesar G
eef1b586d5 [ticket/12048] Fix the regexp for language keys in custom bbcodes. 
PHPBB3-12048
 2013-12-02 00:53:42 -08:00
Joas Schilling
afb4585dd9 Merge remote-tracking branch 'prototech/ticket/12037' into develop-olympus 
* prototech/ticket/12037:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.
 2013-11-26 11:31:43 +01:00
Cesar G
e111d7bd13 [ticket/12037] Fix hard-coded text in acp_inactive.html. 
PHPBB3-12037
 2013-11-25 12:38:53 -08:00
Joas Schilling
af3417ce86 Merge remote-tracking branch 'prototech/ticket/11814' into develop-olympus 
* prototech/ticket/11814:
  [ticket/11814] Remove redundant text from the topic reply email notification.
 2013-11-19 15:28:06 +01:00
Cesar G
f833a42e7e [ticket/11814] Remove redundant text from the topic reply email notification. 
PHPBB3-11814
 2013-11-19 06:20:37 -08:00
Nils Adermann
3eb4575f61 Merge remote-tracking branch 'github-bantu/ticket/11970' into develop-olympus 
* github-bantu/ticket/11970:
  [ticket/11970] Make apt-get less quiet.
  [ticket/11970] Add set -x to Travis setup scripts.
 2013-10-26 10:53:35 -05:00
Andreas Fischer
e65483ac32 [ticket/11970] Make apt-get less quiet. 
PHPBB3-11970
 2013-10-26 01:39:04 +02:00
Andreas Fischer
3c135ccab2 [ticket/11970] Add set -x to Travis setup scripts. 
Output is hidden by Travis by default and this will allow easier debugging.

PHPBB3-11970
 2013-10-26 01:37:03 +02:00
Andreas Fischer
66841a55d0 Merge remote-tracking branch 'bantu/ticket/11920' into develop-olympus 
* bantu/ticket/11920:
  [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
 2013-10-25 14:01:33 +02:00
Andreas Fischer
acc6e440d0 [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL. 
PHPBB3-11920
 2013-10-25 13:21:10 +02:00
Nils Adermann
5e01ea61f9 Merge branch 'task/github-readme/travis' into develop-olympus 
* task/github-readme/travis:
  [task/github-readme/travis] Fix Travis-Badge and link
 2013-10-24 21:53:47 -05:00
Falk Seidel
98a6f10ce7 [task/github-readme/travis] Fix Travis-Badge and link 
PHPBB3-11968
 2013-10-24 21:51:49 -05:00
Nils Adermann
a5eaaa10dc Merge remote-tracking branch 'github-bantu/ticket/11951' into develop-olympus 
* github-bantu/ticket/11951:
  [ticket/11951] Add MariaDB to platforms we test on.
  [ticket/11951] Add MariaDB to supported DBMSes in requirement section.
 2013-10-20 16:03:23 -07:00
Andreas Fischer
7df35a288a [ticket/11951] Add MariaDB to platforms we test on. 
PHPBB3-11951
 2013-10-19 23:08:04 +02:00
Andreas Fischer
6de519431d [ticket/11951] Add MariaDB to supported DBMSes in requirement section. 
PHPBB3-11951
 2013-10-19 23:05:27 +02:00
Nils Adermann
16ab35c1b5 Merge pull request #1782 from bantu/ticket/11920 
[ticket/11920] Actually call travis/setup-mariadb.sh.
 2013-10-15 16:34:32 -07:00
Andreas Fischer
5a481bb176 [ticket/11920] Print MariaDB version after successful setup. 
PHPBB3-11920
 2013-10-16 00:25:07 +02:00
Andreas Fischer
0f64f0edc4 [ticket/11920] Manually purge mysql-common. 
PHPBB3-11920
 2013-10-16 00:24:44 +02:00
Andreas Fischer
878cb836f5 [ticket/11920] Actually call travis/setup-mariadb.sh. 
PHPBB3-11920
 2013-10-15 22:44:49 +02:00
Nils Adermann
8131700330 Merge pull request #1780 from bantu/ticket/11920 
[ticket/11920] Add MariaDB environment to Travis-CI.
 2013-10-15 13:34:51 -07:00
Andreas Fischer
55e24eb4f8 [ticket/11920] Have to use empty root password otherwise db creation fails. 
PHPBB3-11920
 2013-10-15 16:57:16 +02:00
Andreas Fischer
cdaea7a406 [ticket/11920] Add MariaDB environment to Travis-CI. 
PHPBB3-11920
 2013-10-15 16:28:59 +02:00
Nathan Guse
9e51b43829 Merge remote-tracking branch 'remotes/bantu/ticket/11877' into develop-olympus 
* remotes/bantu/ticket/11877:
  [ticket/11877] Create package links and checksums for announcement via script.
 2013-10-03 22:26:14 -05:00
Andreas Fischer
8f2cebc0bb Merge remote-tracking branch 'cyberalien/ticket/11879' into develop-olympus 
* cyberalien/ticket/11879:
  [ticket/11879] Replace .live() with .on()
 2013-10-02 15:00:26 +02:00
Vjacheslav Trushkin
a79d0e6758 [ticket/11879] Replace .live() with .on() 
PHPBB3-11879
 2013-10-02 11:12:41 +03:00
Andreas Fischer
dbd0380c3f [ticket/11877] Create package links and checksums for announcement via script. 
PHPBB3-11877
 2013-10-01 16:16:19 +02:00
Andreas Fischer
0cf9d657b7 [ticket/11876] Replace MD5 with SHA256. 
PHPBB3-11876
 2013-09-30 18:09:27 +02:00
Andreas Fischer
da9756ba25 [ticket/11876] Move checksum generation from build PHP files to phing build.xml 
This also removes paths from the checksum files.

PHPBB3-11876
 2013-09-30 18:08:42 +02:00
Andreas Fischer
ac4736db08 [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. 2013-09-30 17:04:14 +02:00
Andreas Fischer
02f9d179e5 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 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
 2013-09-28 15:02:44 +02:00
Andreas Fischer
446ea9928d [prep-release-3.0.12] Update changelog for 3.0.12 release. 2013-09-28 03:20:51 +02:00
Andreas Fischer
426994a7f8 Merge branch 'ticket/11873' into prep-release-3.0.12 
* ticket/11873:
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
 2013-09-28 03:19:24 +02:00
Joas Schilling
c6aefcf555 [ticket/11873] Add unit test for large password input. 
The password should be rejected quite fast.

PHPBB3-11873
 2013-09-28 03:14:18 +02:00
Joas Schilling
cba28c39ad [ticket/11873] Do not hash very large passwords in order to safe resources. 
PHPBB3-11873
 2013-09-28 03:12:50 +02:00
Andreas Fischer
50f6af2a20 [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. 2013-09-27 01:37:14 +02:00
Andreas Fischer
9a5415fe6d Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2013-09-27 01:32:09 +02:00
Andreas Fischer
d18bded3ac [prep-release-3.0.12] Bumping version number for 3.0.12 final. 2013-09-27 01:26:31 +02:00
Andreas Fischer
259a6f0834 Merge remote-tracking branch 'marc1706/ticket/11864' into develop-olympus 
* marc1706/ticket/11864:
  [ticket/11864] Do not call exit after display_progress_bar in acp_forums
 2013-09-26 16:00:53 +02:00
Marc Alexander
c654e9d247 [ticket/11864] Do not call exit after display_progress_bar in acp_forums 
The progress bar is called with the method display_progress_bar() in the
acp_forums files. This method then call adm_page_footer() which also calls
exit_handler(). Therefore, the exit; in acp_forums after
$this->display_progress_bar() is obsolete and shouldn't exist in the first
place.

PHPBB3-11864
 2013-09-25 13:35:08 +02:00
Nathan Guse
a5c532979d Merge remote-tracking branch 'remotes/cyberalien/ticket/11811' into develop-olympus 
* remotes/cyberalien/ticket/11811:
  [ticket/11811] Remove outline on :focus
 2013-09-13 17:16:20 -05:00
Vjacheslav Trushkin
3cd445d055 [ticket/11811] Remove outline on :focus 
PHPBB3-11811
 2013-09-13 23:41:07 +03:00
David King
424080c45a Merge pull request #1701 from EXreaction/ticket/11831 
Update fabpot/goutte
 2013-09-12 20:42:05 -07: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
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
Nathan
b17d15276f [ticket/11831] getAttribute was replaced with attr 
PHPBB3-11831
 2013-09-06 12:36:40 -05:00
Nathan
b7eca27f2a [ticket/11831] Update fabpot/goutte to 1.0.* 
PHPBB3-11831
 2013-09-06 12:28:46 -05: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