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

5560 commits

Author SHA1 Message Date
Nils Adermann
d68b815690 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10074] Change default value of 'Set as special rank' to No
 2011-10-14 02:55:21 +02:00
Nils Adermann
d16b160d5c Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop-olympus 
* github-nickvergessen/ticket/10074:
  [ticket/10074] Change default value of 'Set as special rank' to No
 2011-10-14 02:55:05 +02:00
Nils Adermann
c5ee92c3f2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:49:15 +02:00
Nils Adermann
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus 
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:47:45 +02:00
Joas Schilling
1f677d5de3 [ticket/10074] Change default value of 'Set as special rank' to No 
PHPBB3-10074
 2011-10-14 02:41:37 +02:00
Nils Adermann
bb616b4135 [ticket/10412] Replace memory_get_usage with memory_get_peak_usage 
PHPBB3-10412
 2011-10-14 02:02:17 +02:00
Nils Adermann
cd522a11f3 [feature/extension-manager] Properly remove old ACP language loading code 
PHPBB3-10323
 2011-10-14 01:31:24 +02:00
Nils Adermann
4fb9f2101d [feature/extension-manager] Support extensions in subdirectories of ext/ 
PHPBB3-10323
 2011-10-14 01:30:50 +02:00
Nils Adermann
f53892c838 [feature/extension-manager] Add prefix to extension meta data / install classes 
PHPBB3-10323
 2011-10-14 00:52:36 +02:00
Nils Adermann
639e3b9f17 [feature/extension-manager] Support for loading language files from extensions 
The referenced extension needs to be explicitly specified in an add_lang_ext()
call.

PHPBB3-10323
 2011-10-14 00:44:48 +02:00
Andreas Fischer
85407986ea Merge remote-tracking branch 'nickvergessen/ticket/10300' into develop 
* nickvergessen/ticket/10300:
  [ticket/10300] Always set group attributes for teampage and legend
 2011-10-13 23:48:45 +02:00
Andreas Fischer
301f9d42f7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
 2011-10-13 23:45:04 +02:00
Andreas Fischer
4e69fe6859 Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympus 
* igorw/ticket/10307:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
 2011-10-13 23:44:42 +02:00
Nils Adermann
724f40f0f4 [feature/extension-manager] extension finder now saves ext it found a file in 
PHPBB3-10323
 2011-10-13 21:19:35 +02:00
Igor Wiedler
39f6d58315 [ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE 
PHPBB3-8616
 2011-10-13 19:28:46 +02:00
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
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
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
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
3cd8c2507d [ticket/10307] Return false in mysqli sql_fetchrow on empty result 
PHPBB3-10307
 2011-10-13 16:43:11 +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
f94f872624 [ticket/10304] Fix URL for ICQ while view private messages 
PHPBB3-10304
 2011-10-13 13:59:39 +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
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
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
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
Nils Adermann
fe4b8818ec [feature/extension-manager] Always store the full class name as module basename 
The updater swaps out all basenames.

PHPBB3-10323
 2011-09-29 15:42:49 +02:00
Nils Adermann
c785ef7aa7 [feature/extension-manager] Make sure the extension manager works without cache 
Includes a test for manager without a cache

PHPBB3-10323
 2011-09-29 15:42:49 +02:00
Nils Adermann
739e9eb58e [feature/extension-manager] Make the cache variable name for extensions dynamic 
Allows multiple instances to use cache simultaneously.

PHPBB3-10323
 2011-09-29 15:42:48 +02:00
Nils Adermann
bd1366d62d [feature/extension-manager] Use _ext for cache - avoids conflict with file ext 
PHPBB3-10323
 2011-09-29 15:42:48 +02:00
Nils Adermann
64827a6623 [feature/extension-manager] Test creation of new extension finder cache 
PHPBB3-10323
 2011-09-29 15:42:48 +02:00