makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
27647 commits 18 branches 192 tags 207 MiB
Commit graph

27647 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marc Alexander
27e95864a8 [ticket/14271] Update sample config 
PHPBB3-14271
 2015-11-05 16:55:19 +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
081424a6c4 [ticket/14257] Fix CLI error message 
PHPBB3-14257
 2015-11-01 03:31:09 +01: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
Zoddo
fbacd1df16 [ticket/14261] Fix tests by removing old code. 
This will obselete GH-4007

PHPBB3-14261
PHPBB3-13202
 2015-10-28 12:32:24 +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
Zoddo
88dd8a4849 [ticket/14261] Move the update of session informations to page_footer() 
Currently, the unique way to disable the update of session_page is to pass
"false" to the parameter of session_begin(). This method is directly
called in app.php, so pages served from the routing system can't disable
the update of session informations.

By moving the update to page_footer, we can allow controllers to tell to
the session manager that we don't want to update the session infos.

PHPBB3-14261
 2015-10-27 17:26:18 +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
Oliver Schramm
c805fd2a73 [ticket/14257] Fix phpdoc in CLI command 
PHPBB3-14257
 2015-10-26 01:49:11 +01:00
Oliver Schramm
25e2b17837 [ticket/14257] Add text_reparser manager 
PHPBB3-14257
 2015-10-26 01:39:52 +01:00
Oliver Schramm
33500fd372 [ticket/14257] Use migrations instead of cron job for some reparsers 
PHPBB3-14257
 2015-10-25 02:30:01 +01:00
Oliver Schramm
8b0f8d7b3c [ticket/14257] Fix lock acquire in CLI command 
PHPBB3-14257
 2015-10-25 02:32:19 +02:00
Oliver Schramm
c7ebbcf9f2 [ticket/14257] Fix if condition 
PHPBB3-14257
 2015-10-24 21:24:34 +02:00
Oliver Schramm
c7ecb1310f [ticket/14257] Add reparse_lock to CLI command 
PHPBB3-14257
 2015-10-24 20:16:54 +02:00
Oliver Schramm
8376c6552a [ticket/14257] Add cron tasks for reparsing text 
PHPBB3-14257
 2015-10-24 20:01:15 +02: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