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

12078 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
8c7be51bcc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10246] Move coding guidelines VCS section to wiki
 2011-10-13 18:30:08 +02:00
Andreas Fischer
e43b7813a5 Merge remote-tracking branch 'igorw/ticket/10246' into develop-olympus 
* igorw/ticket/10246:
  [ticket/10246] Move coding guidelines VCS section to wiki
 2011-10-13 18:29:17 +02:00
Andreas Fischer
1dc1583b92 [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. 
PHPBB3-10278
 2011-10-13 18:23:33 +02:00
Andreas Fischer
091119605a [ticket/10278] Also timeout when receiving data over a slow connection. 
PHPBB3-10278
 2011-10-13 18:03:02 +02:00
Igor Wiedler
75ef0fde82 [ticket/10246] Move coding guidelines VCS section to wiki 
The VCS section can now be found at:
* http://wiki.phpbb.com/Git#Branches

PHPBB3-10246
 2011-10-13 17:43:59 +02:00
Andreas Fischer
e9677e6980 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
 2011-10-13 17:25:19 +02:00
Andreas Fischer
b957639abb Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympus 
* igorw/ticket/8094:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
 2011-10-13 17:25:10 +02:00
Andreas Fischer
563fb56c4a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10275] Remove incorrect password information from FAQ
 2011-10-13 17:21:02 +02:00
Andreas Fischer
8017469e59 Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympus 
* igorw/ticket/10275:
  [ticket/10275] Remove incorrect password information from FAQ
 2011-10-13 17:20:52 +02:00
Andreas Fischer
bfe621d7b5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9898] Encourage patches in README
 2011-10-13 17:16:31 +02:00
Andreas Fischer
57d157a723 Merge remote-tracking branch 'igorw/ticket/9898' into develop-olympus 
* igorw/ticket/9898:
  [ticket/9898] Encourage patches in README
 2011-10-13 17:16:20 +02:00
Andreas Fischer
baf09125ab Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
 2011-10-13 17:10:38 +02:00
Andreas Fischer
3a92623dfa Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympus 
* nickvergessen/ticket/10408:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
 2011-10-13 17:09:48 +02:00
Igor Wiedler
ee91656968 [ticket/10275] Remove incorrect password information from FAQ 
FAQ contains instructions to find the password in the registration
e-mail. We no longer send the password on registration. So let's just
remove this incorrect piece of information from the FAQ.

PHPBB3-10275
 2011-10-13 17:09:34 +02:00
Andreas Fischer
d5cd49f276 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10304] Fix URL for ICQ while view private messages
 2011-10-13 17:07:39 +02:00
Andreas Fischer
4c1bde350a Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympus 
* nickvergessen/ticket/10304:
  [ticket/10304] Fix URL for ICQ while view private messages
 2011-10-13 17:07:28 +02:00
Andreas Fischer
9fbe4e34ab Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10400] Allow forum name to be '0'
 2011-10-13 17:05:53 +02:00
Andreas Fischer
4b42646f36 Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympus 
* nickvergessen/ticket/10400:
  [ticket/10400] Allow forum name to be '0'
 2011-10-13 17:05:01 +02:00
Igor Wiedler
6d9e9d1901 [ticket/10307] Add a test for PHPBB3-10307 
PHPBB3-10307
 2011-10-13 16:57:42 +02:00
Igor Wiedler
3cd8c2507d [ticket/10307] Return false in mysqli sql_fetchrow on empty result 
PHPBB3-10307
 2011-10-13 16:43:11 +02:00
Igor Wiedler
6698a9cbd6 [ticket/8094] Remove ambiguity of "phpBB has no categories" 
PHPBB3-8094
 2011-10-13 16:25:41 +02:00
Joas Schilling
88aacd0f2c [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP 
PHPBB3-10408
 2011-10-13 15:52:12 +02:00
Joas Schilling
367bc23009 Merge branch 'develop-olympus' into develop 
Conflicts:
	phpBB/includes/functions.php
 2011-10-13 14:46:16 +02:00
Joas Schilling
b515f5462e Merge remote-tracking branch 'remotes/cyberalien/ticket/10397' into develop-olympus 2011-10-13 14:37:45 +02:00
Joas Schilling
f94f872624 [ticket/10304] Fix URL for ICQ while view private messages 
PHPBB3-10304
 2011-10-13 13:59:39 +02:00
Igor Wiedler
d4bbfae0d5 [ticket/9898] Encourage patches in README 
PHPBB3-9898
 2011-10-13 11:53:25 +02:00
Igor Wiedler
330b79686a Merge remote-tracking branch 'ckwalsh/ticket/9661' into develop 
* ckwalsh/ticket/9661:
  [ticket/9661] Remove eval() from functions_privmsgs.php
 2011-10-10 23:58:18 +02:00
Joas Schilling
cacb9f2ec5 [ticket/10400] Allow forum name to be '0' 
PHPBB3-10400
 2011-10-07 09:44:31 +02:00
Matt Friedman
2d0f96e8cc [ticket/10390] Revert back to escaped script tags inside document.write 
Revert all script tags inside a document.write back to the escaped
version so they won't trip up any XML parsers.

PHPBB3-10390
 2011-10-05 21:24:34 -07:00
Vjacheslav Trushkin
b38fbc6d25 [ticket/10397] Pagination inconsistency fix 
Fixing topic_generate_pagination()

PHPBB3-10397
 2011-10-04 12:24:42 +03:00
Vjacheslav Trushkin
12882084d4 [ticket/10397] Pagination inconsistency fix 
Fixing inconsistency in code generated by generate_pagination()

PHPBB3-10397
 2011-10-04 11:55:25 +03:00
Matt Friedman
9bea7c3278 [ticket/10390] Fix wording: fallback should be fall back 
PHPBB3-10390
 2011-09-27 20:15:41 -07:00
Andreas Fischer
8377418466 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
 2011-09-27 22:44:20 +02:00
Andreas Fischer
86f8851c40 Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus 
* naderman/ticket/10394:
  [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function
 2011-09-27 22:39:30 +02:00
Nils Adermann
b197ea56c2 [ticket/10394] Use call_user_func_array to pass a ref into a dynamic function 
PHPBB3-10394
 2011-09-27 22:32:20 +02:00
Andreas Fischer
76f3d08383 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
 2011-09-27 20:58:17 +02:00
Andreas Fischer
dad7aa9593 Merge remote-tracking branch 'nickvergessen/ticket/10315' into develop-olympus 
* nickvergessen/ticket/10315:
  [ticket/10315] Add top/bottom margin to the options in ACP to avoid overlapping
 2011-09-27 20:57:55 +02:00
Andreas Fischer
887a9e583f Merge remote-tracking branch 'cs278/ticket/10387' into develop 
* cs278/ticket/10387:
  [ticket/10387] Add CURRENT_PAGE var to the template when pagination is used.
 2011-09-27 20:29:03 +02:00
Andreas Fischer
9e35eb2e1f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
 2011-09-27 20:24:24 +02:00
Andreas Fischer
af66fbb93b Merge branch 'develop' of git://github.com/phpbb/phpbb3 into develop 
* 'develop' of git://github.com/phpbb/phpbb3:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
 2011-09-27 20:24:16 +02:00
Andreas Fischer
13b718e720 Merge remote-tracking branch 'naderman/ticket/10394' into develop-olympus 
* naderman/ticket/10394:
  [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4
 2011-09-27 20:21:57 +02:00
Matt Friedman
2dca3c3c27 [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP 
jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.

PHPBB3-10390
 2011-09-27 11:12:11 -07:00
Matt Friedman
2a28b6fc40 [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback 
HTML5 styles (ACP / Prosilver) do not need to use escaped javascript
wrapped in an unescape function, so we can simplify it! Only subsilver2 will
use the escaped version of the fallback code, because it is still XHTML.

PHPBB3-10390
 2011-09-27 11:11:42 -07:00
Matt Friedman
c6a2d81bd3 [ticket/10390] Drop http protocol for Microsoft's CDN option 
Like Google, Microsoft supports both http and https protocols, so we
can drop the protocol alltogether from the url so the Microsoft CDN
will work on both HTTP or HTTPS sites without issue. Also I cleaned
up some of the comments here.

PHPBB3-10390
 2011-09-27 11:11:30 -07:00
Matt Friedman
81e8faecbc [ticket/10390] Reword the language for jQuery host/server options 
Reword some of the language used for the description and pull-down options
to try and make it more clear to users that they have the option to use
jQuery from their own server with the copy included with phpBB, or from one
of the remote CDN servers.

PHPBB3-10390
 2011-09-27 11:10:43 -07:00
Nils Adermann
fd376dfbe6 Merge remote-tracking branch 'github-cs278/ticket/10392' into develop 
* github-cs278/ticket/10392:
  [ticket/10392] Alter parent namespace stripping.
  [ticket/10392] Test for magic loop variables with nested namespaces.
  [ticket/10392] Missed fix for S_BLOCK_NAME.
  [ticket/10392] Fix access to nested special block variables.
 2011-09-27 17:39:08 +02:00
Nils Adermann
b571b3e032 [ticket/10394] Remove call-time pass by reference from tests for PHP 5.4 
PHPBB3-10394
 2011-09-27 17:31:24 +02:00
Chris Smith
1f14013093 [ticket/10392] Alter parent namespace stripping. 
PHPBB3-10392
 2011-09-27 01:06:43 +01:00
Chris Smith
118bc6198e [ticket/10392] Test for magic loop variables with nested namespaces. 
PHPBB3-10392
 2011-09-27 01:02:58 +01:00
Chris Smith
02a24e2439 [ticket/10392] Missed fix for S_BLOCK_NAME. 
PHPBB3-10392
 2011-09-27 00:50:53 +01:00