Cesar G
2478eef550
Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeus
...
* Senky/ticket/13082:
[ticket/13082] Repair fix
[ticket/13082] Join classes
[ticket/13082] move style to css file
[ticket/13082] Replace float by text-align
2014-09-23 12:48:23 -07:00
hanakin
aa1ffc9319
[ticket/13097] Add missing unit type
...
PHPBB3-13097
2014-09-23 17:11:51 +02:00
Joas Schilling
ef9e0e743a
Merge pull request #2937 from Senky/ticket/13027
...
[ticket/13027] PM folder full percentage could be a bit more accurate
2014-09-23 15:32:14 +02:00
Joas Schilling
05ae327553
Merge pull request #2974 from hanakin/ticket/13080
...
[Ticket/13080] Fix text overflow issue in mobile
2014-09-23 14:43:04 +02:00
Marc Alexander
92b096b05b
Merge pull request #2984 from nickvergessen/ticket/10729-asc
...
[3.1][ticket/10729] Update editor information when user being deleted
2014-09-23 11:09:29 +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
Joas Schilling
d48e4b680e
[ticket/10729] Fix doc block for user_delete
...
PHPBB3-10729
2014-09-22 00:55:08 +02:00
Jakub Senko
9f981a7741
[ticket/13082] Repair fix
...
PHPBB3-13082
2014-09-21 10:03:48 +02: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
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
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
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
Joas Schilling
7729ae4ad0
[ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
...
This reverts commit 46a9fe93d797bf7d56fd9b1e204f3c0459270122.
PHPBB3-13064
2014-09-17 21:24:33 +02:00
Jakub Senko
e59222496a
[ticket/13045] Remove Pragma headers
...
PHPBB3-13045
2014-09-17 20:10:01 +02:00
Joas Schilling
910cd5edbe
Merge pull request #2948 from Nicofuma/ticket/13061
...
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
* Nicofuma/ticket/13061:
[ticket/13061] Replace the service event.subscriber_loader by a compiler pass
2014-09-17 20:09:49 +02:00
Joas Schilling
676f453cbd
Merge pull request #2949 from rxu/ticket/13062
...
[ticket/13062] Add viewforum.php core event to modify topic ids sql query
* rxu/ticket/13062:
[ticket/13062] Add viewforum.php core event to modify topic ids sql query
2014-09-17 20:02:13 +02:00
Joas Schilling
86ea314598
Merge pull request #2951 from Nicofuma/ticket/13064
...
[ticket/13064] Validate the migrations provided to migrator::set_migrations()
* Nicofuma/ticket/13064:
[ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:39 +02:00
Jakub Senko
3885ac90f1
[ticket/13044] Move GMT out of gmdate in functions_acp
...
PHPBB3-13044
2014-09-17 18:38:21 +02:00
Jakub Senko
3d637fea98
[ticket/13044] Move GMT out of gmdate()
...
PHPBB3-13044
2014-09-17 18:35:38 +02:00