makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
15936 commits 18 branches 192 tags 207 MiB
Commit graph

15936 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Guse
1e5a1b72dc Merge remote-tracking branch 'remotes/bantu/ticket/11201' into develop 
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11201:
  [ticket/11201] Revert WLM dropping because it is still used in China.
 2013-02-04 20:57:37 -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
Nathan Guse
e4c37c159a Merge pull request #7 from VSEphpbb/ticket/11103-tweaks 
[ticket/11103] Rounded Corners and antialiased pointer
 2013-01-31 11:26:03 -08: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
Oleg Pudeyev
ba5d84ba1d Merge PR #1219 branch 'bantu/ticket/11343' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11343:
  [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:45:55 -05:00
Oleg Pudeyev
a6aec47cb1 Merge PR #1207 branch 'bantu/ticket/11295' into develop 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11295:
  [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
 2013-01-26 04:21:26 -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
Andreas Fischer
7203f39f87 [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres. 
PHPBB3-11295
 2013-01-25 17:10:43 +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
Oleg Pudeyev
01607be42a Merge PR #1201 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.

Conflicts:
	.travis.yml
 2013-01-24 01:16:56 -05:00
Oleg Pudeyev
229d1092f8 Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11337:
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.
 2013-01-24 01:10:06 -05: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
Andreas Fischer
4b9c163969 [ticket/11337] Abort setup-webserver.sh script when an error occurs. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
9860cf6b16 [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. 
There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19,
which is what 5.3 is currently aliased to.

PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
ea1c8ee85a [ticket/11337] Silence nginx config file writing. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
d2f09a9e65 [ticket/11337] php-fpm.conf is no longer owned by root. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
dee1b38ebc [ticket/11337] Run functional tests on travis using nginx and php-fpm. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
ec97e60e17 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11295] Drop tables rather than database for postgres in test suite.

Conflicts:
	tests/test_framework/phpbb_database_test_connection_manager.php
 2013-01-23 15:47:28 +01:00
Andreas Fischer
9a0992f6a0 Merge remote-tracking branch 'p/ticket/11295' into develop-olympus 
* p/ticket/11295:
  [ticket/11295] Drop tables rather than database for postgres in test suite.
 2013-01-23 15:45:18 +01:00
Oleg Pudeyev
85611150c4 Merge PR #1203 branch 'bantu/ticket/11338' into develop 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11338:
  [ticket/11338] Travis CI: Install PHP extension for redis key-value store.
 2013-01-23 09:36:10 -05:00
Andreas Fischer
bd180b8e38 [ticket/11338] Travis CI: Install PHP extension for redis key-value store. 
PHPBB3-11338
 2013-01-23 01:39:39 +01:00
Oleg Pudeyev
722181bc3b Merge PR #1202 branch 'bantu/ticket/11338' into develop 
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11338:
  [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.
 2013-01-22 19:25:15 -05:00
Marc Alexander
e841453d03 [feature/avatars] Add note about when compatibility function was added 
PHPBB3-10018
 2013-01-22 21:05:31 +01:00
Andreas Fischer
d377a25f23 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11323] Backport include_define test to olympus.

Conflicts:
	tests/template/template_test.php
 2013-01-22 20:32:36 +01:00
Andreas Fischer
a83c766ebd Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympus 
* p/ticket/11323-olympus:
  [ticket/11323] Backport include_define test to olympus.
 2013-01-22 20:32:07 +01:00
Andreas Fischer
55fa3dce90 Merge branch 'develop-olympus' into develop 
* develop-olympus:
 2013-01-22 20:31:18 +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
Andreas Fischer
aa7350eba7 [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run. 
PHPBB3-11338
 2013-01-22 20:12:24 +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