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

11841 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Pudeyev
de1e343c5b [ticket/10605] Add a section for updating from 3.0.10 to schema updates. 
Without it data updates do not appear to be run.

PHPBB3-10605
 2012-04-05 17:34:54 -04:00
Oleg Pudeyev
03e382f99c [ticket/10605] Fix syntax error in database updater. 
PHPBB3-10605
 2012-04-05 17:34:37 -04:00
Callum Macrae
be9eb57785 [ticket/10455] Removed NOTE from prosilver overall_header.html. 
PHPBB3-10455
 2012-04-05 22:22:11 +01:00
Oleg Pudeyev
30093d6e86 Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympus 
* Fyorl/ticket/10508:
  [ticket/10508] Marked as read message now less specific.
 2012-04-05 15:35:12 -04:00
Hari Sankar R
018419b36c [ticket/10561] Moved and renamed the funtion validate_style(). 
Fixed minor changes as suggested by @bantu.

PHPBB3-10561
 2012-04-05 19:31:18 +05:30
Andreas Fischer
444fa29beb Merge remote-tracking branch 'p/ticket/10760' into develop-olympus 
* p/ticket/10760:
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  [ticket/10760] Use externally specified PHP_BIN if any.
 2012-04-05 03:28:16 +02:00
Oleg Pudeyev
21639d5d54 Merge remote-tracking branch 'Fyorl/ticket/10607' into develop-olympus 
* Fyorl/ticket/10607:
  [ticket/10607] Added 'Powered by' translation string.
 2012-04-04 15:22:00 -04:00
Oleg Pudeyev
dc63db1860 [ticket/10760] Fix numbering in php fun facts. 
PHPBB3-10760
 2012-04-04 11:43:59 -04:00
Oleg Pudeyev
efdd1e623e [ticket/10760] Value must be quoted as it might be two words. 
PHPBB3-10760
 2012-04-04 11:41:14 -04:00
Oleg Pudeyev
6536a36208 [ticket/10760] PHP is great. This commit is the proof. 
PHPBB3-10760
 2012-04-04 00:27:06 -04:00
Oleg Pudeyev
f2967b6669 [ticket/10760] Catch both versions of parse error output in php. 
PHPBB3-10760
 2012-04-04 00:01:08 -04:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string. 
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
 2012-04-04 11:38:15 +08:00
Oleg Pudeyev
a0da2408e7 [ticket/10760] Account for display_errors=stderr in pre-commit hook. 
With that php.ini value set errors are printed to stderr, therefore
by redirecting stderr to /dev/null we also throw out the errors.

Instead merge stderr into stdout.

PHPBB3-10760
 2012-04-03 23:18:33 -04:00
Oleg Pudeyev
b803fc4351 [ticket/10760] Quote PHP_BIN when using it. 
This should make a difference on windows where paths may include spaces.

PHPBB3-10760
 2012-04-03 23:14:44 -04:00
Oleg Pudeyev
786fcbf212 [ticket/10760] Use echo -e only if echo understands -e. 
/bin/echo on freebsd and dash's builtin echo do not understand -e,
therefore -e is printed with the other messages in such cases.

Test if echo understands -e, if not do not use it.

PHPBB3-10760
 2012-04-03 23:06:50 -04:00
Oleg Pudeyev
57209a1e68 [ticket/10760] Use externally specified PHP_BIN if any. 
We have a PHP_BIN variable but we always set it unconditionally,
therefore in order to use a different php binary one had to
modify the hook script.

Instead set PHP_BIN if it is not set.

Now one can set PHP_BIN in their environment to use a non-default
php binary.

PHPBB3-10760
 2012-04-03 23:05:15 -04:00
Oleg Pudeyev
14e727b834 Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympus 
* bantu/ticket/10658:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
 2012-04-03 20:57:24 -04:00
Fyorl
0df3f1c5d0 [ticket/10508] Marked as read message now less specific. 
Changed 'The selected forums have been marked read' to 'Forums
have been marked read'

PHPBB3-10508
 2012-04-04 02:51:28 +08:00
Hari Sankar R
a84b97f58e [ticket/10561] Fixed syntax error and renamed return variables. 
Renamed $style_verified to $style_is_active and fixed extra ';'.

PHPBB3-10561
 2012-04-03 23:15:16 +05:30
Hari Sankar R
c5481371b9 [ticket/10561] Changes made to $db->sql_fetchrow(). 
Changed $db->sql_fetchrow() to $db->sql_fetchfield().

PHPBB3-10561
 2012-04-03 23:04:56 +05:30
Hari Sankar R
b81a5afc25 [ticket/10561] Changes made to function phpbb_style_is_active(). 
Fixed return type, documented function and, removed
style_id from fetch.

PHPBB3-10561
 2012-04-03 22:56:06 +05:30
Hari Sankar R
084e1ae560 [ticket/10561] All users can choose deactivated styles (fixed). 
A form exploit enabled the users to select a deactivated
style. Fixed with extra check on submit, with a new function
styles_verify to check if the selected style is activated or not.

PHPBB3-10561
 2012-04-03 22:15:59 +05:30
Vjacheslav Trushkin
51bc9540cf Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympus 
* sadu/ticket/10699:
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
  [ticket/10699] Long h2 title breaks div.minitabs in MCP
 2012-04-02 16:18:56 +03:00
Hari Sankar R
17e050e109 [ticket/10699] Long h2 title breaks div.minitabs in MCP 
Fixed minor issues in formatting.

PHPBB3-10699
 2012-04-02 16:59:05 +05:30
Hari Sankar R
42101fe8d4 [ticket/10699] Long h2 title breaks div.minitabs in MCP 
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both

PHPBB3-10699
 2012-04-02 16:26:23 +05:30
Hari Sankar R
b1b530f92c [ticket/10731] Fixed addquote() to work on opera browser. 
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.

PHPBB3-10731
 2012-04-01 17:05:31 +03:00
Igor Wiedler
3477b5e5a8 Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympus 
* Dickyf/ticket/10675:
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [ticket/10675] Add disk full language string when posting attachments
 2012-03-31 19:27:19 +02:00
Richard Foote
b8b342be2d [Ticket/10675] Correct language string ATTACH_DISK_FULL 
Add period to ATTACH_DISK_FULL language string

PHPBB3-10675
 2012-03-31 12:46:44 -04:00
Igor Wiedler
313cf7297c Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympus 
Feature/events dispatcher olympus
 2012-03-30 11:15:54 -07:00
Michael Cullum
9391d423c0 [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus 
To keep the .gitignore's the same.

PHPBB3-9550
 2012-03-30 19:13:32 +01:00
David King
dc4d0677b9 Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-olympus 2012-03-30 13:38:40 -04:00
David King
10d4f8c35e Merge branch 'harderthanfire/ticket/10129' into develop-olympus 2012-03-29 20:37:50 -04:00
Oleg Pudeyev
ccf83dd69b Merge remote-tracking branch 'janschejbal/ticket/10730' into develop-olympus 
* janschejbal/ticket/10730:
  [ticket/10730] Added label tag around "select" text in post splitting UI
 2012-03-28 23:23:53 -04:00
Jan Schejbal
fff9f6611e [ticket/10730] Added label tag around "select" text in post splitting UI 
Added label tags around the "select" text in the post splitting UI in the MCP.
Had to add IDs based on the post ID to the select boxes to allow label to
work. Tested in Firefox and Chrome.

PHPBB3-10730
 2012-03-29 04:16:34 +02:00
Andreas Fischer
2516b1e8f1 Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympus 
* Dickyf/ticket/10708:
  [ticket/10708] Check converted passwords for multi-byte characters
 2012-03-29 00:51:12 +02:00
Igor Wiedler
a820ff1ebc Merge pull request #664 from imkingdavid/ticket/10732 
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
 2012-03-28 14:38:16 -07:00
David King
1789e0948b [ticket/10732] Add config_dev.php and config_test.php to .gitignore 
PHPBB3-10732
 2012-03-28 17:05:45 -04:00
Joas Schilling
b9324577ac [ticket/10605] Reset user´s pm count to 0 when deleting his PMs 
PHPBB3-10605
 2012-03-27 17:32:55 +02:00
Joas Schilling
0397b46217 [ticket/10605] Split query to be able to use indexes 
PHPBB3-10605
 2012-03-27 17:29:03 +02:00
Andreas Fischer
9c8aab4d32 [ticket/10605] Rename $delete_rows to $delete_ids. 
PHPBB3-10605
 2012-03-27 02:02:17 +02:00
Andreas Fischer
ad073d22b9 [ticket/10605] Break long comment into multiple lines 80 chars short. 
PHPBB3-10605
 2012-03-27 01:43:09 +02:00
Andreas Fischer
dd53d0576d [ticket/10605] Remove unnecessary $delete_ids array. 
PHPBB3-10605
 2012-03-27 01:39:49 +02:00
Andreas Fischer
9040f18d7c [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. 
PHPBB3-10605
 2012-03-27 01:35:01 +02:00
Andreas Fischer
dbc7a69ad2 [ticket/10605] Remove unused variable declarations. 
PHPBB3-10605
 2012-03-27 01:30:52 +02:00
Andreas Fischer
2203bc204e [ticket/10605] Turn $undelivered_user into a real array of counters. 
PHPBB3-10605
 2012-03-27 01:29:29 +02:00
Andreas Fischer
e8830f605f [ticket/10605] Use unset() instead of checking user_id over and over again. 
PHPBB3-10605
 2012-03-27 01:18:02 +02:00
Andreas Fischer
a618e22fca Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympus 
* unknownbliss/ticket/10694:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
 2012-03-26 00:06:17 +02:00
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. 
PHPBB3-10129
 2012-03-24 15:13:04 +00:00
Andreas Fischer
9c85c6c318 Merge remote-tracking branch 'unknownbliss/ticket/10723' into develop-olympus 
* unknownbliss/ticket/10723:
  [ticket/10723] Stop Travis running all tests on sqlite
 2012-03-24 14:52:50 +01:00
Michael Cullum
5bcdfe94dd [ticket/10723] Stop Travis running all tests on sqlite 
Correct information so all tests don't run on sqlite

PHPBB3-10723
 2012-03-23 06:40:15 +00:00