1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

22850 Commits

Author SHA1 Message Date
jeroendedauw
626234aece [ticket/12902] Remove duplicate entry in switch statement
PHPBB3-12902
2014-08-02 13:44:51 +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
5b2e962934 Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeus 2014-08-01 23:27:55 +02:00
omniError
a7794b765c [ticket/12831] Optn to prevent setting HTTP headers
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
2014-08-01 15:27:17 -05: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
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
Tristan Darricau
92106d52d0 [ticket/12693] Force the composer.phar to be executable
PHPBB3-12693
2014-07-31 14:20:46 +02:00
Tristan Darricau
5739a3da8f [ticket/12693] All the files in bin/ must be executable
PHPBB3-12693
2014-07-31 14:20:45 +02:00
Tristan Darricau
d284675241 [ticket/12693] Expand manually the wildcard
PHPBB3-12693
2014-07-31 14:20:44 +02:00
Tristan Darricau
6081175857 [ticket/12693] Fix the query for bin/*
PHPBB3-12693
2014-07-31 14:20:42 +02:00
Tristan Darricau
ffcc1e9d94 [ticket/12693] Extract exceptions, bin/* must be executable
PHPBB3-12693
2014-07-31 14:20:41 +02:00
Tristan Darricau
ae9c1cddc8 [ticket/12693] Remove the executable bit on icon_print.gif
PHPBB3-12693
2014-07-31 14:20:40 +02:00
Tristan Darricau
949264507d [ticket/12693] Check the persmissions of the owner
PHPBB3-12693
2014-07-31 14:20:38 +02:00
Tristan Darricau
30e13a429c [ticket/12693] Check if the are executable and not if they are 644
PHPBB3-12693
2014-07-31 14:20:37 +02:00
Tristan Darricau
f394f55fe2 [ticket/12693] Fix the permissions
PHPBB3-12693
2014-07-31 14:20:36 +02:00
Tristan Darricau
636eac2cd2 [ticket/12693] Check if the files have the right 644
And not only if they are executable.

PHPBB3-12693
2014-07-31 14:20:34 +02:00
Tristan Darricau
18207ae1ec [ticket/12693] Fix indentation
PHPBB3-12693
2014-07-31 14:20:33 +02:00
Tristan Darricau
a6f43d09d7 [ticket/12693] Add a travis test that checks file permissions
PHPBB3-12693
2014-07-31 14:20:32 +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
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
Matt Friedman
ced76b5f4d [ticket/12841] Make config position default to after
PHPBB3-12841
2014-07-28 22:27:01 -05: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
d8867bb40d Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeus 2014-07-28 16:44:37 +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
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
6576e0eb88 [ticket/12841] Update comments in tests making after default
PHPBB3-12841
2014-07-27 23:03:43 -05:00
Matt Friedman
4ce6811d2b [ticket/12864] Update event docs
PHPBB3-12864
2014-07-27 22:55:36 -05:00
Joas Schilling
3df41920f7 Merge pull request #2718 from lucifer4o/ticket/12793
[ticket/12793] String '0' does not display for string profile fields

* lucifer4o/ticket/12793:
  [ticket/12793] Tests (added and changed)
  [ticket/12793] Changing get_profile_contact_value to get_profile_value_raw
  [ticket/12793] String '0' does not display for string profile fields
2014-07-27 20:11:44 +02:00
Joas Schilling
8a6d3f2b1d Merge pull request #2719 from lucifer4o/ticket/12791
[ticket/12791] String profile fields do not use links ...

* lucifer4o/ticket/12791:
  [ticket/12791] Changed the if check
  [ticket/12791] String profile fields do not use links ...
2014-07-27 20:06:53 +02:00
Joas Schilling
e94f24c821 Merge branch 'ticket/sumanai/12843' into develop-ascraeus
* ticket/sumanai/12843:
  [ticket/12843] Fix Mark forums read browser console error
2014-07-27 19:51:38 +02:00
Sumanai
ab8400a616 [ticket/12843] Fix Mark forums read browser console error
When you click on "Mark forums read" in the browser console error occurs
ReferenceError: assignment to undeclared variable phpbbAlertTimer
ajax.js (line13)

PHPBB3-12843
2014-07-27 19:50:48 +02:00
Joas Schilling
e226c99474 Merge pull request #2769 from rxu/ticket/12884
[ticket/12884] Add core event to the function upload_attachment()

* rxu/ticket/12884:
  [ticket/12884] Add core event to the function upload_attachment()
2014-07-27 19:45:07 +02:00
Joas Schilling
64f2d778cd Merge branch 'ticket/forumhulp/12896' into develop-ascraeus
* ticket/forumhulp/12896:
  [ticket/12896] Add php event for admin notices
2014-07-27 19:41:56 +02:00
Forumhulp.com
5dcf56c98d [ticket/12896] Add php event for admin notices
PHPBB3-12896
2014-07-27 19:35:07 +02:00
Dhruv
8a046743bc [ticket/12656] Fix typo for "purged extension"
PHPBB3-12656
2014-07-27 14:56:12 +05:30
Tristan Darricau
a8e81b6e9f [ticket/12870] Create the migrations table with a method in the migrator
PHPBB3-12870
2014-07-27 11:08:13 +02:00
Andreas Fischer
a775bb082c Merge pull request #2768 from Nicofuma/ticket/12883
[ticket/12883] Do not use basename() to get the search class in tidy_search

* Nicofuma/ticket/12883:
  [ticket/12883] Remove pointless comments
  [ticket/12883] Do not use basename() to get the search class in tidy_search
2014-07-26 22:52:08 +02:00