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
23,665 Commits 17 Branches 190 Tags
Commit Graph

23665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing
changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb.

PHPBB3-13280
 2014-11-12 15:42:23 +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
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
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
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
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
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
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
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
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
Marc Alexander
f23634d580 [ticket/13197] Fix tabbing 
PHPBB3-13197
 2014-11-09 13:43:26 +01:00
Marc Alexander
8dd32c2bb5 [ticket/13197] Correctly format sql query 
PHPBB3-13197
 2014-11-09 13:07:38 +01:00
Marc Alexander
10b628a20a Merge pull request #3120 from Elsensee/ticket/13301 
[ticket/13301] Fix called function in apche auth module
 2014-11-09 10:42:30 +01:00
Marc Alexander
8e64652d80 Merge pull request #3119 from Elsensee/ticket/13243 
[ticket/13243] Validate announcement entry for existence in version_helper
 2014-11-09 10:38:48 +01:00
Oliver Schramm
98711450dd [ticket/13309] Add event acp_email_options_after 
PHPBB3-13309
 2014-11-09 02:31:20 +01:00
Oliver Schramm
ced316d88c [ticket/13300] Don't show jabber in profile if jabber is disabled 
PHPBB3-13300
 2014-11-09 02:22:39 +01:00
Oliver Schramm
c4628bd92a [ticket/13301] Fix called function in apche auth module 
PHPBB3-13301
 2014-11-09 01:37:28 +01:00
Oliver Schramm
3fba5e317a [ticket/13243] Validate announcement entry for existence in version_helper 
PHPBB3-13243
 2014-11-09 01:21:40 +01:00
Joas Schilling
101945acf9 Merge pull request #3110 from Elsensee/ticket/13242 
[ticket/13242] Fix HTML validity
 2014-11-09 00:39:19 +01:00
Cesar G
92c509bc48 Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeus 
* Elsensee/ticket/13265:
  [ticket/13265] Don't show link to edit own profile to those without permission
 2014-11-08 13:53:11 -08:00
rxu
70641e701a [ticket/13220] Add template events to memberlist_search.html 
PHPBB3-13220
 2014-11-08 21:22:59 +07:00
Tristan Darricau
9aa8f44489 [ticket/13133] Rename $ok variable 
PHPBB3-13133
 2014-11-07 15:57:31 +01:00
Tristan Darricau
778e0e06f3 Merge pull request #3118 from prototech/ticket/13270 
[ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.

* prototech/ticket/13270:
  [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
 2014-11-07 15:19:35 +01:00
Tristan Darricau
8956ec0bd4 Merge pull request #3117 from prototech/ticket/13303 
[ticket/13303] Speed up migration dependency calculation.

* prototech/ticket/13303:
  [ticket/13303] Speed up migration dependency calculation.
 2014-11-07 11:38:40 +01:00
Cesar G
757e1eac7a [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. 
PHPBB3-13270
 2014-11-07 02:31:11 -08:00
Cesar G
95140bb724 [ticket/13303] Speed up migration dependency calculation. 
PHPBB3-13303
 2014-11-07 02:30:44 -08:00
Cesar G
d60534d52c [ticket/13251] Escape container parameters defined from config.php. 
PHPBB3-13251
 2014-11-07 02:30:03 -08:00
Tristan Darricau
a1b58d05d1 Merge pull request #3107 from marc1706/ticket/13280 
[ticket/13280] Properly format the current page and add sanitizer to tests

* marc1706/ticket/13280:
  [ticket/13280] Remove unneeded str_replace in build_url()
  [ticket/13280] Only run sanitizer for server superglobal and modify tests
  [ticket/13280] Seperate server sanitizer call and add comment
  [ticket/13280] Add additional sanitizer for ampersands in server superglobal
  [ticket/13280] Correctly format user page for build_url()
  [ticket/13280] Properly format the current page and add sanitizer to tests
 2014-11-07 11:10:03 +01:00
Marc Alexander
f432193e07 [ticket/13280] Remove unneeded str_replace in build_url() 
PHPBB3-13280
 2014-11-06 13:45:09 +01:00