mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
17,533 Commits 17 Branches 190 Tags
Commit Graph

17533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
aadff800dc [ticket/11582] Remove left over calls to lang['acl_*'] 
PHPBB3-11582
 2013-07-14 11:51:39 -04:00
Joas Schilling
22ba3de1a2 [ticket/11582] Use member isntead of a new variable everytime 
PHPBB3-11582
 2013-07-14 11:51:37 -04:00
Joas Schilling
9c653341e4 [ticket/11582] Use new methods and remove duplicated entries 
PHPBB3-11582
 2013-07-14 11:51:36 -04:00
Joas Schilling
ce0a182c7f [ticket/11582] Add methods to return the language string 
PHPBB3-11582
 2013-07-14 11:51:34 -04:00
Joas Schilling
7f9a1c8116 [ticket/11582] Add event in constructor and add docs 
PHPBB3-11582
 2013-07-14 11:51:33 -04:00
Joas Schilling
137cec5895 [ticket/11582] Fix event dispatcher class name 
PHPBB3-11582
 2013-07-14 11:51:32 -04:00
Joas Schilling
e8d2a2fd88 [ticket/11582] Use new class for categories 
PHPBB3-11582
 2013-07-14 11:51:30 -04:00
Joas Schilling
573987d2d2 [ticket/11582] Add new service for permissions 
Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
 2013-07-14 11:51:29 -04:00
Nils Adermann
3d9e57d0ce Merge pull request #1558 from nickvergessen/ticket/11696 
[ticket/11696] Rename db_tools.php so it can be autoloaded
 2013-07-14 07:29:29 -07:00
Joas Schilling
f302cbe175 [ticket/11696] Move file to new directory 
PHPBB3-11696
 2013-07-14 10:16:15 -04:00
Joas Schilling
131194d216 [ticket/11696] Rename constructor to __construct() 
PHPBB3-11696
 2013-07-14 10:12:49 -04:00
Joas Schilling
5d4c443c2d [ticket/11696] Remove manual loading of db_tools in extension controller test 
Remember to store the file, before commiting it...

PHPBB3-11696
 2013-07-14 10:10:05 -04:00
Joas Schilling
057d860d07 [ticket/11696] Rename db_tools.php so it can be autoloaded 
PHPBB3-11696
 2013-07-14 10:10:05 -04:00
Nathan Guse
1e37d97909 Merge pull request #1559 from naderman/ticket/11698 
[WIP][ticket/11698] Moving all autoloadable files to phpbb/
 2013-07-13 22:47:41 -07:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/ 
PHPBB3-11698
 2013-07-14 01:32:34 -04:00
Nils Adermann
4186c05bb4 Merge pull request #1555 from EXreaction/ticket/11692 
[ticket/11692] Don't update search_type in dev migration if already appended
 2013-07-13 20:53:48 -07:00
David King
6946cea72d Merge remote-tracking branch 'cyberalien/ticket/11694' into develop 
* cyberalien/ticket/11694:
  [ticket/11694] Do not locate assets with root path
 2013-07-13 23:45:49 -04:00
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
Nils Adermann
71f6f5ad7e Merge pull request #1554 from EXreaction/ticket/11675 
[ticket/11675] Fix template loop
 2013-07-13 14:29:15 -07: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
Nathan Guse
47a611ab4f Merge pull request #1553 from naderman/ticket/11690 
[ticket/11690] Old module class names may get autoloaded by class_exists
 2013-07-13 14:09:38 -07:00
Nils Adermann
2aa58ee3b8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
 2013-07-13 17:06:17 -04:00
Nils Adermann
b0905cc1d2 Merge remote-tracking branch 'github-exreaction/ticket/11686' into develop-olympus 
* github-exreaction/ticket/11686:
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
 2013-07-13 17:06:00 -04: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
fd2c309aa7 Merge pull request #1473 from marc1706/ticket/11600 
[ticket/11600] Increase code test coverage of avatar manager
 2013-07-13 13:27:06 -07: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. release-3.0.12-RC1 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
Nils Adermann
1783134217 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11674] Do not include vendor folder if there are no dependencies.
 2013-07-13 13:12:28 -04:00
Nils Adermann
4b8126585d Merge branch 'prep-release-3.0.12' into develop-olympus 
* prep-release-3.0.12:
  [ticket/11674] Do not include vendor folder if there are no dependencies.
 2013-07-13 13:12:19 -04:00
Nils Adermann
9a486539c3 Merge remote-tracking branch 'github-bantu/ticket/11674' into prep-release-3.0.12 
* github-bantu/ticket/11674:
  [ticket/11674] Do not include vendor folder if there are no dependencies.
 2013-07-13 13:12:10 -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
Nils Adermann
9d57c9635c Merge remote-tracking branch 'github-bantu/ticket/11670' into prep-release-3.0.12 
* github-bantu/ticket/11670:
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
 2013-07-13 13:09:07 -04:00
Nathaniel Guse
6bfa2fc055 [ticket/11686] Not checking for phpBB Debug errors on functional tests 
PHPBB3-11686
 2013-07-13 12:06:05 -05:00