makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 20:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
31453 commits 18 branches 192 tags 207 MiB
Commit graph

26695 commits

Author SHA1 Message Date
Joas Schilling
740be0507e [ticket/13807] Add version to the usage output 
PHPBB3-13807
 2015-05-05 18:35:57 +02:00
Nicofuma
51376a4391 [ticket/13638] Inject $filesystem in \phpbb\template\asset 
PHPBB3-13638
 2015-05-05 17:07:11 +02:00
Nicofuma
f097f84f16 [ticket/13638] Handle assets outside of phpbb_root_path 
PHPBB3-13638
 2015-05-04 23:23:40 +02:00
Nicofuma
3b631cb40d [ticket/13638] Prepend the assets path phpbb root 
PHPBB3-13638
 2015-05-04 23:23:18 +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
f821130c3a [ticket/12632] Add twig.debug and twig.auto_reload in config.yml 
PHPBB3-13206
PHPBB3-12632
 2015-05-04 14:43:58 +02:00
Tristan Darricau
6be8841a57 Merge pull request #3590 from rxu/ticket/13814 
[ticket/13814] Prevent phpbb_is_writable() method from truncating files
 2015-05-04 14:39:36 +02:00
rxu
0d2c8b5961 [ticket/13814] Prevent phpbb_is_writable() method from truncating files 
phpbb_is_writable() of filesystem class uses 'w' mode to fopen files
which causes checked files to be truncated. Use the 'c' mode instead.

PHPBB3-13814
 2015-05-04 16:53:27 +07:00
Tristan Darricau
1a42ec64c8 Merge pull request #3589 from marc1706/ticket/13782 
[ticket/13782] Rename classes that use reserved PHP7 keywords
 2015-05-04 11:16:33 +02:00
Tristan Darricau
98546a738b Merge branch '3.1.x' 2015-05-04 10:57:17 +02: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
Marc Alexander
232f71dae4 [ticket/13782] Rename null log to dummy for PHP7 compatibility 
PHPBB3-13782
 2015-05-04 10:11:28 +02:00
Marc Alexander
b3cc20a575 [ticket/13782] Rename null driver to dummy for PHP7 compatibility 
PHPBB3-13782
 2015-05-04 10:10:12 +02:00
Joas Schilling
36abb61d39 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
 2015-05-03 18:44:34 +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
9074738a10 Merge branch '3.1.x' 
* 3.1.x:
  [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.
 2015-05-03 16:45:10 +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
MateBartus
74dbaac039 [ticket/13800] Make router's extension manager dependency optional 
PHPBB3-13800
 2015-05-02 23:45:45 +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
MateBartus
9a99c9e4b1 [ticket/13762] Replace user service with lang in twig extension 
PHPBB3-13762
 2015-05-02 13:37:13 +02:00
MateBartus
9f1f6f96ce [ticket/13762] Optional DI injectable default language module array 
PHPBB3-13762
 2015-05-02 13:37:13 +02:00
MateBartus
179a470022 [ticket/13762] Moving language related functionality into a separate class 
PHPBB3-13762
 2015-05-02 13:37:12 +02:00
JoshyPHP
e5a167e6c2 [ticket/13805] Updated generate_text_for_storage() to match message_parser 
PHPBB3-13805
 2015-05-02 01:53:11 +02:00
MateBartus
57072a1e28 [ticket/13793] Remove translation on throwing exceptions 
PHPBB3-13793
 2015-05-01 12:40:53 +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
d67fdfa02b Merge branch '3.1.x' 2015-04-29 17:16:21 +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
39f1e8c009 Merge branch '3.1.x' 
* 3.1.x:
  [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:51 +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