mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
13,143 Commits 17 Branches 190 Tags
Commit Graph

13143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wagnerch
0191e1313c [feature/postgresql-fulltext-search] PostgreSQL fulltext search, version 1. 
PHPBB3-9730
 2012-06-08 21:28:23 +05:30
Andreas Fischer
1d0607cbb3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10843] Backport changes to install language.
  [ticket/10834] Backport general development language changes to 3.0.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/docs/README.html
 2012-05-09 13:30:09 +02:00
Andreas Fischer
0488d70062 Merge remote-tracking branch 'p/ticket/10834' into develop-olympus 
* p/ticket/10834:
  [ticket/10843] Backport changes to install language.
  [ticket/10834] Backport general development language changes to 3.0.
 2012-05-09 13:25:07 +02:00
Andreas Fischer
1a9b30b871 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10858] Move generic row seeking to DBAL
  [ticket/10858] Tests for row seeking with fetchfield()
  [ticket/10858] Fix MSSQL Native's row seeking behavior

Conflicts:
	tests/dbal/select_test.php
 2012-05-09 12:55:58 +02:00
Andreas Fischer
12dbcc7f1e Merge remote-tracking branch 'Noxwizard/ticket/10858' into develop-olympus 
* Noxwizard/ticket/10858:
  [ticket/10858] Move generic row seeking to DBAL
  [ticket/10858] Tests for row seeking with fetchfield()
  [ticket/10858] Fix MSSQL Native's row seeking behavior
 2012-05-09 12:50:13 +02:00
Patrick Webster
09d49fb7b2 [ticket/10858] Move generic row seeking to DBAL 
Removed from: firebird, mssql_odbc, and mssqlnative

PHPBB3-10858
 2012-05-08 19:41:22 -05:00
Patrick Webster
afbaa6979b [ticket/10858] Tests for row seeking with fetchfield() 
PHPBB3-10858
 2012-05-08 18:45:51 -05:00
Patrick Webster
e52d23848a [ticket/10858] Fix MSSQL Native's row seeking behavior 
The result_mssqlnative class remains in case someone wants to use it

PHPBB3-10858
 2012-05-08 18:44:43 -05:00
Andreas Fischer
30579ecb09 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10860] Fixing js error in updater
 2012-05-06 18:39:32 +02:00
Andreas Fischer
c0718fae96 Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympus 
* cyberalien/ticket/10860:
  [ticket/10860] Fixing js error in updater
 2012-05-06 18:39:23 +02:00
Vjacheslav Trushkin
a960bd6790 [ticket/10860] Fixing js error in updater 
Fixing javascript error in side-by-side diff styling in updater:
resizing inner block instead of outer block and increasing
height by inner/outer block difference.

PHPBB3-10860
 2012-05-06 19:37:49 +03:00
Andreas Fischer
1264e39aa9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10819] Remove support for older browsers
  [ticket/10819] Forgot this causes vertical scrollbars on IE
  [ticket/10819] Improve side-by-side diff styling
 2012-05-06 00:43:12 +02:00
Andreas Fischer
9d542aec1e Merge remote-tracking branch 'Noxwizard/ticket/10819' into develop-olympus 
* Noxwizard/ticket/10819:
  [ticket/10819] Remove support for older browsers
  [ticket/10819] Forgot this causes vertical scrollbars on IE
  [ticket/10819] Improve side-by-side diff styling
 2012-05-06 00:43:01 +02:00
Andreas Fischer
9d827f491f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10849] Added missing helptext for listitem
 2012-05-05 22:50:08 +02:00
Andreas Fischer
5ccbe06911 Merge remote-tracking branch 'galaxyAbstractor/ticket/10849' into develop-olympus 
* galaxyAbstractor/ticket/10849:
  [ticket/10849] Added missing helptext for listitem
 2012-05-05 22:47:58 +02:00
Oleg Pudeyev
c34ee343ba [ticket/10843] Backport changes to install language. 
PHPBB3-10688
PHPBB3-10843
 2012-05-05 16:08:37 -04:00
Oleg Pudeyev
58842b5ca8 [ticket/10834] Backport general development language changes to 3.0. 
PHPBB3-10688
PHPBB3-10834
 2012-05-05 16:05:55 -04:00
Andreas Fischer
cb02dfda96 Merge remote-tracking branch 'brunoais/ticket/10871' into develop 
* brunoais/ticket/10871:
  [ticket/10871] Delete the unwanted implode
 2012-05-04 21:28:16 +02:00
Bruno Ais
fce0c5d436 [ticket/10871] Delete the unwanted implode 
Deleted the implode that had no reason to be there

PHPBB3-10871
 2012-05-04 20:08:42 +01:00
Nils Adermann
859c3ca7d5 Merge pull request #791 from erikfrerejean/task/10869 
[task/10869] Remove PHP 5.2 check from .travis.yml
 2012-05-03 16:22:04 -07:00
Erik Frèrejean
0e906f2575 [task/10869] Remove PHP 5.2 check from .travis.yml 
The travis configuration file contains a statement that checks whether
the test is ran against PHP 5.2 but as that version isn't tested at
all the check can be removed.

PHPBB3-10869
 2012-05-04 00:13:27 +02:00
Andreas Fischer
7426c7a97f Merge remote-tracking branch 'nickvergessen/ticket/10818' into develop 
* nickvergessen/ticket/10818:
  [ticket/10818] Global Announcements Update Dialog should call exit_handler()
 2012-05-03 01:22:31 +02:00
Joas Schilling
ed67dcf3d8 [ticket/10818] Global Announcements Update Dialog should call exit_handler() 
PHPBB3-10818
 2012-05-02 21:12:18 +02:00
Andreas Fischer
beda22c0b1 Merge remote-tracking branch 'mvinny/ticket/10778' into develop 
* mvinny/ticket/10778:
  [ticket/10778] Remove extra space from close link in prosilver smilies window
 2012-05-01 19:57:11 +02:00
Vinny
7294c71431 [ticket/10778] Remove extra space from close link in prosilver smilies window 
PHPBB3-10778
 2012-05-01 14:41:02 -03:00
Andreas Fischer
81af5c95ed Merge remote-tracking branch 'Senky/ticket/10847' into develop 
* Senky/ticket/10847:
  [ticket/10847] fixing all misspelled "dependant" to "dependent"
 2012-05-01 13:47:31 +02:00
Andreas Fischer
52c7193ad0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10846] fixing SQL query bug in acp_main.php
 2012-05-01 13:38:25 +02:00
Andreas Fischer
8cb0e30afc Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympus 
* Senky/ticket/10846:
  [ticket/10846] fixing SQL query bug in acp_main.php
 2012-05-01 13:38:11 +02:00
Senky
665f38d42f [ticket/10846] fixing SQL query bug in acp_main.php 
PHPBB3-10846
 2012-04-30 22:01:53 +02:00
Senky
b83fa0349a [ticket/10847] fixing all misspelled "dependant" to "dependent" 
PHPBB3-10847
 2012-04-30 21:55:24 +02:00
galaxyAbstractor
8d45901657 [ticket/10849] Added missing helptext for listitem 
Added the missing helptext for list item in subsilver2.

PHPBB3-10849
 2012-04-27 22:19:41 +02:00
Oleg Pudeyev
2a92fee06d Merge PR #753 branch 'Senky/ticket/10161' into develop 
* Senky/ticket/10161:
  [ticket/10161] added fullstop to the end of sentence
  [ticket/10161] coding-guidelines.html updated
  [ticket/10161] all "e-mail" strings in language files changed to "email"
 2012-04-26 22:57:30 -04:00
Oleg Pudeyev
cd6f6d2813 Merge PR #771 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10836] Check if avatar directory is writable after install
  [ticket/10836] Enable avatars by default at install
 2012-04-26 22:25:26 -04:00
Oleg Pudeyev
3a67604900 Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympus 
* galaxyAbstractor/ticket/10836:
  [ticket/10836] Check if avatar directory is writable after install
  [ticket/10836] Enable avatars by default at install
 2012-04-26 22:08:42 -04:00
Senky
0858a8023b [ticket/10161] added fullstop to the end of sentence 
PHPBB3-10161
 2012-04-26 09:20:33 +02:00
Senky
02cc32b901 [ticket/10161] coding-guidelines.html updated 
PHPBB3-10161
 2012-04-26 09:19:51 +02:00
Oleg Pudeyev
7d92cccf74 Merge PR #731 branch 'VSEphpbb/ticket/10779' into develop 
* VSEphpbb/ticket/10779:
  [ticket/10779] Move jQuery CDN option to Load Settings
 2012-04-25 17:52:24 -04:00
galaxyAbstractor
1a8db76a20 [ticket/10836] Check if avatar directory is writable after install 
Check if the avatar directory is writeable after the installation is complete.
If it isn't, disable avatars and avatar uploading by default.

PHPBB3-10836
 2012-04-25 11:49:06 +02:00
galaxyAbstractor
a21b367b21 [ticket/10836] Enable avatars by default at install 
Enables avatars and local avatar upload by default.

PHPBB3-10836
 2012-04-21 14:16:55 +02:00
Nils Adermann
417caa649a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer

Conflicts:
	phpBB/includes/functions_install.php
	phpunit.xml.functional
	tests/bootstrap.php
	tests/test_framework/phpbb_functional_test_case.php
	tests/test_framework/phpbb_test_case_helpers.php
 2012-04-21 12:36:40 +02:00
Nils Adermann
cdf7ff1797 Merge remote-tracking branch 'github-noxwizard/ticket/10492' into develop-olympus 
* github-noxwizard/ticket/10492:
  [ticket/10492] Fix line endings
  [ticket/10492] Backporting functional tests
  [ticket/10492] Separate config generation from the installer
 2012-04-21 12:31:43 +02:00
Patrick Webster
6293bbf099 [ticket/10492] Fix line endings 
PHPBB3-10492
 2012-04-21 05:24:57 -05:00
Patrick Webster
2aa994b5ad [ticket/10492] Backporting functional tests 
PHPBB3-10492
 2012-04-21 04:37:57 -05:00
Patrick Webster
de70b17b1d [ticket/10492] Separate config generation from the installer 
PHPBB3-10492
 2012-04-20 23:50:49 -05:00
Nils Adermann
13a00ee8cb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10815] enables feed feature by default for a fresh install
 2012-04-20 20:13:17 +02:00
Nils Adermann
29a6aec9ad Merge remote-tracking branch 'github-dhruv/ticket/10815' into develop-olympus 
* github-dhruv/ticket/10815:
  [ticket/10815] enables feed feature by default for a fresh install
 2012-04-20 20:13:00 +02:00
Dhruv Goel
4788705a9a [ticket/10815] enables feed feature by default for a fresh install 
PHPBB3-10815
 2012-04-20 23:30:01 +05:30
Andreas Fischer
70cba47871 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10767] Clarify what happens at the end of the hook.
  [ticket/10767] Use warning/error language as appropriate.
  [ticket/10767] Default to non-fatal behavior.
  [ticket/10767] Revert unconditional unfatality in commit-msg hook.
 2012-04-20 14:55:03 +02:00
Andreas Fischer
31fbc40a09 Merge remote-tracking branch 'p/ticket/10767' into develop-olympus 
* p/ticket/10767:
  [ticket/10767] Clarify what happens at the end of the hook.
  [ticket/10767] Use warning/error language as appropriate.
  [ticket/10767] Default to non-fatal behavior.
  [ticket/10767] Revert unconditional unfatality in commit-msg hook.
 2012-04-20 14:54:55 +02:00
Andreas Fischer
4df8afd27e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10812] Disabled register_globals check in PHP 5.4
 2012-04-20 14:41:20 +02:00