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

19404 Commits

Author SHA1 Message Date
Nathan Guse
ce8b8593e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
2014-01-17 20:50:25 -06:00
Nathan Guse
90f3cc48e5 Merge remote-tracking branch 'remotes/bantu/ticket/12046' into develop-olympus
* remotes/bantu/ticket/12046:
  [ticket/12046] Use PHP_BINARY environment variable in PHP lint test.
2014-01-17 20:50:04 -06:00
Nathan Guse
8486d6a9d1 Merge pull request #1938 from prototech/ticket/12077
[ticket/12077] Ensure that valid upload methods are presented to user in language packs page.
2014-01-17 18:28:19 -08:00
Nathan Guse
54afdeb7ee Merge pull request #1945 from VSEphpbb/ticket/12104
[ticket/12104] Replace shadow topics $sql with $sql_array for better Eve...
2014-01-17 18:08:19 -08:00
Nathan Guse
574eb2c199 Merge pull request #1947 from bantu/ticket/12107
[ticket/12107] Use log table property instead of log table constant.
2014-01-17 17:57:06 -08:00
Nathan Guse
6c8f217832 Merge pull request #1949 from prototech/ticket/12110
[ticket/12110] Update Plupload to 2.1.1.
2014-01-17 17:56:19 -08:00
Nathan Guse
6ae6dceb47 Merge pull request #1950 from prototech/ticket/12096
[ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.
2014-01-17 17:55:00 -08:00
Nathan Guse
8eb9f1542c Merge pull request #1951 from prototech/ticket/12032
[ticket/12032] Do not inherit read status in certain notifications.
2014-01-17 17:52:49 -08:00
Cesar G
4bb05c74e5 [ticket/12032] Do not inherit read status in certain notifications.
PHPBB3-12032
2014-01-16 17:27:30 -08:00
Cesar G
b3a25c52e5 [ticket/12096] Use plurals for MAX_NUM_SEARCH_KEYWORDS_REFINE.
PHPBB3-12096
2014-01-16 11:48:40 -08:00
Cesar G
86ee2a470d [ticket/12110] Update Plupload to 2.1.1.
PHPBB3-12110
2014-01-16 11:05:43 -08:00
Andreas Fischer
83ec308eff [ticket/12107] Use log table property instead of log table constant.
PHPBB3-12107
2014-01-12 21:36:50 +01:00
Andreas Fischer
670a9a1aea Merge pull request #1893 from nickvergessen/ticket/12039
[ticket/12039] Add config:* to the command line interface tool

* nickvergessen/ticket/12039:
  [ticket/12039] Allow getting the value without a new line at the end
  [ticket/12039] Do not print success message when config did not exist
  [ticket/12039] Do not colour returned value in get command
  [ticket/12039] Update command descriptions
  [ticket/12039] Remove debug code
  [ticket/12039] Fix option descriptions
  [ticket/12039] Use an abstract class and some more minor adjustments
  [ticket/12039] Add config:* to the command line interface tool
2014-01-12 21:23:21 +01:00
Nils Adermann
46fec7ee90 Merge pull request #1936 from nickvergessen/ticket/12030
[Ticket/12030] Include some directories completly in update packages
2014-01-12 02:31:40 -08:00
Joas Schilling
a70973ea42 [ticket/12039] Allow getting the value without a new line at the end
PHPBB3-12039
2014-01-10 11:36:11 +01:00
Matt Friedman
f14ca6df6f [ticket/12104] Update the event's doc block to reflect new variable
PHPBB3-12104
2014-01-09 15:48:32 -08:00
Matt Friedman
c2c677d4f2 [ticket/12104] Remove newline before WHERE parameter
PHPBB3-12104
2014-01-09 15:45:24 -08:00
Matt Friedman
b95631b163 [ticket/12104] Remove empty LEFT_JOIN array
PHPBB3-12104
2014-01-09 15:42:25 -08:00
Matt Friedman
f9cef15989 [ticket/12104] Replace shadow topics $sql with $sql_array for better Event handling
PHPBB3-12104
2014-01-09 12:43:33 -08:00
Joas Schilling
5d89c283f0 [ticket/12039] Do not print success message when config did not exist
PHPBB3-12039
2014-01-08 23:59:46 +01:00
Joas Schilling
52c452c768 [ticket/12039] Do not colour returned value in get command
PHPBB3-12039
2014-01-08 23:56:50 +01:00
Joas Schilling
2081d973b0 [ticket/12030] Fix some spelling issues
PHPBB3-12030
2014-01-08 23:53:45 +01:00
Joas Schilling
3e84fb76a3 Merge remote-tracking branch 'Marc/ticket/11997' into develop
* Marc/ticket/11997: (23 commits)
  [ticket/11997] Use functional test cases that should always work
  [ticket/11997] Fix redirect tests for mod rewrite
  [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
  [ticket/11997] Remove obsolete function get_controller_redirect_url()
  [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
  [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
  [ticket/11997] Do not check if file or dir we redirect to exist
  [ticket/11997] Modifiy tests after adding path_helper clean_url method
  [ticket/11997] Add clean_url() method to path_helper
  [ticket/11997] Allow redirects to parent folders like previously
  [ticket/11997] Move expected redirect returns to controller and output to HTML
  [ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
  [ticket/11997] Use get_controller_redirect_url() in redirect() function
  [ticket/11997] Add method for controller redirect URLs to path helper
  [ticket/11997] Undo changes to phpbb_own_realpath()
  [ticket/11997] Remove obsolete failover_flag in function redirect()
  [ticket/11997] Add functional test for redirects in controller
  [ticket/11997] Fix missing global
  [ticket/11997] Fix redirects from inside controllers
  [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
  ...
2014-01-08 16:17:48 +01:00
Nathan Guse
821f737560 Merge pull request #1890 from prototech/ticket/12034
[ticket/12034] AJAXify notifications popup.
2013-12-30 12:20:22 -08:00
Nathan Guse
b186d31ce6 Merge pull request #1920 from prototech/ticket/12038
[ticket/12038] AJAXify move up/down buttons for various ACP pages.
2013-12-30 11:23:22 -08:00
Cesar G
d76ec60ee1 [ticket/12034] Move similar code in the two callbacks to separate function.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
Cesar G
0c0375df65 [ticket/12034] Add comma to end of array.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
Cesar G
f4b832a27d [ticket/12034] AJAXify notifications popup.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
Cesar G
06262aca54 [ticket/12038] Free query results.
PHPBB3-12038
2013-12-30 11:09:08 -08:00
Nathan Guse
be67124dc7 Merge pull request #1889 from prototech/ticket/11963
[ticket/11963] Remove stale MCP notifications.
2013-12-30 11:04:43 -08:00
Nathan Guse
34c3e74c16 Merge pull request #1913 from prototech/ticket/12055
[ticket/12055] Alternate table row background colors using nth-child rule.
2013-12-30 10:44:30 -08:00
Marc Alexander
f906fb41e9 [ticket/11997] Use functional test cases that should always work
The previous test cases that tried to redirect to ../index.php and similar
might cause us to try to go to http://localhost/../index.php, which will
result in http://index.php. As this obviously will trigger an error as
intended, we should not put this inside our test cases for the redirect
function.

PHPBB3-11997
2013-12-28 20:40:18 +01:00
Marc Alexander
3e815616c5 [ticket/11997] Fix redirect tests for mod rewrite
Controller routes that are supposed to link to parent directories can't be
tested as the links are incorrectly created depending on enabled mod rewrite
or not.

PHPBB3-11997
2013-12-28 16:50:15 +01:00
Marc Alexander
4c1569dd8a [ticket/11997] Add user's page dir to redirect path and fix unit tests for it
The user's page directory needs to be added to the redirect URL for proper
redirects outside of the forum root. Fix the unit tests accordingly.

PHPBB3-11997
2013-12-28 00:14:12 +01:00
Marc Alexander
ce2c5213d7 [ticket/11997] Remove obsolete function get_controller_redirect_url()
PHPBB3-11997
2013-12-27 18:41:44 +01:00
Marc Alexander
68ce16f9b3 [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
By using path_helper's clean_url() method, we'll be able to properly check
the full URL instead of just parts of the expected URL.

PHPBB3-11997
2013-12-27 17:55:14 +01:00
Marc Alexander
a304d99b2b [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
Adding a call to this method to the redirect function will make sure that we
do not end up with incorrect URLs after using append_sid().

PHPBB3-11997
2013-12-27 17:50:17 +01:00
Dhruv
db94f80c5b Merge remote-tracking branch 'nickvergessen/ticket/11911' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11911:
  [ticket/11911] Warn admins when there is no search index for the selected engine
2013-12-27 18:01:48 +05:30
Joas Schilling
bef7bc7900 [ticket/11911] Warn admins when there is no search index for the selected engine
PHPBB3-11911
2013-12-27 13:16:38 +01:00
Marc Alexander
9161816267 [ticket/11997] Do not check if file or dir we redirect to exist
The redirect function will now properly redirect to where we want it to.
It will no longer try to check if the file or directory we redirect to exist.
This will ensure compatibility with the new routes.

PHPBB3-11997
2013-12-27 13:00:22 +01:00
Joas Schilling
98200161fc [ticket/12039] Update command descriptions
PHPBB3-12039
2013-12-26 19:03:43 +01:00
Dhruv
f9c7f0fc19 Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/feature/pagination-class:
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
2013-12-25 00:54:07 +05:30
Marc Alexander
4ced162646 [ticket/11997] Modifiy tests after adding path_helper clean_url method
PHPBB3-11997
2013-12-21 20:08:33 +01:00
Marc Alexander
d9358c26da [ticket/11997] Add clean_url() method to path_helper
This method will get rid of unnecessary . and .. in URLs.

PHPBB3-11997
2013-12-21 20:08:00 +01:00
Andreas Fischer
02336d9a69 Merge pull request #1940 from prototech/ticket/12079
[ticket/12079] Add default value to $multibyte in request.untrimmed_varible().

* prototech/ticket/12079:
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
2013-12-21 19:24:21 +01:00
Marc Alexander
235d2069e0 [ticket/11997] Allow redirects to parent folders like previously
Redirects to parent folders were possible with the previous redirect function.
This change will allow these redirects again.

PHPBB3-11997
2013-12-21 16:31:20 +01:00
Marc Alexander
15913fdf79 [ticket/11997] Move expected redirect returns to controller and output to HTML
The controller will now output the expected redirect returns the same way the
redirect returns are output. The extension controller test will compare those
2 outputs.

PHPBB3-11997
2013-12-20 18:13:53 +01:00
Nils Adermann
9f7985d725 Merge pull request #1932 from ptarjan/patch-1
Try running unit tests on HHVM
2013-12-20 07:15:32 -08:00
Joas Schilling
558f3cd21c Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop
* vsephpbb/ticket/12060: (37 commits)
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  [ticket/12060] Rename event in message parser to modify_format_display_text_after
  [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql
  [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block
  [ticket/12060] Use separate template event for acp user signature posting buttons
  [ticket/12060] Rename event from append to after in acp_bbcodes.html
  [ticket/12060] Correctly label alpha versions in event docblocks
  [ticket/12060] Fix u_action comments in docblocks
  [ticket/12060] Change @since in event docblocks
  [ticket/12060] Update the docblock comments in acp core events
  [ticket/12060] Refactor u_action in the events that use it
  [ticket/12060] Use $sql_ary instead of $sql
  [ticket/12060] Update docblock for core event due to addition of another var
  [ticket/12060] Remove re-tabbing of html from subsilver2 files
  [ticket/12060] Add $update_this_message var to the core event
  [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis
  ...
2013-12-20 16:11:02 +01:00
Cesar G
d512197bb9 [ticket/12077] Fix another strict standards error.
PHPBB3-12077
2013-12-19 19:36:49 -08:00