mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00
Code Issues Releases Wiki Activity
27,322 Commits 17 Branches 190 Tags
Commit Graph

27322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Máté Bartus
024ec86181 Merge pull request #4024 from marc1706/ticket/14278 
[ticket/14278] Check if user_id is set and fall back to ANONYMOUS
 2015-11-09 18:24:18 +01:00
Marc Alexander
d77455309b [ticket/14278] Check if user_id is set and fall back to ANONYMOUS 
PHPBB3-14278
 2015-11-09 18:23:38 +01:00
Marc Alexander
5739317567 Merge pull request #4023 from CHItA/ticket/14277 
[ticket/14277] Fix undefined index error in migrations
 2015-11-09 14:32:24 +01:00
Mate Bartus
671598656c [ticket/14277] Fix CS 
PHPBB3-14277
 2015-11-09 09:15:17 +01:00
Mate Bartus
d04c7687c0 [ticket/14277] Use user_id if available 
PHPBB3-14277
 2015-11-09 09:11:03 +01:00
Mate Bartus
e02432ec82 [ticket/14277] Fix undefined index error in migrations 
PHPBB3-14277
 2015-11-08 22:11:14 +01:00
Marc Alexander
d8760568b6 Merge pull request #4019 from prototech/ticket/14273 
[ticket/14273] Remove unused core.root_path dependency in files.upload service
 2015-11-06 21:47:05 +01:00
Oliver Schramm
022c271caf Merge pull request #4020 from VSEphpbb/ticket/14274 
[ticket/14274] Include user functions during installer
 2015-11-06 18:36:17 +01:00
Oliver Schramm
fbb9f8859a Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/acp/acp_captcha.php
 2015-11-06 13:28:24 +01:00
Oliver Schramm
854ee0b04d Merge pull request #3975 from prototech/ticket/11971 
[ticket/11971] Validate "Spambot countermeasures" settings before saving
 2015-11-06 12:06:47 +01:00
Matt Friedman
50d102c975 [ticket/14274] Include user functions during installer 
PHPBB3-14274
 2015-11-05 16:32:19 -08:00
Cesar G
a92083169a [ticket/14273] Remove unused core.root_path dependency in files.upload service 
PHPBB3-14273
 2015-11-05 13:52:04 -08:00
Máté Bartus
402f36e42d Merge pull request #4010 from Elsensee/ticket/14264 
[ticket/14264] Don't use constants as return values
 2015-11-05 21:43:00 +01:00
Oliver Schramm
ed02365868 [ticket/14264] Fix tests calling removed method 
PHPBB3-14264
 2015-11-05 20:52:37 +01:00
Tristan Darricau
c783c37c73 Merge pull request #3995 from CHItA/ticket/14044 
[ticket/14044] Deduplicate the installers

* CHItA/ticket/14044:
  [ticket/14044] Add config as global in notify user
  [ticket/14044] Fix language selection data loss
  [ticket/14044] Patch language::set_fallback_array()
  [ticket/14044] Fix tests
  [ticket/14044] Fix wrong descriptions in install
  [ticket/14044] Solve missing email template error
  [ticket/14044] global $table_prefix in constants.php
  [ticket/14044] Try to fix missing table prefix
  [ticket/14044] Use the correct language file version
  [ticket/14044] Automatically trigger rollback on insert in transaction
  [ticket/14044] Use empty instead of !count
  [ticket/14044] Fix Sqlite error in tests
  [ticket/14044] Deduplicate the installers
 2015-11-03 20:35:24 +01:00
Oliver Schramm
3c43865a15 [ticket/14264] Fix textreparser tests 
PHPBB3-14264
 2015-11-03 16:45:57 +01:00
Oliver Schramm
2016550a32 [ticket/14264] Don't use constants as return values 
This will prevent BC breaking in the future if we decide to
get rid of constants.

PHPBB3-14264
 2015-11-03 16:35:53 +01:00
Marc Alexander
8b7f711a18 Merge branch '3.1.x' 2015-11-03 09:36:43 +01:00
Marc Alexander
8dbf3976fd Merge pull request #4012 from RMcGirr83/ticket_14228 
[ticket/14228] Vertical align of numbers in polls
 2015-11-03 09:36:14 +01:00
Mate Bartus
f991e484da [ticket/14044] Add config as global in notify user 
PHPBB3-14044
 2015-11-03 02:16:23 +01:00
Andreas Fischer
996886de17 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
 2015-11-02 21:48:32 +01:00
Andreas Fischer
afbeda7cfd Merge pull request #3983 from prototech/ticket/13831 
[ticket/13831] Store provided reason when deleting from Mod. Queue module.

* prototech/ticket/13831:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
 2015-11-02 21:48:32 +01:00
Andreas Fischer
8c2fe55caf Merge pull request #4011 from Elsensee/ticket/14265 
[ticket/14265] Make all tables available in container

* Elsensee/ticket/14265:
  [ticket/14265] Make all tables available in container
 2015-11-02 21:17:55 +01:00
Richard McGirr
22d234a345 [ticket/14228] Vertical align of numbers in polls 
PHPBB3-14228
 2015-11-01 05:39:07 -05:00
Oliver Schramm
ec4bdf5438 [ticket/14265] Make all tables available in container 
PHPBB3-14265
 2015-11-01 03:16:44 +01:00
Mate Bartus
719f42c54a [ticket/14044] Fix language selection data loss 
PHPBB3-14044
 2015-10-30 15:46:39 +01:00
Mate Bartus
0990894cf8 [ticket/14044] Patch language::set_fallback_array() 
PHPBB3-14044
 2015-10-30 15:25:27 +01:00
Mate Bartus
a910c86997 [ticket/14044] Fix tests 
PHPBB3-14044
 2015-10-30 14:58:53 +01:00
Oliver Schramm
257f5f8b24 Merge pull request #3971 from VSEphpbb/ticket/14237 
[ticket/14237] Use $language class for notifications
 2015-10-29 14:46:02 +01:00
Mate Bartus
71ec5185e1 [ticket/14044] Fix wrong descriptions in install 
PHPBB3-14044
 2015-10-28 14:17:29 +01:00
Mate Bartus
3ac10ef544 [ticket/14044] Solve missing email template error 
PHPBB3-14044
 2015-10-28 14:14:49 +01:00
Mate Bartus
33db26d0cf [ticket/14044] global $table_prefix in constants.php 
PHPBB3-14044
 2015-10-28 01:12:52 +01:00
Mate Bartus
369024b56f [ticket/14044] Try to fix missing table prefix 
PHPBB3-14044
 2015-10-28 00:58:34 +01:00
Mate Bartus
a761a4080d [ticket/14044] Use the correct language file version 
PHPBB3-14044
 2015-10-28 00:36:05 +01:00
Marc Alexander
5f85f19a5e Merge branch '3.1.x' 2015-10-24 18:23:52 +02:00
Marc Alexander
6a7567459d Merge pull request #4004 from paul999/ticket/14258 
[ticket/14258] Add event into auth::login before session creation
 2015-10-24 18:23:49 +02:00
Paul Sohier
9596db9b88 [ticket/14258] Add event into auth::login before session creation 
Fix typo

PHPBB3-14258
 2015-10-24 18:00:55 +02:00
Paul Sohier
2a218c2959 [ticket/14258] Add event into auth::login before session creation 
Update comments regarding variables.

PHPBB3-14258
 2015-10-24 17:47:04 +02:00
Paul Sohier
7615a5c22f [ticket/14258] Add event into auth::login before session creation 
Add a new event in the login method just before the session create,
so extensions can do some additional validation during login.

PHPBB3-14258
 2015-10-24 14:28:29 +02:00
Andreas Fischer
7338c5d845 Merge pull request #4003 from Elsensee/ticket/14256 
[ticket/14256] Remove PHP7 from the allowed failures

* Elsensee/ticket/14256:
  [ticket/14256] Remove PHP7 from the allowed failures
 2015-10-24 11:42:22 +02:00
Oliver Schramm
c4d7b6321b [ticket/14256] Remove PHP7 from the allowed failures 
PHPBB3-14256
 2015-10-23 22:49:21 +02:00
Marc Alexander
df53d40922 [ticket/14044] Automatically trigger rollback on insert in transaction 
This will cause the sqlite3 driver to automatically rollback transactions
if an insert fails during a transaction. Other dbms trigger a rollback
inside the sql_error() function with a rollback command. However,
this manual rollback command might fail on sqlite3 due to ongoing queries.

With this change, sqlite3 itself will abort any ongoing queries and
initiate the rollback automatically. Since manually triggered rollbacks
will fail after the rollback was started automatically, we catch
exceptions output by the exec() command during rollback and any exception
that might be thrown by fetchArray() due to aborted queries.

PHPBB3-14044
 2015-10-23 20:47:56 +02:00
Mate Bartus
d34d6378bc [ticket/14044] Use empty instead of !count 
PHPBB3-14044
 2015-10-23 13:25:00 +02:00
Marc Alexander
e0d06ee83e [ticket/14044] Fix Sqlite error in tests 
PHPBB3-14044
 2015-10-23 11:46:03 +02:00
Mate Bartus
597297b169 [ticket/14044] Deduplicate the installers 
PHPBB3-14044
 2015-10-22 21:29:52 +02:00
Cesar G
a246cb6414 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14249] Fix online list order
 2015-10-22 10:05:25 -07:00
Cesar G
5576c9f3b9 Merge pull request #3998 from Elsensee/ticket/14249 
[ticket/14249] Fix online list order
 2015-10-22 10:05:01 -07:00
Oliver Schramm
93208d597a [ticket/14249] Fix online list order 
PHPBB3-14249
 2015-10-21 21:51:43 +02:00
Mate Bartus
cc1a96a804 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13976] Fix comment typo in salted_md5.php
 2015-10-21 00:32:20 +02:00
Máté Bartus
fa44e98e72 Merge pull request #3997 from CHItA/ticket/13976 
[ticket/13976] Fix comment typo in salted_md5.php
 2015-10-21 00:29:05 +02:00