Commit graph

23175 commits

Author SHA1 Message Date
n-aleha
9133b913ec [ticket/12557] Fix post data description for notifications
PHPBB3-12557
2014-08-07 13:03:11 +03:00
Joas Schilling
57f9a96f4b Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12836] Add event core.functions.redirect
2014-08-07 11:47:44 +02:00
Joas Schilling
a8cb525f77 Merge pull request #2717 from Nicofuma/ticket/12836
[ticket/12836] Add event core.functions.redirect

* Nicofuma/ticket/12836:
  [ticket/12836] Add event core.functions.redirect
2014-08-07 11:47:37 +02:00
n-aleha
9d285bdcf5 [ticket/12557] Fix pass by reference doc blocks
PHPBB3-12557
2014-08-07 11:39:04 +03:00
Marc Alexander
3e52126446 Merge branch 'develop-ascraeus' into develop 2014-08-06 23:42:35 +02:00
Marc Alexander
decc896bf5 Merge pull request #2799 from nickvergessen/ticket/12901
Ticket/12901 Wrong type hint in show_available_child_styles() doc block
2014-08-06 23:42:04 +02:00
Marc Alexander
e49de53115 Merge branch 'develop-ascraeus' into develop 2014-08-06 23:38:28 +02:00
Marc Alexander
964bf0b9f5 Merge pull request #2807 from nickvergessen/ticket/12875
[ticket/12875] Find language files in the default and english language
2014-08-06 23:37:55 +02:00
Joas Schilling
cadf4dd56a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12912] Undefined index when adding logs from extensions
2014-08-06 23:36:11 +02:00
Joas Schilling
ca11018760 Merge pull request #2798 from tmbackoff/ticket/12912
[ticket/12912] Undefined index when adding logs from extensions

* tmbackoff/ticket/12912:
  [ticket/12912] Undefined index when adding logs from extensions
2014-08-06 23:35:59 +02:00
Joas Schilling
61bc6c4c67 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12910] Set get_name for Google+ fields
2014-08-06 23:28:10 +02:00
Joas Schilling
0328bc38a4 Merge pull request #2795 from Dragooon/ticket/12910
[ticket/12910] Set get_name for Google+ fields

* Dragooon/ticket/12910:
  [ticket/12910] Set get_name for Google+ fields
2014-08-06 23:27:44 +02:00
Joas Schilling
ae4069acbd Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12913] Add more parameters to core.submit_post_end event
2014-08-06 23:15:39 +02:00
Joas Schilling
243ca3ae82 Merge pull request #2806 from rxu/ticket/12913
[ticket/12913] Add more parameters to core.submit_post_end event

* rxu/ticket/12913:
  [ticket/12913] Add more parameters to core.submit_post_end event
2014-08-06 23:14:06 +02:00
Joas Schilling
591d04157e [ticket/12875] Find language files in the default and english language ...
... when looking for info_xcp_ files.

PHPBB3-12875
2014-08-06 23:04:33 +02:00
n-aleha
e6d6977750 [ticket/12557] Fix doc block in extension base class
PHPBB3-12557
2014-08-06 15:34:42 +03:00
rxu
a9c3c4056c [ticket/12913] Add more parameters to core.submit_post_end event
As @event core.modify_submit_post_data can modify any of the
function submit_post parameters, they may be needed to perform
actions directly after a post or topic has been submitted in
@event core.submit_post_end (includes/functions_posting.php).

PHPBB3-12913
2014-08-06 15:48:26 +08:00
Tristan Darricau
f3f54922be [ticket/12836] Add event core.functions.redirect
PHPBB3-12836
2014-08-04 10:19:32 +02:00
Joas Schilling
7755f5354f [ticket/12901] Fix another wrong type hint for $level
PHPBB3-12901
2014-08-03 22:42:17 +02:00
jeroendedauw
1d923260a6 [ticket/12901] Fix type hinting of style $level
PHPBB3-12901
2014-08-03 22:42:16 +02:00
Andreas Fischer
0c4760bf6d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12906] Add rel="help" to FAQ link
2014-08-03 19:51:24 +02:00
Andreas Fischer
eb872c36d8 Merge pull request #2796 from bantu/ticket/12906
[ticket/12906] Add rel="help" to FAQ link

* bantu/ticket/12906:
  [ticket/12906] Add rel="help" to FAQ link
2014-08-03 19:51:23 +02:00
Shitiz Garg
79cccebc6e [ticket/12910] Set get_name for Google+ fields
PHPBB3-12910
2014-08-03 23:20:53 +05:30
Tabitha Backoff
d5db09e888 [ticket/12912] Undefined index when adding logs from extensions
Add isset() to forum_id and topic_id.

PHPBB3-12912
2014-08-03 13:28:14 -04:00
Louis7777
89fc664227 [ticket/12906] Add rel="help" to FAQ link
PHPBB3-12906
2014-08-03 18:00:25 +02:00
Andreas Fischer
05e54d1ebb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12909] Use correct lang vars in cli extension enable
2014-08-03 17:52:24 +02:00
Andreas Fischer
7beef6e142 Merge pull request #2793 from n-aleha/ticket/12909
[ticket/12909] Use correct lang vars in cli extension enable

* n-aleha/ticket/12909:
  [ticket/12909] Use correct lang vars in cli extension enable
2014-08-03 17:52:24 +02:00
Andreas Fischer
a70f4e173c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12908] Fix operator typo in increment.php
2014-08-03 17:52:00 +02:00
Andreas Fischer
b20c6936bc Merge pull request #2792 from n-aleha/ticket/12908
[ticket/12908] Fix operator typo in increment.php

* n-aleha/ticket/12908:
  [ticket/12908] Fix operator typo in increment.php
2014-08-03 17:52:00 +02:00
n-aleha
752363b435 [ticket/12909] Use correct lang vars in cli extension enable
PHPBB3-12909
2014-08-03 09:53:18 +03:00
n-aleha
cf93b7e367 [ticket/12908] Fix operator typo in increment.php
PHPBB3-12908
2014-08-03 08:34:25 +03:00
n-aleha
2cc20fb977 [ticket/12557] Fix doc block in mimetype guesser
PHPBB3-12557
2014-08-03 07:13:21 +03:00
n-aleha
6d7689f581 [ticket/12557] Fix var $preserve_cr description
PHPBB3-12557
2014-08-03 07:13:21 +03:00
n-aleha
95ec9590df [ticket/12557] Fix doc block errors found by Sami
PHPBB3-12557
2014-08-03 07:13:20 +03:00
n-aleha
6ac8d17af6 [ticket/12557] Fix doc block errors found by Sami
More corrections.

PHPBB3-12557
2014-08-03 07:13:20 +03:00
n-aleha
c355b60c62 [ticket/12557] Fix doc block errors found by Sami
More corrections.

PHPBB3-12557
2014-08-03 07:13:20 +03:00
n-aleha
dfcbace621 [ticket/12557] Template fixes
PHPBB3-12557
2014-08-03 07:12:34 +03:00
n-aleha
8f2395857e [ticket/12557] Search, cron and profilefields fixes
PHPBB3-12557
2014-08-03 07:06:29 +03:00
n-aleha
f34bc924a6 [ticket/12557] Notification fixes
PHPBB3-12557
2014-08-03 07:03:08 +03:00
n-aleha
ffcf45abf3 [ticket/12557] Fix doc block errors found by Sami pt1
PHPBB3-12557
2014-08-03 07:03:08 +03:00
n-aleha
8ac8c9ec61 [ticket/12557] Fix doc block errors found by Sami
More corrections.

PHPBB3-12557
2014-08-03 06:57:05 +03:00
n-aleha
19b9df7e63 [ticket/12557] Fix doc block errors found by Sami
PHPBB3-12557
2014-08-03 06:57:05 +03:00
Joas Schilling
dd86615c63 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12895] Rename user style setting to resolve conflict with style param
2014-08-02 13:56:30 +02:00
Joas Schilling
c991b1d587 Merge pull request #2782 from marc1706/ticket/12895
[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
2014-08-02 13:56:16 +02:00
Joas Schilling
e0f5a37d81 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12902] Remove duplicate entry in switch statement
2014-08-02 13:46:22 +02:00
Joas Schilling
66f859d109 Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeus
* ticket/JeroenDeDauw/12902:
  [ticket/12902] Remove duplicate entry in switch statement
2014-08-02 13:46:13 +02:00
jeroendedauw
626234aece [ticket/12902] Remove duplicate entry in switch statement
PHPBB3-12902
2014-08-02 13:44:51 +02:00
Marc Alexander
69682372bb Merge branch 'develop-ascraeus' into develop 2014-08-01 23:31:55 +02:00
Marc Alexander
ce2c31d18a Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeus 2014-08-01 23:31:31 +02:00
Marc Alexander
fab25164a0 Merge branch 'develop-ascraeus' into develop 2014-08-01 23:28:30 +02:00