1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00

27395 Commits

Author SHA1 Message Date
Tristan Darricau
67f43b1a06 [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1 release-3.2.0-a1 2015-11-09 20:24:46 +01:00
Tristan Darricau
2144f35e9d [prep-release-3.2.0-a1] Add migration for 3.2.0-a1 2015-11-09 20:20:26 +01:00
Tristan Darricau
f8236cc907 [prep-release-3.2.0-a1] Update version to 3.2.0-a1 2015-11-09 20:20:26 +01:00
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
Mate Bartus
8d178f15f0 [ticket/14270] Purge cache when the installer is finished
PHPBB3-14270
2015-11-08 18:09:04 +01:00
Richard McGirr
865c16cf26 [ticket/14276] Adjust function get_folder_status
PHPBB3-14276
2015-11-07 15:33:24 -05: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
RMcGirr83
ffc4b5a6df [ticket/12649] Fix buttons css file
PHPBB3-12649
2015-11-04 13:14:22 -05:00
RMcGirr83
32d6d2a94e [ticket/12649] Restore missing css and fix html file
PHPBB3-12649
2015-11-04 13:11:15 -05:00
RMcGirr83
b0660c47df Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649 2015-11-04 11:05:51 -05:00
RMcGirr83
de984caf98 Merge remote-tracking branch 'origin/ticket_12649' into ticket_12649
PHPBB3-12649
2015-11-04 11:05:25 -05:00
RMcGirr83
f518a57d0d [ticket/12649] Fix bidi.css
PHPBB3-12649
2015-11-03 14:48:06 -05:00
RMcGirr83
9a4e998f70 [ticket/12649] Change sort & display options in footers to dropdown menu
PHPBB3-12649
2015-11-03 14:48:05 -05: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
5d7f67105b [ticket/12649] Change sort & display options in footers to dropdown menu
PHPBB3-12649
2015-11-01 06:51:03 -05: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
RMcGirr83
21aa6cc120 [ticket/14242] Revert some changes
PHPBB3-14242
2015-10-30 13:09:55 -04: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
Richard McGirr
c1d47d9e16 [ticket/14242] Fix u_sort_posts to use correct sort key
PHPBB3-14242
2015-10-26 06:42:33 -04: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