Commit graph

10040 commits

Author SHA1 Message Date
Nils Adermann
760957e7e7 Merge branch 'ticket/nickvergessen/8936' into develop-olympus
* ticket/nickvergessen/8936:
  [ticket/8936] Subsilver2 missing reply-to-all feature.
2010-05-30 14:26:17 +02:00
Nils Adermann
b7afeadd6d Merge branch 'ticket/bantu/8792' into develop-olympus
* ticket/bantu/8792:
  [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
2010-05-30 14:19:58 +02:00
Nils Adermann
26c2efc083 Merge branch 'ticket/p/7782' into develop-olympus
* ticket/p/7782:
  [ticket/7782] Return 404 HTTP status code for nonexistent attachments.
  [ticket/7782] Added spaces.
  [ticket/7782] Added phpdoc comment for send_status_line function.
  [ticket/7782] Send status line using refactored download/file.php logic.
2010-05-29 23:23:08 +02:00
Joas Schilling
801a44b3f0 [ticket/9147] "Change topic type"-option "Normal" always selected.
PHPBB3-9147
2010-05-28 14:25:56 +02:00
Joas Schilling
4746a60d22 [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
When creating a forum, you afterwards read "Forum created successfully. Now you are able to set permissions for this forum.", also when you already copied the permissions from another forum.

PHPBB3-9094
2010-05-27 15:17:03 +02:00
Joas Schilling
9e24993855 [ticket/9135] Fix report-icon for moderators in PM folders.
There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users.

PHPBB3-9135
2010-05-26 01:38:19 +02:00
Andreas Fischer
aaaa4f9abe [ticket/9626] Adding tests for the URL regular expression.
PHPBB3-9626
2010-05-25 12:08:52 +02:00
Andreas Fischer
646b16f5db [ticket/9626] Add missing class prefix.
PHPBB3-9626
2010-05-25 12:08:51 +02:00
Andreas Fischer
6a5ad05d8a [ticket/9626] A few tests for the email regular expression.
PHPBB3-9626
2010-05-25 12:08:51 +02:00
Andreas Fischer
12e92fc45e [ticket/9626] More IPv6 regex tests.
PHPBB3-9626
2010-05-25 12:08:51 +02:00
Andreas Fischer
1c59f3dbd0 [ticket/9626] Adding tests for the IPv4 regular expression.
PHPBB3-9626
2010-05-25 12:08:51 +02:00
Andreas Fischer
222173adae [ticket/9626] Adding tests for regular expressions.
Adding tests for the IPv6 regular expression returned by get_preg_expression()

PHPBB3-9626
2010-05-25 12:08:51 +02:00
Joas Schilling
c7a25c58b8 [ticket/9587] Prosilver overrides reCaptcha class.
PHPBB3-9587
2010-05-24 23:59:28 +02:00
Joas Schilling
b6df5bdb14 [ticket/8936] Subsilver2 missing reply-to-all feature.
PHPBB3-8936
2010-05-24 23:32:18 +02:00
Joas Schilling
877d852a52 [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
Just added a check whether the type is announcement or higher.

PHPBB3-9605
2010-05-24 20:12:34 +02:00
Andreas Fischer
6d63ffc162 [ticket/8212] Tiny 'typo in comment' fix
PHPBB3-8212
2010-05-20 00:38:14 +02:00
Oleg Pudeyev
c185e45e09 [ticket/7782] Return 404 HTTP status code for nonexistent attachments.
PHPBB3-7782
2010-05-17 14:14:53 -04:00
rxu
d819ee343a [ticket/9606] Optimize unread search option.
Get rid of redundant SQL query in search.php that should increase performance slightly.

PHPBB3-9606
2010-05-17 21:14:02 +08:00
Oleg Pudeyev
d721e94b88 [ticket/7782] Added spaces.
PHPBB3-7782
2010-05-17 02:01:13 -04:00
Oleg Pudeyev
691f682fc2 [ticket/7782] Added phpdoc comment for send_status_line function.
PHPBB3-7782
2010-05-16 19:52:01 -04:00
Oleg Pudeyev
c1a4cb1d01 [ticket/7782] Send status line using refactored download/file.php logic.
PHPBB3-7782
2010-05-16 18:24:26 -04:00
Andreas Fischer
327f9afbc0 [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
No longer use LDAP_NO_SERVER_CONNECTION in case ldap_search() fails.
Add and use LDAP_SEARCH_FAILED instead, so users can tell the difference
between ldap_connect() failing and ldap_search() failing.

PHPBB3-8792
2010-05-16 23:05:13 +02:00
Nils Adermann
ac2b5430aa [task/drop-subsilver2] Removing subsilver2 for Ascraeus development.
The discussion about this has taken place on area51:
    http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32496

PHPBB3-9607
2010-05-16 20:57:01 +02:00
Nils Adermann
904d2049c8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Move rxu and nickvergessen to Developers
2010-05-16 20:46:12 +02:00
Joas Schilling
6d7e30ae99 [develop-olympus] Move rxu and nickvergessen to Developers 2010-05-16 20:06:11 +02:00
Nils Adermann
591217a903 Merge branch 'develop-olympus' into develop
* develop-olympus: (21 commits)
  [feature/notify_status] Define'd constants for notify_status
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
  [ticket/9547] Use separate constants for display/enable active topics.
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9510] Unable to copy permissions from and to forums you cannot see
  [ticket/9545] Initial forum should display active topics by default.
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
  [ticket/9529] Topic review is not showing all selected posts.
  [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
  [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
  [ticket/9119] Respect language selection on automated update.
  [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
  [ticket/9567] Newly registered users group description rewording.
  ...
2010-05-16 19:52:36 +02:00
Nils Adermann
0bf2c3eed5 Merge branch 'feature/notify_status' into develop-olympus
* feature/notify_status:
  [feature/notify_status] Define'd constants for notify_status
2010-05-16 19:51:25 +02:00
Mark
cc8d22bed6 [feature/notify_status] Define'd constants for notify_status
define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in
forums_watch table and topics_watch table

PHPBB3-9179
2010-05-16 19:50:35 +02:00
Nils Adermann
e36da18b1c Merge branch 'ticket/p/7782' into develop-olympus
* ticket/p/7782:
  [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
2010-05-16 19:25:41 +02:00
Oleg Pudeyev
82ce29ac58 [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
PHPBB3-7782
2010-05-16 19:23:54 +02:00
Nils Adermann
321f7a9946 Merge branch 'ticket/nickvergessen/9530' into develop-olympus
* ticket/nickvergessen/9530:
  [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
  [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
2010-05-16 19:17:25 +02:00
Joas Schilling
a11fa9c738 [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
PHPBB3-9530
2010-05-16 19:14:57 +02:00
Joas Schilling
d147bdcd73 [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
PHPBB3-9530
2010-05-16 19:14:36 +02:00
Nils Adermann
b1f9b39475 Merge branch 'ticket/nickvergessen/9531' into develop-olympus
* ticket/nickvergessen/9531:
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
2010-05-16 19:13:32 +02:00
Joas Schilling
fe9c5019b6 [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
PHPBB3-9531
2010-05-16 19:13:22 +02:00
Nils Adermann
b308cfe5ea Merge branch 'ticket/bantu/9547' into develop-olympus
* ticket/bantu/9547:
  [ticket/9547] Use separate constants for display/enable active topics.
2010-05-16 18:58:15 +02:00
Andreas Fischer
d555e83b80 [ticket/9547] Use separate constants for display/enable active topics.
Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and
S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the
forum type.

PHPBB3-9547
2010-05-16 18:54:48 +02:00
Nils Adermann
7499c7c884 Merge branch 'ticket/nickvergessen/9535' into develop-olympus
* ticket/nickvergessen/9535:
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
2010-05-16 18:51:09 +02:00
Joas Schilling
9fa8bb82e4 [ticket/9535] Also fix the margin in the install_update.html
PHPBB3-9535
2010-05-16 18:50:48 +02:00
Joas Schilling
0da86964d5 [ticket/9535] Fix some more rtl margin issues.
PHPBB3-9535
2010-05-16 18:50:25 +02:00
Joas Schilling
41498fe3ee [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
PHPBB3-9535
2010-05-16 18:49:17 +02:00
Nils Adermann
8ade14a036 Merge branch 'ticket/nickvergessen/9548' into develop-olympus
* ticket/nickvergessen/9548:
  [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
2010-05-16 18:42:46 +02:00
Nils Adermann
273d926b08 Merge branch 'ticket/aptx/9525' into develop-olympus
* ticket/aptx/9525:
  [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
2010-05-16 18:38:28 +02:00
Marek A. Ruszczyński
1d2b4ffc65 [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
:: can replace 1 or more groups (not 2 or more)

PHPBB3-9524
2010-05-16 18:36:21 +02:00
Josh Woody
e6b9178c44 [ticket/9510] Unable to copy permissions from and to forums you cannot see
This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010).  It also rolls back the changes from branch "bug/58415", which are no longer needed.

PHPBB3-9510
2010-05-16 18:20:54 +02:00
Josh Woody
ed0a26ab16 [ticket/9510] Unable to copy permissions from and to forums you cannot see
This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010).  It also rolls back the changes from branch "bug/58415", which are no longer needed.

PHPBB3-9510
2010-05-16 18:19:28 +02:00
Nils Adermann
63d172e379 Merge branch 'ticket/bantu/9545' into develop-olympus
* ticket/bantu/9545:
  [ticket/9545] Initial forum should display active topics by default.
2010-05-16 17:50:36 +02:00
Andreas Fischer
36c1986986 [ticket/9545] Initial forum should display active topics by default.
The initial forum 'Your first forum' should show topics
(especially the 'Welcome to phpBB3' topic) in the active topics list after
installing phpBB because this is the default setting for new forums
(but not categories).

The default database column value for forum_flags is 32 =
FORUM_FLAG_POST_REVIEW, we therefore have to explicitly set forum_flags to
FORUM_FLAG_POST_REVIEW + FORUM_FLAG_ACTIVE_TOPICS = 48 for this forum.

PHPBB3-9545
2010-05-16 17:49:06 +02:00
Nils Adermann
2a806ddbaf Merge branch 'ticket/nickvergessen/9546' into develop-olympus
* ticket/nickvergessen/9546:
  [ticket/9546] Also delete bookmarks, when a topic is deleted.
2010-05-16 17:47:38 +02:00
Joas Schilling
d8b4c0db0c [ticket/9546] Also delete bookmarks, when a topic is deleted.
PHPBB3-9546
2010-05-16 17:47:05 +02:00