Commit graph

14612 commits

Author SHA1 Message Date
Igor Wiedler
7f42970ba0 [feature/remove-imagesets] Fix create_schema_files, get rid of imagesets
PHPBB3-10336
2011-10-14 02:00:46 +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
5cae822594 Merge remote-tracking branch 'nickvergessen/ticket/10409' into develop
* nickvergessen/ticket/10409:
  [ticket/10409] Running database_update.php multiple times breaks the update
2011-10-13 23:48:24 +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
Joas Schilling
1df2148bf4 [ticket/10409] Running database_update.php multiple times breaks the update
PHPBB3-10409
2011-10-13 23:29:52 +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
Andreas Fischer
3ad5c45097 [ticket/10187] XHTML fix for empty groups in UCP.
PHPBB3-10187
2011-10-13 21:11:58 +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
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