mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 05:55:15 +02:00
Code Issues Releases Wiki Activity
11,544 Commits 18 Branches 192 Tags
Commit Graph

11544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Adermann
65118218c7 Merge branch 'ticket/11355' into develop-olympus 
* ticket/11355:
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.
 2013-02-24 18:05:22 +01:00
erangamapa
ab530a999e [ticket/11355] Referred proper variable when validating selection. 
Earlier PR was referring wrong variable $name_ary. Changed it to
$mark_ary which actually contains selected user ids.

PHPBB3-11355
 2013-02-24 18:04:54 +01:00
erangamapa
f8e184c54e [ticket/11355] Wrong error message when no user is selected. 
In ACP group membership management, if you select 'remove member
from group' without selecting any users and submit,it will display
a wrong error after confirmbox. Since no users are selected, this
should not go even until confirmbox. Added a new condition to check
weather any users are selected when the action is 'deleteusers'
in acp_groups.php and disply a correct error.

PHPBB3-11355
 2013-02-24 18:04:46 +01:00
Nils Adermann
639110766c Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympus 
* github-bantu/ticket/11361:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
 2013-02-24 17:50:04 +01:00
Nils Adermann
678ec7b545 Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-olympus 
* github-exreaction/ticket/10896:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP
 2013-02-24 17:39:04 +01:00
Nils Adermann
f29bebc7ce Merge remote-tracking branch 'github-bantu/ticket/11122' into develop-olympus 
* github-bantu/ticket/11122:
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
 2013-02-24 17:37:32 +01:00
Nils Adermann
d5d412e827 Merge remote-tracking branch 'github-bantu/ticket/7262' into develop-olympus 
* github-bantu/ticket/7262:
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.
 2013-02-24 17:30:51 +01:00
Andreas Fischer
6bf64d5620 [ticket/7262] Add note about set_config() not updating is_dynamic. 
PHPBB3-7262
 2013-02-24 13:39:48 +01:00
Andreas Fischer
a9037a68c1 [ticket/7262] Add $is_dynamic example to set_config() and set_config_count(). 
The logic is the other way around here in comparison to develop's
phpbb_config_db class, so add examples to make things more clear.

PHPBB3-7262
 2013-02-24 13:08:00 +01:00
Andreas Fischer
e8b3e8498d [ticket/7262] Backport set_config() and set_config_count() docs from develop. 
PHPBB3-7262
 2013-02-24 13:07:37 +01:00
Andreas Fischer
c69b1c2ef2 [ticket/11122] Move rxu to 'Former Contributors' section. 
PHPBB3-11122
 2013-02-24 12:43:31 +01:00
Andreas Fischer
c4f8c64a23 [ticket/11122] Add EXreaction to docs/AUTHORS. 
PHPBB3-11122
 2013-02-24 12:37:02 +01:00
Andreas Fischer
ae3a22bd0c [ticket/11361] Make sure that array passed to strtr() has the proper format. 
The array $date_cache[$format]['lang'] passed to strtr() contains a sub-array
which results in an E_NOTICE being thrown for 'Array to string conversion' on
PHP 5.4.
Ensure that the array passed to strtr() is one-dimensional by filtering out
non-string values.

PHPBB3-11361
 2013-02-23 11:06:48 +01:00
Andreas Fischer
42b211a4a1 Merge branch 'ticket/erangamapa/11196' into develop-olympus 
* ticket/erangamapa/11196:
  [ticket/11196] Changed 401 response message in session.php.
 2013-02-12 23:05:59 +01:00
erangamapa
8ec55b062d [ticket/11196] Changed 401 response message in session.php. 
In session.php 401 response message was "Not Authorized".
I changed it to "Unauthorized".

PHPBB3-11196
 2013-02-12 23:04:55 +01:00
Nathan Guse
5aec7600a6 [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID 
PHPBB3-10896
 2013-02-04 23:13:47 -06:00
David Tobin
293b65e3ef [ticket/10896] Adds email validation to email settings in ACP 
Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.

PHPBB3-10896
 2013-02-04 23:10:10 -06:00
Andreas Fischer
996f1abee3 Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympus 
* Crizz0/ticket/11220:
  [ticket/11220] Improvement to the info pop-up from "list="
 2013-02-03 14:51:39 +01:00
Crizz0
cf3edb2c6e [ticket/11220] Improvement to the info pop-up from "list=" 
A improvement to the info popup which is displayed when the cursor
is over the bbcode-button [list=] in the posting-editor

PHPBB3-11220
 2013-02-03 13:24:00 +01:00
Andreas Fischer
a0b141b673 Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympus 
* dhruvgoel92/ticket/11233:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
 2013-01-31 00:32:20 +01:00
Nathaniel Guse
5154c6960d Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympus 
# By Senky
# Via Senky
* remotes/Senky/ticket/10050:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition
 2013-01-30 16:51:50 -06:00
Dhruv
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient 
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
 2013-01-30 21:46:15 +05:30
Oleg Pudeyev
ba5d84ba1d Merge PR #1219 branch 'bantu/ticket/11343' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11343:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
 2013-01-27 17:45:55 -05:00
Andreas Fischer
5a146df07f [ticket/11343] Remove spare parentheses. 
PHPBB3-11343
 2013-01-25 19:52:02 +01:00
Andreas Fischer
8421aa0b0e [ticket/11343] Remove spare space. 
PHPBB3-11343
 2013-01-25 19:51:17 +01:00
Andreas Fischer
305b2b8f48 [ticket/11343] Use === when checking stored user_actkey against user input. 
Use strict comparison when checking whether stored user_actkey is equal to user
input.

PHPBB3-11343
 2013-01-25 19:49:02 +01:00
Senky
80283646e2 [ticket/10050] removing prosilver edits 
PHPBB3-10050
 2013-01-24 22:54:12 +01:00
Oleg Pudeyev
229d1092f8 Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11337:
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.
 2013-01-24 01:10:06 -05:00
Andreas Fischer
4b9c163969 [ticket/11337] Abort setup-webserver.sh script when an error occurs. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
9860cf6b16 [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. 
There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19,
which is what 5.3 is currently aliased to.

PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
ea1c8ee85a [ticket/11337] Silence nginx config file writing. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
d2f09a9e65 [ticket/11337] php-fpm.conf is no longer owned by root. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
dee1b38ebc [ticket/11337] Run functional tests on travis using nginx and php-fpm. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
9a0992f6a0 Merge remote-tracking branch 'p/ticket/11295' into develop-olympus 
* p/ticket/11295:
  [ticket/11295] Drop tables rather than database for postgres in test suite.
 2013-01-23 15:45:18 +01:00
Andreas Fischer
a83c766ebd Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympus 
* p/ticket/11323-olympus:
  [ticket/11323] Backport include_define test to olympus.
 2013-01-22 20:32:07 +01:00
Senky
317964174e [ticket/10050] adding .topicrow to template condition 
PHPBB3-10050
 2013-01-22 20:24:27 +01:00
Nathan Guse
e9a3f09074 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympus 
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
 2013-01-15 22:24:58 -06:00
Oleg Pudeyev
227f7f46df Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympus 
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11323:
  [ticket/11323] Add tests for inclusion of defined variables
 2013-01-13 20:11:31 -05:00
Marc Alexander
4c50a35b62 [ticket/11323] Add tests for inclusion of defined variables 
This adds 2 tests for the template engine. The test using
include_define_variable.html will test if a defined variable, which was
defined with another template variable, can be used to include a file.
The second test will do the same inside a loop using a loop variable.

PHPBB3-11323
 2013-01-14 01:14:29 +01:00
Oleg Pudeyev
90235754b3 [ticket/11323] Backport include_define test to olympus. 
PHPBB3-11323
 2013-01-13 18:28:51 -05:00
Oleg Pudeyev
0b0b5e15c3 Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11324:
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
 2013-01-13 18:14:39 -05:00
Andreas Fischer
4001410c8c [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. 
PHPBB3-11324
 2013-01-13 23:41:40 +01:00
Oleg Pudeyev
8b4e661904 Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11301:
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
 2013-01-09 01:25:44 -05:00
Andreas Fischer
41a07eedeb [ticket/11301] Guidelines: Add spaces in front and after the / operator. 
PHPBB3-11301
 2013-01-08 23:20:30 +01:00
Andreas Fischer
24befac7b4 [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. 
PHPBB3-11301
 2013-01-08 23:18:17 +01:00
Andreas Fischer
c8dd12e5f4 Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympus 
* gn36/ticket/11292:
  [ticket/11292] Fix: Newlines removed in display of PM reports
 2013-01-06 02:11:10 +01:00
Andreas Fischer
cbe91e5b50 Merge remote-tracking branch 'p/ticket/11293' into develop-olympus 
* p/ticket/11293:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
 2012-12-31 00:53:50 +01:00
Oleg Pudeyev
51138d3f3a Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11291:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
 2012-12-29 07:47:10 -05:00
Andreas Fischer
6951356a87 [ticket/11291] phing: Also add checkreturn="true" to composer execution. 
PHPBB3-11291
 2012-12-29 13:38:40 +01:00
Andreas Fischer
b36050983d [ticket/11291] phing: Add checkreturn="true" to all new commands. 
PHPBB3-11291
 2012-12-29 13:30:25 +01:00