1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-29 06:26:22 +01:00
Commit Graph

15646 Commits

Author SHA1 Message Date
David Tobin
293b65e3ef [ticket/10896] Adds email validation to email settings in ACP
Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.

PHPBB3-10896
2013-02-04 23:10:10 -06:00
Nathaniel Guse
77df9109b6 [feature/migrations] Remove default values from necessary parameters
Clean up some comments

PHPBB3-9737
2013-02-04 13:46:23 -06:00
Andreas Fischer
336187151a [ticket/11201] Revert WLM dropping because it is still used in China.
Windows Live Messenger is still in use in china which accounts for ~20% of world
population. Revert WLM dropping which has been merged under the assumption that
WLM data and features are completely useless.

This commit reverts commits
 - 460470229d
 - 9affd6f7e7
which have been merged by d59431691c.

PHPBB3-11201
2013-02-04 01:31:43 +01:00
Marc Alexander
11aff559d4 [feature/avatars] Use deprecated for compatibility function
Also moved use of global variables inside the only if statement they are
used in.

PHPBB3-10018
2013-02-03 23:06:30 +01:00
Marc Alexander
f322f4eac9 [feature/avatars] Correct license, copyright and package info
PHPBB3-10018
2013-02-03 23:02:35 +01:00
Marc Alexander
a54128b3bc [ticket/11342] Mark active topics read when marking forums read
Marking forums read while viewing a category will also mark the active
topics inside that category read. Therefore, the active topics should also
be marked read. With this patch the ajax callback "mark_forums_read" will
check if the active topics id ("active_topics") exists and also mark
topics read if it does. As the active topics will only be displayed in
categories, which can't have any other topics, this is a proper approach.

PHPBB3-11342
2013-02-03 15:51:29 +01:00
Andreas Fischer
34c564062a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11220] Improvement to the info pop-up from "list="
2013-02-03 14:51:52 +01:00
Andreas Fischer
996f1abee3 Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympus
* Crizz0/ticket/11220:
  [ticket/11220] Improvement to the info pop-up from "list="
2013-02-03 14:51:39 +01:00
Crizz0
cf3edb2c6e [ticket/11220] Improvement to the info pop-up from "list="
A improvement to the info popup which is displayed when the cursor
is over the bbcode-button [list=] in the posting-editor

PHPBB3-11220
2013-02-03 13:24:00 +01:00
Matt Friedman
006662a03f [ticket/11103] Rounded Corners and antialiased pointer
PHPBB3-11103
2013-01-31 10:34:39 -08:00
Nathan Guse
b567e09630 [ticket/11103] Remove Primary Key on user_notifications table
PHPBB3-11103
2013-01-31 10:14:42 -06:00
Andreas Fischer
01045a6bb0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:39 +01:00
Andreas Fischer
a0b141b673 Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympus
* dhruvgoel92/ticket/11233:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
2013-01-31 00:32:20 +01:00
Nathaniel Guse
67c85fa4d3 Merge branch 'develop-olympus' into develop
# By Senky
# Via Nathaniel Guse (1) and Senky (1)
* develop-olympus:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition

Conflicts:
	phpBB/styles/subsilver2/template/viewforum_body.html
2013-01-30 16:56:16 -06:00
Nathaniel Guse
5154c6960d Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympus
# By Senky
# Via Senky
* remotes/Senky/ticket/10050:
  [ticket/10050] removing prosilver edits
  [ticket/10050] adding .topicrow to template condition
2013-01-30 16:51:50 -06:00
Nathaniel Guse
75244eafd9 [feature/migrations] Revert unrelated changes to functions.php
PHPBB3-9737
2013-01-30 16:20:50 -06:00
Dhruv
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
2013-01-30 21:46:15 +05:30
Oleg Pudeyev
2df2f27b96 Merge PR #1219 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
2013-01-27 17:46:11 -05:00
Andreas Fischer
5a146df07f [ticket/11343] Remove spare parentheses.
PHPBB3-11343
2013-01-25 19:52:02 +01:00
Andreas Fischer
8421aa0b0e [ticket/11343] Remove spare space.
PHPBB3-11343
2013-01-25 19:51:17 +01:00
Andreas Fischer
305b2b8f48 [ticket/11343] Use === when checking stored user_actkey against user input.
Use strict comparison when checking whether stored user_actkey is equal to user
input.

PHPBB3-11343
2013-01-25 19:49:02 +01:00
Marc Alexander
9c3538eb0e [feature/avatars] Move list of supported formats to avatar driver class
Using the regex and turning it into an array if necessary seemed like the
cleanest approach to achieve this.

PHPBB3-10018
2013-01-25 01:24:15 +01:00
Senky
80283646e2 [ticket/10050] removing prosilver edits
PHPBB3-10050
2013-01-24 22:54:12 +01:00
Marc Alexander
869de98f52 [feature/avatars] Add include of functions_display.php in BC function
The needed function phpbb_get_avatar() is defined in
includes/functions_display.php. Include that file in the backwards
compatible function get_user_avatar().

PHPBB3-10018
2013-01-24 00:23:45 +01:00
Nathaniel Guse
7338bfe3f0 [ticket/9737] Fix some comments
PHPBB3-9737
2013-01-23 09:45:20 -06:00
Joas Schilling
447e845274 [ticket/10714] Remove fallback code from previous commits and move global
PHPBB3-10714
2013-01-23 00:21:01 +01:00
Joas Schilling
e8fd8b9a4b [ticket/10714] Fix missing parameter and global phpbb_log in unit tests
PHPBB3-10714
2013-01-22 22:40:53 +01:00
Marc Alexander
e841453d03 [feature/avatars] Add note about when compatibility function was added
PHPBB3-10018
2013-01-22 21:05:31 +01:00
Senky
317964174e [ticket/10050] adding .topicrow to template condition
PHPBB3-10050
2013-01-22 20:24:27 +01:00
Nathaniel Guse
dfabdbca50 [ticket/9737] Fix a few minor things in migrations
PHPBB3-9737
2013-01-22 13:19:49 -06:00
Joas Schilling
d2e395b41f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11329] Moving colors to colours.css
  [ticket/9492] Fix missing phpbb_container in unit tests
  [ticket/9492] Fix typo in SQL query
  [ticket/9492] Ensure to delete the avatar/rank data when we change it
  [ticket/9492] Ensure to update all avatar values when the avatar is changed
  [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
  [ticket/9492] Add unit tests for custom ranks and avatars
  [ticket/9492] Retain custom ranks and avatars when setting users default group
  [ticket/11328] Replace long buttons text with short text
  [ticket/11328] Add language variables for buttons
2013-01-22 18:41:55 +01:00
Nathan Guse
0e414f4880 Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11329:
  [ticket/11329] Moving colors to colours.css
2013-01-22 10:39:48 -06:00
Nathan Guse
05bb1e472c Merge remote-tracking branch 'remotes/cyberalien/ticket/11328' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11328:
  [ticket/11328] Replace long buttons text with short text
  [ticket/11328] Add language variables for buttons
2013-01-22 10:36:28 -06:00
Marc Alexander
79356f5441 [feature/avatars] Add compatibility function for get_user_avatar()
PHPBB3-10018
2013-01-22 17:21:49 +01:00
Joas Schilling
d5d282005c [ticket/10714] Add getter for is_in_admin and use it
PHPBB3-10714
2013-01-22 16:47:05 +01:00
Joas Schilling
c2504e9300 [ticket/10714] Fix more comments
PHPBB3-10714
2013-01-22 15:56:34 +01:00
Joas Schilling
ffde887aad [ticket/10714] Cast values to integer before using them in the query
PHPBB3-10714
2013-01-22 15:46:48 +01:00
Joas Schilling
c0ab3f3ddd [ticket/10714] Fix several doc blocks and comments
PHPBB3-10714
2013-01-22 15:45:20 +01:00
Vjacheslav Trushkin
95c9095a1c [ticket/11329] Moving colors to colours.css
Moving color values from buttons.css to colours.css

PHPBB3-11329
2013-01-21 12:34:28 +02:00
Joas Schilling
6a972da4c7 [ticket/9492] Fix typo in SQL query
PHPBB3-9492
2013-01-20 20:58:46 +01:00
Joas Schilling
9a6219d8b3 [ticket/9492] Ensure to delete the avatar/rank data when we change it
PHPBB3-9492
2013-01-17 14:45:40 +01:00
Joas Schilling
bd87b06858 [ticket/9492] Ensure to update all avatar values when the avatar is changed
PHPBB3-9492
2013-01-17 14:43:00 +01:00
Joas Schilling
64c27013d4 [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar
PHPBB3-9492
2013-01-17 14:40:58 +01:00
Joas Schilling
3122aeff26 [ticket/9492] Retain custom ranks and avatars when setting users default group
PHPBB3-9492
2013-01-17 14:32:15 +01:00
Joas Schilling
786e2438d5 [ticket/10714] Use new core.adm_relative_path to create the object.
PHPBB3-10714
2013-01-16 16:23:41 +01:00
Joas Schilling
19b6ea8cf7 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (205 commits)
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/10786] Javascript toggle member search panel in memberlist.php
  [ticket/11201] Remove database column on update
  [ticket/10431] Remove .left class from reply-all
  [ticket/10431] Remove reply-all custom css
  [ticket/10431] Adjustments for large buttons
  [ticket/11323] Add tests for inclusion of defined variables
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
  [ticket/11201] Remove MSN/WLM fields
  [ticket/11321] Recreate schema files with develop/create_schema_files.php
  [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
  [ticket/11313] Use correct object el instead of eel in alt_text callback
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
  [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
  [ticket/10949] Remove not needed comma
  [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/11302] Correctly select first timezone or selected timezone
  ...
2013-01-16 16:15:31 +01:00
Joas Schilling
37014abd02 [ticket/10714] Fix several comments and variable names
PHPBB3-10714
2013-01-16 14:18:09 +01:00
Vjacheslav Trushkin
d68c4697be [ticket/11328] Replace long buttons text with short text
Replace long buttons text with short text, like it was on images

PHPBB3-11328
2013-01-16 11:37:50 +02:00
Vjacheslav Trushkin
1d5f8a2bbf [ticket/11328] Add language variables for buttons
New language variables for buttons

PHPBB3-11328
2013-01-16 11:37:13 +02:00
David Colón
4306a7641f [ticket/10786] Javascript toggle member search panel in memberlist.php
Search functions on the memberlist.php page are now rendered by default and displayed via javascript.  If javascript is disabled the page still works as it previously did.

PHPBB3-10786
2013-01-15 23:29:06 -06:00