1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

2047 Commits

Author SHA1 Message Date
Joas Schilling
4ac8eaf9e3 [ticket/9549] Display users in their primary group instead of their first group
PHPBB3-9549
2011-02-25 15:47:34 +01:00
Oleg Pudeyev
e3c854288c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:44 -05:00
Joas Schilling
6e9aecec79 [ticket/9549] Fix language strings.
PHPBB3-9549
2011-02-18 00:22:17 +01:00
Joas Schilling
d2e2ccf8a4 [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
PHPBB3-9549
2011-02-16 18:22:31 +01:00
Joas Schilling
4f2b0d9d42 [ticket/9549] Add the module and files for the ACP.
PHPBB3-9549
2011-02-16 18:21:48 +01:00
Oleg Pudeyev
f07aeba9c0 [feature/system-cron] Added acp ui for use_system_cron config setting.
PHPBB3-9596
2011-02-12 22:05:50 -05:00
Joas Schilling
0e02f5cb0b [ticket/9675] Put the code into methods to avoid code duplication.
PHPBB3-9675
2011-02-08 14:57:42 +01:00
Joas Schilling
18fedfce17 [ticket/9675] Adjust the language-string to reflect the changes.
PHPBB3-9675
2011-02-08 14:57:29 +01:00
Joas Schilling
ffcd307746 [ticket/9675] Add option to delete template/theme/imageset when deleting style.
PHPBB3-9675
2011-02-08 14:27:27 +01:00
Joas Schilling
efedc973eb [ticket/6109] MSN is now called Windows Live Messenger (WLM)
Replaced the logo with the current one and changed the language strings.

PHPBB3-6109
2011-01-10 01:44:54 +01:00
Andreas Fischer
979158f0a2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
  [ticket/9953] Set focus to password on re-authentication
  [ticket/9905] Add SQLite to the DSN description
  [ticket/9859] Remove years from the credit line.
2010-12-29 23:01:19 +01:00
Andreas Fischer
90ccdb4dad Merge branch 'ticket/VSE/9532' into develop
* ticket/VSE/9532:
  [ticket/9532] Simplified page titles by removing meaningless text.
2010-12-28 21:51:55 +01:00
Patrick Webster
4c076bfdc1 [ticket/9905] Add SQLite to the DSN description
The installer's DSN field has additional meanings for ODBC, PostgreSQL, and
SQLite, but only the first two are mentioned. SQLite uses it for the file path.

PHPBB3-9905
2010-12-28 21:21:16 +01:00
Nils Adermann
18f74a7e10 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9851] "Search new posts" should require login.
  [task/phpdoc] Added a phpdoc task to the build process
  [task/phpdoc] Added a configuration file for phpDocumentor.
  [feature/acm-wincache] Adding caching module for WinCache's User Cache.
  [ticket/9939] Fix JavaScript error in admin recaptcha template
  [ticket/9575] Also change 'administrate' to 'administer' in templates
  [ticket/8736] guest can have 255 chars long username
  [ticket/9928] Do not link "login to your board" to the "send statistics" page.
  [ticket/9575] Change 'administrate' to 'administer'
  [ticket/9921] Adding sample configuration file for the lighttpd webserver.
  [ticket/9932] Add the Bing bot when converting
  [ticket/9930] Redirect failes with open_basedir enabled.
  [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
2010-12-13 17:14:36 +01:00
Nils Adermann
5d8ddc7480 Merge branch 'ticket/adamreyher/9928' into develop-olympus
* ticket/adamreyher/9928:
  [ticket/9928] Do not link "login to your board" to the "send statistics" page.
2010-12-13 17:09:56 +01:00
Nils Adermann
adfa1656fb Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
2010-12-13 16:35:55 +01:00
rxu
b88582199d [ticket/9851] "Search new posts" should require login.
The newposts search uses user_lastvisit, so it should require user to log in.

PHPBB3-9851
2010-12-13 14:58:43 +01:00
Adam Reyher
e6a6f00562 [ticket/9928] Do not link "login to your board" to the "send statistics" page.
PHPBB3-9928
2010-12-03 02:15:50 +01:00
Adam Reyher
8b3d068e83 [ticket/9575] Change 'administrate' to 'administer'
PHPBB3-9575
2010-12-01 14:14:46 -05:00
RMcGirr83
7e934c6362 [ticket/9897] A few language fixes
PHPBB3-9897
2010-11-21 23:46:09 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Andreas Fischer
e71911a8d2 Merge branch 'ticket/sa007/9847' into develop-olympus
* ticket/sa007/9847:
  [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
2010-11-08 12:48:19 +01:00
SA007
fd03ecad01 [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'.
The word "gauge" was misspelled as "guage".
The word "judgement" is preferred over "judgment" in british english.

PHPBB3-9847
2010-11-08 12:32:19 +01:00
SA007
babfd0075d [ticket/9883] Change an American English spelling to British English.
PHPBB3-9883
2010-11-08 01:29:46 +00:00
Andreas Fischer
81ca3d202e [ticket/9880] Change "antibot" to "anti-spambot".
PHPBB3-9880
2010-11-07 13:17:27 +01:00
Chris Smith
7b1d9fbbe2 [ticket/9880] Changing the term 'CAPTCHA' to something more obvious.
PHPBB3-9880
2010-11-07 05:28:29 +00:00
Nils Adermann
225482c06a Merge branch 'ticket/cs278/9752' into develop-olympus
* ticket/cs278/9752:
  [ticket/9752] Mark unused language variable as such.
  [ticket/9752] Change reference to 'confirmation code' to be more generic.
2010-11-07 03:27:44 +01:00
Chris Smith
dd1532a72c [ticket/9752] Mark unused language variable as such.
PHPBB3-9752
2010-11-07 02:16:56 +00:00
narqelion
576de284a7 [ticket/9752] Change reference to 'confirmation code' to be more generic.
Related to 71b35a924f7a5f517e8d07d975582c27813f5797

PHPBB3-9752
2010-11-07 02:15:33 +00:00
Nils Adermann
48e6126094 Merge remote branches 'github-bantu/ticket/9879' and 'github-cs278/ticket/9095' into develop-olympus
* github-bantu/ticket/9879:
  [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
  [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.

* github-cs278/ticket/9095:
  [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
2010-11-07 03:10:57 +01:00
narqelion
71b35a924f [ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
With the addition of CAPTCHA plugins in 3.0.6 a number of language
strings need updating to account for non visual based CAPTCHAs.

PHPBB3-9095
2010-11-07 01:52:53 +00:00
Andreas Fischer
5d9a9d6874 [ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
PHPBB3-9879
2010-11-07 00:35:11 +01:00
narqelion
2299c40137 [ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
Fixed spelling, punctuation and grammar as well as removed registration
specific language from plugin as it can be/is used for form submissions other
than registration.

PHPBB3-9879
2010-11-07 00:13:01 +01:00
Igor Wiedler
857271ebbd [ticket/9850] Display upgrade instructions for feature release in acp
PHPBB3-9850
2010-11-02 23:53:14 +01:00
Igor Wiedler
832b09d60d Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and 'ticket/bantu/9853' into develop-olympus
* ticket/bantu/9101:
  [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.

* ticket/bantu/9595:
  [ticket/9595] List min/max characters indexed by search for mysql_fulltext.

* ticket/bantu/9853:
  [ticket/9853] Change recaptcha theme from default to 'clean'.
2010-10-25 22:08:37 +02:00
rxu
257e264af7 [ticket/9478] Validate maximum number of allowed recipients per PM value.
Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8).

PHPBB3-9478
2010-10-25 21:47:13 +02:00
Andreas Fischer
294c2c63c0 [ticket/9595] List min/max characters indexed by search for mysql_fulltext.
PHPBB3-9595
2010-10-21 20:31:00 +02:00
Andreas Fischer
6236cfc9fa [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.
Remove misleading 'below' from RECAPTCHA_EXPLAIN because recaptcha is actually
displayed to the side.

PHPBB3-9101
2010-10-18 11:24:04 +02:00
Andreas Fischer
59e62d271c [ticket/9822] Correct some style related ACP explain statements.
Remove "Additionally, if you have permission you can elect to remove the set
from the filesystem." because that functionality is not implemented.

Also remove unnecessary "When the imageset is deleted it is gone for good."
statement, "It is recommended that you first export your set for possible
future use." should be clear enough.

PHPBB3-9822
2010-10-15 17:57:43 +02:00
Andreas Fischer
f9764c684f [ticket/9613] Slightly update language strings.
PHPBB3-9613
2010-08-29 16:50:57 +02:00
rxu
f1d5005797 [ticket/9613] Implement a load switch for unread posts search feature.
Since unread posts search can produce a high server load in certain
circumstances, we implement a switch for ACP "Load settings" to have an option
to disable this type of search.

PHPBB3-9613
2010-08-29 16:09:09 +02:00
Patrick W
54713dcdc7 [ticket/9761] Reworded quote nesting depth ACP option to match the behaviour
The nesting depth applies per quote block, not per post which the previous
label and description indicated.

PHPBB3-9761
2010-07-12 02:04:29 +01:00
Andreas Fischer
fc25fe694a Merge branch 'ticket/bantu/9068' into develop-olympus
* ticket/bantu/9068:
  [ticket/9068] Added a missing comma in acp load settings explanation text.
2010-07-22 01:41:02 +02:00
Andreas Fischer
0f5814ac4f Merge branch 'ticket/bantu/9744' into develop-olympus
* ticket/bantu/9744:
  [ticket/9744] Fix mistyped word 'then' in FAQ. It should be 'than'.
2010-07-22 01:40:44 +02:00
Andreas Fischer
fada2ad261 Merge branch 'ticket/t-backoff/9099' into develop-olympus
* ticket/t-backoff/9099:
  [ticket/9099] Add missing commas in acp language.
2010-07-22 01:40:19 +02:00
Nick Anderegg
afff4f7923 [ticket/9068] Added a missing comma in acp load settings explanation text.
PHPBB3-9068
2010-07-22 01:36:08 +02:00
Andreas Fischer
72dddf3aa3 [ticket/9744] Fix mistyped word 'then' in FAQ. It should be 'than'.
PHPBB3-9744
2010-07-22 00:31:13 +02:00
Tabitha Backoff
875fcda506 [ticket/9099] Add missing commas in acp language.
PHPBB3-9099
2010-07-21 17:37:14 +02:00
Andreas Fischer
e7e98f1de5 Merge branch 'ticket/nickvergessen/7720' into develop-olympus
* ticket/nickvergessen/7720:
  [ticket/7720] Fix alternative image-description for unread posts.
2010-07-14 20:55:49 +02:00
Joas Schilling
954b3c3484 [ticket/7720] Fix alternative image-description for unread posts.
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.

PHPBB3-7720
2010-07-14 20:55:07 +02:00