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
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
Cesar G
430c6aa32f
[ticket/13239] Ensure "Add files" button position is correctly calculated.
...
PHPBB3-13239
2014-11-11 17:30:34 -08: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
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
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
Marc Alexander
e603451b2f
Merge branch 'develop-ascraeus' into develop
2014-11-09 10:43:02 +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
b8636ab961
Merge branch 'develop-ascraeus' into develop
2014-11-09 10:39:17 +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
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
5b7178badf
Merge branch 'develop-ascraeus' into develop
2014-11-09 00:39:36 +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
c136b4e5fa
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13265] Don't show link to edit own profile to those without permission
2014-11-08 13:53:45 -08: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
Nicolas Grekas
d1a879a56c
[feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback
2014-11-08 11:41:58 +01:00
Nicolas Grekas
a2300eb3aa
[feature/patchwork-utf8] Remove utf8_str_replace
2014-11-08 11:41:55 +01:00
Nicolas Grekas
5a7caf6508
[feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
2014-11-08 11:36:13 +01:00
Tristan Darricau
1601b61ef9
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
2014-11-07 15:21:01 +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
b5ddd87c42
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13303] Speed up migration dependency calculation.
2014-11-07 11:40:40 +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
122c1c6e05
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[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:26 +01: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
Oliver Schramm
25a7c6e829
[ticket/13083] Fix language string NO_ENTRIES for logs
...
The string was misleading because there does not
always have to be a period when viewing log entries.
PHPBB3-13083
2014-11-05 21:16:04 +01:00
Oliver Schramm
307fa831d6
[ticket/13265] Don't show link to edit own profile to those without permission
...
PHPBB3-13265
2014-11-05 21:06:32 +01:00
Oliver Schramm
85031a66cc
[ticket/13242] Fix HTML validity
...
PHPBB3-13242
2014-11-05 20:59:38 +01:00
Marc Alexander
32881dbe31
[ticket/13280] Only run sanitizer for server superglobal and modify tests
...
PHPBB3-13280
2014-11-04 16:54:45 +01:00
