mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-26 10:32:51 +01:00
Code Issues Releases Wiki Activity
30,275 Commits 18 Branches 191 Tags
Commit Graph

30275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Darricau
40e4a6ea87
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13609] Add core.ucp_switch_permissions event
 2017-04-19 23:04:11 +02:00
Tristan Darricau
edf6aefd2a
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:02:03 +02:00
Tristan Darricau
c61e43cc91
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:01:35 +02:00
Tristan Darricau
a8d28d6bc8
Merge pull request #4657 from marc1706/ticket/7336 
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:00:37 +02:00
Tristan Darricau
f579e75be0
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15146] Date profile field validation incorrect
 2017-04-19 22:53:00 +02:00
Tristan Darricau
3661398a78
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15146] Date profile field validation incorrect
 2017-04-19 22:52:56 +02:00
Tristan Darricau
8ae7d2495c
Merge pull request #4763 from javiexin/ticket/15146 
[ticket/15146] Date profile field validation incorrect

* github.com:phpbb/phpbb:
  [ticket/15146] Date profile field validation incorrect
 2017-04-19 22:52:55 +02:00
Tristan Darricau
69b703f1ad
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/13735] Fix input type number for Firefox in prosilver
 2017-04-19 22:20:21 +02:00
Tristan Darricau
fc39aa8d71
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13735] Fix input type number for Firefox in prosilver
 2017-04-19 22:20:15 +02:00
Tristan Darricau
8d8886e7ba
Merge pull request #4798 from javiexin/ticket/13735 
[ticket/13735] Fix input type number for Firefox in prosilver

* github.com:phpbb/phpbb:
  [ticket/13735] Fix input type number for Firefox in prosilver
 2017-04-19 22:20:14 +02:00
hanakin
9f71c1baff [ticket/15109] Add icon to member profile 
PHPBB3-15109
 2017-04-19 15:26:31 -04:00
hanakin
4ffb033978 [ticket/15156] Add icon to pm profile 
PHPBB3-15156
 2017-04-19 14:51:47 -04:00
hanakin
c730702570 [ticket/15156] Add icon to post profile 
PHPBB3-15156
 2017-04-19 14:35:15 -04:00
hanakin
e34ad7c4a9 [ticket/15156] Set icon color 
PHPBB3-15156
 2017-04-19 14:32:25 -04:00
hanakin
e678880492 [ticket/15156] Remove online styles 
PHPBB3-15156
 2017-04-19 14:10:34 -04:00
Tristan Darricau
57b122cc16
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
 2017-04-19 17:08:28 +02:00
Tristan Darricau
7cc2f8aa43
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
 2017-04-19 17:08:16 +02:00
Tristan Darricau
d550f925ab
Merge pull request #4781 from nomind60s/ticket/15151 
[ticket/15151] ACP Cookie settings add explanatory text

* github.com:phpbb/phpbb:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
 2017-04-19 17:05:47 +02:00
nomind60s
d0486964ce [ticket/15151] Use redirected link for consistency 
Other phpbb.com links used in the core use a redirect rather than a direct link
so change to make the Cookie settings link a redirect also.

PHPBB3-15151
 2017-04-19 06:34:16 -06:00
Tristan Darricau
1e14328493
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15158] Update oauth to v0.8.10
 2017-04-18 23:54:27 +02:00
Tristan Darricau
7a4d6209fd
Merge pull request #4786 from vinny/ticket/15158 
[ticket/15158] Update oauth to v0.8.10

* github.com:phpbb/phpbb:
  [ticket/15158] Update oauth to v0.8.10
 2017-04-18 23:53:43 +02:00
Tristan Darricau
3a59ba17e5
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15173] Fix message area resizing lag
 2017-04-18 23:49:00 +02:00
Tristan Darricau
f2659962d3
Merge pull request #4792 from Louis7777/ticket/15173 
[ticket/15173] Fix message area resizing lag

* github.com:phpbb/phpbb:
  [ticket/15173] Fix message area resizing lag
 2017-04-18 23:45:25 +02:00
Tristan Darricau
446bfd9680
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15174] Split timeout message to extra method and set timeout to 60s
  [ticket/15174] Increase timeout for loading indicator
 2017-04-18 23:43:03 +02:00
Tristan Darricau
f4bc0020ca
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15174] Split timeout message to extra method and set timeout to 60s
  [ticket/15174] Increase timeout for loading indicator
 2017-04-18 23:42:28 +02:00
Tristan Darricau
67995e1e09
Merge pull request #4796 from marc1706/ticket/15174 
[ticket/15174] Increase timeout for loading indicator

* github.com:phpbb/phpbb:
  [ticket/15174] Split timeout message to extra method and set timeout to 60s
  [ticket/15174] Increase timeout for loading indicator
 2017-04-18 23:41:34 +02:00
Tristan Darricau
ea1222f3bb
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15163] Escape curly braces in smilies HTML attributes
 2017-04-18 23:37:01 +02:00
Tristan Darricau
e0ae49d8a5
Merge pull request #4788 from JoshyPHP/ticket/15163 
fixes #4788

* ticket/15163:
  [ticket/15163] Escape curly braces in smilies HTML attributes
 2017-04-18 23:36:04 +02:00
JoshyPHP
ddcd0f2437
[ticket/15163] Escape curly braces in smilies HTML attributes 
PHPBB3-15163
 2017-04-18 23:33:35 +02:00
Tristan Darricau
5566d03718
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15084] fix wrong order of breadcrumbs on module management
 2017-04-18 23:25:44 +02:00
Tristan Darricau
d4f0c79b56
Merge pull request #4692 from rubencm/ticket/15084 
[ticket/15084] Fix wrong order of breadcrumbs in module management

* github.com:phpbb/phpbb:
  [ticket/15084] fix wrong order of breadcrumbs on module management
 2017-04-18 23:25:20 +02:00
Tristan Darricau
d4df27b567
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15079] Parse message before inserting it into drafts table
 2017-04-18 23:20:05 +02:00
Tristan Darricau
bd220f233a
Merge pull request #4693 from marc1706/ticket/15079 
[ticket/15079] Parse message before inserting it into drafts table

* github.com:phpbb/phpbb:
  [ticket/15079] Parse message before inserting it into drafts table
 2017-04-18 23:19:54 +02:00
Tristan Darricau
451a7ce43c
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
 2017-04-18 23:15:10 +02:00
Tristan Darricau
4cbf619fd5
Merge pull request #4705 from nomind60s/ticket/15097 
[ticket/15097] Add PHP version to Board statistics

* github.com:phpbb/phpbb:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
 2017-04-18 23:14:56 +02:00
Tristan Darricau
19cbb8fa9d
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15108] Remove duplicate code in request->context
 2017-04-18 23:10:41 +02:00
Tristan Darricau
2b233452c7
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15108] Remove duplicate code in request->context
 2017-04-18 23:10:28 +02:00
Tristan Darricau
2d33b6adc6
Merge pull request #4718 from javiexin/ticket/15108 
[ticket/15108] Remove duplicate code in request->overwrite

* github.com:phpbb/phpbb:
  [ticket/15108] Remove duplicate code in request->context
 2017-04-18 23:10:13 +02:00
Tristan Darricau
a4d1c60b00
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15103] Update fast-image-size to 1.1.3
 2017-04-18 23:07:41 +02:00
Tristan Darricau
42fbf9d815
Merge pull request #4768 from marc1706/ticket/15103 
[ticket/15103] Update fast-image-size to 1.1.3

* github.com:phpbb/phpbb:
  [ticket/15103] Update fast-image-size to 1.1.3
 2017-04-18 23:07:25 +02:00
Tristan Darricau
5e12ca7929
Merge pull request #4773 from VSEphpbb/ticket/15154 
[ticket/15154] Load compatibility globals into the CLI installer

* github.com:phpbb/phpbb:
  [ticket/15154] Load compatibility globals into the CLI installer
 2017-04-18 23:05:52 +02:00
Marc Alexander
31e258c8c3
Merge branch '3.2.x' 2017-04-18 21:46:48 +02:00
Marc Alexander
623058b08c
Merge pull request #4800 from Nicofuma/ticket/15180 
[ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITION
 2017-04-18 21:46:44 +02:00
Marc Alexander
38b44ea5fc
Merge branch '3.2.x' 2017-04-18 20:38:46 +02:00
Marc Alexander
0dfe3da9bb
Merge branch 'ticket/15125' into 3.2.x 2017-04-18 20:38:22 +02:00
Rishabh04-02
72f7f6eff9
[ticket/15125] Remove the function play_qt_file in forum_fn.js 
PHPBB3-15125
 2017-04-18 20:38:02 +02:00
Marc Alexander
771be9310d
[ticket/8116] Correctly get other users who posted under IP 
PHPBB3-8116
 2017-04-18 19:33:05 +02:00
Tristan Darricau
e0d13da5f4
[ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITION 
PHPBB3-15180
 2017-04-17 23:06:25 +02:00
javiexin
3c8bdc8fb4 [ticket/13735] Fix input type number for Firefox in prosilver 
PHPBB3-13735
 2017-04-17 20:04:06 +02:00
Marc Alexander
a87727ba47
Merge branch '3.2.x' 2017-04-17 12:02:22 +02:00