brunoais
9e06beb48d
[ticket/13668] BUMP version to 3.1.5-dev
...
PHPBB3-13668
2015-05-06 22:56:22 +01:00
brunoais
70cbe67105
[ticket/13664] BUMP version to 3.1.5-dev
...
PHPBB3-13664
2015-05-06 22:55:30 +01:00
brunoais
684a050916
[ticket/13661] BUMP version to 3.1.5-dev
...
PHPBB3-13661
2015-05-06 22:53:43 +01:00
brunoais
59a1f4e8ac
[ticket/13693] BUMP version to 3.1.5-dev
...
PHPBB3-13693
2015-05-06 22:50:52 +01:00
Marc Alexander
a8c033f655
Merge pull request #3521 from rxu/ticket/13745
...
[ticket/13745] Add viewtopic.php core event to allow manipulating poll data
2015-05-06 21:47:07 +02:00
Nicofuma
5e99c09abe
Merge pull request #3583 from nickvergessen/ticket/13807
...
Ticket/13807 Allow building changesets for the event list
2015-05-06 01:13:33 +02:00
Marc Alexander
de90dd25b2
[ticket/13819] Add missing sql_freeresult() to files in includes/
...
PHPBB3-13819
2015-05-05 23:55:13 +02:00
Richard McGirr
c2b4636008
[ticket/13699] Add event before and after forum title in viewforum
...
PHPBB3-13699
2015-05-05 13:37:46 -04:00
Joas Schilling
740be0507e
[ticket/13807] Add version to the usage output
...
PHPBB3-13807
2015-05-05 18:35:57 +02:00
javiexin
6e0d12094a
[ticket/13795] Modify core event in posting to include poll data
...
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
Also include the poll variable in the parameter list for event
core.posting_modify_submission_errors, as it was missing, and any
modification here on post_data for poll related data is silently
ignored.
PHPBB3-13795
2015-05-04 20:34:54 +02:00
Matt Friedman
c7a0b4479d
[ticket/13771] Only handle valid JQHXR response objects
...
PHPBB3-13771
2015-05-04 10:27:11 -07:00
Tristan Darricau
0e7448e2b3
Merge pull request #3562 from VSEphpbb/ticket/11521
...
[ticket/11521] Add missing lang strings for migration exceptions
2015-05-04 10:56:41 +02:00
Joas Schilling
f42a737419
Merge branch 'prep-release-3.1.4' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-05-03 18:44:01 +02:00
Joas Schilling
005c27e73d
[prep-release-3.1.4] Add security issue to changelog
2015-05-03 17:14:55 +02:00
Joas Schilling
429b99922e
[prep-release-3.1.4] Add migration
2015-05-03 17:12:12 +02:00
Joas Schilling
199d823f7a
[prep-release-3.1.4] Update version to 3.1.4
2015-05-03 17:07:35 +02:00
Andreas Fischer
cfeb2bec80
Merge branch 'prep-release-3.1.4' into 3.1.x
...
* prep-release-3.1.4:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
2015-05-03 16:43:32 +02:00
Andreas Fischer
52aafb4dea
Merge branch 'prep-release-3.0.14' into 3.0.x
...
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:41:58 +02:00
Andreas Fischer
dde72c58b0
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* prep-release-3.0.14:
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2015-05-03 16:39:51 +02:00
Andreas Fischer
11242dd07d
[prep-release-3.0.14] Add security relevant changes to CHANGELOG.html.
2015-05-03 16:22:28 +02:00
Andreas Fischer
5382552fc8
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
2015-05-03 14:40:50 +02:00
Joas Schilling
45baaf6022
[ticket/13807] Only output the header for diff
...
PHPBB3-13807
2015-05-02 17:29:55 +02:00
Joas Schilling
34141b576e
[ticket/13807] Fix minor coding flaws
...
PHPBB3-13807
2015-05-02 16:55:35 +02:00
Joas Schilling
2226043325
[ticket/13807] Fix "changed version" to match our version numbering
...
PHPBB3-13807
2015-05-02 14:41:59 +02:00
Joas Schilling
96d97ae2d2
[ticket/13807] Add an option to generate a diff for the release highlights
...
PHPBB3-13807
2015-05-02 14:41:59 +02:00
Joas Schilling
bdad879508
[ticket/13807] Allow filtering template events
...
PHPBB3-13807
2015-05-02 14:35:26 +02:00
Joas Schilling
e0180991bf
[ticket/13807] Allow filtering events by phpBB version
...
PHPBB3-13807
2015-05-02 14:35:18 +02:00
rxu
aef5be3d17
[ticket/13791] Add more post buttons template events to viewtopic_body.html
...
The purpose is to allow adding custom post buttons outside of original post
buttons conditionals/list in prosilver (for subsilver2 it's not the issue).
PHPBB3-13791
2015-05-01 10:59:18 +07:00
javiexin
34602037dc
[ticket/13795] Modify core event in posting to include poll data
...
Modified the core.posting_modify_template_vars event in posting.php
to extend the content of the page_data array to include poll data.
That required moving the event and merging the new set of template vars.
PHPBB3-13795
2015-04-29 20:15:20 +02:00
Joas Schilling
9cd0295dd8
Merge branch 'prep-release-3.1.4' into 3.1.x
...
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2015-04-29 17:15:56 +02:00
Marc Alexander
818df0ec68
[ticket/12542] Use extended CSS for all browsers
...
PHPBB3-12542
2015-04-29 12:30:35 +02:00
Marc Alexander
c018b3bbc7
[ticket/12542] Rename javascript method and add doc block
...
PHPBB3-12542
2015-04-29 12:24:12 +02:00
Joas Schilling
1ad09d9c8b
[prep-release-3.1.4] Increase version number to 3.1.4-RC2
2015-04-29 09:59:40 +02:00
Marc Alexander
ae8129b699
[ticket/12542] Add different outline colors for body & textarea
...
PHPBB3-12542
2015-04-29 00:12:55 +02:00
Andreas Fischer
aa0c55ed8f
Merge branch 'prep-release-3.1.4' into 3.1.x
...
* prep-release-3.1.4:
[ticket/security-180] Use language variable for redirect error in 3.1+
[ticket/security-180] Merge if statement with previous one in 3.1.x
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:37 +02:00
Marc Alexander
d7c96cc60c
[ticket/security-180] Use language variable for redirect error in 3.1+
...
SECURITY-180
2015-04-28 22:12:04 +02:00
Marc Alexander
416728fc17
Merge branch 'ticket/security-180' into ticket/security-180-asc
...
Conflicts:
tests/security/redirect_test.php
2015-04-28 22:12:03 +02:00
Marc Alexander
ec207d0a71
[ticket/security-180] Merge if statement with previous one in 3.1.x
...
SECURITY-180
2015-04-28 22:08:19 +02:00
Marc Alexander
89723b17d9
Merge branch 'ticket/security-180' into ticket/security-180-asc
...
Conflicts:
tests/security/redirect_test.php
2015-04-28 22:08:15 +02:00
Andreas Fischer
2fb7ef2668
Merge branch 'prep-release-3.0.14' into 3.0.x
...
* prep-release-3.0.14:
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL
2015-04-28 21:55:15 +02:00
Andreas Fischer
1a3350619f
Merge remote-tracking branch 'phpbb-security/ticket/security-180' into prep-release-3.0.14
...
* phpbb-security/ticket/security-180:
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL
2015-04-28 21:54:50 +02:00
Andreas Fischer
62abead26d
Merge branch 'prep-release-3.1.4' into 3.1.x
...
* prep-release-3.1.4:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-28 21:42:39 +02:00
Andreas Fischer
969718fc91
Merge branch 'prep-release-3.0.14' into prep-release-3.1.4
...
* prep-release-3.0.14:
[3.0.x] Add changelog for 3.0.14 release.
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
2015-04-28 21:40:23 +02:00
Andreas Fischer
6d8df7332c
[3.0.x] Increment version number to 3.0.15-dev.
2015-04-28 20:40:20 +02:00
Andreas Fischer
d833f29069
[3.0.x] Add changelog for 3.0.14 release.
2015-04-28 18:57:03 +02:00
Marc Alexander
46a789de5c
[ticket/12542] Add initial drag-n-drop animation
...
PHPBB3-12542
2015-04-28 16:12:58 +02:00
Matt Friedman
c818873d48
[ticket/11521] Add missing lang strings for migration exceptions
...
PHPBB3-11521
2015-04-28 00:02:42 -07:00
Andreas Fischer
ce74a0bd6c
[3.0.x] Bump version numbers for 3.0.14-RC1 release.
2015-04-27 23:22:44 +02:00
Andreas Fischer
cd6c0427fb
[3.0.x] Bumping version numbers to final for 3.0.14 releases.
2015-04-27 23:13:56 +02:00
Andreas Fischer
0bc352ea7e
Merge pull request #3557 from VSEphpbb/ticket/13778
...
[ticket/13778] Update wording of the reCaptcha instructions
* VSEphpbb/ticket/13778:
[ticket/13778] Update wording of the reCaptcha instructions
2015-04-27 22:56:35 +02:00
