mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 03:29:23 +02:00
Code Issues Releases Wiki Activity
14,075 Commits 18 Branches 192 Tags
Commit Graph

14075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Wiedler
ed052290a7 [ticket/11082] Remove executable permission from redis driver file 
PHPBB3-11082
 2012-09-01 17:40:19 +02:00
Nils Adermann
4fde4abe55 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [task/functional] Fixed DEBUG_TEST related issues
  [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
  [task/functional] Added posting tests (reply and new topic)
 2012-09-01 17:06:59 +02:00
Nils Adermann
3bd19077dc Merge remote-tracking branch 'github-imkingdavid/task/functional' into develop-olympus 
* github-imkingdavid/task/functional:
  [task/functional] Fixed DEBUG_TEST related issues
  [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
  [task/functional] Added posting tests (reply and new topic)
 2012-09-01 17:06:41 +02:00
David King
4dd1bbc587 [task/functional] Fixed DEBUG_TEST related issues 
PHPBB3-10758
 2012-09-01 10:53:01 -04:00
David King
7dfe26dd78 [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST 
PHPBB3-10758
 2012-09-01 10:37:44 -04:00
David King
7cffebbd49 [task/functional] Added posting tests (reply and new topic) 
PHPBB-10758
 2012-09-01 10:37:03 -04:00
Nils Adermann
d866624ea7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10873] Change language for notice about undelivered, deleted PM.
 2012-09-01 16:11:57 +02:00
Nils Adermann
0ba2bfffe2 Merge remote-tracking branch 'github-imkingdavid/ticket/10873' into develop-olympus 
* github-imkingdavid/ticket/10873:
  [ticket/10873] Change language for notice about undelivered, deleted PM.
 2012-09-01 16:11:42 +02:00
Nils Adermann
790e64433d Merge pull request #921 from imkingdavid/ticket/10444 
[ticket/10444] Do not default to the previous post edit reason.
 2012-09-01 07:05:29 -07:00
Andreas Fischer
1128ff1e58 Merge remote-tracking branch 'mvinny/ticket/11065' into develop 
* mvinny/ticket/11065:
  [ticket/11065] Close li tag on topic display options at MCP
 2012-08-27 01:35:46 +02:00
Vinny
7cf49a810f [ticket/11065] Close li tag on topic display options at MCP 
PHPBB3-11065
 2012-08-26 20:24:53 -03:00
Andreas Fischer
d0ce637251 Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop 
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
 2012-08-26 18:56:09 +02:00
Nils Adermann
18039cfa6a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
 2012-08-26 15:22:12 +02:00
Nils Adermann
4db4731fff Merge remote-tracking branch 'github-bantu/ticket/11066' into develop-olympus 
* github-bantu/ticket/11066:
  [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
 2012-08-26 15:22:04 +02:00
Nils Adermann
90d26bb946 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.

Conflicts:
	.travis.yml
 2012-08-26 15:20:04 +02:00
Nils Adermann
a3d87a1443 Merge remote-tracking branch 'github-bantu/ticket/11060' into develop-olympus 
* github-bantu/ticket/11060:
  [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.
 2012-08-26 15:16:08 +02:00
Andreas Fischer
5407f9b00d [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus. 
PHPBB3-11060
 2012-08-26 15:09:00 +02:00
Jordan Rogers
73cd044f5c [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php 
For some reason, all errors are just flipped on before connecting to the
database, despite the system as a whole having a different setting for
displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict
Standards messages, but I would assume that the db piece shouldn't be involved
with setting error_reporting at all.

PHPBB3-11066
 2012-08-23 15:41:57 +02:00
David King
92761e1f2b [ticket/10873] Change language for notice about undelivered, deleted PM. 
See the ticket for my reasoning.

PHPBB3-10873
 2012-08-21 11:59:44 -04:00
Fyorl
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations 
PHPBB3-11042
 2012-08-20 21:52:42 +01:00
Fyorl
b1239f1c1a [feature/attach-dl] Changed $files_added checks 
PHPBB3-11042
 2012-08-20 21:47:29 +01:00
Andreas Fischer
bfdba90a34 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/install/database_update.php
 2012-08-20 16:42:41 +02:00
Andreas Fischer
446607ef53 Merge branch 'prep-release-3.0.11' into develop-olympus 
* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2012-08-20 16:40:50 +02:00
Andreas Fischer
6da03913bf [prep-release-3.0.11] Bumping version number for 3.0.11 final. 2012-08-20 16:32:34 +02:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Joas Schilling
b567175c8d [feature/php-events] Fix doc of core.viewonline_overwrite_location 
PHPBB3-9550
 2012-08-20 10:15:04 +02:00
Joas Schilling
365d95c1fe [feature/php-events] Fix doc of core.user_set_default_group 
PHPBB3-9550
 2012-08-20 10:11:52 +02:00
Joas Schilling
01db8144d4 [feature/php-events] Fix doc of core.generate_smilies_after 
PHPBB3-9550
 2012-08-20 10:10:52 +02:00
Joas Schilling
48b54ed1e0 [feature/php-events] Fix doc of core.delete_user_after 
PHPBB3-9550
 2012-08-20 10:09:29 +02:00
Joas Schilling
74d9ef0bec [feature/php-events] Fix doc of core.delete_user_before 
PHPBB3-9550
 2012-08-20 10:08:59 +02:00
Joas Schilling
aea60f9323 [feature/php-events] Fix doc of core.update_username 
PHPBB3-9550
 2012-08-20 10:08:28 +02:00
Joas Schilling
f2c0b55665 [feature/php-events] Fix doc of core.memberlist_prepare_profile_data 
PHPBB3-9550
 2012-08-20 10:07:05 +02:00
Joas Schilling
7f156c9798 [feature/php-events] Fix doc and position of viewonline_overwrite_location 
PHPBB3-9550
 2012-08-20 10:04:43 +02:00
Joas Schilling
64bc658c04 [feature/php-events] Fix doc of core.viewtopic_get_post_data 
PHPBB3-9550
 2012-08-20 09:54:12 +02:00
Joas Schilling
6ad805713d [feature/php-events] Fix doc of core.viewtopic_cache_guest_data 
PHPBB3-9550
 2012-08-20 09:52:35 +02:00
Andreas Fischer
8c62c33f2a Merge remote-tracking branch 'igorw/ticket/11061' into develop 
* igorw/ticket/11061:
  [ticket/11061] Add the --dev flag to the composer instructions in README
 2012-08-19 23:50:56 +02:00
Andreas Fischer
964f5225ce Merge remote-tracking branch 'igorw/ticket/11060' into develop 
* igorw/ticket/11060:
  [ticket/11060] Make sure pyrus can install everything on travis
 2012-08-19 23:48:15 +02:00
Andreas Fischer
5accd5c88c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11059] Use https for the README logo
 2012-08-19 23:45:45 +02:00
Andreas Fischer
ac81611b90 Merge remote-tracking branch 'igorw/ticket/11059' into develop-olympus 
* igorw/ticket/11059:
  [ticket/11059] Use https for the README logo
 2012-08-19 23:44:31 +02:00
Igor Wiedler
c7363712ce [ticket/11061] Add the --dev flag to the composer instructions in README 
It is needed to install dev dependencies, such as goutte, which are
needed to run the tests.

PHPBB3-11061
 2012-08-19 05:18:52 +02:00
Oleg Pudeyev
3b068566db Merge PR #950 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
 2012-08-18 22:38:34 -04:00
Oleg Pudeyev
97020399fa Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympus 
* dhruvgoel92/ticket/10943:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
 2012-08-18 22:38:25 -04:00
Oleg Pudeyev
89d334ee6a Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop 
* dhruvgoel92/ticket/11032:
  [ticket/11032] fix language of error displayed
 2012-08-18 22:26:58 -04:00
Igor Wiedler
ca4cee86af [ticket/11060] Make sure pyrus can install everything on travis 
This is needed so it can install symfony/yaml from a new channel.

PHPBB3-11060
 2012-08-19 02:28:11 +02:00
Igor Wiedler
0ae4b20160 [ticket/11059] Use https for the README logo 
It's causing troubles since we moved the site to HTTPS

PHPBB3-11059
 2012-08-19 02:20:58 +02:00
Joas Schilling
90ed6e734d [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum 
PHPBB3-9550
 2012-08-18 20:32:58 +02:00
Joas Schilling
b32d5a3edf [feature/php-events] Fix core.acp_manage_forums_update_data_after vars 
PHPBB3-9550
 2012-08-18 20:25:11 +02:00
Fyorl
53aadd60a6 [feature/attach-dl] Renamed $post_id to $post_msg_id 
PHPBB3-11042
 2012-08-17 16:16:02 +01:00
Dhruv
d4f1e71d5e [ticket/11032] fix language of error displayed 
Language of the error displayed is modified.

PHPBB3-11032
 2012-08-15 22:57:02 +05:30
David King
d07cb6d778 Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop 2012-08-15 12:40:08 -04:00