mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00
Code Issues Releases Wiki Activity
17,844 Commits 18 Branches 192 Tags
Commit Graph

15788 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
8d30322635 [ticket/11694] Do not locate assets with root path 
Do not locate assets that start with ./

PHPBB3-11694
 2013-07-13 23:15:26 -04:00
Nathaniel Guse
176729ab00 [ticket/11692] Don't update search_type in dev migration if already appended 
PHPBB3-11692
 2013-07-13 17:50:35 -05:00
Nathaniel Guse
e9cc1e9cd2 [ticket/11675] Fix template loop 
PHPBB3-11675
 2013-07-13 16:25:08 -05:00
Nathan Guse
346efbbb5b Merge pull request #1429 from cyberalien/ticket/11553 
Move bulletin points for linklist lists to pseudo classes
 2013-07-13 14:20:23 -07:00
Nils Adermann
9f5ee08bae [ticket/11690] Old module class names may get autoloaded by class_exists 
PHPBB3-11690
 2013-07-13 16:47:25 -04:00
Nathan Guse
ea0ef00801 Merge pull request #1550 from nickvergessen/ticket/9649 
[ticket/9649] Display information on index for moderators on unapproved posts
 2013-07-13 12:03:33 -07:00
Joas Schilling
081350678d [ticket/9649] Display information on index for moderators on unapproved posts 
PHPBB3-9649
 2013-07-13 14:57:31 -04:00
Nathan Guse
9d86385a36 Merge pull request #1436 from cyberalien/ticket/11563 
Fix subPanels() in forum_fn.js
 2013-07-13 10:49:04 -07:00
Nathan Guse
e10cbbf023 Merge pull request #1541 from nickvergessen/ticket/11684 
[ticket/11684] Remove useless confirmation page after login and admin login
 2013-07-13 10:38:24 -07:00
Nathan Guse
b6c3939c32 Merge pull request #1543 from nickvergessen/ticket/11685 
[ticket/11685] Remove logout confirmation page
 2013-07-13 10:37:43 -07:00
Nathan Guse
f22a53f2cf Merge pull request #1549 from cyberalien/ticket/10999 
[ticket/10999] Fix assets_version in ACP
 2013-07-13 10:32:32 -07:00
Andreas Fischer
f514269846 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
 2013-07-13 19:30:57 +02:00
Andreas Fischer
f14967fbff Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
 2013-07-13 19:30:45 +02:00
Vjacheslav Trushkin
c1bb179914 [ticket/10999] Fix assets_version in ACP 
PHPBB3-10999
 2013-07-13 13:30:33 -04:00
Andreas Fischer
9e789c4e9f [prep-release-3.0.12] More changelog items for the 3.0.12 release. 2013-07-13 19:30:09 +02:00
Nils Adermann
b607b3eab8 Merge remote-tracking branch 'github-phpbb/develop' into develop 
* github-phpbb/develop:
  [ticket/11687] Add assets_version to phpbb_config
 2013-07-13 13:17:55 -04:00
Nils Adermann
0ef95a7009 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php
 2013-07-13 13:16:58 -04:00
Nils Adermann
0341555314 Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com
 2013-07-13 13:14:48 -04:00
Nathan Guse
ce924f48d5 Merge pull request #1548 from cyberalien/ticket/11687 
[ticket/11687] Add assets_version to phpbb_config
 2013-07-13 10:14:47 -07:00
Nils Adermann
2aff3b19df Merge remote-tracking branch 'github-marc1706/ticket/11112' into prep-release-3.0.12 
* github-marc1706/ticket/11112:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com
 2013-07-13 13:14:37 -04:00
Vjacheslav Trushkin
f2c6da3975 [ticket/11687] Add assets_version to phpbb_config 
PHPBB3-11687
 2013-07-13 13:10:21 -04:00
Nils Adermann
c39d3b56a7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
 2013-07-13 13:09:45 -04:00
Nils Adermann
1c9604286d Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
 2013-07-13 13:09:33 -04:00
Andreas Fischer
598ab05807 [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". 
PHPBB3-11670
 2013-07-13 18:50:49 +02:00
Joas Schilling
8f95ef55a6 [ticket/11685] Remove logout confirmation page 
PHPBB3-11685
 2013-07-13 12:27:00 -04:00
Joas Schilling
7d0c1d02ca [ticket/11684] Remove useless confirmation page after login and admin login 
PHPBB3-11684
 2013-07-13 12:02:49 -04:00
Nathan Guse
87795eba55 Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission 
Soft delete
 2013-07-13 08:57:20 -07:00
Bruno Ais
713a2ba573 [ticket/11638] generate_text_for_display on viewtopic.php 
lines: 1403-1417

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

PHPBB3-11638
 2013-07-13 16:57:00 +01:00
Bruno Ais
a58ccdabf3 [ticket/11638] generate_text_for_display on viewtopic.php 
lines: 1395-1403

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

PHPBB3-11638
 2013-07-13 16:55:36 +01:00
Nathan Guse
d879acb7cc Merge pull request #1519 from cyberalien/ticket/11647 
Fix INCLUDEJS URLs handling
 2013-07-13 08:46:46 -07:00
Bruno Ais
97054d81f8 [ticket/11638] generate_text_for_display on viewtopic.php 
lines: 846-854

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

PHPBB3-11638
 2013-07-13 16:39:29 +01:00
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
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
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
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