makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-26 21:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
17926 commits 18 branches 192 tags 207 MiB
Commit graph

17926 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Ais
b4fcdc51e9 [ticket/11638] generate_text_for_display on viewtopic.php 
lines: 835-843

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
 2013-07-13 16:38:51 +01:00
Nathaniel Guse
fd10d97cb1 Merge branch 'develop-olympus' into develop 
# By Igor Wiedler (1) and others
* develop-olympus:
  [ticket/11671] Update composer.lock
  [ticket/11671] Add phing as a dependency and upgrade deps
  [ticket/11668] Move lint test to the end for travis

Conflicts:
	phpBB/composer.lock
 2013-07-13 10:28:02 -05:00
Joas Schilling
167ca1f33f [ticket/9657] Define user before injecting 
PHPBB3-9657
 2013-07-13 11:25:38 -04:00
Nathaniel Guse
b1b37ddde2 Merge remote-tracking branch 'remotes/igorw/ticket/11668-travis' into develop-olympus 
# By Igor Wiedler
# Via Igor Wiedler
* remotes/igorw/ticket/11668-travis:
  [ticket/11668] Move lint test to the end for travis
 2013-07-13 10:21:58 -05:00
Joas Schilling
1584fdd26d Merge remote-tracking branch 'EXreaction/ticket/11420' into develop 
* EXreaction/ticket/11420:
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Fix tests
  [ticket/11420] Use !==, === when comparing strings
  [ticket/11420] Fix comments, license link
  [ticket/11420] Rename migrations file to something more helpful
  [ticket/11420] Forgot to include mock sql_insert_buffer
  [ticket/11420] Fix notification options conversion
 2013-07-13 11:15:53 -04:00
Bruno Ais
402d987ccb [ticket/11656] Wrong bitwise OR 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
 2013-07-13 15:56:55 +01:00
Bruno Ais
fca4bc5323 [ticket/11656] Remove line break in function call 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
 2013-07-13 15:55:37 +01:00
Joas Schilling
6cde302ffa [ticket/9657] Remove old code 
PHPBB3-9657
 2013-07-13 10:47:42 -04:00
Nathaniel Guse
7b0a6ef06c [ticket/11671] Update composer.lock 
PHPBB3-11671
 2013-07-13 09:20:18 -05:00
Nathaniel Guse
2b69715e21 Merge branch 'prep-release-3.0.12' into develop-olympus 
# By Nathaniel Guse (1) and Nils Adermann (1)
* prep-release-3.0.12:
  [ticket/11671] Update composer.lock
  [ticket/11671] Add phing as a dependency and upgrade deps
 2013-07-13 09:15:09 -05:00
Nathaniel Guse
678cccfb04 [ticket/11671] Update composer.lock 
PHPBB3-11671
 2013-07-13 09:14:22 -05:00
Nathaniel Guse
93e4b4450d Merge remote-tracking branch 'remotes/naderman/ticket/11671' into prep-release-3.0.12 
# By Nils Adermann
# Via Nils Adermann
* remotes/naderman/ticket/11671:
  [ticket/11671] Add phing as a dependency and upgrade deps
 2013-07-13 09:10:34 -05:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657 
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
 2013-07-13 09:36:24 -04:00
Bruno Ais
31fed42150 [ticket/11656] generate_text_for_display on memberlist.php 
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11656
 2013-07-13 12:58:04 +01:00
Igor Wiedler
51ab2c710e [ticket/11574] Make install language filename less crazy 
PHPBB3-11574
 2013-07-13 09:57:57 +02:00
Igor Wiedler
1dea0286a4 [ticket/11574] Use alternate DI config file for updater 
PHPBB3-11574
 2013-07-13 09:57:57 +02:00
Joas Schilling
6c52fae750 [ticket/11574] Include normalizer so it loads form the correct directory 
PHPBB3-11574
 2013-07-13 09:57:57 +02:00
Joas Schilling
3bccd10ccd [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) 
PHPBB3-11574
 2013-07-13 09:57:57 +02:00
Joas Schilling
fe7823b668 [ticket/11574] Use log object instead of old function 
PHPBB3-11574
 2013-07-13 09:57:57 +02:00
Joas Schilling
129e393b66 [ticket/11574] Include vendor into update packages 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
14ff1ef540 [ticket/11574] Create phpbb_log object before using it. 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
fcf3437338 [ticket/11574] Add correct language parameter to return links 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
3eaeede321 [ticket/11574] Use request object rather then request_var function 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
deac5f53e3 [ticket/11574] Load new language files whenever possible 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
f11993c038 [ticket/11574] Require new files in install/index.php and add a class loader 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
e12fd2fdda [ticket/11574] Require new files in database_update.php and add a class loader 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
8aca9635f5 [ticket/11574] Find language files in update/new before throwing an error 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
06caac0444 [ticket/11574] Try to load updated service.yml before the default one 
PHPBB3-11574
 2013-07-13 09:57:56 +02:00
Joas Schilling
28e3341fcd [ticket/9657] Keep approval state of posts/topics when copying them 
PHPBB3-9657
 2013-07-13 00:54:39 -04:00
Joas Schilling
da38d13094 [ticket/9657] Add functional tests for forking a copy 
PHPBB3-9657
 2013-07-13 00:53:55 -04:00
Joas Schilling
e96932b0e3 [ticket/9657] Add functional test for splitting topic 
PHPBB3-9657
 2013-07-12 22:43:11 -04:00
Marc Alexander
ee3d4199bb [ticket/11112] Do not change opensource.org link to https 
PHPBB3-11112
 2013-07-12 22:40:55 -04:00
Joas Schilling
a01d8cdfa3 [ticket/9657] Add functional test for restoring a post/topic 
PHPBB3-9657
 2013-07-12 21:20:33 -04:00
Nils Adermann
97f633bced [ticket/11671] Add phing as a dependency and upgrade deps 
PHPBB3-11671
 2013-07-12 16:47:08 -04:00
Marc Alexander
07eadac2f6 [ticket/11112] Use https for user-visible links to phpbb.com 
PHPBB3-11112
 2013-07-12 16:24:27 -04:00
Igor Wiedler
3375f41ef1 [ticket/11668] Move lint test to the end for travis 
PHPBB3-11668
 2013-07-12 16:16:01 -04:00
Nathaniel Guse
b5651c0289 Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop 
# By Joseph Warner
# Via Joseph Warner
* remotes/Hardolaf/ticket/11626:
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [ticket/11626] Make identifier uppercase per style requirements
  [ticket/11626] Change the identifier template file in the template
  [ticket/11626] Call method only one time per provider
  [ticket/11626] Change interface to match functionality
  [ticket/11626] Include the template file in acp_board
  [ticket/11626] LDAP Auth ACP Template File
  [ticket/11626] Create get_acp_template method for auth providers
 2013-07-12 14:59:43 -05:00
Joseph Warner
64308f41b0 [ticket/11626] Remove last reference to template in ldap 
PHPBB3-11626
 2013-07-12 15:57:35 -04:00
Joseph Warner
631ce22f2c [ticket/11626] Remove LDAP dependency on template 
Returns template vars rather than requiring the template.

PHPBB3-11626
 2013-07-12 15:54:41 -04:00
Nathan Guse
86b910692a Merge pull request #1515 from Hardolaf/feature/auth-refactor 
[feature/auth-refactor] Use a base class for all authentication providers
 2013-07-12 12:51:35 -07:00
Andreas Fischer
dfa888c13f Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop 
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
 2013-07-12 21:45:30 +02:00
Joas Schilling
8c5ff0775a [ticket/9657] Fix a little error when moving softdeleted topics 
PHPBB3-9657
 2013-07-12 15:42:28 -04:00
Joas Schilling
0297b88aaf [ticket/9657] Add unit tests for softdeleting and moving posts/topics 
PHPBB3-9657
 2013-07-12 15:41:52 -04:00
Andreas Fischer
37b28ca7e7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.

Conflicts:
	build/build.xml
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
 2013-07-12 21:34:15 +02:00
Nathaniel Guse
8a93a35def Merge remote-tracking branch 'remotes/Marc/ticket/11548-develop' into develop 
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11548-develop:
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
 2013-07-12 14:12:46 -05:00
Andreas Fischer
036a4188f3 [develop-olympus] Add changelog for 3.0.12 release. 2013-07-12 21:10:05 +02:00
Andreas Fischer
b93636d42d [develop-olympus] Increment version number to 3.0.13-dev. 2013-07-12 21:10:05 +02:00
Andreas Fischer
f1dd35387c [develop-olympus] Bump version numbers for 3.0.12-RC1 release. 2013-07-12 21:10:05 +02:00
Andreas Fischer
6f14c8375e [develop-olympus] Bumping version numbers to final for 3.0.12 releases. 2013-07-12 21:10:05 +02:00
Nathaniel Guse
91672b6d56 Merge branch 'develop-olympus' into develop 
# By Igor Wiedler
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11668] Run lint test at the end of the test suite

Conflicts:
	phpunit.xml.all
	phpunit.xml.dist
	phpunit.xml.functional
 2013-07-12 14:07:43 -05:00