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
15303 commits 18 branches 192 tags 207 MiB
Commit graph

15303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
1ebb17c698 [ticket/11323] Reduce additional code and revert regex to previous one 
PHPBB3-11323
 2013-02-26 21:43:39 +01:00
Marc Alexander
dd5963eabb [ticket/11323] Enable tests for inclusion of defined variables 
PHPBB3-11323
 2013-02-19 16:08:36 +01:00
Marc Alexander
01a2622dc6 [ticket/11323] Correctly treat variables in template defines 
Previously, any template variables that were used when defining a variable
were treated as strings. This is a regression to phpBB 3.0. With this
patch the template variables will be properly parsed.

PHPBB3-11323
 2013-02-19 16:08:28 +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
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
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
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
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
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
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
Nathan Guse
9314784f50 Merge remote-tracking branch 'remotes/nickv/ticket/9492' into develop 
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/9492:
  [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
 2013-01-22 10:09:47 -06: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
ddec4e00d5 [ticket/9492] Fix missing phpbb_container in unit tests 
PHPBB3-9492
 2013-01-20 20:59:27 +01: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
50542a389c [ticket/9492] Add unit tests for custom ranks and avatars 
PHPBB3-9492
 2013-01-17 14:35:37 +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
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
Nathan Guse
f63e115ae9 Merge remote-tracking branch 'remotes/DavidIQ/ticket/10786' into develop 
# By David Colón
* remotes/DavidIQ/ticket/10786:
  [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
 2013-01-16 00:13:01 -06:00