mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 21:13:50 +01:00
Code Issues Releases Wiki Activity
26,937 Commits 17 Branches 190 Tags
Commit Graph

26937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Miday
5b112b974f [ticket/14038] Give links some visual love 2015-08-30 14:01:56 +02:00
Zoddo
af246483e2 [ticket/13950] Hide undefined categories 
This hides the categories added by disabled extensions

PHPBB3-13950
 2015-08-28 18:56:10 +02:00
Zoddo
11b2bffa8e [ticket/13950] Hide undefined permissions 
This hides the permissions of the disabled extensions

PHPBB3-13950
 2015-08-28 18:43:59 +02:00
Tristan Darricau
214c5c6d0b Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13988] Update tests
  [ticket/13988] Use absolute path for image attachments in feeds
 2015-08-28 17:34:50 +02:00
Tristan Darricau
bfbce5a1b0 Merge pull request #3764 from Zoddo/ticket/13988 
[ticket/13988] Use absolute path for image attachments in feeds

* Zoddo/ticket/13988:
  [ticket/13988] Update tests
  [ticket/13988] Use absolute path for image attachments in feeds
 2015-08-28 17:05:09 +02:00
Matt Friedman
76158e429b [ticket/14123] Fix typo 
PHPBB3-14123
 2015-08-28 07:54:50 -07:00
Matt Friedman
6c36f56b12 [ticket/14123] Remove redundant help messages 
PHPBB3-14123
 2015-08-28 07:49:07 -07:00
Tristan Darricau
c3ceafb37d Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
 2015-08-28 16:40:41 +02:00
Tristan Darricau
624f5ae921 Merge pull request #3835 from rxu/ticket/14106 
[ticket/14106] Fix topics sorting in MCP for topics merging.

* rxu/ticket/14106:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
 2015-08-28 16:40:33 +02:00
Tristan Darricau
74418f2300 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14058] Contact us form missing email subject field in subsilver2
 2015-08-28 16:30:04 +02:00
Tristan Darricau
6d7a5dfe5e Merge pull request #3802 from Oyabun1/ticket/14058 
[ticket/14058] Contact us form missing email subject field in subsilver2

* Oyabun1/ticket/14058:
  [ticket/14058] Contact us form missing email subject field in subsilver2
 2015-08-28 16:29:31 +02:00
Tristan Darricau
9e0a075be1 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14070] Properly pass whether config should be ignored for avatars
 2015-08-28 16:28:59 +02:00
Tristan Darricau
90d18356a0 Merge pull request #3809 from marc1706/ticket/14070 
[ticket/14070] Properly pass whether config should be ignored for avatars

* marc1706/ticket/14070:
  [ticket/14070] Properly pass whether config should be ignored for avatars
 2015-08-28 16:27:05 +02:00
Máté Bartus
e91e525e8a Merge pull request #3858 from Nicofuma/ticket/14125 
[ticket/14125] Add --env option to all CLI commands
 2015-08-28 12:00:46 +02:00
Máté Bartus
e8219e8610 Merge pull request #3470 from Nicofuma/ticket/13645 
[ticket/13645] Move the feeds to controllers
 2015-08-28 10:39:07 +02:00
Máté Bartus
6dc195e5a7 Merge pull request #3859 from Nicofuma/ticket/13897 
[ticket/13897] Make dependency to the filesystem optional in error handler
 2015-08-28 09:58:44 +02:00
Tristan Darricau
3babe02540 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol
 2015-08-27 23:09:11 +02:00
Tristan Darricau
eb2b3868bb Merge pull request #3862 from Zoddo/ticket/14127 
[ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol

* Zoddo/ticket/14127:
  [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol
 2015-08-27 23:09:01 +02:00
Tristan Darricau
7d41a9894a Merge pull request #3863 from VSEphpbb/ticket/14128 
[ticket/14128] Fix img bbcode regression, lost postimage class

* VSEphpbb/ticket/14128:
  [ticket/14128] Fix img bbcode regression, lost postimage class
 2015-08-27 22:55:37 +02:00
Matt Friedman
e19d446881 [ticket/14128] Fix img bbcode regression, lost postimage class 
PHPBB3-14128
 2015-08-26 14:08:59 -07:00
Tristan Darricau
de686a2e83 Merge pull request #3840 from hanakin/ticket/12719 
[ticket/12719] Convert to Normalize & SUITCSS

* hanakin/ticket/12719:
  [ticket/12719] normalize 3.0.3 and firefox 40 fx
  [ticket/12719] Remove old reset
  [ticket/12719] Fix hamburger menu icon
  [ticket/12719] Fix pagination
  [ticket/12719] Fix Buttons
  [ticket/12719] Add normalize & base
 2015-08-26 19:28:55 +02:00
Michael Miday
b8692e459c [ticket/12719] normalize 3.0.3 and firefox 40 fx 2015-08-26 17:39:14 +02:00
Marc Alexander
b96250b391 Merge pull request #3478 from n-aleha/ticket/12505 
[ticket/12505] Remove outdated media handling in attachments
 2015-08-26 15:27:07 +02:00
Michael Miday
69039054a0 [ticket/12719] Remove old reset 2015-08-26 06:44:04 +02:00
Tristan Darricau
6af8c579e0 [ticket/13897] Make dependency to the filesystem optional in error handler 
PHPBB3-13897
 2015-08-25 21:44:40 +02:00
Marc Alexander
5a51acd643 [ticket/14075] Update version to 3.1.7-RC1 
PHPBB3-14075
 2015-08-25 15:22:09 +02:00
Zoddo
2b01772fa9 [ticket/14127] Fix the BBCode FAQ about auto-linking w/o protocol 
This error was accidentally introduced in the patch
for PHPBB3-13967 (PR #3729)

PHPBB3-14127
 2015-08-25 12:43:18 +02:00
Kailey Truscott
d08c5edcca [ticket/14126] Add viewtopic_topic_title_after template event 
Add content directly after the topic title link on the View topic screen
(outside of the h2 HTML tag).

PHPBB3-14126
 2015-08-24 17:53:09 -04:00
Tristan Darricau
c868582e44 [ticket/14125] Add --env option to all CLI commands 
PHPBB3-14125
 2015-08-24 18:07:37 +02:00
Tristan Darricau
c9ec16f614 [ticket/13645] Fix docblocks 
PHPBB3-13645
 2015-08-24 03:24:26 +02:00
Matt Friedman
13851f308f [ticket/14123] Add descriptive help to the CLI help output 
PHPBB3-14123
 2015-08-23 15:14:08 -07:00
n-aleha
afccb9cb49 [ticket/12505] Fix variable usage in migration file 
PHPBB3-12505
 2015-08-24 00:40:38 +03:00
n-aleha
1f16704d34 [ticket/12505] Add migration 
PHPBB3-12505
 2015-08-24 00:40:38 +03:00
n-aleha
5cc6370cea [ticket/12505] Set deprecations for constants to 3.2 
PHPBB3-12505
 2015-08-24 00:40:38 +03:00
n-aleha
83f45bdac0 [ticket/12505] Remove outdated media extensions 
Update constants and data schema for new installations.
Mark outdated media constants as deprecated.

PHPBB3-12505
 2015-08-24 00:40:38 +03:00
n-aleha
c60b92bf61 [ticket/12505] Remove outdated media handling from acp 
Remove outdated media handling from acp

PHPBB3-12505
 2015-08-24 00:40:38 +03:00
n-aleha
436b020f9e [ticket/12505] Remove outdated media handling from prosilver 
PHPBB3-12505
 2015-08-24 00:40:26 +03:00
n-aleha
626dfbdd86 [ticket/12505] Remove outdated media handing in attachments 
Remove code for handling media in RealPlayer, QuickTime, and Windows Media
Player.

PHPBB3-12505
 2015-08-24 00:27:42 +03:00
Tristan Darricau
f6a4843c6d Merge pull request #3652 from Elsensee/ticket/12143 
[ticket/12143] Make it possible to use translated group names for non-special groups

* Elsensee/ticket/12143:
  [ticket/12143] Fix tests after rebase
  [ticket/12143] Avoid no output from get_group_name()
  [ticket/12143] Fix those tests
  [ticket/12143] Add some tests
  [ticket/12143] Oops, fixed array index
  [ticket/12143] Replace group name output
  [ticket/12143] Add group helper class to translate groupnames
  [ticket/12143] Add is_set method to language service
 2015-08-23 22:42:18 +02:00
Tristan Darricau
5df9a45473 [ticket/13645] Proper OOP for feeds 
PHPBB3-13645
 2015-08-23 22:36:10 +02:00
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers 
PHPBB3-13645
 2015-08-23 22:36:10 +02:00
Tristan Darricau
f56fe0ba8d Merge pull request #3842 from CHItA/ticket/14097 
[ticket/14097] Improve error and failure handling in the installer

* CHItA/ticket/14097:
  [ticket/14097] Remove auto refresh on install failure
  [ticket/14097] Improve error and failure handling in the installer
 2015-08-23 21:44:28 +02:00
Joas Schilling
05851e2b4b Merge branch '3.1.x' 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2015-08-23 18:27:30 +02:00
Joas Schilling
335452b1c1 [3.1.x] Update version to 3.1.7-dev 2015-08-23 18:24:12 +02:00
Joas Schilling
4be255ef9f Merge branch 'prep-release-3.1.6' into 3.1.x 2015-08-23 18:22:33 +02:00
Joas Schilling
5be06ec66a [prep-release-3.1.6] Add changelog for 3.1.6-RC1 release-3.1.6-RC1 2015-08-23 17:20:22 +02:00
Joas Schilling
623a8f2d0f [prep-release-3.1.6] Add migration for 3.1.6-RC1 2015-08-23 16:54:43 +02:00
Joas Schilling
819eca99a8 [prep-release-3.1.6] Update version to 3.1.6-RC1 2015-08-23 16:50:43 +02:00
Joas Schilling
eb53e51e36 Merge branch '3.1.x' 2015-08-23 16:33:11 +02:00
Joas Schilling
96fe2666f7 Merge pull request #3854 from Nicofuma/ticket/14099-master 
[ticket/14099] Update twig/twig to 1.20.0 - master version
 2015-08-23 16:33:04 +02:00