Commit graph

8634 commits

Author SHA1 Message Date
Cesar G
eef1b586d5 [ticket/12048] Fix the regexp for language keys in custom bbcodes.
PHPBB3-12048
2013-12-02 00:53:42 -08:00
Joas Schilling
5d69eddcf5 [ticket/12045] Only display group selection if there are groups
Also fixed the empty option which is not allowed.

PHPBB3-12045
2013-11-28 13:22:25 +01:00
Joas Schilling
f58add8d79 Merge remote-tracking branch 'prototech/ticket/11507' into develop
* prototech/ticket/11507:
  [ticket/11507] Handle empty sets correctly.
  [ticket/11507] Allow group & unapproved post count options to be used alone.
  [ticket/11507] Fix the unapproved posts count query.
  [ticket/11507] Allow the posts awaiting approval value to be 0.
2013-11-28 13:12:12 +01:00
Cesar G
7da4490402 [ticket/11507] Handle empty sets correctly.
Using the last parameter in $db->sql_in_set() does not give the correct
behaviour expected here. The query should not be negated if the set is empty.

PHPBB3-11507
2013-11-27 21:26:23 -08:00
Cesar G
ef2e5ca966 [ticket/11507] Allow group & unapproved post count options to be used alone.
PHPBB3-11507
2013-11-27 21:26:22 -08:00
Cesar G
c5656747d8 [ticket/11507] Fix the unapproved posts count query.
Only unapproved posts should be counted.

PHPBB3-11507
2013-11-27 21:26:22 -08:00
Cesar G
b41e2d335a [ticket/11507] Allow the posts awaiting approval value to be 0.
PHPBB3-11507
2013-11-27 21:26:18 -08:00
Cesar G
83b1278273 [ticket/11869] Fix strict standards error when registering.
PHPBB3-11869
2013-11-27 20:05:00 -08:00
Marc Alexander
33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842
Conflicts:
	phpBB/includes/acp/acp_groups.php
2013-11-27 14:55:24 +01:00
Cesar G
3da445ada4 [ticket/11963] Fix undefined variable: post_data when mass-approving topics.
PHPBB3-11963
2013-11-23 11:56:56 -08:00
Cesar G
8fa8037b4e [ticket/11963] Delete topic_in_queue notifications in MCP approve_details mode
PHPBB3-11963
2013-11-23 11:03:37 -08:00
Cesar G
a6a23784c3 [ticket/11963] Don't depend on user_notify flag to delete report notifications.
PHPBB3-11963
2013-11-23 10:19:49 -08:00
Marc Alexander
b5e6d107ae [ticket/11842] Add missing prefix for group id in avatar data
PHPBB3-11842
2013-11-23 01:05:39 +01:00
Joas Schilling
2f4d15015e [ticket/10910] Do not add size when its 1 (default)
PHPBB3-10910
2013-11-22 15:52:59 +01:00
Mario Skouat
3a00cb0c08 [ticket/10910] Allow setting size selects in build_cfg_template()
PHPBB3-10910
2013-11-22 15:02:44 +01:00
Nathan Guse
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005
[ticket/12005] Remove code responsible for PM popup completely
2013-11-21 14:01:23 -08:00
Nathan Guse
6f419b0049 Merge pull request #1869 from prototech/ticket/10810
[ticket/10810] Move color swatches from popup windows to inline blocks.
2013-11-21 13:41:03 -08:00
Cesar G
6d45146df7 [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.
The $redirect assignment is not necessary because the variable  has already been
set near the start of the functions. The redirect value will also never default
to index.php because a default value has already been provided when $redirect
is initially assigned and passed to the template as a hidden field.

PHPBB3-11672
2013-11-21 04:45:16 -08:00
Lukasz
fc778fe637 [ticket/12026] Remove phpbb root path
PHPBB3-12026
2013-11-20 23:12:35 +01:00
Lukasz
fa31096cb9 [ticket/12026] Correct path for template files
Correct path for template files in MCP and UCP modules, which are added
via extenstions

PHPBB3-12026
2013-11-20 22:57:41 +01:00
Marc Alexander
3caeb09b18 [ticket/11842] Use only new avatar type in user_delete function
PHPBB3-11842
2013-11-20 17:15:32 +01:00
Cesar G
bc33fd9950 [ticket/11672] Remove duplicate $request global.
PHPBB3-11672
2013-11-19 07:34:37 -08:00
Cesar G
03e78c33fa [ticket/11672] The json response call exits so the else is not necessary.
PHPBB3-11672
2013-11-19 07:32:49 -08:00
Cesar G
cccb4fb83d [ticket/11672] Remove the messages for lock/unlock/change topic type.
PHPBB3-11672
2013-11-19 07:32:49 -08:00
Cesar G
10bfb212c4 [ticket/11672] Clean up the logic in mcp_queue.php.
PHPBB3-11672
2013-11-19 07:32:49 -08:00
Cesar G
3eda261b8d [ticket/11672] Remove some messages that were missed in mcp_queue.php.
PHPBB3-11672
2013-11-19 07:32:49 -08:00
Cesar G
c6473da412 [ticket/11672] Replace sprintf() usage with $user->lang().
PHPBB3-11672
2013-11-19 07:32:49 -08:00
callumacrae
0faafce4ce [ticket/11672] Removed unnecessary text from alerts.
Messages like "Return to forum last visited" are entirely unnecessary
when using AJAX to delete a post, so this commit removes them.

PHPBB3-11672
2013-11-19 07:32:49 -08:00
Joas Schilling
d67341ea00 [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant 2013-11-19 01:37:31 +01:00
Joas Schilling
6ee05d369e [prep-release-3.1.0-a2] Update version to 3.1.0-a2 2013-11-19 01:18:21 +01:00
Joas Schilling
d213e23ab6 Merge remote-tracking branch 'Marc/ticket/11896' into develop
* Marc/ticket/11896:
  [ticket/11896] Use $form_time and fix out of bounds $form_time
  [ticket/11896] Correctly document return of null in docblocks
  [ticket/11896] Minor code improvements in phpbb_functional_test_case
  [ticket/11896] Add functional tests for marking all notifications read
  [ticket/11896] Add ability to define expected message after posting
  [ŧicket/11896] Set form_time with time() when marking all notifications read
2013-11-19 01:03:12 +01:00
Joas Schilling
5fe822021b [ticket/12023] Correctly compare the size of the array in ignore_new_files
PHPBB3-12023
2013-11-19 00:23:49 +01:00
Marc Alexander
68db335468 [ticket/11997] Remove obsolete failover_flag in function redirect()
This flag is no longer needed as the failover is no longer needed.

PHPBB3-11997
2013-11-17 20:16:02 +01:00
Marc Alexander
0d3396487e [ticket/11896] Use $form_time and fix out of bounds $form_time
PHPBB3-11896
2013-11-14 18:16:29 +01:00
Nils Adermann
52845b22f2 Merge pull request #1815 from marc1706/ticket/11525
[ticket/11525] Only remove group or user prefix from given avatar data
2013-11-13 09:52:21 -08:00
Joas Schilling
0aed281676 [ticket/11997] Fix missing global
PHPBB3-11997
2013-11-13 11:30:41 +01:00
Joas Schilling
0a7db81426 [ticket/11997] Fix redirects from inside controllers
The redirect url currently uses the web root path. However as we prepend the
full board url later, we need to remove the relative web root path and prepend
the normal root path again. Otherwise redirects from inside routes will not
work as intended.

PHPBB3-11997
2013-11-13 11:30:13 +01:00
Cesar G
97915b467e [ticket/10810] Remove obsolete swatch code.
PHPBB3-10810
2013-11-13 01:27:24 -08:00
Marc Alexander
d43542a434 [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
PHPBB3-11997
2013-11-12 00:46:43 +01:00
Marc Alexander
2d0fb4d166 [ticket/11997] Rename root_dirs_size to superordinate_dirs_count
This variable name better fits what is done with it. A comment explaining
why 2 has to be subtracted from the size of root_dirs has also been added

PHPBB3-11997
2013-11-11 21:55:21 +01:00
Nathan Guse
d69f35d450 Merge pull request #1853 from nickvergessen/ticket/11927
[ticket/11927] Correctly add new files on update
2013-11-11 09:40:50 -08:00
Marc Alexander
6bb9bce40e [ticket/11997] Remove obsolete if statement in phpbb_own_realpath()
PHPBB3-11997
2013-11-10 12:56:09 +01:00
Marc Alexander
252b5fe4f7 [ŧicket/11896] Set form_time with time() when marking all notifications read
form_time is only set if is passed via the form. Since the mark notifications
read link does not use the form, it will default to 0 causing the mark
notifications logic to only mark notifications read if their time is smaller
or equal to 0. This patch will change ucp_notifications to correctly set
form_time for the confirm_box.

PHPBB3-11896
2013-11-09 20:28:24 +01:00
Marc Alexander
60dda5577d [ticket/11997] Correctly redirect to front controllers
We currently do a lot of checks in order to prevent users from getting to
a 404 page. However, this logic relies on checking if a file or folder exists.
Due to the front controllers and the URL rewriting in 3.1, it is no longer
possible to rely on existing files for redirecting. This patch will take
care of properly redirecting users to front controller files. An incorrect
link will cause users to get a 404 error though.

PHPBB3-11997
2013-11-08 23:12:42 +01:00
Lukasz
65fbf87ce7 [ticket/12005] Remove PM popup
PHPBB3-12005
2013-11-08 21:57:08 +01:00
Lukasz
0499c30b2b [ticket/12005] Remove PM popup UCP module
PHPBB3-12005
2013-11-08 21:57:06 +01:00
Lukasz
166e27566a [ticket/12005] Remove PM popup from converter
PHPBB3-12005
2013-11-08 21:57:05 +01:00
Lukasz
57ec9ee49e [ticket/12005] Remove PM popup setting from user preferences
PHPBB3-12005
2013-11-08 21:57:03 +01:00
Joas Schilling
a6c73ea0c8 [ticket/12002] Add link hash to extension manager links
PHPBB3-12002
2013-11-08 14:08:02 +01:00
Joas Schilling
bb0ff715f8 [ticket/11994] Change error level for missing .json file
PHPBB3-11994
2013-11-08 01:20:02 +01:00