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

27061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
e5b2dc922f Merge pull request #3615 from rxu/ticket/13846 
[ticket/13846] Fix softdelete feature workflow in viewtopic
 2015-10-07 16:50:35 +02:00
Marc Alexander
3c448f889f Merge pull request #3871 from Zoddo/ticket/10165 
[ticket/10165] Add a "Send test email" feature
 2015-10-07 15:08:08 +02:00
Marc Alexander
da4d6dfa28 Merge pull request #3857 from Nicofuma/ticket/14124 
[ticket/14124] Automatically translate exceptions in CLI
 2015-10-07 14:47:23 +02:00
Marc Alexander
d7109fb130 Merge pull request #3947 from marc1706/ticket/14199 
[ticket/14199] Correctly resolve merge conflicts
 2015-10-07 14:41:30 +02:00
Marc Alexander
5e2ccb2dd7 [ticket/14199] Correctly resolve merge conflicts 
PHPBB3-14199
 2015-10-07 14:38:26 +02:00
Marc Alexander
ebb3169d56 Merge branch '3.1.x' 2015-10-07 14:18:50 +02:00
Marc Alexander
3fd1fa5492 Merge pull request #3716 from javiexin/ticket/13748 
[ticket/13748] Wrong tooltip after poll vote change
 2015-10-07 14:11:16 +02:00
Marc Alexander
64641f9b1f Merge pull request #3904 from Zoddo/ticket/14162 
[ticket/14162] Add CLI commands to manage migrations
 2015-10-07 14:03:02 +02:00
Marc Alexander
f68d5a59e6 Merge pull request #3927 from hanakin/ticket/14199 
[ticket/14199] Fix screen reader compatability

Conflicts:
	phpBB/styles/prosilver/template/mcp_topic.html
	phpBB/styles/prosilver/template/overall_header.html
	phpBB/styles/prosilver/template/pagination.html
	phpBB/styles/prosilver/template/posting_buttons.html
	phpBB/styles/prosilver/template/posting_topic_review.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/ucp_pm_history.html
	phpBB/styles/prosilver/template/ucp_pm_message_header.html
	phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/prosilver/template/viewtopic_topic_tools.html
 2015-10-07 12:05:38 +02:00
Marc Alexander
2695950a61 Merge pull request #3940 from hanakin/ticket/14206 
[Ticket/14206]Fix jumpbox UI consistency
 2015-10-07 11:52:08 +02:00
Marc Alexander
7bda33b525 Merge pull request #3932 from hanakin/ticket/14193 
[ticket/14193]Fix secondary buttons
 2015-10-07 11:48:56 +02:00
Tristan Darricau
617df4aa0e Merge pull request #3945 from marc1706/ticket/14216 
[ticket/14216] Do not run thumbnail test if gd is disabled

* marc1706/ticket/14216:
  [ticket/14216] Do not run thumbnail test if gd is disabled
 2015-10-04 22:28:13 +02:00
Marc Alexander
664119ec6b [ticket/14216] Do not run thumbnail test if gd is disabled 
PHPBB3-14216
 2015-10-04 21:15:46 +02:00
Marc Alexander
4437d0c794 Merge pull request #3939 from Nicofuma/ticket/14205 
[ticket/14205] Bump PHP requirement to PHP 5.4
 2015-10-04 20:27:43 +02:00
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4 
PHPBB3-14205
 2015-10-04 16:19:48 +02:00
Michael Miday
8907a66156 [ticket/14193]Minor cleanups 
PHPBB3-14193
 2015-10-03 05:16:08 +02:00
Michael Miday
6b7fa249f1 [ticket/14193]Fix posting buttons 
PHPBB3-14193
 2015-10-03 05:15:16 +02:00
Michael Miday
9da14c9b24 [ticket/14199]Add aria-hidden to all icons 
PHPBB3-14199
 2015-10-01 20:21:38 +02:00
Marc Alexander
8451272d69 Merge pull request #3933 from hanakin/ticket/14202 
[ticket/14202]Add missing sr-only classes
 2015-10-01 13:48:45 +02:00
Marc Alexander
c35c9a9d9c Merge pull request #3941 from hanakin/ticket/14195 
[ticket/14195]Fix pupload & polls hiding
 2015-10-01 11:42:54 +02:00
Michael Miday
f74743fb65 [ticket/14195]Revert hidden class 
PHPBB3-14195
 2015-09-28 22:06:43 +02:00
Michael Miday
0244be6d75 [ticket/14202]Remove blank line 
PHPBB3-14202
 2015-09-28 18:24:38 +02:00
Michael Miday
d50801a056 [ticket/14202]Add missing sr-only classes 
PHPBB3-14202
 2015-09-28 18:24:24 +02:00
Michael Miday
7806a2f1fd [ticket/14206]Fix button UI 
PHPBB3-14206
 2015-09-28 17:55:27 +02:00
Michael Miday
a19660ad4c [ticket/14206]Fix arrow placement 
PHPBB3-14206
 2015-09-28 17:54:26 +02:00
HB
66397ae0e4 [ticket/14181] Fix empty denial reason if the reason isn't translated 
PHPBB3-14181
 2015-09-27 17:23:49 +02:00
Zoddo
43d9657130 [ticket/13101] Remove MSN/WLM custom profile field from new installs 
PHPBB3-13101
 2015-09-27 12:55:57 +02:00
Andreas Fischer
a342517dfb Merge pull request #3919 from hanakin/ticket/12554 
[ticket/12554] Fix blockquote overflow in lists

* hanakin/ticket/12554:
  [ticket/12554]Remove left margin when li
  [ticket/12554]Overide blockquote overflow in lists
 2015-09-24 14:21:55 +02:00
Michael Miday
d477d79dc8 [ticket/12554]Remove left margin when li 2015-09-23 06:29:30 +02:00
Andreas Fischer
4972141a14 Merge pull request #3916 from Nicofuma/ticket/12633 
[ticket/12633] Doesn't use DEBUG to debug templates events

* Nicofuma/ticket/12633:
  [ticket/12633] Doesn't use DEBUG to debug templates events
 2015-09-22 19:29:07 +02:00
Andreas Fischer
7e379c4cea Merge pull request #3920 from marc1706/ticket/14186 
[ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()

* marc1706/ticket/14186:
  [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
 2015-09-22 19:14:34 +02:00
Andreas Fischer
85718e63f1 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
 2015-09-22 19:14:34 +02:00
Marc Alexander
d62b03e0de [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting() 
PHPBB3-14186
 2015-09-22 09:50:17 +02:00
Michael Miday
494c9047c7 [ticket/12554]Overide blockquote overflow in lists 2015-09-22 06:50:08 +02:00
Marc Alexander
692db1ad2b Merge pull request #3917 from Nicofuma/ticket/14182 
[ticket/14182] Move v310\notifications_board migration to v320\...
 2015-09-21 11:41:36 +02:00
Tristan Darricau
a7ba640ea7 [ticket/14182] Move v310\notifications_board migration to v320\... 
PHPBB3-14182
 2015-09-21 10:47:20 +02:00
Marc Alexander
db600d840d Merge pull request #3911 from Nicofuma/ticket/12577 
[ticket/12577] Lazy initialize the password manager
 2015-09-20 14:18:51 +02:00
Marc Alexander
20982df71e Merge pull request #3851 from hanakin/ticket/12769 
[ticket/12769] Font-Awesome Integration & Icon overhaul
 2015-09-20 14:16:01 +02:00
Tristan Darricau
26f6f6208b Merge pull request #3915 from marc1706/ticket/14180 
[ticket/14180] Use unix line endings in type_foo

* marc1706/ticket/14180:
  [ticket/14180] Use unix line endings in type_foo
 2015-09-20 12:47:49 +02:00
Zoddo
60099cf97c [ticket/14162] Add CLI command db:list 
This command lists all installed and uninstalled migrations.

Note: The class is named `list_command`, because `list` is a reserved word
and can't be used as class name in PHP.

PHPBB3-14162
 2015-09-20 12:29:33 +02:00
Zoddo
2596fba487 [ticket/14162] Add CLI command db:revert 
This command allow to revert a migration from the CLI

PHPBB3-14162
 2015-09-20 12:26:46 +02:00
Marc Alexander
7f3dfde163 [ticket/14180] Use unix line endings in type_foo 
PHPBB3-14180
 2015-09-20 10:05:23 +02:00
Marc Alexander
9df76ac987 Merge pull request #3914 from CHItA/ticket/14178 
[ticket/14178] Fix installer's database helper test
 2015-09-20 00:27:41 +02:00
Mate Bartus
635b5999b9 [ticket/14178] Fix installer's database helper test 
PHPBB3-14178
 2015-09-19 20:28:39 +02:00
Tristan Darricau
4c00474845 [ticket/12633] Doesn't use DEBUG to debug templates events 
Check the templates events on runtime only when Twig debug is on

PHPBB3-12633
 2015-09-18 21:23:34 +02:00
Tristan Darricau
f9f7f935b4 [ticket/12577] Docblock 
PHPBB3-12577
 2015-09-18 19:54:06 +02:00
Michael Miday
ff6d590b36 [ticket/12769] Fix font permissions 2015-09-17 18:57:33 +02:00
Michael Miday
f00a7e3acc [ticket/12769] Fix avatar spacing 2015-09-17 18:37:32 +02:00
Michael Miday
3eb63b921d [ticket/12769] Guess we should add the fonts 2015-09-17 18:37:32 +02:00
Michael Miday
aa5daba9f7 [ticket/12769] Fix spacing issue 2015-09-17 18:37:32 +02:00