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

24879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zoddo
2f4fcee7e8 [ticket/14159] Hide version info on ACP if we don't have the permission 
This also hide a link to an unreachable module (Check phpBB version).

We could have simply remove the link to the module, but if the user hasn't
the permission to access to the phpBB version check module, I think that
he shouldn't view any version information about phpBB.

PHPBB3-14159
 2015-09-12 17:11:20 +02:00
Marc Alexander
c166adf3c7 Merge pull request #3767 from Zoddo/ticket/14020 
[ticket/14089] Add posting_topic_title_after template event

Conflicts:
	phpBB/docs/events.md
 2015-09-12 13:23:47 +02:00
Marc Alexander
46f6b4459a Merge pull request #3892 from cyberalien/ticket/14153 
[ticket/14153] Fix floating elements in notifications dropdown header
 2015-09-11 09:35:24 +02:00
cyberalien
0744330080 [ticket/14153] Fix floating elements in notifications dropdown header 
PHPBB3-14153
 2015-09-10 12:03:02 +03:00
Tristan Darricau
c9d159257a Merge pull request #3868 from Zoddo/ticket/7362 
[ticket/7362] Add alt attribute on topic icons

* Zoddo/ticket/7362:
  [ticket/7362] Add alt attribute on topic icons
 2015-09-09 11:06:36 +02:00
Tristan Darricau
1affd34814 Merge pull request #3890 from marc1706/ticket/13423 
[ticket/13423] Set busyTimeout on connect to prevent db locking

* marc1706/ticket/13423:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
 2015-09-09 11:00:44 +02:00
Marc Alexander
90d5eefccf Merge pull request #3881 from VSEphpbb/ticket/14142 
[ticket/14142] Remove unused ignore_configs from avatar drivers
 2015-09-08 13:34:58 +02:00
Marc Alexander
ea594d00f7 [ticket/13423] Set busyTimeout on connect to prevent db locking 
PHPBB3-13423
 2015-09-07 12:23:49 +02:00
Marc Alexander
9537ec56eb Merge pull request #3884 from Nicofuma/ticket/14143 
[ticket/14143] Flush the mail queue when writing it
 2015-09-07 12:15:24 +02:00
Tristan Darricau
0e93efd7cb [ticket/14143] Flush the mail queue when writing it 
PHPBB3-14143
 2015-09-05 17:53:29 +02:00
Andreas Fischer
8cab2374f9 Merge pull request #3877 from Nicofuma/ticket/14140 
[ticket/14140] Update Symfony to 2.3.32

* Nicofuma/ticket/14140:
  [ticket/14140] Update SYmfony to 2.3.32
 2015-09-05 16:08:13 +02:00
Joas Schilling
f201c22ca7 Merge branch 'prep-release-3.1.6' into 3.1.x 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
 2015-09-05 15:19:16 +02:00
Joas Schilling
5258fba2e0 [prep-release-3.1.6] Add migration for 3.1.6 2015-09-05 12:45:53 +02:00
Joas Schilling
82a45cd4da [prep-release-3.1.6] Update version for final 3.1.6 release 2015-09-05 12:45:00 +02:00
Matt Friedman
076807c63a [ticket/14142] Remove unused ignore_configs from avatar drivers 
PHPBB3-14142
 2015-09-04 13:38:14 -07:00
Tristan Darricau
7701034871 [ticket/14140] Update SYmfony to 2.3.32 
PHPBB3-14140
 2015-09-03 14:57:05 +02:00
Tristan Darricau
5faa12db4c Merge pull request #3855 from VSEphpbb/ticket/14123 
[ticket/14123] Add descriptive help to the CLI help output

* VSEphpbb/ticket/14123:
  [ticket/14123] Fix typo
  [ticket/14123] Remove redundant help messages
  [ticket/14123] Add descriptive help to the CLI help output
 2015-09-02 12:44:52 +02:00
Tristan Darricau
58af8606c1 Merge pull request #3853 from marc1706/ticket/14075 
[ticket/14075] Add template event after poll preview panel

* marc1706/ticket/14075:
  [ticket/14075] Update version to 3.1.7-RC1
  [ticket/14075] Add template event after poll preview panel
 2015-09-02 12:03:58 +02:00
Tristan Darricau
48d05bad25 Merge pull request #3860 from kinerity/ticket/14126 
[ticket/14126] Add viewtopic_topic_title_after template event

* kinerity/ticket/14126:
  [ticket/14126] Add viewtopic_topic_title_after template event
 2015-09-02 11:59:14 +02:00
Tristan Darricau
2ee8b14f86 Merge pull request #3872 from Zoddo/ticket/11468 
[ticket/11468] Allow controllers to set paramters of page_header()

* Zoddo/ticket/11468:
  [ticket/11468] Allow controllers to set paramters of page_header()
 2015-09-02 11:50:35 +02:00
Tristan Darricau
8749c99e34 Merge pull request #3765 from Zoddo/ticket/13950 
[ticket/13950] Hide undefined permissions

* Zoddo/ticket/13950:
  [ticket/13950] Hide undefined categories
  [ticket/13950] Hide undefined permissions
 2015-09-01 21:47:05 +02:00
Tristan Darricau
4979d98aa9 Merge pull request #3873 from lavigor/ticket/14133 
[ticket/14133] Comment fix for phpbb_get_user_rank()

* lavigor/ticket/14133:
  [ticket/14133] Comment fix for phpbb_get_user_rank()
 2015-09-01 18:46:56 +02:00
lavigor
3fe517f50c [ticket/14133] Comment fix for phpbb_get_user_rank() 
PHPBB3-14133
 2015-08-31 21:49:22 +03:00
Zoddo
cc060a2611 [ticket/11468] Allow controllers to set paramters of page_header() 
PHPBB3-11468
 2015-08-30 23:24:07 +02:00
Zoddo
a606b1c480 [ticket/7362] Add alt attribute on topic icons 
PHPBB3-7362
 2015-08-30 14:37:28 +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
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
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
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
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
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
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
Matt Friedman
13851f308f [ticket/14123] Add descriptive help to the CLI help output 
PHPBB3-14123
 2015-08-23 15:14:08 -07: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 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
a7272fec97 Merge pull request #3829 from Nicofuma/ticket/14099 
[ticket/14099] Update Twig to 1.20.0
 2015-08-23 16:30:26 +02:00
Zoddo
0caaf86158 [ticket/14089] Add posting_topic_title_after template event 
Allows to add some information after the topic title in the posting form

PHPBB3-14089
 2015-08-23 14:12:44 +02:00
Marc Alexander
f585f48aca Merge pull request #3823 from lavigor/ticket/14087 
[ticket/14087] Add an event to ucp_activate.php.
 2015-08-22 10:40:33 +02:00
Marc Alexander
d8dd6bad6b Merge pull request #3834 from brunoais/ticket/14104 
[ticket/14104] Fix missing  variables from previous commit
 2015-08-22 10:37:48 +02:00
Marc Alexander
f2a0fe39a5 Merge pull request #3831 from rxu/ticket/14101 
[ticket/14101] Add core event to the download/file.php
 2015-08-22 10:36:09 +02:00
Marc Alexander
b09e1ad26d Merge pull request #3852 from marc1706/ticket/14068 
[ticket/14068] Add template events before and after poll panel in viewtopic
 2015-08-22 10:32:09 +02:00
Marc Alexander
583068da9d Merge pull request #3771 from Zoddo/ticket/14025 
[ticket/14091] Add mcp_topic_subject_* template events

Conflicts:
	phpBB/docs/events.md
 2015-08-22 09:08:11 +02:00