Dhruv
24f26478c4
Merge branch '3.1.x'
...
Conflicts:
phpBB/phpbb/search/fulltext_native.php
2015-03-14 23:44:58 +08:00
brunoais
9b030fd174
[ticket/13674] Missing space after "if"
...
PHPBB3-13674
2015-03-07 14:57:42 +00:00
brunoais
f4c423cea1
[ticket/13674] Change MySQL native total search results calculation
...
This changes how the native FULLTEXT search calculates the total
match number for MySQL.
This should improve performance as there is one less query being made
and it is being searched using the technique mentioned in the manual
PHPBB3-13674
2015-03-06 22:23:45 +00:00
Tristan Darricau
cf39cfc593
[ticket/13132] Twig: Add loops content to the root context
...
PHPBB3-13132
2015-03-05 21:38:59 +01:00
Marc Alexander
a33c99b3fd
Merge branch '3.1.x'
2015-03-05 16:02:48 +01:00
Marc Alexander
d0ab101c32
Merge pull request #3453 from RMcGirr83/ticket/13477
...
[ticket/13477] Update file cache driver for extension paths
2015-03-05 16:02:46 +01:00
Marc Alexander
7c26cd25c7
Merge pull request #3434 from nickvergessen/ticket/13647
...
[ticket/13647] Move FAQ page to a controller
2015-03-05 15:25:30 +01:00
RMcGirr83
4618a3e2f8
[ticket/13477] rename function and fix doc blocks
...
PHPBB3-13477
2015-03-04 14:20:27 -05:00
RMcGirr83
5cd4941c55
[ticket/13477] Update file cache driver for filenames
...
Replace slashes on file name
PHPBB3-13477
2015-03-03 09:31:30 -05:00
Joas Schilling
7e0d54a331
[ticket/13647] Use the Symfony way for redirecting
...
PHPBB3-13647
2015-02-27 22:58:51 +01:00
Joas Schilling
8ec18b10c3
Merge branch '3.1.x'
...
Conflicts:
phpBB/phpbb/session.php
2015-02-27 22:47:02 +01:00
Joas Schilling
8abf259273
Merge pull request #3444 from naderman/ticket/13617-ascraeus
...
[ticket/13617] Enforce column size limit for session_forum_id
2015-02-27 22:44:04 +01:00
Marc Alexander
a11181b5dd
Merge branch '3.1.x'
2015-02-27 12:00:27 +01:00
Marc Alexander
0daf148aaa
Merge pull request #3384 from brunoais/ticket/13592
...
[ticket/13592] Allow changing get_visibility_sql's result
2015-02-27 12:00:09 +01:00
Marc Alexander
c9df29d680
Merge pull request #3303 from Nicofuma/ticket/13513
...
[ticket/13513] Use paths relative to the phpBB root in the router
2015-02-26 13:41:51 +01:00
Nils Adermann
106bc1c232
[ticket/13617] Document magic number for forum_id
...
PHPBB3-13617
2015-02-25 17:00:22 +01:00
Nils Adermann
c5a15c0635
[ticket/13617] Use request->variable instead of request_var
...
PHPBB3-13617
2015-02-25 16:58:38 +01:00
Nils Adermann
d08d988df4
Merge branch 'ticket/13617' into ticket/13617-ascraeus
...
* ticket/13617:
[ticket/13617] Enforce column size limit for session_forum_id
Conflicts:
phpBB/phpbb/session.php
2015-02-25 16:25:20 +01:00
Andreas Fischer
b57e00226a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Andreas Fischer
525a62f72e
Merge pull request #3433 from Nicofuma/ticket/13643
...
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000
* Nicofuma/ticket/13643:
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Nicofuma
ffc5a73a0c
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
...
PHP_INT_MIN isn't a defined constant but it can be calculed by
~PHP_INT_MAX (two's complement of PHP_INT_MAX)
PHPBB3-13643
2015-02-22 21:53:05 +01:00
Joas Schilling
0595ab959c
[ticket/13647] Move FAQ page to a controller
...
PHPBB3-13647
2015-02-22 20:20:28 +01:00
Andreas Fischer
71eb981a81
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:36 +01:00
Andreas Fischer
d152bbc727
Merge pull request #3427 from prototech/ticket/13551
...
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
* prototech/ticket/13551:
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00
Andreas Fischer
677337348f
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Nicofuma
9b5493372d
[ticket/13644] Always type hint dispatch_interface
...
PHPBB3-13644
2015-02-22 17:01:37 +01:00
Joas Schilling
3657d7a85a
Merge branch '3.1.x'
2015-02-20 22:26:47 +01:00
Joas Schilling
379eae1a92
Merge pull request #3418 from brunoais/ticket/13631
...
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
Cesar G
71d3ddc623
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
...
PHPBB3-13551
2015-02-19 18:38:35 -08:00
brunoais
f0850f1915
[ticket/13631] Better, more explicit comment explanation
...
PHPBB3-13631
2015-02-18 10:36:29 +00:00
brunoais
997b229723
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
...
I don't get this... I was positive I, at some point, had it right... I don't get
what happened...
PHPBB3-13631
2015-02-18 10:33:49 +00:00
Andreas Fischer
978b96cbf5
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
2015-02-17 22:24:15 +01:00
Jakub Senko
f23d2ec42f
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
...
PHPBB3-13570
2015-02-16 20:25:11 +01:00
Joas Schilling
ec1fb0423d
[ticket/10748] Split postgres DB tools into it's own class
...
PHPBB3-10748
2015-02-13 22:49:29 +01:00
brunoais
bf20fb03ef
[ticket/13592] The name didn't make proper sense
...
PHPBB3-13592
2015-02-11 10:56:36 +00:00
brunoais
74385b8fce
[ticket/13592] Empty line before event comment block.
...
I had forgotten this one
PHPBB3-13592
2015-02-09 11:58:35 +00:00
brunoais
6111f5fa74
[ticket/13592] Removed unwanted space in self line.
...
PHPBB3-13592
2015-02-09 11:56:53 +00:00
brunoais
bb7d294190
[ticket/13592] Allow full override of get_visibility_sql()
...
PHPBB3-13592
2015-02-09 10:44:12 +00:00
brunoais
8a4df90dac
[ticket/13592] Allow changing get_visibility_sql's result
...
PHPBB3-13592
2015-02-09 08:42:37 +00:00
brunoais
1bcce75633
[ticket/13592] Allow changing get_visibility_sql's result
...
PHPBB3-13592
2015-02-08 23:52:27 +00:00
Joas Schilling
74d1b1812f
[ticket/10748] Overwrite the type map correctly
...
PHPBB3-10748
2015-02-07 14:41:40 +01:00
Joas Schilling
37ae99c75d
[ticket/10748] Replace direct creations of tools();
...
PHPBB3-10748
2015-02-07 14:41:39 +01:00
Joas Schilling
4ea90ca44d
[ticket/10748] Split MS SQL from the db tools file into it's own
...
PHPBB3-10748
2015-02-07 14:36:26 +01:00
Joas Schilling
b0c910e49c
Merge branch 'develop-ascraeus' into develop
2015-02-07 14:33:37 +01:00
Crizzo
fbc603861d
[ticket/13588] Fixes wrong message in info fsockopen() disabled
...
PHPBB3-13588
2015-02-07 13:50:08 +01:00
Andreas Fischer
e4064ca839
Merge pull request #3207 from Nicofuma/ticket/13407
...
[ticket/13407] Update Symfony to 2.7.*@dev
* Nicofuma/ticket/13407:
[ticket/13407] Update composer.lock file
[ticket/13407] Bump minimal version to php 5.3.9
[ticket/13407] Introduce a request_stack service
[ticket/13407] Remove the last occurence of pattern in routing files
[ticket/13407] Update Symfony to 2.7.*@dev
2015-02-04 21:14:01 +01:00
Andreas Fischer
3267c6a61a
Merge pull request #3257 from MGaetan89/ticket/13455
...
[ticket/13455] Change request_var() calls with $request->variable()
* MGaetan89/ticket/13455:
[ticket/13455] Remove `request_var()` references from comments
[ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`
[ticket/13455] Update calls to `request_var()`
2015-02-04 21:09:54 +01:00
Nicofuma
b8939da242
[ticket/13407] Bump minimal version to php 5.3.9
...
PHPBB3-13407
2015-02-04 17:40:18 +01:00
Gaëtan Muller
52446c8327
[ticket/13455] Remove request_var()
references from comments
...
PHPBB3-13455
2015-02-03 20:56:48 +01:00
Gaëtan Muller
abcb2680ee
[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()
...
PHPBB3-13455
2015-02-03 20:50:40 +01:00