mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 15:17:16 +01:00
Code Issues Releases Wiki Activity
20,429 Commits 17 Branches 190 Tags
Commit Graph

20429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Adermann
02c4d4ee7e Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12310] Don't autocomplete SMTP user/pass on install
 2014-03-26 23:35:57 -04:00
Nils Adermann
47ab801440 Merge remote-tracking branch 'marshalrusty/ticket/12310' into develop-olympus 
* marshalrusty/ticket/12310:
  [ticket/12310] Don't autocomplete SMTP user/pass on install
 2014-03-26 23:35:48 -04:00
Yuriy Rusko
dc9ae231e5 [ticket/12310] Don't autocomplete SMTP user/pass on install 
PHPBB3-12310
 2014-03-26 23:16:39 -04:00
Oliver Schramm
db6e5a19f2 [ticket/7707] Remove unnecessary variables 
PHPBB3-7707
 2014-03-26 17:13:46 +01:00
Andreas Fischer
5e688f9540 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12302] Added `--no-dev` to composer call in build.xml
  [ticket/12302] Updated composer.phar to 1.0.0-alpha8
 2014-03-25 17:32:03 +01:00
Andreas Fischer
0b9752a594 Merge pull request #2183 from s9e/ticket/12302 
Upgrade all composer.phar to 1.0.0-alpha8

* s9e/ticket/12302:
  [ticket/12302] Added `--no-dev` to composer call in build.xml
  [ticket/12302] Updated composer.phar to 1.0.0-alpha8
 2014-03-25 17:27:15 +01:00
s9e
55e7459922 [ticket/12302] Added --no-dev to composer call in build.xml 
PHPBB3-12302
 2014-03-25 17:20:59 +01:00
s9e
53740111f6 [ticket/12302] Updated composer.phar to 1.0.0-alpha8 
wget -N https://getcomposer.org/download/1.0.0-alpha8/composer.phar

PHPBB3-12302
 2014-03-25 17:09:00 +01:00
Andreas Fischer
389bbe32d1 Merge pull request #2179 from bantu/ticket/12257 
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT test...

* bantu/ticket/12257:
  [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.

Conflicts:
	.travis.yml
 2014-03-25 00:15:09 +01:00
Andreas Fischer
ca8fa03659 [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run. 
PHPBB3-12257
 2014-03-24 21:42:06 +01:00
Joas Schilling
800c779403 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
 2014-03-24 20:58:43 +01:00
Joas Schilling
574a9f4f2a Merge remote-tracking branch 'schosser/ticket/10174' into develop-olympus 
* schosser/ticket/10174:
  [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
 2014-03-24 20:58:11 +01:00
Joas Schilling
ce76a028c8 Merge remote-tracking branch 'Elsensee/ticket/12297' into develop-ascraeus 
* Elsensee/ticket/12297:
  [ticket/12297] Delete user_from column on update
 2014-03-24 20:46:02 +01:00
Matt Friedman
f6519414b7 [ticket/12300] Make topic icon links clickable to newest unread posts 
PHPBB3-12300
 2014-03-24 10:42:32 -07:00
Matt Friedman
449e583fc4 [ticket/12300] Revert topic title links back to default behavior 
PHPBB3-12300
 2014-03-24 09:43:25 -07:00
geetakshi
76f7ef5c83 [ticket/11360] Updating default value of $display_online_list 
PHPBB3-11360
 2014-03-24 00:12:40 +05:30
Oliver Schramm
ccf400ef0f [ticket/12297] Delete user_from column on update 
PHPBB3-12297
 2014-03-23 15:53:24 +01:00
Daniel Schosser
a46ad06c19 [ticket/10174] Rename "Ban usernames" to "Ban users" in ACP 
Changing the language string from "Ban usernames" to "Ban users"
to clarify its use. It bans users by their name and not the username itself

PHPBB3-10174
 2014-03-23 14:06:32 +01:00
Cesar G
2e6911b7e7 Merge remote-tracking branch 'VSEphpbb/ticket/12292' into develop-ascraeus 
* VSEphpbb/ticket/12292:
  [ticket/12292] Fix syntax error in admin.css
 2014-03-22 20:50:21 -07:00
Matt Friedman
b6b32c2340 [ticket/12292] Fix syntax error in admin.css 
PHPBB3-12292
 2014-03-22 19:49:03 -07:00
Dhruv
dfa1377f1b Merge remote-tracking branch 'nickvergessen/ticket/12268' into develop-ascraeus 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12268:
  [ticket/12268] Do not use substr but just compare the character
  [ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.php
  [ticket/12268] Move class out of extension namespace and rename it
  [ticket/12268] Do not search in folders starting with a dot
  [ticket/12268] Use FilesystemIterator::SKIP_DOTS
  [ticket/12268] Extension finder should not crawl through .git/ of extensions
 2014-03-23 02:39:00 +05:30
Joas Schilling
84b91beed1 Merge remote-tracking branch 'rxu/ticket/12289' into develop-ascraeus 
* rxu/ticket/12289:
  [ticket/12289] Add viewtopic template events for posts specific custom notices
 2014-03-22 21:35:38 +01:00
Matt Friedman
b87fc1e56c [ticket/11230] Update cache driver dock blocks 
PHPBB3-12230
 2014-03-22 08:23:18 -07:00
rxu
4bb898a061 [ticket/12289] Add viewtopic template events for posts specific custom notices 
These events allow extensions to add own posts specific notices-alike info.

PHPBB3-12289
 2014-03-22 22:45:05 +08:00
Joas Schilling
13eb0ec5b9 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page

Conflicts:
	phpBB/adm/style/acp_users_overview.html
 2014-03-22 15:13:41 +01:00
Joas Schilling
5197e5afe3 Merge remote-tracking branch 'geetakshi/ticket/12035' into develop-olympus 
* geetakshi/ticket/12035:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page
 2014-03-22 15:07:01 +01:00
Joas Schilling
4de099d969 Merge remote-tracking branch 'vsephpbb/ticket/11904' into develop-ascraeus 
* vsephpbb/ticket/11904:
  [ticket/11904] Update explanation for what Allow CDN does
 2014-03-22 15:01:11 +01:00
Joas Schilling
b191c1c5a6 Merge remote-tracking branch 'geetakshi/ticket/11357' into develop-ascraeus 
* geetakshi/ticket/11357:
  [ticket/11357] Correcting invalid markup
 2014-03-22 14:15:09 +01:00
Joas Schilling
4e58a03c20 Merge remote-tracking branch 'vsephpbb/ticket/12292' into develop-ascraeus 
* vsephpbb/ticket/12292:
  [ticket/12292] Improve style details page
 2014-03-22 13:22:13 +01:00
Andreas Fischer
3654ba4a35 Merge pull request #2169 from bantu/ticket/12293 
[ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php eve...

* bantu/ticket/12293:
  [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php events.
 2014-03-22 02:38:42 +01:00
Forumhulp.com
4051ab689f [ticket/12293] Add missing compact() call to phpBB/phpbb/log/log.php events. 
PHPBB3-12293
 2014-03-22 02:07:39 +01:00
Matt Friedman
e4f6d9bc90 [ticket/12292] Improve style details page 
http://tracker.phpbb.com/browse/PHPBB3-12292
Gave style details page a proper heading and back button.
Also removed a few obsolete code leftovers in the style
and CSS.

PHPBB3-12292
 2014-03-20 18:11:45 -07:00
geetakshi
5afb06102b [ticket/11360] Avoiding online list where not required 
PHPBB3-11360
 2014-03-20 17:15:43 +05:30
geetakshi
663eb74cf3 [ticket/12035] Correcting the condition 
PHPBB3-12035
 2014-03-20 14:17:03 +05:30
Matt Friedman
60e5757fa1 [ticket/11230] Use inheritdoc in docblocks in cache drivers 
http://tracker.phpbb.com/browse/PHPBB3-11230

PHPBB3-11230
 2014-03-19 20:31:55 -07:00
Dhruv Goel
7f5d8becad Merge pull request #2137 from geetakshi/ticket/8309 
[ticket/8309] Rename "Last visited" to "Last activity" on memberlist/viewprofile
 2014-03-20 03:44:39 +05:30
geetakshi
5316c32b10 [ticket/12035] Adding necessary conditions 
PHPBB3-12035
 2014-03-20 03:36:53 +05:30
Joas Schilling
82c8986aed Merge remote-tracking branch 'vsephpbb/ticket/12285' into develop 
* vsephpbb/ticket/12285:
  [ticket/12285] Fix mult-lingual issues between extensions
 2014-03-19 21:48:29 +01:00
Joas Schilling
997ad65062 Merge remote-tracking branch 'Elsensee/ticket/11169' into develop 
* Elsensee/ticket/11169:
  [ticket/11169] Skip migration if "Users" category has been deleted
  [ticket/11169] Move module 'prune users' to users category
 2014-03-19 21:35:08 +01:00
Dhruv Goel
03f6ad544f Merge pull request #2145 from Elsensee/ticket/10590 
[ticket/10590] Remove confirmation page after posting
 2014-03-20 01:50:17 +05:30
geetakshi
9a3011c2dd [ticket/8309] Changing $last_activity to $last_active 
PHPBB3-8309
 2014-03-20 01:48:52 +05:30
Oliver Schramm
dd7e8c8d1d [ticket/11169] Skip migration if "Users" category has been deleted 
or the module has already been moved to that category

PHPBB3-11169
 2014-03-19 21:16:25 +01:00
Joas Schilling
2d1e6975b4 Merge remote-tracking branch 'netdeamon/ticket/12198-Language-issue' into develop 
* netdeamon/ticket/12198-Language-issue:
  [ticket/12198] Language issue in en/common.php
 2014-03-19 21:07:15 +01:00
Joas Schilling
76d7d38dea Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11766] Hide edit, quote and delete buttons if topic is locked

Conflicts:
	phpBB/viewtopic.php
 2014-03-19 20:37:52 +01:00
Joas Schilling
bdab6dede0 Merge remote-tracking branch 'Elsensee/ticket/11766' into develop-olympus 
* Elsensee/ticket/11766:
  [ticket/11766] Hide edit, quote and delete buttons if topic is locked
 2014-03-19 20:34:22 +01:00
Oliver Schramm
d71fd5d660 [ticket/11766] Hide edit, quote and delete buttons if topic is locked 
But show quote button to guests if topic isn't locked

PHPBB3-11766
 2014-03-19 20:23:56 +01:00
Matt Friedman
b0f34afb8b [ticket/12285] Fix mult-lingual issues between extensions 
PHPBB3-12285
 2014-03-19 09:10:17 -07:00
geetakshi
51ff202820 [ticket/11357] Correcting invalid markup 
PHPBB3-11357
 2014-03-19 19:59:19 +05:30
geetakshi
18bed2ea47 [ticket/11360] Change second parameter in page_header function 
PHPBB3-11360
 2014-03-19 19:55:55 +05:30
Cesar G
2a822931c6 [ticket/11959] Add unit tests. 
PHPBB3-11959
 2014-03-19 03:08:34 -07:00