03918f7fd2
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10185] Always set board startdate on conversion
2011-11-18 18:07:58 +01:00
93c4cdd1de
Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympus
...
* nickvergessen/ticket/10185:
[ticket/10185] Always set board startdate on conversion
2011-11-18 18:07:44 +01:00
21117c69f3
[feature/extension-manager] Add documentation on caching in ext finder
...
PHPBB3-10323
2011-11-18 17:30:23 +01:00
0c443a089c
[feature/extension-manager] Reference correct new module basenames in install
...
PHPBB3-10323
2011-11-18 17:09:53 +01:00
0d296785b2
[feature/extension-manager] Rename default methods to core methods on finder.
...
There are now extension_ and core_ methods for all finder settings as well as
a generic method which overwrites both.
PHPBB3-10323
2011-11-18 16:44:42 +01:00
d8e5783e8c
[feature/extension-manager] Document what the class loader stores in cache
...
PHPBB3-10323
2011-11-18 16:00:22 +01:00
91c0a0d426
[feature/extension-manager] Add docblock to cached paths map in class loader
...
PHPBB3-10323
2011-11-18 15:57:51 +01:00
7cdc4bba25
[feature/extension-manager] Clear up docs of extension related template changes
...
PHPBB3-10323
2011-11-18 15:29:32 +01:00
c2a19235eb
Merge branch 'develop-olympus' into develop
...
Conflicts:
phpBB/includes/functions.php
2011-11-18 15:28:37 +01:00
a7d7083d75
Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympus
2011-11-18 15:22:01 +01:00
8be1500048
[feature/extension-manager] Use "core files" instead of "global files" in docs
...
PHPBB3-10323
2011-11-18 14:48:39 +01:00
121cab1c29
[feature/extension-manager] Add docblocks to new search backend methods
...
PHPBB3-10323
2011-11-18 14:46:30 +01:00
81ac369808
[feature/extension-manager] Add docblocks to new methods in functions_module
...
PHPBB3-10323
2011-11-18 14:43:38 +01:00
eab7374f3f
[feature/extension-manager] Clarify comment on ext meta class instantiator
...
PHPBB3-10323
2011-11-18 14:38:31 +01:00
10fa711f00
[feature/extension-manager] Add more info on suffixes in extension finder
...
PHPBB3-10323
2011-11-18 14:37:57 +01:00
acc42bb2e9
[feature/extension-manager] Clarify is_dir parameter description
...
PHPBB3-10323
2011-11-18 13:16:32 +01:00
ef33bd72d0
[feature/extension-manager] Clarify class finding method docblock
...
PHPBB3-10323
2011-11-18 13:14:15 +01:00
7ee9a07179
[feature/extension-manager] Correct default path comment & remove double strlen
...
PHPBB3-10323
2011-11-18 13:10:09 +01:00
64bf03f4ca
[feature/extension-manager] Fix "disbale" typo in comment
...
PHPBB3-10323
2011-11-18 13:07:49 +01:00
ff91c037c9
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10157] Add notification to update cpfs when installing a language.
2011-11-17 12:46:00 -05:00
aeb896399c
Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympus
...
* nickvergessen/ticket/10157:
[ticket/10157] Add notification to update cpfs when installing a language.
2011-11-17 12:44:04 -05:00
3091efc501
[ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
...
PHPBB3-9416
2011-11-17 22:16:41 +08:00
b2b057910e
[ticket/10157] Add notification to update cpfs when installing a language.
...
We currently just copy the language-strings from the default language. But the
admin should be reminded to change them.
PHPBB3-10157
2011-11-17 10:28:16 +01:00
3d893c8222
[ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
...
PHPBB3-10296
2011-11-15 22:19:45 +01:00
e8686d9dad
[ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
...
PHPBB3-10296
2011-11-15 22:14:28 +01:00
815dd3591b
[ticket/10185] Always set board startdate on conversion
...
The board startdate should always be set to first user registration date.
The current code did not do anything at all, as the board_startdate was always
set on installation before running the convertor.
PHPBB3-10185
2011-11-15 17:23:55 +01:00
512aee5124
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10419] Reword the language strings
[ticket/10419] Reword some language strings, minor code changes
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
2011-11-15 16:46:23 +01:00
39f8592312
Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympus
...
* rxu/ticket/10419:
[ticket/10419] Reword the language strings
[ticket/10419] Reword some language strings, minor code changes
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
2011-11-15 16:46:08 +01:00
f1a53659bd
[ticket/10419] Reword the language strings
...
PHPBB3-10419
2011-11-15 23:43:52 +08:00
08827fa733
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10452] Fix xHTML errors when print-viewing PMs
Conflicts:
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
2011-11-14 22:01:36 +01:00
f7286e1abe
Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympus
...
* nickvergessen/ticket/10452:
[ticket/10452] Fix xHTML errors when print-viewing PMs
2011-11-14 21:57:00 +01:00
c0ffc8386c
[ticket/10453] PM viewmessage page is misplacing the online icon
...
Removed the position: absolute value, and made it so that if the
buttons are bigger the text move with it, also added support for
bidi.css (text right to left).
PHPBB3-10453
http://tracker.phpbb.com/browse/PHPBB3-10453
2011-11-14 21:38:10 +01:00
2236849511
Merge remote-tracking branch 'nickvergessen/ticket/10457' into develop
...
* nickvergessen/ticket/10457:
[ticket/10457] Undefined variable $request, when print-viewing PMs
2011-11-14 19:01:28 +01:00
2761a993ff
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:15 +01:00
69f943c8d6
Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympus
...
* nickvergessen/ticket/9361:
[ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:06 +01:00
14af18cb1b
[ticket/9361] View correct error messages when editing account information
...
Currently the "current password" is only checked, when you change something.
This means you get "Your profile has been updated." although you enter a wrong
password. I also added proper error messages, when you leave the confirm fields
empty, and sorted them in the order of the field appearances on the html page.
PHPBB3-9361
2011-11-14 18:54:12 +01:00
160e89aa06
[ticket/10457] Undefined variable $request, when print-viewing PMs
...
PHPBB3-10457
2011-11-14 18:49:07 +01:00
9830453487
[ticket/10452] Fix xHTML errors when print-viewing PMs
...
Also changed the layout of prosilvers PM print-view, so it looks like the post
print-view and not like the subsilver2 print-view.
PHPBB3-10452
2011-11-14 18:41:19 +01:00
34ed1352a6
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:58 +01:00
f31da015fc
Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympus
...
* nickvergessen/ticket/9066:
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:50 +01:00
3302305cd4
[ticket/9066] Move regex into get_preg_expression function and add tests
...
PHPBB3-9066
2011-11-14 15:10:25 +01:00
b21e343b5e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
[ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
[ticket/10254] Remove subsilver2 as default style on theme.
[ticket/10254] Remove style names from themes and fix some informations on it.
2011-11-14 13:45:01 +01:00
9d7b144c54
Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympus
...
* bantu/ticket/10254:
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
[ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
[ticket/10254] Remove subsilver2 as default style on theme.
[ticket/10254] Remove style names from themes and fix some informations on it.
2011-11-14 13:44:38 +01:00
e543effc64
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
...
PHPBB3-10254
2011-11-14 13:32:54 +01:00
cf044c363b
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
...
PHPBB3-10254
2011-11-14 13:29:38 +01:00
4d760630c3
[ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
...
PHPBB3-10254
2011-11-14 13:29:28 +01:00
c79992d1cc
[ticket/10254] Remove subsilver2 as default style on theme.
...
PHPBB3-10254
2011-11-14 13:29:18 +01:00
dee836315c
[ticket/10254] Remove style names from themes and fix some informations on it.
...
PHPBB3-10254
2011-11-14 13:28:42 +01:00
3dfb116942
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10087] Organize bans in acp_baninto optgroups
2011-11-13 21:14:21 +01:00
9553b2239c
Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympus
...
* igorw/ticket/10087:
[ticket/10087] Organize bans in acp_baninto optgroups
2011-11-13 21:13:22 +01:00
