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

141 Commits

Author SHA1 Message Date
Andreas Fischer
79443eb1d4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10280] Change the display of user activation settings in the ACP.
2011-11-25 18:15:00 +01:00
RMcGirr83
3ce5b1d386 [ticket/10280] Change the display of user activation settings in the ACP.
Use a select box to be consistent with other settings.

PHPBB3-10280
2011-11-25 01:27:44 -05:00
Oleg Pudeyev
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
2011-10-20 20:46:48 -04:00
Andreas Fischer
c6e370d33a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:44:08 +02:00
Joas Schilling
e40abfbde9 [ticket/9525] Minimum post length 0 is accepted but not working.
PHPBB3-9525
2011-10-14 15:19:47 +02:00
Matt Friedman
2dca3c3c27 [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.

PHPBB3-10390
2011-09-27 11:12:11 -07:00
Matt Friedman
56c6476233 [ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
2011-09-26 11:15:22 -07:00
Andreas Fischer
d79d093d11 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10221] Append unit (seconds) after input field, remove from explanation
2011-06-16 16:11:38 +02:00
Nils Adermann
63b9b91dee [ticket/10221] Append unit (seconds) after input field, remove from explanation
PHPBB3-10221
2011-06-16 16:02:34 +02:00
Andreas Fischer
fe5d616349 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9992] Clarify explanations of ip and account limits on login
  [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN
  [ticket/9992] Use sql_fetchfield for single row and single column result
  [ticket/9992] Adding a limit on login attempts per IP.
  [ticket/9992] Make sql_create_table and sql_table_exists available in updater
2011-06-11 19:42:04 +02:00
Nils Adermann
2dee57fd43 [ticket/9992] Adding a limit on login attempts per IP.
A new table was created to save all failed login attempts with
corresponding information on username, ip and useragent. By default
the limit is 50 login attempts within 6 hours per IP. The limit is
relatively high to avoid big problems on sites behind a reverse
proxy that don't receive the forwarded-for value as REMOTE_ADDR but
see all users as coming from the same IP address. But if these
users run into problems a special forwarded-for option is available
to limit logins by forwarded-for value instead of ip.

PHPBB3-9992
2011-06-10 12:18:19 +02:00
Andreas Fischer
ad90f262ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Add separator to h_radio to place options on individual lines

Conflicts:
	phpBB/adm/index.php
2011-06-06 11:06:01 +02:00
Nils Adermann
26e052bb26 [ticket/10067] Add separator to h_radio to place options on individual lines
The previous mechanism for account activation resulted in two h_radio calls
with identical id attributes for two elements.

PHPBB3/10067
2011-06-05 09:52:17 +02:00
Nils Adermann
cc14f4b9e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10067] Clarify language for user activation options in ACP.
2011-06-05 02:50:17 +02:00
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
Oleg Pudeyev
8155bc5a9d [ticket/10067] Clarify language for user activation options in ACP.
PHPBB3-10067
2011-04-30 15:39:19 -04:00
mtrs
1d122f56bb [ticket/8641] Added/removed several commas for consistency in acp_board.php.
PHPBB3-8641
2011-02-26 08:37:01 -05: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
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
Igor Wiedler
e35711ddde Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9609] Change header() calls setting HTTP status to send_status_line().
  [ticket/9613] Slightly update language strings.
  [ticket/9613] Fix missing database part for unread posts search load switch.
  [ticket/9613] Implement a load switch for unread posts search feature.
  [ticket/9785] Allow users to request new passwords when board is disabled.
  [ticket/9644] Check $mode before calling user_notification() from submit_post()
2010-09-16 22:42:32 +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
Andreas Fischer
a2918fd98e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9704] Fix minor typo in coding guidelines.
  [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
  [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
  [ticket/9593] A readme file for unit tests and running unit tests.
  [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
  [ticket/9589] Added sample nginx configuration file for phpbb.
2010-07-08 20:10:17 +02:00
Oleg Pudeyev
097854ca85 [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
PHPBB3-9570
2010-07-06 13:14:04 +02:00
Andreas Fischer
6d63ffc162 [ticket/8212] Tiny 'typo in comment' fix
PHPBB3-8212
2010-05-20 00:38:14 +02:00
Andreas Fischer
3e9d15a25d [ticket/9176] Take current board timezone settings into account when setting board date format.
PHPBB3-9176
2010-05-13 14:25:44 +02:00
Andreas Fischer
a0531a990b r10491 - Also in the Post Settings section. Thanks leviatan21
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10492 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-16 10:42:24 +00:00
Andreas Fischer
c6e176d88e Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10491 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-15 15:04:44 +00:00
Andreas Fischer
77af6caed7 [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10430 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-19 19:08:51 +00:00
Andreas Fischer
0f5856ce5b No longer include subforums in forum feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10405 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-12 21:15:32 +00:00
Andreas Fischer
ad7e3ccf4c Integrate active topics feed. Some language adjustments and rearrangements.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-27 00:48:52 +00:00
Andreas Fischer
035fe74264 Let's try this. Split feed user interface into sections. This partly reverts r10366.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10374 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 03:26:38 +00:00
Andreas Fischer
54c97ee608 Rearrange items. Move post based feeds up.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10367 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:32:39 +00:00
Andreas Fischer
a4cee51de5 Split feed_limit into feed_limit_post and feed_limit_topic. Drop feed_overall_topics_limit.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10366 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:30:37 +00:00
Andreas Fischer
d0c596a5ea Add ability to disable overall (aka board-wide) feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10363 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-22 19:21:41 +00:00
Andreas Fischer
183045072f Cache forever, destroy on change.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10354 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-20 14:31:37 +00:00
Joas Schilling
139f1d3530 fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic.
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10080 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 14:57:04 +00:00
Meik Sievertsen
09ad10a734 ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 15:00:47 +00:00
Meik Sievertsen
dea4eb6a0b check for not set values in acp_board to correctly grab those input elements not populated if empty (checkboxes and multiple select fields)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9944 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-10 11:17:24 +00:00
Meik Sievertsen
d327154a5a ok, r9704 was correct - i used a wrong code base within my tests. :/
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9943 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-10 11:14:21 +00:00
Meik Sievertsen
d5c6d1d434 reverted all changes made to this code block, especially the one mentioned in r9704 with reference to wrong bug report "undoing change from #9575, as it broke the board disabled message". The board disabled message still works fine. If there are any problems with the code and settings within the ACP, please tell me and i will check them.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9941 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-10 09:13:28 +00:00
Andreas Fischer
af67047008 Remove some left over code introduced in r9575, reverted in r9704.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9938 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-07 13:53:17 +00:00
Nils Adermann
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:59:11 +00:00
Marek A. R
a777691994 - Add pagination for icons and smilies in the ACP and smilies in the smiley popup
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9763 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-16 17:57:05 +00:00
Joas Schilling
0b2979c6ba Feature Bug #45375 - Add option to disable remote upload avatars
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9757 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-14 20:25:41 +00:00
Henry Sudhof
1c5e724e5e undoing change from #9575, as it broke the board disabled message
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9704 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-29 14:36:05 +00:00
Meik Sievertsen
c32f49679f - add options for quick reply (forum-based and board-wide)
- add option for minimum post chars (which is a required setting for quick reply, therefore we introduce it here)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9656 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-23 10:48:53 +00:00
Meik Sievertsen
433de350c0 - [Feature] New "Newly Registered Users" group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.
- [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users.

As a coincidence also Bug #46535 got fixed.
Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-20 18:45:16 +00:00
Joas Schilling
d85a5ad036 Fix bug #46785 - Hide avatars if type disabled and give global option to turn on/off
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9632 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 22:03:19 +00:00
Meik Sievertsen
863d7a7614 First ATOM Feed commit/integration
- Idea and original RSS Feed 2.0 MOD (Version 1.0.8/9) by leviatan21

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9575 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-12 14:41:03 +00:00