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

1075 Commits

Author SHA1 Message Date
Joas Schilling
093debdebc [task/restore-subsilver2] Reapply commit fc89d5d
[ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.

PHPBB3-9677
PHPBB3-9783
2010-08-20 23:48:10 +02:00
Andreas Fischer
2315a354d2 [task/restore-subsilver2] Reapply commit ac45f07
[ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures

PHPBB3-9653
PHPBB3-9783
2010-08-20 23:47:06 +02:00
Andreas Fischer
ec002955d5 [task/restore-subsilver2] Reapply commit 6221ba4
[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
PHPBB3-9783
2010-08-20 23:46:32 +02:00
Joas Schilling
e0066ef28e [task/restore-subsilver2] Reapply commit 9e24993
[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
PHPBB3-9783
2010-08-20 23:44:23 +02:00
Joas Schilling
04503c69fb [task/restore-subsilver2] Reapply commit b6df5bd
[ticket/8936] Subsilver2 missing reply-to-all feature.

PHPBB3-8936
PHPBB3-9783
2010-08-20 23:44:04 +02:00
Nils Adermann
c69936d220 [task/restore-subsilver2] Revert removing subsilver2 for Ascraeus development.
This reverts commit ac2b5430aa2e4e75ed7b9372ae39024c22dac915.

PHPBB3-9783
2010-08-20 22:55:25 +02:00
Andreas Fischer
3f0c02533a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
  [ticket/9012] Adjust shadow topic title to the title at the time it was moved.

Conflicts:
	phpBB/styles/subsilver2/template/editor.js
	phpBB/styles/subsilver2/template/posting_topic_review.html
	phpBB/styles/subsilver2/template/ucp_pm_history.html
2010-07-12 00:13:32 +02:00
Andreas Fischer
6724b79967 Merge branch 'ticket/nickvergessen/9531' into develop-olympus
* ticket/nickvergessen/9531:
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
2010-07-12 00:04:33 +02:00
Joas Schilling
5d9948e39c [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables.

PHPBB3-9531
2010-07-11 10:18:45 +02:00
Andreas Fischer
e46745ed34 Merge branch 'ticket/nickvergessen/9678' into develop-olympus
* ticket/nickvergessen/9678:
  [ticket/9678] Flash attachments are not displayed in subsilver2.
2010-07-10 21:22:33 +02:00
Joas Schilling
df99bdbd53 [ticket/9678] Flash attachments are not displayed in subsilver2.
PHPBB3-9678
2010-07-08 21:22:54 +02:00
Joas Schilling
fc89d5d7db [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
PHPBB3-9677
2010-07-08 21:13:17 +02:00
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
352c69f7b2 Merge branch 'ticket/bantu/9665' into develop-olympus
* ticket/bantu/9665:
  [ticket/9665] Allow preview of signature when it is the string "0".
2010-06-20 22:46:14 +02:00
Andreas Fischer
b91950d413 Merge branch 'ticket/bantu/9653' into develop-olympus
* ticket/bantu/9653:
  [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
2010-06-20 22:45:47 +02:00
Andreas Fischer
ac45f07402 [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
PHPBB3-9653
2010-06-20 21:48:07 +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
db4ab58d92 Merge branch 'task/naderman/drop-subsilver2' into develop
* task/naderman/drop-subsilver2:
  [task/drop-subsilver2] Removing subsilver2 for Ascraeus development.

Conflicts:
	phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
	phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
2010-06-17 18:43:05 +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
4bc2158235 [ticket/9587] Replace '0px' with '0'.
This has been introduced by merge of c7a25c58b893fc72ffb3746374ece9de1d388531, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead.

PHPBB3-9587
2010-06-17 17:01:13 +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
Andreas Fischer
84e58260ae Merge branch 'ticket/nickvergessen/9587' into develop-olympus
* ticket/nickvergessen/9587:
  [ticket/9587] Prosilver overrides reCaptcha class.
2010-06-17 16:27:25 +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
Nils Adermann
8f91e6ce8b Merge branch 'ticket/nickvergessen/9135' into develop-olympus
* ticket/nickvergessen/9135:
  [ticket/9135] Fix report-icon for moderators in PM folders.
2010-05-30 14:58:30 +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
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
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
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
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
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
Andreas Fischer
6c321c53a1 Fix Bug #57505 - Replace button2 with btnlite, button2 doesn't exist.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10488 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-09 14:10:42 +00:00
Josh Woody
8adf583bdf Bug #38765 - Unify BBCode selection across browsers (also needs fixing in subsilver2)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10474 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-04 01:04:52 +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