1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

23282 Commits

Author SHA1 Message Date
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
Marc Alexander
5b2e962934 Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeus 2014-08-01 23:27:55 +02:00
Joas Schilling
76dbe95afc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/11480] Header file
  [ticket/11480] Fix unit tests
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
2014-08-01 22:24:06 +02:00
Joas Schilling
50d10c4efd Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-08-01 22:23:53 +02:00
Joas Schilling
6ced579ab3 Merge pull request #2784 from Nicofuma/ticket/11480-ascraeus
[ticket/11480-ascraeus] PM : "Unknown folder" returned when inbox folder is full

* Nicofuma/ticket/11480-ascraeus:
  [ticket/11480] Header file
  [ticket/11480] Fix unit tests
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
2014-08-01 22:23:36 +02:00
Joas Schilling
122898d221 Merge pull request #2350 from Nicofuma/ticket/11480
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full

* Nicofuma/ticket/11480:
  [ticket/11480] Move the test into get_folder()
  [ticket/11480] Fix the double spaces in phpbb_functional_test_case
  [ticket/11480] Fix typos
  [ticket/11480] Add functionnal test
  [ticket/11480] PM : "Unknown folder" returned when inbox folder is full
2014-08-01 22:17:17 +02:00
brunoais
47bfe2999d [ticket/12801] Changed name change @since as requested
Changed name to core.load_drafts_draft_list_result as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12801
2014-08-01 11:12:29 +01:00
brunoais
25826fa587 [ticket/12880] Changed name change @since as requested
Changed name to core.display_user_activity_modify_actives as requested

Changed @since to 3.1.0-RC3 because RC2 is already out.

PHPBB3-12880
2014-08-01 11:09:26 +01:00
Marc Alexander
589cf73202 Merge branch 'develop-ascraeus' into develop 2014-07-31 21:40:37 +02:00
Marc Alexander
89557f5cac Merge remote-tracking branch 'VSE/ticket/12864' into develop-ascraeus 2014-07-31 21:39:48 +02:00
Tristan Darricau
cd0dad8951 [ticket/11480] Header file
PHPBB3-11480
2014-07-31 15:36:58 +02:00
Tristan Darricau
67d19920c4 [ticket/11480] Fix unit tests
PHPBB3-11480
2014-07-31 15:36:42 +02:00
Tristan Darricau
4328141fd2 [ticket/12693] The files skipped list can not be empty
PHPBB3-12693
2014-07-31 14:20:48 +02:00