Commit graph

20904 commits

Author SHA1 Message Date
Marc Alexander
8bd1853b56 Merge pull request #2981 from nickvergessen/ticket/10729
Ticket/10729 Update editor information when user being deleted
2014-09-23 11:08:56 +02:00
Joas Schilling
9ff6358dc9 Merge branch 'ticket/10729' into ticket/10729-asc
Conflicts:
	phpBB/includes/functions_user.php
2014-09-23 09:31:13 +02:00
Jakub Senko
9a8a0af7ba [ticket/13094] Condition search properly
PHPBB3-13094
2014-09-22 21:12:18 +02:00
Marc Alexander
d03be5ea5f [ticket/13070] Use old 'template' class for template class hook
PHPBB3-13070
2014-09-22 20:03:55 +02:00
Joas Schilling
d48e4b680e [ticket/10729] Fix doc block for user_delete
PHPBB3-10729
2014-09-22 00:55:08 +02:00
Mario Skouat
39d46e2599 [ticket/13041] Reordering "Login and Registration Issues"
PHPBB3-13041
2014-09-21 10:43:10 +02:00
blitze
d6de9ce5d9 [ticket/13072] Add total_match_count to core.search_get_topic_data event
PHPBB3-13072
2014-09-21 08:22:15 +00:00
Jakub Senko
9f981a7741 [ticket/13082] Repair fix
PHPBB3-13082
2014-09-21 10:03:48 +02:00
blitze
6a33472214 [ticket/13071] Only use total_match_count after event dispatcher
PHPBB3-13071
2014-09-21 07:39:50 +00:00
Dhruv Goel
84e68b3a73 Merge pull request #2963 from Senky/ticket/13045
[ticket/13045] Remove Pragma headers
2014-09-21 11:29:56 +05:30
Jakub Senko
6851ff8fab [ticket/13082] Join classes
PHPBB3-13082
2014-09-21 00:07:39 +02:00
n-aleha
7313cc777e [ticket/13085] Fix typo in oauth.php
PHPBB3-13085
2014-09-21 00:33:07 +03:00
Jakub Senko
ace3b806a9 [ticket/13082] move style to css file
PHPBB3-13082
2014-09-20 20:35:14 +02:00
Jakub Senko
ef58752db8 [ticket/13082] Replace float by text-align
PHPBB3-13082
2014-09-20 18:35:26 +02:00
hanakin
8b8e065441 [ticket/13080] Fix mediaqueries formating
open { are should not to be on new lines for
media queries per spec, causes code highlight
issues in reputible code editors

PHPBB3-13080
2014-09-20 16:55:20 +02:00
hanakin
e3eff2a976 [ticket/13080] Remove nowrap from dd in responsive
PHPBB3-13080
2014-09-20 16:51:01 +02:00
Joas Schilling
26c6ffa458 [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development 2014-09-20 09:52:53 +02:00
Marc Alexander
457e13634e [ticket/12858] Properly format UTC offset in footer
PHPBB3-12858
2014-09-19 23:45:03 +02:00
Joas Schilling
2c5e184ea1 [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 2014-09-19 19:09:46 +02:00
Joas Schilling
841abf712e [prep-release-3.1.0-RC4] Prepare Changelog 2014-09-19 19:07:41 +02:00
Joas Schilling
221f4a4a8c [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 2014-09-19 19:04:21 +02:00
Joas Schilling
301694e922 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 2014-09-19 19:02:31 +02:00
Joas Schilling
fc252f1ba5 Merge pull request #2969 from marc1706/ticket/13073
[ticket/13073] Correctly generate routes from subfolders like /adm

* marc1706/ticket/13073:
  [ticket/13073] Remove _test suffix from common test class
  [ticket/13073] Switch $input with $expected and add paths with letters
  [ticket/13073] Use abstract class for controller helper route tests
  [ticket/13073] Add path regex to get_preg_expression() and add unit tests
  [ticket/13073] Use just one regex in helper route()
  [ticket/13073] Properly place comments in helper
  [ticket/13073] Use correct class names in test files
  [ticket/13073] Rework route tests and add tests for more directory types
  [ticket/13073] Test that routes from subfolders like /adm work
  [ticket/13073] Add tests for routes from adm pages
  [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
2014-09-19 18:58:53 +02:00
Marc Alexander
6fd54436ee [ticket/13073] Add path regex to get_preg_expression() and add unit tests
We're now calling get_preg_expression() instead of hardcoding the regex into
the helper route method.

PHPBB3-13073
2014-09-19 13:54:15 +02:00
Marc Alexander
4186ced479 [ticket/13073] Use just one regex in helper route()
PHPBB3-13073
2014-09-19 12:14:57 +02:00
Marc Alexander
eaef881e7d [ticket/13073] Properly place comments in helper
PHPBB3-13073
2014-09-19 12:03:04 +02:00
LEZY Thomas
4a76763a8a [ticket/12657] Add a test file for base case
PHPBB3-12657
2014-09-19 11:09:29 +02:00
brunoais
55664c1c10 [ticket/12930] Fixing event comment block and variable
According to comments on pull request

PHPBB3-12930
2014-09-19 08:44:12 +01:00
brunoais
d4938e34b0 [ticket/12929] Fixing event comment block and variable
PHPBB3-12929
2014-09-19 08:36:00 +01:00
Joas Schilling
6bc23ee282 [ticket/13062] Fix name of "ORDER_BY" key in SQL array
PHPBB3-13062
2014-09-19 00:56:16 +02:00
Joas Schilling
e9285d43af Merge pull request #2952 from rxu/ticket/13066
[ticket/13066] Add search results core event to modify search title

* rxu/ticket/13066:
  [ticket/13066] Add search results core event to modify search title
2014-09-19 00:22:53 +02:00
Marc Alexander
d892dfe084 [ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
PHPBB3-13073
2014-09-18 23:44:51 +02:00
hanakin
1914a08088 [ticket/12598] Fix sir typo
PHPBB3-12598
2014-09-18 23:13:42 +02:00
hanakin
88f645eeda [ticket/12598] Fix rtl positon in header
PHPBB3-12598
2014-09-18 22:45:24 +02:00
hanakin
2ca001edcf [ticket/12598] Remove right border
PHPBB3-12598
2014-09-18 22:34:55 +02:00
hanakin
6eb2b876f1 [ticket/12598] Remove border from .search-header
PHPBB3-12598
2014-09-18 21:47:24 +02:00
hanakin
0dc181a529 [ticket/12598] Replace #search-box with class
PHPBB3-12598
2014-09-18 21:47:23 +02:00
PayBas
d27e9c7c76 [ticket/12598] Remove hover border-color and use hover icon
PHPBB3-12598
2014-09-18 21:47:23 +02:00
PayBas
93d50db2d6 [ticket/12598] Add some responsive margin to give breathing room
PHPBB3-12598
2014-09-18 21:47:22 +02:00
PayBas
b5800d1124 [ticket/12598] Clean up unused link colors
PHPBB3-12598
2014-09-18 21:47:22 +02:00
PayBas
3f71d7dba1 [ticket/12598] Remove unused link colors
PHPBB3-12598
2014-09-18 21:47:21 +02:00
PayBas
514bf6e39a [ticket/12598] Add lt IE9 fixes
In case this one gets merged before hanakin's gradient PR.

PHPBB3-12598
2014-09-18 21:47:21 +02:00
PayBas
470e6d5edf [ticket/12598] Improve search box styling
PHPBB3-12598
2014-09-18 21:47:20 +02:00
Joas Schilling
3066cd700a Merge pull request #2875 from PayBas/ticket/12961
[ticket/12961] Add link in anti-spam ACP page which links directly to captchas in titania

* PayBas/ticket/12961:
  [ticket/12961] Shorten ext-db link text
  [ticket/12961] Fix missing phpBB.com
  [ticket/12961] Remove target="_blank" and switch to <strong>
  [ticket/12961] Add additional link to the KB
  [ticket/12961] Move link to language file
  [ticket/12961] Refactor lang entry
  [ticket/12961] Change url to anti-spam-ext
  [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/
  [ticket/12961] Add link in anti-spam ACP page to titania
2014-09-18 14:23:41 +02:00
Tristan Darricau
bad07b355c Merge pull request #2967 from nickvergessen/ticket/12963
[ticket/12963] Revert back to "migrations" folder name for extensions

* nickvergessen/ticket/12963:
  [ticket/12963] Always use core_path and core_directory()
  [ticket/12963] Remove old migration/ folder from tests
  [ticket/12963] Revert back to "migrations" folder name for extensions
2014-09-18 14:04:06 +02:00
Joas Schilling
b82a3cddd8 Merge pull request #2927 from Senky/ticket/13022
[ticket/13022] "Return to advanced search" wrong assumption

* Senky/ticket/13022:
  [ticket/13022] Language adjustments
  [ticket/13022] Remove ternary condition
  [ticket/13022] Condition Return to advanced search link
2014-09-18 12:44:12 +02:00
Jakub Senko
31e43ce124 [ticket/12489] Add notice about %s wildcard in FIELD_IS_CONTACT_EXPLAIN
PHPBB3-12489
2014-09-18 12:13:17 +02:00
Joas Schilling
c220fa89a1 [ticket/12963] Revert back to "migrations" folder name for extensions
The issues that can be created with the name change are just too much

PHPBB3-12963
2014-09-18 10:45:08 +02:00
Giampaolo Falqui
a2b5ec7e1b [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN
PHPBB3-13068
2014-09-18 02:25:39 +02:00
rxu
dc65058c20 [ticket/13055] Add string profile fields validation options to support unicode
PHPBB3-13055
2014-09-18 08:19:08 +08:00