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

30449 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
713fe496ce Merge branch '3.0.x' into 3.1.x 
* 3.0.x:

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2015-05-03 16:44:55 +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
Tristan Darricau
8596742579 Merge pull request #3535 from MateBartus/ticket/13762 
[ticket/13762] Moving language related functionality into a service
 2015-05-02 22:51:43 +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
Tristan Darricau
2f480be02d Merge pull request #3565 from MateBartus/ticket/13793 
[ticket/13793] Remove translation on throwing exceptions
 2015-05-02 13:21:21 +02:00
Tristan Darricau
e51571eaa3 Merge branch '3.1.x' 2015-05-02 11:54:50 +02:00
Tristan Darricau
af3cde98f4 Merge branch '3.0.x' into 3.1.x 2015-05-02 11:54:09 +02:00
Tristan Darricau
9c320ccdce Merge pull request #3575 from marc1706/ticket/13792 
[ticket/13792] Use hhvm instead of manually installing nightlys for now
 2015-05-02 11:45:05 +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
Marc Alexander
7f820ee962 [ticket/13792] Use hhvm instead of manually installing nightlys for now 
Nightly builds are currently not supported because packages for precise
no longer exist and travis is still running on it.

PHPBB3-13792
 2015-05-01 15:45:40 +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
JoshyPHP
66ad805127 [ticket/9073] Added regression test 
PHPBB3-9073
 2015-04-30 00:35:32 +02:00
JoshyPHP
abb4a2f6de [ticket/8419] Added regression test 
PHPBB3-8419
 2015-04-30 00:21:43 +02:00
JoshyPHP
71660301d6 [ticket/13425] Added regression test 
PHPBB3-13425
 2015-04-30 00:09:35 +02:00
JoshyPHP
c56726e9da [ticket/13641] Added regression test 
PHPBB3-13641
 2015-04-29 23:59:55 +02:00
JoshyPHP
2bbd78ec7d [ticket/10268] Added regression test 
PHPBB3-10268
 2015-04-29 23:01:19 +02: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
95add752b7 Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
 2015-04-28 22:17:44 +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
Andreas Fischer
c1702b8e19 Merge remote-tracking branch 'phpbb-security/ticket/security-180-asc' into prep-release-3.1.4 
* phpbb-security/ticket/security-180-asc:
  [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:11 +02:00
Matt Friedman
acaa10de52 [ticket/13516] Do not search ICC profiles in extension vendors 
PHPBB3-13516
 2015-04-28 13:12:48 -07: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
ae2707db13 Merge branch '3.1.x' 
* 3.1.x:
  [3.0.x] Increment version number to 3.0.15-dev.
 2015-04-28 21:48:51 +02:00
Andreas Fischer
98c9734db4 Merge branch '3.0.x' into 3.1.x 
* 3.0.x:
  [3.0.x] Increment version number to 3.0.15-dev.

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2015-04-28 21:48:42 +02:00