1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

23058 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
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
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
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
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
Joas Schilling
b9bb22e009 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12882] Use a new migration
  [ticket/12882] Update search_type when it's not prefixed by phpbb_search
2014-07-31 14:03:31 +02:00
Joas Schilling
f4fc1bde03 Merge pull request #2767 from Nicofuma/ticket/12882
[ticket/12882] Update search_type when it's not prefixed by phpbb_search

* Nicofuma/ticket/12882:
  [ticket/12882] Use a new migration
  [ticket/12882] Update search_type when it's not prefixed by phpbb_search
2014-07-31 14:03:23 +02:00
Tristan Darricau
702d567c69 Merge branch 'ticket/11480' into ticket/11480-ascraeus
* 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

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2014-07-30 21:01:05 +02:00
Tristan Darricau
8bdfda723c [ticket/11480] Move the test into get_folder()
PHPBB3-11480
2014-07-30 15:28:02 +02:00
Joas Schilling
c068da7353 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12492] Add support of special chars
2014-07-30 15:01:27 +02:00
Joas Schilling
6d39a5b015 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12492] Add support of special chars
2014-07-30 15:01:16 +02:00
Joas Schilling
9a3af2a052 Merge pull request #2425 from Zoddo/ticket/12492
[ticket/12492] Add support of special chars

* Zoddo/ticket/12492:
  [ticket/12492] Add support of special chars
2014-07-30 15:00:32 +02:00
Marc Alexander
98eeaacc36 [ticket/12895] Rename user style setting to resolve conflict with style param
The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.

PHPBB3-12895
2014-07-29 13:24:44 +02:00
Andreas Fischer
7d4b019266 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12870] Add doc block
  [ticket/12870] Create the migrations table with a method in the migrator
  [ticket/12870] Add $config['version'] in phpbb_extension_manager_test
  [ticket/12870] Create the migrations table in db:migrate
2014-07-28 18:13:44 +02:00
Andreas Fischer
e992eab4c3 Merge pull request #2780 from Nicofuma/ticket/12870
[ticket/12870] phpbbcli.php db:migrate can not update from 3.0.12 to 3.1

* Nicofuma/ticket/12870:
  [ticket/12870] Add doc block
  [ticket/12870] Create the migrations table with a method in the migrator
  [ticket/12870] Add $config['version'] in phpbb_extension_manager_test
  [ticket/12870] Create the migrations table in db:migrate
2014-07-28 18:13:44 +02:00
Marc Alexander
1095086cde Merge branch 'develop-ascraeus' into develop 2014-07-28 16:45:21 +02:00
Marc Alexander
d8867bb40d Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeus 2014-07-28 16:44:37 +02:00
Marc Alexander
db80091a66 Merge branch 'develop-ascraeus' into develop 2014-07-28 16:33:06 +02:00
Marc Alexander
63c938c703 Merge remote-tracking branch 'Nicofuma/ticket/12898' into develop-ascraeus 2014-07-28 16:32:27 +02:00
Tristan Darricau
ae350bda42 [ticket/12870] Add doc block
PHPBB3-12870
2014-07-28 15:17:19 +02:00
Tristan Darricau
f86bfeb3a1 [ticket/12898] Call garbage_collection() at the end of cron.php
PHPBB3-12898
2014-07-28 14:45:39 +02:00
Andreas Fischer
26ddd5a7fc Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12656] Fix typo for "purged extension"
  [ticket/12656] Fix syntax in language file
  [ticket/12656] Fix typo
  [ticket/12656] Use utf8 ’ instead of escaping '
  [ticket/12656] Use lang keys for all CLI strings
  [ticket/12656] Use lang keys for CLI command descriptions
2014-07-28 14:45:34 +02:00
Andreas Fischer
52e8a7231e Merge pull request #2772 from dhruvgoel92/ticket/12656
[ticket/12656] Translate existing CLI commands

* dhruvgoel92/ticket/12656:
  [ticket/12656] Fix typo for "purged extension"
  [ticket/12656] Fix syntax in language file
  [ticket/12656] Fix typo
  [ticket/12656] Use utf8 ’ instead of escaping '
  [ticket/12656] Use lang keys for all CLI strings
  [ticket/12656] Use lang keys for CLI command descriptions
2014-07-28 14:45:33 +02:00
Matt Friedman
4ce6811d2b [ticket/12864] Update event docs
PHPBB3-12864
2014-07-27 22:55:36 -05:00