makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-06 18:18:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
33150 commits 18 branches 192 tags 208 MiB
Commit graph

4419 commits

Author SHA1 Message Date
Tristan Darricau
fdece6cdf3 [ticket/13126] Add missing use statement 
PHPBB3-13126
 2014-10-22 15:25:50 +02:00
Marc Alexander
a623868f20 [ticket/13192] Pass correct parameters and rename method to get_valid_page 
PHPBB3-13192
 2014-10-21 22:38:03 -05:00
Marc Alexander
40497ec824 [ticket/13192] Add method for generating valid user page links 
PHPBB3-13192
 2014-10-21 22:16:53 -05:00
Joas Schilling
7c2ed57a99 Merge branch 'develop-ascraeus' into develop 2014-10-20 22:19:43 +02:00
Joas Schilling
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
Nils Adermann
79d6f67e81 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13188] Correctly format string concatenation
  [ticket/13188] Add missing where clause to post_id query in sphinx index
 2014-10-20 15:31:06 -04:00
Nils Adermann
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
Nils Adermann
ee97b92e5d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id
 2014-10-20 14:53:52 -04:00
Nils Adermann
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
Tristan Darricau
981d3005f3 [ticket/13126] Fix tests 
PHPBB3-13126
 2014-10-20 20:46:11 +02:00
Tristan Darricau
faf4b03c43 [ticket/13126] Change messages verbosity levels 
PHPBB3-13126
 2014-10-20 19:42:54 +02:00
Tristan Darricau
8f6fcd2744 [ticket/13126] Move migrator_output_handler to an interface 
PHPBB3-13126
 2014-10-20 19:41:32 +02:00
Nils Adermann
941cf6979e [ticket/13188] Correctly format string concatenation 
PHPBB3-13188
 2014-10-20 12:20:44 -04:00
Nils Adermann
566c8a1bbc [ticket/13188] Add missing where clause to post_id query in sphinx index 
PHPBB3-13188
 2014-10-20 12:08:35 -04:00
Dhruv
1bb3d6b410 Merge branch 'develop-ascraeus' into develop 
# By Nils Adermann
# Via Dhruv Goel (1) and Nils Adermann (1)
* develop-ascraeus:
  [ticket/13181] Replace database credentials with placeholders in sphinx conf
 2014-10-19 01:30:26 +05:30
Nils Adermann
e7ad87e15f [ticket/13181] Replace database credentials with placeholders in sphinx conf 
PHPBB3-13181
 2014-10-18 12:32:39 -04:00
Joas Schilling
55b97ffc27 Merge branch 'ticket/13138-2' into ticket/13138-asc 
Conflicts:
	phpBB/phpbb/session.php
 2014-10-16 12:48:13 +02:00
Tristan Darricau
58075e25e8 [ticket/13126] Extends migrator_output_handler instead of using a closure 
PHPBB3-13126
 2014-10-16 01:34:23 +02:00
Joas Schilling
7de0e17711 Merge branch 'develop-ascraeus' into develop 2014-10-15 18:31:55 +02:00
Joas Schilling
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
Tristan Darricau
56d7c2c6ed [ticket/13126] Improve the feedback when running the migrations 
PHPBB3-13126
 2014-10-14 17:58:29 +02:00
Tristan Darricau
911831a9c5 [ticket/13133] Allow @vendor_name for includecss 
PHPBB3-13133
 2014-10-08 18:25:36 +02:00
Joas Schilling
9d6cef2225 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-07 22:12:37 +02:00
Joas Schilling
7f692e7b28 [prep-release-3.1.0-RC5] Add migration for 3.1.0-RC5 2014-10-07 21:12:06 +02:00
Joas Schilling
8d9e6653b4 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:21:35 +02:00
Joas Schilling
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
Marc Alexander
825af557ae [ticket/13124] Also trim spaces in front of comments except for first line 
PHPBB3-13124
 2014-10-06 16:09:56 +02:00
Nils Adermann
b354afdeb4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13033] Fix "Duplicate entry 'notification.type.*' for key 'type'"
 2014-10-06 02:08:39 +02:00
Nils Adermann
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
Marc Alexander
f1d37b52fb Merge branch 'develop-ascraeus' into develop 2014-10-05 15:25:13 +02:00
Tristan Darricau
bda6879305 [ticket/12368] Always clean the cache prior to run the migrations 
PHPBB3-12368
 2014-10-05 12:25:14 +02:00
Tristan Darricau
8e638dbf6d [ticket/11224] Revert Revert "Merge pull request #2460 from ticket/11224" 
This reverts commit 40cd7570e6.
 2014-10-03 23:50:24 +02:00
Joas Schilling
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
Joas Schilling
ea1eff4fa5 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:36:02 +02:00
Joas Schilling
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
Joas Schilling
b9226c6877 Merge branch 'develop-ascraeus' into develop 2014-10-01 11:39:35 +02:00
Joas Schilling
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
Joas Schilling
dceb334a0c Merge branch 'develop-ascraeus' into develop 2014-10-01 10:34:42 +02:00
Joas Schilling
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
Joas Schilling
0a58cca031 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:27:56 +02:00
Joas Schilling
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
Joas Schilling
b1d35363db Merge branch 'develop-ascraeus' into develop 2014-10-01 10:24:27 +02:00
Joas Schilling
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
Joas Schilling
d73194a415 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:19:39 +02:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993 
[ticket/12993] Improve get_user_ranks
 2014-10-01 10:19:24 +02:00
Matt Friedman
1ee4894271 [ticket/13121] Fix migration file 
PHPBB3-13121
 2014-10-01 00:29:45 -07:00
Matt Friedman
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
Andreas Fischer
7694623cd2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13111] Dropdown options are already an array in the field data
 2014-09-30 21:04:25 +02:00
Andreas Fischer
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