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

10913 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nils Adermann
a0930e78c6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10081] remove $phpEx.
  [ticket/10081] Cleanup Template Tests.
 2011-03-07 19:10:19 +01:00
Nils Adermann
5646d65712 Merge branch 'ticket/aptx/10081' into develop-olympus 
* ticket/aptx/10081:
  [ticket/10081] remove $phpEx.
  [ticket/10081] Cleanup Template Tests.
 2011-03-07 19:10:02 +01:00
Marek A. Ruszczynski
b835f364f5 [ticket/10081] remove $phpEx. 
PHPBB3-10081
 2011-03-07 18:50:18 +01:00
Marek A. Ruszczynski
7147382e9e [ticket/10081] Cleanup Template Tests. 
There are no incomplete template tests anymore.

PHPBB3-10081
 2011-03-07 18:26:46 +01:00
Andreas Fischer
a444eec473 Merge branch 'ticket/naderman/10011' into develop 
* ticket/naderman/10011:
  [ticket/10011] Removing __DIR__ uses I missed in previous commit
 2011-03-07 17:29:19 +01:00
Nils Adermann
01dce65aee [ticket/10011] Removing __DIR__ uses I missed in previous commit 
PHPBB3-10011
 2011-03-07 17:26:31 +01:00
Andreas Fischer
cda3ba62b9 Merge branch 'ticket/naderman/10011' into develop 
* ticket/naderman/10011:
  [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files.
 2011-03-07 17:13:23 +01:00
Nils Adermann
4f14ae94e2 [ticket/10011] Removing __DIR__ for PHP5.2 compatability from new files. 
PHPBB3-10011
 2011-03-07 17:08:55 +01:00
Andreas Fischer
bd03419f87 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
 2011-03-07 16:32:58 +01:00
Andreas Fischer
21c5e6f149 Merge branch 'ticket/naderman/10040' into develop-olympus 
* ticket/naderman/10040:
  [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED.
 2011-03-07 16:32:42 +01:00
Nils Adermann
dec9d24392 [ticket/10040] Ensure the test suite runs on PHP 5.2 without E_DEPRECATED. 
PHPBB3-10040
 2011-03-07 16:25:52 +01:00
Oleg Pudeyev
f0b36961fc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
 2011-03-06 14:53:53 -05:00
Oleg Pudeyev
f08cbc73de Merge branch 'ticket/bantu/10075' into develop-olympus 
* ticket/bantu/10075:
  [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
 2011-03-06 14:53:47 -05:00
Andreas Fischer
239cb56af0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9824] Accept commit messages with less than perfect headings.
  [ticket/9824] Allow empty lines after ticket reference.
  [ticket/9824] Use printf instead of echo to render \n.
  [ticket/9824] Handle empty commit messages in commit-msg hook.
  [ticket/10059] Fix two misspellings of consistent.
  [ticket/9824] Add space after [ticket/12345] in prepared commit message.
  [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
 2011-03-06 15:08:29 +01:00
Andreas Fischer
7027489c8e Merge branch 'ticket/p/10059' into develop-olympus 
* ticket/p/10059:
  [ticket/10059] Fix two misspellings of consistent.
 2011-03-06 15:06:58 +01:00
Andreas Fischer
12721f654e Merge branch 'ticket/p/9824' into develop-olympus 
* ticket/p/9824:
  [ticket/9824] Accept commit messages with less than perfect headings.
  [ticket/9824] Allow empty lines after ticket reference.
  [ticket/9824] Use printf instead of echo to render \n.
  [ticket/9824] Handle empty commit messages in commit-msg hook.
  [ticket/9824] Add space after [ticket/12345] in prepared commit message.
  [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
 2011-03-06 14:55:57 +01:00
Andreas Fischer
32af9e8865 [ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release. 
Remove:
 - A_Jelly_Doughnut
 - dhn
 - TerraFrost

Add:
 - nn-

Move:
 - Brainy

Rename:
 - Brainy -> ckwalsh

PHPBB3-10075
 2011-03-04 16:54:24 +01:00
Oleg Pudeyev
e8def259ef Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
 2011-03-02 22:08:01 -05:00
Oleg Pudeyev
afae883619 Merge branch 'ticket/nickvergessen/9911' into develop-olympus 
* ticket/nickvergessen/9911:
  [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
 2011-03-02 22:07:56 -05:00
Oleg Pudeyev
c177ba7a4e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9915] "Length of ban:" is not displayed in ACP
 2011-03-02 20:47:06 -05:00
Oleg Pudeyev
57ab0816e2 Merge branch 'ticket/nickvergessen/9915' into develop-olympus 
* ticket/nickvergessen/9915:
  [ticket/9915] "Length of ban:" is not displayed in ACP
 2011-03-02 20:46:28 -05:00
Joas Schilling
5c2243360d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10072] Added the POST_NUMBER template var
 2011-03-03 00:26:32 +01:00
Joas Schilling
1b97506ec5 Merge branch 'ticket/samt/10072' into develop-olympus 
* ticket/samt/10072:
  [ticket/10072] Added the POST_NUMBER template var
 2011-03-03 00:14:24 +01:00
Sam Thompson
4c565774bf [ticket/10072] Added the POST_NUMBER template var 
PHPBB3-10072
 2011-03-02 23:41:11 +01:00
Oleg Pudeyev
e552287128 [ticket/9824] Accept commit messages with less than perfect headings. 
Some commit messages exist only temporarily, because they are given
on commits that are intended to be squashed. Accept such commit
messages with a warning.

PHPBB3-9824
 2011-03-01 20:59:04 -05:00
Oleg Pudeyev
d7a38fd7ef [ticket/9824] Allow empty lines after ticket reference. 
PHPBB3-9824
 2011-03-01 20:59:04 -05:00
Oleg Pudeyev
b90e01392c [ticket/9824] Use printf instead of echo to render \n. 
On FreeBSD `echo "\n"` prints \n verbatim. Use printf instead.

PHPBB3-9824
 2011-03-01 20:59:04 -05:00
Oleg Pudeyev
c489b189df [ticket/9824] Handle empty commit messages in commit-msg hook. 
Git already handles the case of commit message being empty by
aborting the commit and displaying a reasonably helpful message.
If there is no commit message, the hook will exit with success
exit code to let git do its thing.

PHPBB3-9824
 2011-03-01 20:59:04 -05:00
Oleg Pudeyev
36e96bbc6a [ticket/10059] Fix two misspellings of consistent. 
PHPBB3-10059
 2011-03-01 19:53:12 -05:00
Andreas Fischer
9bed2b119c [ticket/9824] Add space after [ticket/12345] in prepared commit message. 
PHPBB3-9824
 2011-03-02 00:24:34 +01:00
Andreas Fischer
16a46e6a24 [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message. 
PHPBB3-9824
 2011-03-02 00:04:45 +01:00
Oleg Pudeyev
5debf22ba5 Merge branch 'ticket/bantu/9766' into develop 
* ticket/bantu/9766:
  [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.
 2011-03-01 18:02:38 -05:00
Andreas Fischer
1bb8dad941 Merge branch 'ticket/p/10070' into develop 
* ticket/p/10070:
  [ticket/10070] Fixed line endings after ticket/9549.
 2011-03-01 23:54:43 +01:00
Oleg Pudeyev
7554469b6b [ticket/10070] Fixed line endings after ticket/9549. 
PHPBB3-10070
 2011-03-01 17:47:42 -05:00
Andreas Fischer
f0facd4c9d [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called. 
Delete phpbb_default_captcha:delete_code() and phpbb_captcha_qa::delete_code()
methods. We never call it and it has a bogus body.

PHPBB3-9766
 2011-03-01 23:28:14 +01:00
Oleg Pudeyev
448df1cdf5 Merge branch 'ticket/9549' into develop 
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
 2011-03-01 16:57:00 -05:00
Andreas Fischer
6c49f95b01 Merge branch 'feature/igorw/request-class' into develop 
* feature/igorw/request-class:
  [feature/request-class] Fix the error message when accessing superglobal
 2011-03-01 22:26:08 +01:00
Joas Schilling
51b985399d [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE. 
IE handles onchange after the next click on the page, instead of directly like Firefox, Opera and Safari do. Changing it to onclick works.

PHPBB3-9911
 2011-03-01 17:03:06 +01:00
Joas Schilling
25c738ccdb [ticket/9915] "Length of ban:" is not displayed in ACP 
Regression from PHPBB3-9695, innerHTML does not work on input-fields, so we
need to go back to "value", which we had before.

PHPBB3-9915
 2011-03-01 16:48:04 +01:00
Oleg Pudeyev
79caaa455e Merge branch 'ticket/nickvergessen/7938' into develop 
* ticket/nickvergessen/7938:
  [ticket/7938] Display information about unread and new PMs in the header.
 2011-02-28 19:55:58 -05:00
Joas Schilling
8fee84a68a [ticket/7938] Display information about unread and new PMs in the header. 
PHPBB3-7938
 2011-03-01 01:11:53 +01:00
Igor Wiedler
597311ba6b [feature/request-class] Fix the error message when accessing superglobal 
Adjust the misleading "This error message was generated" text.

PHPBB3-9716
 2011-02-28 08:04:40 +01:00
Igor Wiedler
80a063ac34 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10024] Populate unread information to template for styling issues.
 2011-02-28 01:03:55 +01:00
Igor Wiedler
bda64edae8 Merge branch 'ticket/nickvergessen/10024' into develop-olympus 
* ticket/nickvergessen/10024:
  [ticket/10024] Populate unread information to template for styling issues.
 2011-02-28 01:03:44 +01:00
Igor Wiedler
ab3f45c0e9 Merge branch 'ticket/hanakin/10001' into develop 
* ticket/hanakin/10001:
  [ticket/10001]  Created the new styles within colours.css to handle the displaying of the forum & topic images
  [ticket/10001]  Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
 2011-02-28 00:07:59 +01:00
Philippe Chevrier
ffe691db10 [ticket/10024] Populate unread information to template for styling issues. 
PHPBB3-10024
 2011-02-28 00:00:56 +01:00
Igor Wiedler
f49b8a0e3e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
 2011-02-27 23:18:33 +01:00
Igor Wiedler
23475abab3 Merge branch 'ticket/raimon/9980' into develop-olympus 
* ticket/raimon/9980:
  [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
 2011-02-27 23:18:10 +01:00
Nils Adermann
ea82c6d22c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9984] Add a phing target that does not create packages.
 2011-02-27 23:06:01 +01:00
Nils Adermann
dc112092e0 Merge branch 'ticket/naderman/9984' into develop-olympus 
* ticket/naderman/9984:
  [ticket/9984] Add a phing target that does not create packages.
 2011-02-27 23:04:54 +01:00