makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-26 05:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
25443 commits 18 branches 192 tags 207 MiB
Commit graph

25443 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
9f9ce10f2f Merge pull request #3125 from lavigor/ticket/13318 
[ticket/13318] login_username needs to have the multibyte parameter set to true
 2014-11-13 01:02:49 +01:00
Marc Alexander
f0bdf02b32 Merge branch 'develop-ascraeus' into develop 2014-11-13 00:16:46 +01:00
Marc Alexander
2f54ab0a24 Merge pull request #3137 from prototech/ticket/13209 
[ticket/13209] Fix loss of CPF language field values when switching steps
 2014-11-13 00:14:54 +01:00
Joas Schilling
9406f1fe11 Merge branch 'develop-ascraeus' into develop 2014-11-12 23:04:23 +01:00
Joas Schilling
a520edb8fa Merge branch 'develop-olympus' into develop-ascraeus 2014-11-12 23:04:10 +01:00
Joas Schilling
12fd9a8827 Merge pull request #3143 from bantu/ticket/13331-ascraeus 
[ticket/13331] Use docs target for this branch, add docs-all for all branches
 2014-11-12 23:04:07 +01:00
Joas Schilling
b99fbd0be0 Merge pull request #3142 from bantu/ticket/13331 
[ticket/13331] Use docs target for this branch, add docs-all for all branches
 2014-11-12 22:55:30 +01:00
Andreas Fischer
968360fed6 [ticket/13331] Remove travis/sami.conf.php. Use build/sami-checkout.conf.php. 
PHPBB3-13331
 2014-11-12 21:45:03 +01:00
Andreas Fischer
0103478521 Merge pull request #3142 from bantu/ticket/13331 
[ticket/13331] Use docs target for this branch, add docs-all for all branches

* bantu/ticket/13331:
  [ticket/13331] Use docs target for this branch, add docs-all for dev branches.

Conflicts:
	build/build.xml
	build/sami-checkout.conf.php
 2014-11-12 21:43:56 +01:00
Andreas Fischer
b55d744e77 [ticket/13331] Use docs target for this branch, add docs-all for dev branches. 
PHPBB3-13331
 2014-11-12 21:40:26 +01:00
Andreas Fischer
1e4ff6105a [ticket/13325] Make installing composer dependencies in tests folder optional. 
Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19
here. Remove __init__ include. Composer classmap autoloading ensures classes
can be loaded.

PHPBB3-13325
 2014-11-12 20:34:36 +01:00
Andreas Fischer
8df63a4499 [ticket/13325] Remove whitespace at end of line. 
PHPBB3-13325
 2014-11-12 20:32:36 +01:00
Andreas Fischer
e1bf699ad4 [ticket/13325] Update / Fix composer.lock hash. 
PHPBB3-13325
 2014-11-12 20:31:41 +01:00
Tristan Darricau
526a97db7c [ticket/13280] Add new tests 
PHPBB3-13280
 2014-11-12 15:43:20 +01:00
Tristan Darricau
f142ed28e4 [ticket/13280] Make the tests failing 
PHPBB3-13280
 2014-11-12 15:43:12 +01:00
Tristan Darricau
6d533d2f86 [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280" 
This reverts commit a1b58d05d1, reversing
changes made to 0e772afb9d.

PHPBB3-13280
 2014-11-12 15:42:23 +01:00
Marc Alexander
1b439ee2b7 Merge branch 'develop-ascraeus' into develop 2014-11-12 13:05:04 +01:00
Marc Alexander
09ad1d529e Merge pull request #3139 from prototech/ticket/13239 
[ticket/13239] Ensure "Add files" button position is correctly calculated.
 2014-11-12 13:04:46 +01:00
Marc Alexander
63022f3c59 [ticket/13332] Fix auth provider tests 
PHPBB3-13332
 2014-11-12 11:42:08 +01:00
omniError
834a93f76c [ticket/13306] allow 0 error types 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-11 20:23:13 -06:00
omniError
efd4b43c1b [ticket/13306] constructor sets error types 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-11 20:20:52 -06:00
Cesar G
430c6aa32f [ticket/13239] Ensure "Add files" button position is correctly calculated. 
PHPBB3-13239
 2014-11-11 17:30:34 -08:00
Cesar G
d43f196fa6 [ticket/12642] Ensure CPF type specific options are set when editing booleans. 
prepare_hidden_fields is expected to return null if the option is not sent
in the request. The boolean method returns false instead, which results in
the options being set as false in hidden fields when accessing the first edit
step.

When checking the "Default value" option, there is also a failure to check
whether the "Field type" option is set to checkbox, thus resulting in this
option getting lost as well.

PHPBB3-12642
 2014-11-11 16:48:25 -08:00
Cesar G
ec220d6494 [ticket/13209] Gather language field values for boolean CPF's in all steps. 
The user can move back and forth between all three steps and as such the lang
field data should be expected in all steps.

PHPBB3-13209
 2014-11-11 16:32:04 -08:00
Cesar G
3108d0b060 [ticket/13209] Fix expected request value of CPF language fields. 
Multiple languages can be edited, thus the expected value is an array.

PHPBB3-13209
 2014-11-11 16:28:06 -08:00
Marc Alexander
91f7d53d8e [ticket/13332] Remove useless $result assignment 
PHPBB3-13332
 2014-11-11 19:02:20 +01:00
Marc Alexander
040fc6dd0f [ticket/13332] Pass user row to passwords manager check method 
PHPBB3-13332
 2014-11-11 19:02:01 +01:00
omniError
65f83b814c [ticket/13326] fix CS 
https://tracker.phpbb.com/browse/PHPBB3-13326

PHPBB3-13326
 2014-11-11 10:51:03 -06:00
omniError
b648d3eb4c [ticket/13328] fix CS 
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
 2014-11-11 10:47:39 -06:00
Tristan Darricau
9b4c284102 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
 2014-11-11 15:30:15 +01:00
Tristan Darricau
cd6085ebdc Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
 2014-11-11 15:29:58 +01:00
Tristan Darricau
6949f64d28 Merge pull request #3133 from bantu/ticket/13324 
[ticket/13324] Update sami/sami and fabpot/goutte for new zipball location

* bantu/ticket/13324:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
 2014-11-11 15:27:53 +01:00
Andreas Fischer
d266c7ae26 [develop] Update / Fix composer.lock hash. 2014-11-11 13:59:16 +01:00
Tristan Darricau
16de388437 Merge pull request #1880 from nicolas-grekas/develop 
[3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback

* nicolas-grekas/develop:
  [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback
  [feature/patchwork-utf8] Remove utf8_str_replace
  [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
 2014-11-11 13:07:54 +01:00
Andreas Fischer
9bd24e2efb [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. 
PHPBB3-13324
 2014-11-11 12:23:02 +01:00
Tristan Darricau
4535740aa2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13083] Fix language string NO_ENTRIES for logs
 2014-11-11 11:57:12 +01:00
Tristan Darricau
4dfd4e4cd3 Merge pull request #3112 from Elsensee/ticket/13083 
[ticket/13083] Fix language string NO_ENTRIES for logs

* Elsensee/ticket/13083:
  [ticket/13083] Fix language string NO_ENTRIES for logs
 2014-11-11 11:56:23 +01:00
omniError
71e0de5588 [ticket/13328] add core.mcp_view_forum_modify_sql 
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
 2014-11-10 22:57:54 -06:00
omniError
42b595e7e7 [ticket/13326] add viewtopic_url to event 
https://tracker.phpbb.com/browse/PHPBB3-13326

PHPBB3-13326
 2014-11-10 20:35:23 -06:00
omniError
a143a19b8b [ticket/13306] add error level to collector 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-10 18:05:18 -06:00
omniError
2d0917c56e [ticket/13323] empty auth option in posting.php 
https://tracker.phpbb.com/browse/PHPBB3-13323

PHPBB3-13323
 2014-11-10 17:23:23 -06:00
Matt Friedman
971b30a76d [ticket/13290] Add EVENT index_body_forumlist_body_after 
PHPBB3-13290
 2014-11-10 13:56:52 -08:00
lavigor
8171087cfb [ticket/13318] login_username needs to have the multibyte parameter set to true 
This is needed for usernames with UTF-8 characters.

PHPBB3-13318
 2014-11-10 20:12:10 +03:00
Marc Alexander
9bb302b92c [ticket/security-169] Stop loop through referer dir in top directory 
SECURITY-169
 2014-11-09 23:00:39 +01:00
Marc Alexander
697ae43b2e Merge branch 'develop-ascraeus' into develop 2014-11-09 20:01:42 +01:00
Marc Alexander
6a4cb42565 Merge pull request #3113 from prototech/ticket/13251 
[ticket/13251] Escape container parameters defined from config.php.
 2014-11-09 20:01:20 +01:00
Oliver Schramm
b6f0c789d5 [ticket/13310] Add event core.acp_email_modify_sql 
PHPBB3-13310
 2014-11-09 15:34:54 +01:00
rxu
483af1d036 [ticket/13297] Add unicode modifier to url/email regular expression patterns. 
PHPBB3-13297
 2014-11-09 20:59:14 +07:00
Joas Schilling
e29eece45f Merge branch 'develop-ascraeus' into develop 2014-11-09 14:50:15 +01:00
Joas Schilling
7ab774bc8d Merge pull request #3121 from Elsensee/ticket/13300 
[ticket/13300] Don't show jabber in profile if jabber is disabled
 2014-11-09 14:50:06 +01:00