mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-19 22:10:14 +02:00
Code Issues Releases Wiki Activity
19,120 Commits 18 Branches 192 Tags
Commit Graph

8180 Commits

Author SHA1 Message Date
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
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
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
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
Cesar G
97915b467e [ticket/10810] Remove obsolete swatch code. 
PHPBB3-10810
 2013-11-13 01:27:24 -08: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
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
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
Joas Schilling
f8e92efc3f [ticket/11994] Rename "uninstall" to "delete data" 
PHPBB3-11994
 2013-11-08 01:20:00 +01:00
Joas Schilling
7e1a02b3a1 [ticket/11994] Make install/enable just one UI thing 
PHPBB3-11994
 2013-11-08 01:19:59 +01:00
Joas Schilling
473402c77b [ticket/11994] Use display name on confirmation screen 
PHPBB3-11994
 2013-11-08 01:19:58 +01:00
Joas Schilling
8d5fcc8d4c [ticket/11994] Make extension manager UI less misleading 
Enable and Install were split into two different expressions.
Purge was renamed to uninstall to make clearer what is going to happen.

PHPBB3-11994
 2013-11-08 01:19:54 +01:00
Joas Schilling
95348c8f6d [ticket/11927] Prefix function with phpbb_ 
PHPBB3-11927
 2013-11-07 13:49:55 +01:00
Joas Schilling
0e33c8d3d2 [ticket/11927] Add doc block to new function 
PHPBB3-11927
 2013-11-07 13:26:43 +01:00
Joas Schilling
7aa4d8fce2 [ticket/11927] Correctly add new files on update 
Currently we ignore language and style files when the directory where they
go to do not exist. However in 3.1 we introduce some new sub directories:
* language/en/email/short/
* styles/prosilver/theme/en/
So we need to change our check to look whether the language or style exist,
rather then the parent directory.

PHPBB3-11927
 2013-11-07 13:12:58 +01:00
Dhruv
efe94e9c73 Merge remote-tracking branch 'nickvergessen/ticket/11973' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11973:
  [ticket/11973] Remove logic from tokens language array
 2013-11-04 00:11:23 +05:30
Patrick Webster
ad44407b19 [ticket/11990] Remove result_mssqlnative usage in acp_database.php 
The class result_mssqlnative was removed in ticket 11980. This removes
the dependency on that class from the database backup utility. It is
possible to use the sqlsrv functions to retrieve the field information,
but they must be then mapped back to type names. That mapping was removed
in 11980 and it is easier to just look it up in the information schema
table.

PHPBB3-11990
 2013-11-03 00:37:18 -05:00
Nathan Guse
25995e311c Merge pull request #1790 from prototech/ticket/11280 
[ticket/11280] Prevent duplicate entry in forums_track table.
 2013-11-02 12:10:19 -07:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746 
[ticket/11746] Add "admin activation required" notification.
 2013-11-02 11:55:16 -07:00
Joas Schilling
8a78699f6c Merge remote-tracking branch 'brunoais/ticket/11663' into develop 
* brunoais/ticket/11663:
  [ticket/11663] Add the doc block about the parameters.
  [ticket/11663] Add the doc block about the return value.
  [ticket/11663] Make generate_text_for_storage return the errors.
 2013-11-02 16:26:29 +01:00
Nils Adermann
158c998216 Merge pull request #1810 from nickvergessen/ticket/11031 
Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
 2013-11-02 07:20:15 -07:00
Joas Schilling
cb8cd50495 [ticket/11031] Correctly add groups to teampage 
PHPBB3-11031
 2013-11-02 13:25:46 +01:00
Marc Alexander
54b7b2320c [ticket/11983] Add missing argument to docblock in ucp_notifications 
The argument $subscriptions was not documented in the docblock of the method
output_notification_types() until now.

PHPBB3-11983
 2013-11-02 10:42:16 +01:00
Nils Adermann
e118b4f4c0 Merge pull request #1839 from bantu/task/code-sniffer 
More PHP Code Sniffer rules
 2013-11-01 07:58:18 -07:00
Cesar G
831075e5fe [ticket/11987] Add {ADMIN_ROOT_PATH}. 
PHPBB3-11987
 2013-10-30 16:13:20 -07:00
Cesar G
05dd4d55d2 [ticket/11987] Replace {PHPBB_ROOT_PATH} with {ROOT_PATH}. 
PHPBB3-11987
 2013-10-30 15:43:07 -07:00
Cesar G
7251feab67 [ticket/11987] Change {ROOT_PATH} to point to board root. 
PHPBB3-11987
 2013-10-30 15:42:35 -07:00
Dhruv
a9524d6e08 Merge remote-tracking branch 'nickvergessen/ticket/11974' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
  [ticket/11974] Fix timezone names with underscores
  [ticket/11974] Translate all timezones
 2013-10-30 22:43:25 +05:30
Andreas Fischer
ef1f991837 [task/code-sniffer] Replace spaces with tabs. 
PHPBB3-11980
 2013-10-30 13:37:29 +01:00
Andreas Fischer
02e9f6e284 [task/code-sniffer] Fix argument list spacing. 
PHPBB3-11980
 2013-10-29 23:38:05 +01:00
Andreas Fischer
59e3c2d16e Merge remote-tracking branch 'marc1706/ticket/11981' into develop 
* marc1706/ticket/11981:
  [ticket/11981] Fix code sniffer complaints
 2013-10-29 00:00:00 +01:00
Joas Schilling
85a12ce4f4 [ticket/11031] Fix group legend position 
PHPBB3-11031
 2013-10-28 23:28:24 +01:00
Marc Alexander
7f58a4572e [ticket/11981] Fix code sniffer complaints 
PHPBB3-11981
 2013-10-28 23:05:46 +01:00
Nils Adermann
ed94e3c576 Merge pull request #1784 from nickvergessen/ticket/11924 
[Ticket/11924] Add a script to export the events in wiki format
 2013-10-28 14:53:59 -07:00
Joas Schilling
2086db0d7a [ticket/11974] Translate all timezones 
PHPBB3-11974
 2013-10-27 00:21:17 +02:00