mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 07:07:51 +02:00
Code Issues Releases Wiki Activity
16,298 Commits 18 Branches 192 Tags
Commit Graph

16298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dhruv
679183385f [ticket/10820] add unit tests for phpbb_is_greater_ie7 
PHPBB3-10820
 2013-04-29 02:29:19 +05:30
Andreas Fischer
cba5dde0ee Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ticket/10820-develop 
* dhruvgoel92/ticket/10820:
  [ticket/10820] remove unnecessary parentheses
  [ticket/10820] fix docblock
  [ticket/10820] add param and return to function
  [ticket/10820] simplify regex and escape dot
  [ticket/10820] Use singular return
  [ticket/10820] remove unnecessary condition checks
  [ticket/10820] add function docblock
  [ticket/10820] fix IE check function
  [ticket/10820] proper usage of global and local variable browser
  [ticket/10820] Image downloader recognize new version of ie

Conflicts:
	phpBB/download/file.php
 2013-04-27 23:04:46 +02:00
Dhruv
b39e6e01b2 [ticket/10820] remove unnecessary parentheses 
PHPBB3-10820
 2013-04-27 23:24:22 +05:30
Dhruv
8c9786c504 [ticket/10820] fix docblock 
PHPBB3-10820
 2013-04-27 21:33:30 +05:30
Dhruv
f0f28f261c [ticket/10820] add param and return to function 
Add param and return in function docblock. Rename function
parameter to $user_agent.

PHPBB3-10820
 2013-04-27 20:57:51 +05:30
Dhruv
8d1bbc1e7f [ticket/10820] simplify regex and escape dot 
PHPBB3-10820
 2013-04-27 19:39:31 +05:30
Dhruv
0ad48d7ea1 [ticket/10820] Use singular return 
PHPBB3-10820
 2013-04-27 19:39:30 +05:30
Dhruv
79a740bb80 [ticket/10820] remove unnecessary condition checks 
PHPBB3-10820
 2013-04-27 19:39:29 +05:30
Dhruv
adb2441f22 [ticket/10820] add function docblock 
PHPBB3-10820
 2013-04-27 19:39:27 +05:30
Dhruv
095ac054e0 [ticket/10820] fix IE check function 
Add phpbb_ prefix to function name and return boolean value.

PHPBB3-10820
 2013-04-27 19:39:26 +05:30
Dhruv
ac56363351 [ticket/10820] proper usage of global and local variable browser 
PHPBB3-10820
 2013-04-27 19:39:25 +05:30
riadhchtara
bef96b9792 [ticket/10820] Image downloader recognize new version of ie 
When a user download image attachement using ie8, the file is displayed.
However, when he uses ie version greater than 8, the image is download.
A changes are made to phpbb/download/file.php to solve the problem.
We check now if the ie version is greater or equal to 8 and not only equal
to 8

PHPBB3-10820
 2013-04-27 19:39:24 +05:30
Oleg Pudeyev
c182ab0e7b Merge PR #1371 branch 'EXreaction/ticket/11236' into develop 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11236:
  [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language
  [ticket/11236] Do not require group selection in prune users
  [ticket/11236] Correct HTML
 2013-04-26 22:35:13 -04:00
Oleg Pudeyev
efd9e331bc Merge PR #1370 branch 'EXreaction/ticket/11237' into develop 
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11237:
  [ticket/11237] Fix PHP error in acp_prune.php
 2013-04-26 22:34:55 -04:00
Nathaniel Guse
c057141ea6 Merge remote-tracking branch 'remotes/cyberalien/ticket/11275' into develop 2013-04-25 16:33:30 -05:00
Nathaniel Guse
ad1a4919d6 Merge remote-tracking branch 'remotes/cyberalien/ticket/4412' into develop 2013-04-25 16:21:14 -05:00
Nathaniel Guse
e7cb0f687d [ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language 
PHPBB3-11236
 2013-04-25 11:23:09 -05:00
Nathaniel Guse
1a16ee4cb2 [ticket/11236] Do not require group selection in prune users 
PHPBB3-11236
 2013-04-25 11:20:13 -05:00
Nathaniel Guse
ee457e584c [ticket/11236] Correct HTML 
PHPBB3-11236
 2013-04-25 11:16:00 -05:00
Nathaniel Guse
42cfb7264d [ticket/11237] Fix PHP error in acp_prune.php 
Also making the code a bit more efficient (removing one SQL query)

PHPBB3-11237
 2013-04-25 10:58:48 -05:00
Nils Adermann
2bf01098d2 Merge pull request #1361 from MGaetan89/ticket/11471 
[ticket/11471] Unrelated text in e-mail templates
 2013-04-25 06:09:08 -07:00
Nils Adermann
ba05c9dd6b Merge pull request #1368 from EXreaction/ticket/11479 
[ticket/11479] Fix install/update (rebuild container)
 2013-04-25 04:02:42 -07:00
Nils Adermann
7b144bbff2 Merge pull request #1369 from EXreaction/ticket/11335 
Ticket/11335
 2013-04-25 04:01:38 -07:00
Nils Adermann
6d0b183553 Merge pull request #1367 from EXreaction/ticket/11454 
Ticket/11454 - Jabber notifications are not working at all
 2013-04-25 03:59:34 -07:00
Nathaniel Guse
9c4553c41f [ticket/11335] Replace "$phpEx" with $phpEx 
PHPBB3-11335
 2013-04-24 20:39:24 -05:00
Nathaniel Guse
0d2d72e8ee [ticket/11454] Check if the fields are set 
PHPBB3-11454
 2013-04-24 20:28:35 -05:00
Nathan Guse
f49993766e [ticket/11335] (more) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:46:00 -05:00
Nathan Guse
c870b9f43b [ticket/11335] (more tests) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:56 -05:00
Nathan Guse
e5d032ca21 [ticket/11335] (more class loader) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:53 -05:00
Nathan Guse
df518ac131 [ticket/11335] (tests) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:51 -05:00
Nathan Guse
14f1340903 [ticket/11335] (avatars) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:46 -05:00
Nathan Guse
df70b6ebe6 [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:41 -05:00
Nathan Guse
fe89e56686 [ticket/11335] (hook finder) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:39 -05:00
Nathan Guse
ce230f8dea [ticket/11335] (extension manager/finder) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:36 -05:00
Nathan Guse
6ef363547a [ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:33 -05:00
Nathan Guse
e870c04067 [ticket/11335] (class loader) Make php_ext 'php' not '.php' 
PHPBB3-11335
 2013-04-24 17:45:30 -05:00
Nathan Guse
fcdfe748b8 [ticket/11454] Use set_addresses in other applicable areas 
This should fix some other bugs that may not have yet been recognized--some
areas only set to(), but sent according to user_notify_type, which is not
necessarily email.

PHPBB3-11454
 2013-04-24 15:34:12 -05:00
Nathaniel Guse
ebb5169a46 [ticket/11454] Add messenger function set_addresses 
Automatically fills to/im from a user row

Send messenger the Jabber address if using Jabber notifications

PHPBB3-11454
 2013-04-24 15:19:37 -05:00
Nathan Guse
4becf85f52 [ticket/11479] Use phpbb_create_default_container 
PHPBB3-11479
 2013-04-24 14:58:27 -05:00
Gaëtan Muller
1f6f2435d0 [ticket/11471] Unrelated text in e-mail templates 
Some e-mail templates contain text unrelated
with the subject of the e-mail

PHPBB3-11471
 2013-04-24 20:07:05 +02:00
Nils Adermann
f8ffe84969 Merge pull request #1366 from asperous/ticket/11129 
[ticket/11129] Added headers to empty subscription state
 2013-04-24 10:29:50 -07:00
Nils Adermann
b8c2bf6ce4 Merge remote-tracking branch 'github-asperous/ticket/9975' into develop 
* github-asperous/ticket/9975:
  [ticket/9975] Moved a few E_USER_ERROR errors to /language

Conflicts:
	phpBB/includes/user.php
 2013-04-24 19:16:46 +02:00
Nils Adermann
b3497d955f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9975] Translate missing style error message

Conflicts:
	phpBB/includes/session.php
 2013-04-24 19:13:47 +02:00
Nils Adermann
a33cc92fc8 Merge pull request #1358 from MGaetan89/ticket/9975 
[ticket/9975] Translate missing style error message
 2013-04-24 10:01:30 -07:00
Nils Adermann
aaf109e07d Merge pull request #1326 from dhruvgoel92/ticket/11485 
[ticket/11485] add columns to update_schema before adding data
 2013-04-24 09:59:41 -07:00
Nils Adermann
81daf21dc0 Merge pull request #1324 from nickvergessen/ticket/10844-2 
Ticket/10844 Extensions are not located when front-end file has a diffferent phpbb_root_path
 2013-04-24 09:52:57 -07:00
Nils Adermann
3e32655c7f Merge pull request #1290 from nickvergessen/ticket/11362 
Correctly sanitise the directory path in finder
 2013-04-24 09:45:34 -07:00
Nathaniel Guse
cc902ddee0 [ticket/11479] Fix install/update (rebuild container) 
Code copied from fix in 11305

PHPBB3-11479
 2013-04-24 11:26:13 -05:00
Nathaniel Guse
212971a3a6 [ticket/11454] Correct jabber global available check 
Copied from msg_jabber()

PBPBB3-11454
 2013-04-24 10:37:53 -05:00
asperous
0f41cc34dd [ticket/11129] Added headers to empty subscription state 
Added a newline to better seperate the two headers.

PHPBB3-11129
 2013-04-23 15:02:38 -07:00