1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00
Commit Graph

1533 Commits

Author SHA1 Message Date
516bd9ea51 [ticket/13211] Add log wrapper for writing database updater to log file
PHPBB3-13211
2014-10-24 13:22:56 -07:00
14300a1475 Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211 2014-10-24 13:22:39 -07:00
4c94e44710 [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6 2014-10-23 01:50:12 +02:00
0bc04a4df0 [ticket/13203] Use string_compare method in passwords drivers
PHPBB3-13203
2014-10-22 14:54:55 -05:00
2b47ef1266 [ticket/13203] Add method for byte by byte comparison to drivers helper
PHPBB3-13203
2014-10-22 14:54:22 -05:00
fdece6cdf3 [ticket/13126] Add missing use statement
PHPBB3-13126
2014-10-22 15:25:50 +02:00
75b6545bc2 Merge pull request #3040 from nickvergessen/ticket/13138-asc
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id

Conflicts:
	phpBB/phpbb/session.php
2014-10-20 22:19:25 +02:00
973dfbf868 Merge pull request #3048 from naderman/ticket/13188
[ticket/13188] Add missing where clause to post_id query in sphinx index
2014-10-20 15:30:08 -04:00
99f63f39eb Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id

Conflicts:
	phpBB/phpbb/session.php
2014-10-20 14:53:38 -04:00
981d3005f3 [ticket/13126] Fix tests
PHPBB3-13126
2014-10-20 20:46:11 +02:00
faf4b03c43 [ticket/13126] Change messages verbosity levels
PHPBB3-13126
2014-10-20 19:42:54 +02:00
8f6fcd2744 [ticket/13126] Move migrator_output_handler to an interface
PHPBB3-13126
2014-10-20 19:41:32 +02:00
941cf6979e [ticket/13188] Correctly format string concatenation
PHPBB3-13188
2014-10-20 12:20:44 -04:00
566c8a1bbc [ticket/13188] Add missing where clause to post_id query in sphinx index
PHPBB3-13188
2014-10-20 12:08:35 -04:00
e7ad87e15f [ticket/13181] Replace database credentials with placeholders in sphinx conf
PHPBB3-13181
2014-10-18 12:32:39 -04:00
55b97ffc27 Merge branch 'ticket/13138-2' into ticket/13138-asc
Conflicts:
	phpBB/phpbb/session.php
2014-10-16 12:48:13 +02:00
58075e25e8 [ticket/13126] Extends migrator_output_handler instead of using a closure
PHPBB3-13126
2014-10-16 01:34:23 +02:00
90771c1762 Merge pull request #3024 from marc1706/ticket/13124
[ticket/13124] Also trim spaces in front of comments except for first line
2014-10-15 18:31:46 +02:00
56d7c2c6ed [ticket/13126] Improve the feedback when running the migrations
PHPBB3-13126
2014-10-14 17:58:29 +02:00
7f692e7b28 [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5 2014-10-07 21:12:06 +02:00
f3eaf6fe04 Merge pull request #3016 from Nicofuma/ticket/11224-ascraeus
[ticket/11224][ascraeus] SQL cache destroy does not destroy queries to tables joined
2014-10-06 23:21:13 +02:00
825af557ae [ticket/13124] Also trim spaces in front of comments except for first line
PHPBB3-13124
2014-10-06 16:09:56 +02:00
5e86c89989 Merge pull request #3017 from nickvergessen/ticket/13033
[ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
2014-10-06 02:07:52 +02:00
bda6879305 [ticket/12368] Always clean the cache prior to run the migrations
PHPBB3-12368
2014-10-05 12:25:14 +02:00
8e638dbf6d [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224"
This reverts commit 40cd7570e6.
2014-10-03 23:50:24 +02:00
3d9b257597 [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
Caused by the solution of PHPBB3-12990

PHPBB3-13033
2014-10-02 16:04:33 +02:00
90241ae4e6 Merge pull request #2947 from rxu/ticket/13059
[ticket/13059] Add core event to generate_page_link()
2014-10-02 15:35:55 +02:00
rxu
ce4035fdd3 [ticket/13059] Add core event to generate_page_link()
Add core event to generate_page_link() to allow
overriding/modifying pagination URLs.
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905

PHPBB3-13059
2014-10-01 20:55:07 +08:00
40cd7570e6 [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"
This reverts commit d264369441, reversing
changes made to 75fcfb1c1d.

PHPBB3-11224
2014-10-01 11:38:45 +02:00
b003019958 Merge pull request #3013 from VSEphpbb/ticket/13121
[ticket/13121] Remove cache mode from style management module
2014-10-01 10:34:08 +02:00
d264369441 Merge pull request #2460 from Nicofuma/ticket/11224
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
2014-10-01 10:27:47 +02:00
75fcfb1c1d Merge pull request #2545 from ptitlazy/ticket/12657
[ticket/12657] Add a test file for base case of command cache:purge
2014-10-01 10:24:19 +02:00
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993
[ticket/12993] Improve get_user_ranks
2014-10-01 10:19:24 +02:00
1ee4894271 [ticket/13121] Fix migration file
PHPBB3-13121
2014-10-01 00:29:45 -07:00
65539df39a [ticket/13121] Remove cache mode from style management module
https://tracker.phpbb.com/browse/PHPBB3-13121

PHPBB3-13121
2014-10-01 00:03:54 -07:00
8fb9f19aae Merge pull request #3008 from nickvergessen/ticket/13111
[ticket/13111] Dropdown options are already an array in the field data

* nickvergessen/ticket/13111:
  [ticket/13111] Dropdown options are already an array in the field data
2014-09-30 21:04:25 +02:00
a0db23bd0e Merge pull request #3007 from nickvergessen/ticket/13118
[ticket/13118] Correctly use the provided datetime class

* nickvergessen/ticket/13118:
  [ticket/13118] Correctly use the provided datetime class
2014-09-30 21:00:05 +02:00
f1ab6f31a1 Merge pull request #3003 from nickvergessen/ticket/13117
[ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
2014-09-30 14:00:02 +02:00
f64a937a57 [ticket/13111] Dropdown options are already an array in the field data
PHPBB3-13111
2014-09-30 12:27:14 +02:00
526329e697 [ticket/13118] Correctly use the provided datetime class
PHPBB3-13118
2014-09-30 11:58:02 +02:00
bc24c78e06 [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
Unintended change from 95ab4b3e93

PHPBB3-13117
2014-09-29 20:48:47 +02:00
a159899d02 [ticket/13113] Updates the base url only when the front-end isn't app.php
PHPBB3-13113
2014-09-28 23:32:56 +02:00
be769d4ca6 Merge pull request #2995 from nickvergessen/ticket/13105
[ticket/13105] Future relative dates are always displayed as "Tomorrow"

* nickvergessen/ticket/13105:
  [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
  [ticket/13105] Add a test for relative dates
2014-09-25 21:52:53 +02:00
f64373a29f [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
PHPBB3-13106
2014-09-25 20:12:33 +02:00
e803efc6fc [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"
PHPBB3-13105
2014-09-25 18:09:32 +02:00
f3fef8934e Merge pull request #2954 from rxu/ticket/13055
[ticket/13055] Fix string profile fields validation to support unicode
2014-09-24 12:25:57 +02:00
9feb7096ee Merge pull request #2985 from nickvergessen/ticket/13048
[ticket/13048] Only do not update the session page for ajax requests

* nickvergessen/ticket/13048:
  [ticket/13048] Only do not update the session page for ajax requests
2014-09-23 23:29:52 +02:00
820db008ff [ticket/13048] Only do not update the session page for ajax requests
The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.

PHPBB3-13048
2014-09-23 15:25:40 +02:00
d03be5ea5f [ticket/13070] Use old 'template' class for template class hook
PHPBB3-13070
2014-09-22 20:03:55 +02:00
7313cc777e [ticket/13085] Fix typo in oauth.php
PHPBB3-13085
2014-09-21 00:33:07 +03:00