makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-07 18:48:52 +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
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
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var() 
PHPBB3-13455
 2015-02-03 20:50:40 +01:00
Andreas Fischer
f9ab676530 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13348] Remove unnecessary global $cache
  [ticket/13348] Use close method to free query result handle
 2015-02-03 20:36:53 +01:00
Marc Alexander
a09d022d5e Merge branch 'ticket/13348-olympus' into ticket/13348 
Conflicts:
	phpBB/feed.php
 2015-02-03 18:30:45 +01:00
Andreas Fischer
63d863a883 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13569] Add missing sql_freeresults and remove unneeded results
 2015-02-03 17:38:02 +01:00
Nicofuma
f4b42c961f [ticket/13139] Fix tests 
PHPBB3-13139
 2015-02-03 13:37:52 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config() 
PHPBB3-13494
 2015-02-02 19:28:23 +01:00
Marc Alexander
a166f6f42c [ticket/13569] Add missing sql_freeresults and remove unneeded results 
PHPBB3-13569
 2015-02-02 17:36:39 +01:00
Joas Schilling
6e2838a4ca Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
 2015-02-01 20:24:32 +01:00
Joas Schilling
7f99e1c857 [prep-release-3.1.3] Add migration for 3.1.3 2015-02-01 19:18:30 +01:00
Marc Alexander
a893dfa46b Merge pull request #3352 from VSEphpbb/ticket/10388 
Ticket/10388 Use Twig's JS escape filter instead of addslashes on LA_ keys
 2015-01-31 12:59:40 +01:00
Joas Schilling
bacb38b161 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-01-31 12:12:56 +01:00
Matt Friedman
9f4c2effe9 [ticket/10388] Update deprecation comment 
PHPBB3-10388
 2015-01-31 01:11:28 -08:00
Joas Schilling
9232367b35 [prep-release-3.1.3] Add migration for 3.1.3-RC2 2015-01-31 01:06:23 +01:00
Joas Schilling
c14cf0457d Merge branch 'develop-ascraeus' into develop 2015-01-31 00:57:32 +01:00
Matt Friedman
e6bbde2bff [ticket/13553] Use defined title value in page headers too 
PHPBB3-13553
 2015-01-31 00:56:59 +01:00
Matt Friedman
ab4b1afd98 [ticket/13553] Make title var accept a lang key var 
PHPBB3-13553
 2015-01-31 00:56:54 +01:00
Matt Friedman
7127d08c8f [ticket/13553] Message helper should accept a lang key var 
PHPBB3-13553
 2015-01-31 00:56:47 +01:00
Joas Schilling
14ab007128 Merge branch 'develop-ascraeus' into develop 2015-01-31 00:43:30 +01:00
Joas Schilling
9628e8df3b [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1 
PHPBB3-13557
 2015-01-30 22:57:15 +01:00
Andreas Fischer
7531bfb291 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13556] Fix exception translation with filedownloader
 2015-01-30 19:00:15 +01:00
Joas Schilling
69450c7152 [ticket/13556] Fix exception translation with filedownloader 
PHPBB3-13556
 2015-01-30 18:05:13 +01:00
Joas Schilling
1b185413bf Merge branch 'develop-ascraeus' into develop 2015-01-30 17:48:54 +01:00
Joas Schilling
e5f2eee167 Merge pull request #3341 from brunoais/ticket/13544 
[ticket/13544] Fixing wrong SQL query for permission_unset() for roles
 2015-01-30 17:45:21 +01:00
Andreas Fischer
b6786f8ba1 Merge branch 'prep-release-3.0.13' into prep-release-3.1.3 
* prep-release-3.0.13:
  [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.
  [prep-release-3.0.13] Also update version in references to files.
  [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.
  [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.
  [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
  [ticket/12933] Handle case when * is last character of word
  [ticket/13554] Show feature release upgrades in blue rather than red.

Conflicts:
	build/build.xml
	phpBB/adm/style/acp_update.html
	phpBB/docs/CHANGELOG.html
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/includes/startup.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	tests/security/trailing_path_test.php
 2015-01-30 13:34:40 +01:00
Andreas Fischer
b78ae290e8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13553] Add a method to the controller helper to display a message
  [prep-release-3.1.3] Add changelog for 3.1.3-RC1
  [prep-release-3.1.3] Prepare Changelog
  [prep-release-3.1.3] Add migration for 3.1.3-RC1
  [prep-release-3.1.3] Update version to 3.1.2-RC1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-01-30 13:14:33 +01:00
Dhruv
ab07be8157 Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 13:10:38 +05:30
Joas Schilling
afe99f9050 [ticket/13553] Add a method to the controller helper to display a message 
PHPBB3-13553
 2015-01-29 19:08:32 +01:00
Matt Friedman
5b7d1f1b43 [ticket/10388] Update deprecation date for addslashes 
PHPBB3-10388
 2015-01-29 01:50:13 -08:00
Matt Friedman
a62adfc115 [ticket/10388] Use TWIG escape JS filter instead of addslashes 
PHPBB3-10388
 2015-01-29 01:41:28 -08:00
Andreas Fischer
d7741cea60 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12933] Add test cases for * wildcard searches
  [ticket/12933] Handle case when * is last character of word
 2015-01-29 00:02:42 +01:00
Dhruv
252018b813 Merge branch 'ticket/12933-olympus' into ticket/12933 2015-01-28 21:41:24 +05:30
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log() 
PHPBB3-13468
 2015-01-27 18:34:33 +01:00
brunoais
4b16add055 [ticket/13544] Use integer case because $role_id is an int 
PHPBB3-13544
 2015-01-26 22:00:20 +00:00
brunoais
73d1bf9fea [ticket/13544] Fixing wrong SQL query for permission_unset for roles 
PHPBB3-13544
 2015-01-26 19:21:22 +00:00
Joas Schilling
32b25d7b11 [prep-release-3.1.3] Add migration for 3.1.3-RC1 2015-01-26 19:43:36 +01:00
Marc Alexander
874f3584e2 [ticket/13522] Remove unused variables and unexpected returns 
PHPBB3-13522
 2015-01-24 13:40:42 +01:00
Marc Alexander
9a03b3aab6 [ticket/13522] Remove empty answers from possible answers in Q&A 
PHPBB3-13522
 2015-01-24 13:09:00 +01:00