mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
11,883 Commits 17 Branches 190 Tags
Commit Graph

11883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleg Pudeyev
93b892d24a Merge remote-tracking branch 'bantu/ticket/9474' into develop 
* bantu/ticket/9474:
  [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
 2011-09-05 02:53:13 -04:00
Oleg Pudeyev
dce62b5271 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
 2011-09-05 02:48:54 -04:00
Oleg Pudeyev
cf5f0cce83 Merge remote-tracking branch 'nickvergessen/ticket/10321' into develop-olympus 
* nickvergessen/ticket/10321:
  [ticket/10321] Add descriptions to the unit tests
  [ticket/10321] Do not append the ? if the param-list is empty anyway.
 2011-09-05 02:42:41 -04:00
Oleg Pudeyev
511f2e0435 [ticket/10355] Correctly end output buffering in template tests. 
This code was copied verbatim from develop-olympus.

PHPBB3-10355
 2011-09-05 02:07:44 -04:00
Oleg Pudeyev
1061e881bd [ticket/10354] Include cache directory path in unwritable message. 
When template tests are skipped because cache directory is not
writable, include path to the cache directory into the message
saying it is not writable.

PHPBB3-10354
 2011-09-05 01:20:57 -04:00
Patrick Webster
5c7f5f0516 [ticket/10352] Add missing break for Oracle's sql_table_drop() 
PHPBB3-10352
 2011-09-04 20:31:34 -05:00
Patrick Webster
d938d5d399 [ticket/10351] Fix Oracle's sql_column_remove() 
The correct syntax is DROP COLUMN.

PHPBB3-10351
 2011-09-04 20:22:36 -05:00
Vjacheslav Trushkin
0cb539ed72 [ticket/10350] Fix for class phpbb_template_renderer_eval 
Fixing bug in class phpbb_template_renderer_eval

PHPBB3-10350
 2011-09-04 23:25:54 +03:00
Vjacheslav Trushkin
3e76f74688 [feature/remove-imagesets] Script for converting imageset to css 
Removing imagesets. Script for converting imageset to css

PHPBB3-10336
 2011-09-04 11:05:30 +03:00
Vjacheslav Trushkin
4035f3f6c8 [feature/remove-imagesets] Changing subsilver 
Removing imagesets. Changing subsilver

PHPBB3-10336
 2011-09-04 11:05:10 +03:00
Vjacheslav Trushkin
57fac62c0c [feature/remove-imagesets] Changing prosilver 
Removing imagesets. Changing prosilver

PHPBB3-10336
 2011-09-04 11:05:09 +03:00
Vjacheslav Trushkin
830c3f4047 [feature/remove-imagesets] Adjustments to php files 
Removing imagesets. Adjustments to php files

PHPBB3-10336
 2011-09-04 01:08:00 +03:00
Vjacheslav Trushkin
98590201d8 [feature/remove-imagesets] Changing admin control panel styles module 
Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
 2011-09-03 18:57:16 +03:00
Vjacheslav Trushkin
33adfd633b [feature/remove-imagesets] Changing database structure 
Removing imagesets. Changing database structure

PHPBB3-10336
 2011-09-03 18:55:30 +03:00
Vjacheslav Trushkin
929c13a52b [feature/remove-imagesets] Removing imageset files 
Removing imagesets. Removing imageset files

PHPBB3-10336
 2011-09-03 18:53:23 +03:00
Vjacheslav Trushkin
e5daccdf33 [feature/remove-imagesets] Moving images 
Removing imagesets. Moving images

PHPBB3-10336
 2011-09-03 18:51:33 +03:00
Andreas Fischer
6216e6748c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10339] Remove invalid template loop variable from mcp_front.html
 2011-08-30 01:52:26 +02:00
Andreas Fischer
8e5eacf692 Merge remote-tracking branch 'nickvergessen/ticket/10339' into develop-olympus 
* nickvergessen/ticket/10339:
  [ticket/10339] Remove invalid template loop variable from mcp_front.html
 2011-08-30 01:52:17 +02:00
Andreas Fischer
bf4eb6d06c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10334] Require permissions to view the birthday-list on board index

Conflicts:
	phpBB/index.php
 2011-08-30 01:41:41 +02:00
Andreas Fischer
1daefc6177 Merge remote-tracking branch 'nickvergessen/ticket/10334' into develop-olympus 
* nickvergessen/ticket/10334:
  [ticket/10334] Require permissions to view the birthday-list on board index
 2011-08-30 01:39:14 +02:00
Joas Schilling
57f7c24806 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
 2011-08-29 22:28:44 +02:00
Joas Schilling
a73bc353d6 Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/10341 
* remotes/bantu/ticket/10341:
  [ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
 2011-08-29 22:27:20 +02:00
Joas Schilling
ee2c8702ea Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10346] Add drop_tables to perform_schema_changes and add tests
 2011-08-29 21:00:13 +02:00
Joas Schilling
6cde745e28 Merge remote-tracking branch 'remotes/naderman/ticket/10346' into ticket/10346 
* remotes/naderman/ticket/10346:
  [ticket/10346] Add drop_tables to perform_schema_changes and add tests
 2011-08-29 20:56:06 +02:00
Nils Adermann
0f2e45800e [ticket/10346] Add drop_tables to perform_schema_changes and add tests 
PHPBB3-10346
 2011-08-29 14:24:50 -04:00
Oleg Pudeyev
37a659513e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
 2011-08-27 17:49:09 -04:00
Oleg Pudeyev
0d41385344 Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus 
* nickvergessen/ticket/10253:
  [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
 2011-08-27 17:38:27 -04:00
Nils Adermann
2219193096 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
 2011-08-26 05:59:34 -04:00
Nils Adermann
dc9a771473 Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympus 
* github-bantu/ticket/10335:
  [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
 2011-08-26 05:59:13 -04:00
Nils Adermann
73aca1a6fb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
 2011-08-25 23:21:09 -04:00
Nils Adermann
0d4089da7f Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympus 
* github-bantu/ticket/10320:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
 2011-08-25 23:20:55 -04:00
Nils Adermann
459570bcca Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9995] Do not run forum SQL query when marking the whole board read.
  [ticket/9995] Always continue when harvesting $forum_ids for markread().
  [ticket/9995] Remove useless statement from display_forums()

Conflicts:
	phpBB/includes/functions_display.php
 2011-08-25 23:16:31 -04:00
Nils Adermann
d602f74866 Merge remote-tracking branch 'github-bantu/ticket/9995' into develop-olympus 
* github-bantu/ticket/9995:
  [ticket/9995] Do not run forum SQL query when marking the whole board read.
  [ticket/9995] Always continue when harvesting $forum_ids for markread().
  [ticket/9995] Remove useless statement from display_forums()
 2011-08-25 23:12:22 -04:00
Nils Adermann
28f72e427e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10222] Also build language and styles changes in diff/patch format.
 2011-08-25 22:57:56 -04:00
Nils Adermann
34491f5569 Merge remote-tracking branch 'github-bantu/ticket/10222' into develop-olympus 
* github-bantu/ticket/10222:
  [ticket/10222] Also build language and styles changes in diff/patch format.
 2011-08-25 22:57:39 -04:00
Andreas Fischer
7ae871dfae [ticket/9995] Do not run forum SQL query when marking the whole board read. 
PHPBB3-9995
 2011-08-26 03:59:39 +02:00
Andreas Fischer
afc35f610d [ticket/9995] Always continue when harvesting $forum_ids for markread(). 
PHPBB3-9995
 2011-08-26 03:32:36 +02:00
Andreas Fischer
e4e854863f [ticket/9995] Remove useless statement from display_forums() 
The $forum_ids array is only used if $mark_read == 'forums'.

When $mark_read == 'forums', we either continue when
$auth->acl_get('f_list', $forum_id) is false or true.

So this statement is never useful.

PHPBB3-9995
 2011-08-26 03:29:05 +02:00
Andreas Fischer
d221d2f7e8 [ticket/10222] Also build language and styles changes in diff/patch format. 
PHPBB3-10222
 2011-08-25 19:35:01 +02:00
Andreas Fischer
4499be5795 [ticket/10341] Also show forum/topic name of "0" as most active forum/topic. 
PHPBB3-10341
 2011-08-25 17:44:45 +02:00
Andreas Fischer
4f8bb02a57 [ticket/10320] Exclude passworded forums when determining "Most active topic". 
PHPBB3-10320
 2011-08-25 17:33:39 +02:00
Andreas Fischer
4491746c73 [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class. 
PHPBB3-10320
 2011-08-25 17:12:42 +02:00
Andreas Fischer
7a36c3b34b [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots. 
PHPBB3-10335
 2011-08-24 14:51:37 +02:00
Joas Schilling
53e0e3240c [ticket/10339] Remove invalid template loop variable from mcp_front.html 
PHPBB3-10339
 2011-08-24 10:33:12 +02:00
Joas Schilling
efc443aac9 [ticket/10334] Require permissions to view the birthday-list on board index 
PHPBB3-10334
 2011-08-23 14:49:50 +02:00
Callum Macrae
03da3c7c4c [ticket/10240] Added optionset to mock_user in the tests. 
Also made optionset use the value set by optionset. We're not checking
whether the option is set or not, because we would just throw an error
if it wasn't set, and it throws an error anyway.

PHPBB3-10240
 2011-08-23 13:28:42 +01:00
Callum Macrae
d4f1b92479 [ticket/10240] Fixed copyright year in censor_text_test.php. 
PHPBB3-10240
 2011-08-23 11:38:59 +01:00
Callum Macrae
0d104b00c8 [ticket/10240] Fixed censor_text test assetEquals param order. 
Before, expected and input were the wrong way round.

PHPBB3-10240
 2011-08-23 11:32:35 +01:00
Callum Macrae
e7ab7f5f7a [ticket/10240] Added censor_text tests for special characters. 
PHPBB3-10240
 2011-08-23 11:30:32 +01:00
Andreas Fischer
ad20758916 [ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files. 
PHPBB3-9474
 2011-08-23 00:11:15 +02:00