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

26820 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
2a217e38e2 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/prosilver/template/overall_header.html
 2015-09-15 14:37:35 +02:00
Marc Alexander
2bf9e91101 Merge pull request #3865 from Zoddo/ticket/13992 
[ticket/13992] Fix HTML5 error from w3.org validator
 2015-09-15 14:35:29 +02:00
Marc Alexander
a033cd7d5e Merge pull request #3879 from hanakin/ticket/14139 
[Ticket/14139] Stop styling with IDs
 2015-09-15 10:08:14 +02:00
Michael Miday
3606e130de [ticket/14139] Fix loading indicator 2015-09-14 16:26:27 +02:00
Michael Miday
9e5e2ee3e2 [ticket/14139] Swap ids for classes in css files 2015-09-14 16:26:07 +02:00
Michael Miday
70f1b08c69 [ticket/14139] Add class of IDs to html tags 2015-09-14 16:25:36 +02:00
Marc Alexander
fe0e9b2e4c Merge pull request #3837 from hanakin/ticket/14107 
[ticket/14107] Fix dropdown rtl states
 2015-09-14 14:42:53 +02:00
Marc Alexander
3303ce511f Merge pull request #3905 from Zoddo/ticket/14078 
[ticket/14078] Fix SQL error when editing a post with a quote
 2015-09-14 12:45:12 +02:00
Zoddo
e9013db9b9 [ticket/14078] Fix SQL error when editing a post with a quote 
PHPBB3-14078
 2015-09-13 22:13:02 +02:00
Marc Alexander
797e70380b Merge branch '3.1.x' 2015-09-13 17:51:08 +02:00
Marc Alexander
bc518bf96e Merge pull request #3894 from Nicofuma/ticket/14156 
[ticket/14156] Add Symfony ResponseListener
 2015-09-13 17:51:02 +02:00
Marc Alexander
3bde202a10 Merge pull request #3897 from Nicofuma/ticket/14158 
[ticket/14158] Add language::lang_array() to avoid using call_user_func_array
 2015-09-12 17:33:58 +02:00
Tristan Darricau
8aa8173ebf [ticket/14158] Fix 5.3 compatibility 
PHPBB3-14158
 2015-09-12 15:14:42 +02:00
Tristan Darricau
d332fe734c Merge pull request #3899 from marc1706/ticket/14089 
[ticket/14089] Remove subsilver2 file from events.md

* marc1706/ticket/14089:
  [ticket/14089] Remove subsilver2 file from events.md
 2015-09-12 15:09:57 +02:00
Marc Alexander
baf95d3ca2 [ticket/14089] Remove subsilver2 file from events.md 
PHPBB3-14089
 2015-09-12 14:33:23 +02:00
Marc Alexander
087a42a887 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2015-09-12 13:24:29 +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
Tristan Darricau
8629eac393 [ticket/14158] Add language::lang_array() to avoid using call_user_func_array 
PHPBB3-14158
 2015-09-12 11:15:06 +02:00
Tristan Darricau
7d15704f6a [ticket/14156] Add Symfony ResponseListener 
PHPBB3-14156
 2015-09-11 18:17:09 +02:00
Marc Alexander
8f6b50922f Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/prosilver/theme/common.css
	phpBB/styles/subsilver2/theme/stylesheet.css
 2015-09-11 09:39:17 +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
2c188f22d0 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/7362] Add alt attribute on topic icons
 2015-09-09 11:06:58 +02: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
542d75b3a9 Merge pull request #3870 from Zoddo/ticket/9485 
[ticket/9485] Add a "View post" link in the moderation logs

* Zoddo/ticket/9485:
  [ticket/9485] Fix tests
  [ticket/9485] Add post_id to relevant $phpbb_log->add()
  [ticket/9485] Add a "View post" link in the moderation logs
 2015-09-09 11:04:13 +02:00
Tristan Darricau
b83ce0a702 Merge pull request #3876 from VSEphpbb/ticket/14138 
[ticket/14138] Use span tags instead of abbr

* VSEphpbb/ticket/14138:
  [ticket/14138] Use span tags instead of abbr
 2015-09-09 11:02:22 +02:00
Tristan Darricau
23205ca0cc Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13423] Set busyTimeout on connect to prevent db locking
 2015-09-09 11:01:03 +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
Tristan Darricau
dccc0877c1 Merge pull request #3891 from marc1706/ticket/14150 
[ticket/14150] Update fast-image-size to newest version

* marc1706/ticket/14150:
  [ticket/14150] Update fast-image-size to newest version
 2015-09-09 00:16:22 +02:00
Marc Alexander
9d18b3d1ee Merge branch '3.1.x' 2015-09-08 13:35:04 +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
58286171f1 [ticket/14150] Update fast-image-size to newest version 
PHPBB3-14150
 2015-09-08 12:59:55 +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
3ddee852fa Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/functions_messenger.php
 2015-09-07 12:16:12 +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
Michael Miday
71def7cda6 [ticket/14107] Remove template var 2015-09-06 09:13:35 +02:00
Michael Miday
fd1195ed6a [ticket/14107] Fix typo 2015-09-06 09:13:35 +02:00
Michael Miday
39ca60023b [ticket/14107] Add back comment 2015-09-06 09:13:35 +02:00
Michael Miday
a21ed712bc [ticket/14107] Fix dropdown rtl states 2015-09-06 09:13:35 +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
c2a5108452 Merge pull request #3878 from Nicofuma/ticket/14140-master 
[ticket/14140] Update Symfony to latest 2.8-dev version  - #3877

* Nicofuma/ticket/14140-master:
  [ticket/14140] Update Symfony to latest 2.8-dev version
  [ticket/14140] Update SYmfony to 2.3.32
 2015-09-05 16:08:28 +02:00
Andreas Fischer
35bb32ff88 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14140] Update SYmfony to 2.3.32

Conflicts:
	phpBB/composer.lock
 2015-09-05 16:08:21 +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
fb3e9d9a77 Merge branch '3.1.x' 
Conflicts:
	build/build.xml
 2015-09-05 15:20:38 +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
615ed729b5 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14123] Fix typo
  [ticket/14123] Remove redundant help messages
  [ticket/14123] Add descriptive help to the CLI help output
 2015-09-02 12:45:34 +02:00