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

13333 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alan
f7c1341402 [ticket/8616] Direct links in pm notification emails 
Import the "Direct links in pm notification emails" modification,
version 1.0.1.

PHPBB3-8616
 2011-10-13 19:17:56 +02:00
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
Nils Adermann
7b12bba95b [feature/extension-manager] Allow old non-prefix basenames to work for lookups 
These module basenames are hardcoded in a bunch of places so they need to
continue to work unless we want to rewrite all of them.

PHPBB3-10323
 2011-10-13 17:38:38 +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
Nils Adermann
fbc2442ccd [feature/extension-manager] Correctly detect and handle directories in finder 
PHPBB3-10323
 2011-09-29 17:20:42 +02:00
Nils Adermann
77f42969ab [feature/extension-manager] Extend the tests for finding directories 
PHPBB3-10323
 2011-09-29 16:55:50 +02:00
Nils Adermann
cffc676f17 [feature/extension-manager] Find dirs with SELF_FIRST setting on iterator 
PHPBB3-10323
 2011-09-29 16:34:17 +02:00
Nils Adermann
f61ee5d6f5 [feature/extension-manager] Make sure the directory pattern matches on windows 
PHPBB3-10323
 2011-09-29 16:15:54 +02:00
Nils Adermann
024a5e710e [feature/extension-manager] Correctly reset paths in set_template 
PHPBB3-10323
 2011-09-29 16:15:54 +02:00
Nils Adermann
e52022c572 [feature/extension-manager] Make sure named styles are loaded from root dir 
PHPBB3-10323
 2011-09-29 16:15:54 +02:00
Nils Adermann
4d08d769c2 [feature/extension-manager] Fallback template might not always be set 
PHPBB3-10323
 2011-09-29 16:15:53 +02:00
Nils Adermann
703fcae382 [feature/extension-manager] Reset all template paths after a set_templates call 
PHPBB3-10323
 2011-09-29 16:15:53 +02:00
Nils Adermann
520a5f9295 [feature/extension-manager] Refactoring the structure of extension provider 
PHPBB3-10323
 2011-09-29 16:15:53 +02:00
Nils Adermann
52f5fa796f [feature/extension-manager] Add extension meta info classes for test extensions 
PHPBB3-10323
 2011-09-29 16:15:53 +02:00
Nils Adermann
482a8c47ea [feature/extension-manager] Don't use the extension manager during install 
Template needs to be able to work without extensions.

PHPBB3-10323
 2011-09-29 16:15:53 +02:00
Nils Adermann
ea46feb115 [feature/extension-manager] Add support for templates in extensions. 
This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

PHPBB3-10323
 2011-09-29 16:15:53 +02:00
Nils Adermann
6ea6d50ccb [feature/extension-manager] Don't cache the phpbb_root_path in the ext manager 
Otherwise the paths are incorrect from e.g. adm/

PHPBB3-10323
 2011-09-29 15:42:49 +02:00
Nils Adermann
6c6a7d7992 [feature/extension-manager] Extract extension provider functionality from cron 
PHPBB3-10323
 2011-09-29 15:42:49 +02:00
Nils Adermann
7d16007d6a [feature/extension-manager] Prepend the phpbb_root_path if necessary. 
PHPBB3-10323
 2011-09-29 15:42:49 +02:00
Nils Adermann
fd42599191 [feature/extension-manager] Correct formatting of documentation 
PHPBB3-10323
 2011-09-29 15:42:49 +02:00
Nils Adermann
0ea4de4171 [feature/extension-manager] Add support for directories to the extension finder 
PHPBB3-10323
 2011-09-29 15:42:49 +02:00