Commit graph

444 commits

Author SHA1 Message Date
Andreas Fischer
7d6545bd09 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
  [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
  [ticket/9665] Allow preview of signature when it is the string "0".
  [ticket/9112] Make sure current user can see most active forum/topic.
  [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
  [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.

Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_signature.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2010-06-20 22:50:10 +02:00
Andreas Fischer
6221ba4dd1 [ticket/9665] Allow preview of signature when it is the string "0".
Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates
<!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0".
<!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0".

PHPBB3-9665
2010-06-20 13:38:36 +02:00
Andreas Fischer
6cb574d03c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9587] Replace '0px' with '0'.
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 18:37:53 +02:00
Andreas Fischer
f9105084b0 Merge branch 'ticket/nickvergessen/9605' into develop-olympus
* ticket/nickvergessen/9605:
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:47:48 +02:00
Andreas Fischer
478f8052ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [feature/dbal-tests] Follow the coding guidelines and ...
  [feature/dbal-tests] Update data
  [feature/dbal-tests] Multi insert
  [feature/dbal-tests] Delete data
  [feature/dbal-tests] Insert data
  [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
  [ticket/9587] Prosilver overrides reCaptcha class.
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:33:48 +02:00
Andreas Fischer
9975d24b9d Merge branch 'ticket/nickvergessen/9605' into develop-olympus
* ticket/nickvergessen/9605:
  [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
2010-06-17 16:31:38 +02:00
Joas Schilling
82db1c9c50 [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
Compare the topic_type on their real value, to ensure there is no MOD causing problems, because of a new topic-type.

PHPBB3-9605
2010-06-17 15:56:25 +02:00
Nils Adermann
2cf57822bb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
  [ticket/9135] Fix report-icon for moderators in PM folders.
  [ticket/8936] Subsilver2 missing reply-to-all feature.
  [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.
  [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
2010-05-30 14:59:06 +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
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
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
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
355d4b8ff8 Merge branch 'ticket/nickvergessen/9528' into develop-olympus
* ticket/nickvergessen/9528:
  [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
2010-05-16 17:06:50 +02:00
Joas Schilling
18e0b07487 [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
PHPBB3-9528
2010-05-16 17:06:28 +02:00
Joas Schilling
97d180ab66 [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
PHPBB3-9146
2010-05-16 16:59:48 +02:00
Nils Adermann
f8ff68f21d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)
  [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
  [feature/unapproved-posts-in-feed] Little changelog correction
  [feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
  [feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
  [bug/58745] Correct changelog message
  [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)
  [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
  [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
  [bug/59465] Remove start=0 from topic pagination links.
  [bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
2010-04-04 15:33:48 +02:00
Joas Schilling
5f044a015e [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512) 2010-04-04 02:03:23 +02:00
Nils Adermann
693a2dc99b Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
2010-03-03 23:32:09 +01:00
Andreas Fischer
cdc96b0c7d Bug #58085 - Add terminating semicolons to JavaScript code found by JSLint. Patch by nn-
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10539 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:51:35 +00:00
Andreas Fischer
e57981d1f5 Fix Bug #57875 - We have to add the paragraph tags there. Patch by HardStyle, Regression from r10096.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10537 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:33:06 +00:00
Josh Woody
63be6762f3 Bug #38765 - Unify BBCode selection across browsers
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10472 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-04 00:04:25 +00:00
Nils Adermann
5a429ee61e Change version numbers to 3.0.7 and 3.0.8-dev in preparation for development on next release
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10468 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-01 01:14:06 +00:00
Joas Schilling
283ad368eb Bug #54745 - Fix language string for PM-Reports refering to post-data.
Authorised by: jelly_doughnut

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10455 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:06:00 +00:00
Joas Schilling
7a1b507fa6 Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.
Authorised by: bantu


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 15:57:10 +00:00
Henry Sudhof
5cce7d0bae #56455 - remove extra space in template
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10421 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 17:27:19 +00:00
Chris Smith
b9ef9b8786 - Forgot to fix jQuery code in r10409 #54395
- Also changed using jQuery instead of the $ shortcut


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10416 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 16:58:38 +00:00
Chris Smith
1f59edf140 Don't submit when pressing enter on preview button. Regression from r10069 #54395
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10409 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 16:32:10 +00:00
Andreas Fischer
d67d6ed26a Fix Bug #30315 - No longer use group colours for usernames on print view. Colour could be white. Patch by Pasqualle.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10387 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-29 02:11:16 +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
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
Meik Sievertsen
b68de2323d merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-16 15:48:23 +00:00
Henry Sudhof
67a9a7b074 #54905 - use LA for the javascript variable, remove comma
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10334 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-13 15:05:39 +00:00
Henry Sudhof
9fc3a40c5e #54145 - move redirect parameter back to POST to avoid mod_security triggers
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10333 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-13 14:59:45 +00:00
Henry Sudhof
d096696ef2 #54145 - move redirect parameter back to POST to avoid mod_security triggers
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10332 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-13 14:59:03 +00:00
Chris Smith
5bdb6b733c IE6 must die, thanks Raimon. #54115
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10326 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-12 15:07:34 +00:00
Andreas Fischer
edc475b83f Oops. #54705, r10293.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10294 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-28 21:24:40 +00:00
Andreas Fischer
85f062c7d9 Fix Bug #54705 - Tiny XHTML mistake
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10293 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-28 21:14:44 +00:00
Meik Sievertsen
72c4b694cf only change what needs to be changed. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10276 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-16 11:44:14 +00:00
Henry Sudhof
926ce5abaa weird, editor is acting up
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10275 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-16 11:21:41 +00:00
Henry Sudhof
6ad759539a weird, editor is acting up
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10274 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-16 11:05:45 +00:00
Henry Sudhof
2ef4f51b4c #53905 - thanks DavidIQ
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10273 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-16 11:02:28 +00:00
Meik Sievertsen
c693127b18 Fix for r10255
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10262 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-09 16:48:13 +00:00
Meik Sievertsen
91721d67fa simplify the js code a bit and also detect up arrow key for auto completion
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10255 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-06 14:59:02 +00:00
Meik Sievertsen
f0ef35ce6e update to r10069 (try to detect auto completion on input fields and do not submit form if user uses enter key for auto completion instead of right arrow key)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10254 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-05 14:58:25 +00:00
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Meik Sievertsen
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
Meik Sievertsen
53965f0085 Bug #52175
atm the "fix" with the most changes involved. We will inform style authors about these changes. We will not release RC2 to RC3 code changes, but will annnounce the style changes within the RC3 release announcement.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10204 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 11:08:12 +00:00
Henry Sudhof
5e22b11be1 #52095
Authorised by: AcydBurn
That should finally fix the issue for rtl

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10194 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-28 13:31:30 +00:00
Henry Sudhof
4208ed9c57 #52095
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10192 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-28 10:40:20 +00:00