27354 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marc Alexander	f7a25ad8c3	Merge branch '3.1.x' ... Conflicts: phpBB/styles/subsilver2/template/search_body.html	2015-11-13 09:36:04 +01:00
Marc Alexander	8bb4af6271	Merge pull request #3805 from rxu/ticket/14066 ... [ticket/14066] Add template events to search_body.html	2015-11-13 09:34:25 +01:00
Marc Alexander	74cd82dff8	Merge branch '3.1.x'	2015-11-13 09:23:38 +01:00
Marc Alexander	27cf9e490b	Merge pull request #3996 from RMcGirr83/ticket_14242 ... [ticket/14242] Fix memberlist sort method	2015-11-13 09:23:34 +01:00
Marc Alexander	21fe46bf8a	Merge branch '3.1.x'	2015-11-12 17:57:02 +01:00
Marc Alexander	d53c5b7e2a	Merge pull request #4028 from prototech/ticket/14287 ... [ticket/14287] Always remove loading indicator after confirming action.	2015-11-12 17:56:59 +01:00
Cesar G	da6ce7a668	[ticket/14287] Always remove loading indicator after confirming action. ... If there is no success message after the action is confirmed, the indicator is not currently removed. PHPBB3-14287	2015-11-12 07:58:18 -08:00
rxu	19c84dabe1	[ticket/14066] Change the events listing order in events.md. ... PHPBB3-14066	2015-11-12 20:53:36 +07:00
rxu	9ef06d67e6	[ticket/14066] Add template events to search_body.html ... PHPBB3-14066	2015-11-12 20:53:35 +07:00
Cesar G	f180f9a181	Merge pull request #4027 from marc1706/ticket/14284 ... [ticket/14284] Correctly remove link to first unread post	2015-11-12 04:05:56 -08:00
Marc Alexander	a119a91a16	Merge branch '3.1.x'	2015-11-12 09:11:37 +01:00
Marc Alexander	224efba459	Merge pull request #3850 from rxu/ticket/14117 ... [ticket/14117] Add core events to index.php to allow modifying birthdays list	2015-11-12 09:11:32 +01:00
Marc Alexander	77f447c07c	Merge branch '3.1.x'	2015-11-12 08:50:22 +01:00
Marc Alexander	8398e0700a	Merge pull request #3910 from kinerity/ticket/14170 ... [ticket/14170] Fix mcp_change_poster_after event	2015-11-12 08:50:18 +01:00
Marc Alexander	87446452f5	Merge branch '3.1.x'	2015-11-12 08:46:09 +01:00
Marc Alexander	13133b359b	Merge pull request #4022 from RMcGirr83/3.1.x ... [ticket/14276] Adjust function get_folder_status	2015-11-12 08:46:05 +01:00
Marc Alexander	a11b900de4	[ticket/14284] Correctly remove link to first unread post ... PHPBB3-14284	2015-11-11 17:19:10 +01:00
Máté Bartus	6806c20bce	Merge pull request #4025 from marc1706/ticket/14280 ... [ticket/14280] Add missing language strings for version check	2015-11-10 19:18:50 +01:00
Marc Alexander	fc1008f6a3	Merge branch '3.1.x'	2015-11-10 17:40:41 +01:00
Marc Alexander	1c1fe43e16	Merge pull request #3930 from rxu/ticket/14201 ... [ticket/14201] Add multiple ACP template events	2015-11-10 17:40:04 +01:00
Marc Alexander	fd6c28f103	[ticket/14280] Add missing language strings for version check ... PHPBB3-14280	2015-11-10 12:00:30 +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
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
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
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