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,757 Commits 17 Branches 190 Tags
Commit Graph

11757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Joas Schilling
5d66faafc1 [ticket/10321] Add descriptions to the unit tests 
PHPBB3-10321
 2011-08-21 18:56:47 +02:00
Igor Wiedler
4bc09cd34d Merge remote-tracking branch 'bantu/ticket/10329' into develop 
* bantu/ticket/10329:
  [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
 2011-08-21 15:21:25 +02:00
Andreas Fischer
8ad58645fe Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
 2011-08-21 15:18:01 +02:00
Andreas Fischer
540ca1a8d8 Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympus 
* nickvergessen/ticket/8177:
  [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
 2011-08-21 15:17:51 +02:00
Andreas Fischer
ac11806bf4 [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function. 
Introduced by 6b4d0a254218e8d40151ca1bdff8c439f89502e9.

PHPBB3-10329
 2011-08-21 14:34:34 +02:00
Andreas Fischer
0b9fe01cce Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10240] Reverted a commit which added buggy code.
 2011-08-21 14:26:37 +02:00
Andreas Fischer
91b415dd01 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus 
* callumacrae/ticket/10240:
  [ticket/10240] Reverted a commit which added buggy code.
 2011-08-21 14:26:24 +02:00
Callum Macrae
4592076366 [ticket/10240] Reverted a commit which added buggy code. 
This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888.

The code which was added also removed new lines and tabs.

PHPBB3-10240
 2011-08-21 13:16:50 +01:00
Andreas Fischer
4253a73e81 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10309] Update .gitignore and move .gitkeep.
  [ticket/10309] Coding guidelines fix.
  [ticket/10309] Write unicode data to tests/tmp.

Conflicts:
	.gitignore
 2011-08-21 14:12:08 +02:00
Andreas Fischer
9f9e4ad3d8 Merge remote-tracking branch 'p/ticket/10309' into develop-olympus 
* p/ticket/10309:
  [ticket/10309] Update .gitignore and move .gitkeep.
 2011-08-21 14:11:10 +02:00
Andreas Fischer
15d0fe7d9f Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into develop-olympus 
* 'develop-olympus' of git://github.com/phpbb/phpbb3:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
 2011-08-21 14:11:06 +02:00
Joas Schilling
dc149a43e4 [ticket/10321] Do not append the ? if the param-list is empty anyway. 
PHPBB3-10321
 2011-08-21 13:16:05 +02:00
Joas Schilling
3c7dfc7e19 [ticket/8177] Display birthdays of 29th february on 28th in non-leap years. 
PHPBB3-8177
 2011-08-21 01:46:47 +02:00
Oleg Pudeyev
57accade85 [ticket/10309] Update .gitignore and move .gitkeep. 
PHPBB3-10309
 2011-08-20 14:34:02 -04:00
Oleg Pudeyev
19ee2d2d40 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
 2011-08-20 14:25:37 -04:00
Oleg Pudeyev
1680b3a2a7 Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympus 
* callumacrae/ticket/9978:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
 2011-08-20 14:17:31 -04:00
Callum Macrae
b18b3363e9 [ticket/9978] Added semicolons to JavaScript in overall_header. 
Semicolons have been added to the anonymous functions in the javascript
in overall_header.html. This makes JSLint happier, and also makes the
code easier to minify.

PHPBB3-9978
 2011-08-20 11:20:30 +01:00
Nils Adermann
052e33823b Merge remote-tracking branch 'github-igorw/feature/request-class' into develop 
* github-igorw/feature/request-class:
  [feature/request-class] Fix session_testable_factory
  [feature/request-class] Adjust code base to do html decoding manually
  [feature/request-class] Remove $html_encode arg, force manual decoding
  [feature/request-class] Do not html escape user agent in header_filename
  [feature/request-class] Make use of the is_secure() method
  [feature/request-class] Add is_secure method to request for HTTPS
  [feature/request-class] Make server() use the $html_encode parameter
  [feature/request-class] Remove useless condition
  [feature/request-class] Minor spacing CS adjustments
  [feature/request-class] Add server(), header() and is_ajax() to request
 2011-08-18 19:15:00 -04:00
Igor Wiedler
b05382d226 [feature/request-class] Fix session_testable_factory 
PHPBB3-9716
 2011-08-19 00:13:34 +02:00