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

603 Commits

Author SHA1 Message Date
Oleg Pudeyev
2a566b0863 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10105] Update AIM express link.
  [ticket/10105] Update AIM application download link.
2011-04-22 00:04:51 -04:00
Andreas Fischer
8c3cfbb40e [ticket/10105] Update AIM express link.
PHPBB3-10105
2011-04-22 00:42:49 +02:00
Andreas Fischer
78fa3a3b03 [ticket/10105] Update AIM application download link.
PHPBB3-10105
2011-04-22 00:41:55 +02:00
Andreas Fischer
087e7642e7 [ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
There is no member.S_PENDING_SET variable.

This fixes an XHTML error when managing groups with both approved and pending
users from the UCP.

PHPBB3-10102
2011-03-19 14:56:56 +01:00
Oleg Pudeyev
4d231112b6 Merge branch 'ticket/bantu/8802' into develop-olympus
* ticket/bantu/8802:
  [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
  [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
2011-03-12 23:32:43 -05:00
Oleg Pudeyev
3dd5c95b6c Merge branch 'ticket/erikfrerejean/9948' into develop-olympus
* ticket/erikfrerejean/9948:
  [ticket/9948] Inline quicktime files won't show
2011-03-12 19:13:55 -05:00
Andreas Fischer
dfbd8f7de9 [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
Clicking "Mark forums read" when not browsing on the index page only marks
all subforums (and sub-sub forums etc.) read, topics in the current forum have
to marked seperately by clicking the "Mark topics read" link.

Let's indicate this circumstance by using the word "subforums".

PHPBB3-8802
2011-03-10 16:28:46 +01:00
Igor Wiedler
23475abab3 Merge branch 'ticket/raimon/9980' into develop-olympus
* ticket/raimon/9980:
  [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
2011-02-27 23:18:10 +01:00
Andreas Fischer
b1d6c0a7a1 Merge branch 'ticket/nickvergessen/10036' into develop-olympus
* ticket/nickvergessen/10036:
  [ticket/10036] Use image from configuration file for displaying online-status.
2011-02-26 18:17:39 +01:00
Callum Macrae
e4497f4a15 [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
The order of the Approve / Disapprove buttons was inconsistent in the
Moderator Control Panel - while on the main page and the moderation
queue itself the Approve button was to the right of the Disapprove
button, in the post details the Approve button was to the left of the
Disapprove button.

This very simple edit simply switches the position of these two buttons
in the post details page in the mcp.

PHPBB3-9995
2011-02-24 20:06:34 +00:00
Joas Schilling
a875075cc8 [ticket/10036] Use image from configuration file for displaying online-status.
PHPBB3-10036
2011-02-24 12:57:28 +01:00
Andreas Fischer
01fb5532cf Merge branch 'ticket/nickvergessen/9989' into develop-olympus
* ticket/nickvergessen/9989:
  [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
2011-01-30 00:12:52 +01:00
Joas Schilling
90f5e4e2b1 [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
PHPBB3-9989
2011-01-29 16:13:36 +01:00
Schnorrer42
03f117ea30 [ticket/9166] Fixed CSS element order in prosilver.
PHPBB3-9166
2011-01-28 03:21:35 +01:00
Andreas Fischer
732fd5980e [ticket/9859] Remove the meta copyright tag as well.
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
c617400f95 [ticket/9859] Remove the credit line comment from all html files.
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
2a703b4055 [ticket/9859] Remove years in credit line from some more files.
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
2011-01-16 17:53:30 +01:00
Raimon
6a7c853828 [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
PHPBB3-9980
2011-01-08 01:33:35 +01:00
Andreas Fischer
c54683be8c Merge branch 'ticket/bantu/9859' into develop-olympus
* ticket/bantu/9859:
  [ticket/9859] Remove years from the credit line.
2010-12-29 22:56:55 +01:00
Patrick Webster
7f0f08bcc4 [ticket/9953] Set focus to password on re-authentication
Sets the login focus to the password field when prompting for admin
re-authentication, rather than the username field.

PHPBB3-9953
2010-12-28 21:26:55 +01:00
Marc Alexander
d1cf7ff24a [ticket/9925] prosilver logo margin bug in IE 6-7-8
PHPBB3-9925
2010-12-19 17:31:02 +01:00
Andreas Fischer
fc9516a2e3 [ticket/9859] Remove years from the credit line.
PHPBB3-9859
2010-12-16 01:19:40 +01:00
Erik Frèrejean
e4488fe788 [ticket/9948] Inline quicktime files won't show
When attaching a quicktime file and placing it
inline the movie won't be shown due to the size
the movie box is being given.

PHPBB3-9948
2010-12-15 09:39:28 +01:00
Nils Adermann
794c0f6b68 [develop-olympus] Bumping version number for 3.0.8-RC1. 2010-11-08 23:21:27 +01:00
Adam Reyher
3b7414fca8 [ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
The IE9 beta fixes the IE8 textarea width bug which required IE7 emulation in
phpBB's styles. Emulation should only occur when using IE8 now.

PHPBB3-9827
2010-11-05 17:07:18 +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
Andreas Fischer
acabe5a013 Merge branch 'ticket/rxu/9840' into develop-olympus
* ticket/rxu/9840:
  [ticket/9840] Display view unread posts link for guests.
2010-10-18 11:50:51 +02:00
Andreas Fischer
d6aa25ede1 [ticket/9853] Change recaptcha theme from default to 'clean'.
Change recaptcha theme to 'clean' to better coordinate with the color schemes
of prosilver and subsilver2. The default red theme doesn't really fit prosilver
and subsilver2.

PHPBB3-9853
2010-10-18 10:59:00 +02:00
Igor Wiedler
1722c1c819 Merge branch 'ticket/bantu/9841' into develop-olympus
* ticket/bantu/9841:
  [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".
2010-10-17 21:38:38 +02:00
Igor Wiedler
f6db95914b Merge branch 'ticket/bantu/9664' into develop-olympus
* ticket/bantu/9664:
  [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
2010-10-17 21:33:45 +02:00
Igor Wiedler
6582455e5d Merge branch 'ticket/bantu/7417' into develop-olympus
* ticket/bantu/7417:
  [ticket/7417] Also focus search keywords and username in subsilver2.
  [ticket/7417] Focus username field when prosilver login page is loaded.
  [ticket/7417] Focus search keywords field when prosilver search page is loaded.
2010-10-17 21:30:40 +02:00
Andreas Fischer
0aecbfa806 Merge branch 'ticket/cs278/7332' into develop-olympus
* ticket/cs278/7332:
  [ticket/7332] Fix post details expand link rendering on Webkit.
2010-10-17 18:33:29 +02:00
Chris Smith
e2d57fb4da [ticket/7332] Fix post details expand link rendering on Webkit.
PHPBB3-7332
2010-10-17 12:25:20 +01:00
rxu
880bace355 [ticket/9840] Display view unread posts link for guests.
Display view unread posts link for guests if applicable.

PHPBB3-9840
2010-10-16 20:46:38 +08:00
Oleg Pudeyev
6e9cf09adb [ticket/7417] Focus username field when prosilver login page is loaded.
PHPBB3-7417
2010-10-16 12:24:48 +02:00
Oleg Pudeyev
105de6b637 [ticket/7417] Focus search keywords field when prosilver search page is loaded.
PHPBB3-7417
2010-10-16 12:24:37 +02:00
Andreas Fischer
931bd25e34 [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".
This has confused people that are less familiar with phpBB or web applications
in general. "Save draft" should make it clear that a draft is being saved, but
it is still short enough to be used in a button.

PHPBB3-9841
2010-10-15 19:42:29 +02:00
Andreas Fischer
2c4c1f9257 [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
PHPBB3-9664
2010-10-15 19:14:20 +02:00
Igor Wiedler
c439cdc618 Merge branch 'ticket/marc1706/9810' into develop-olympus
* ticket/marc1706/9810:
  [ticket/9810] Hide "Select All" of code bbcode on print page
2010-10-04 20:27:00 +02:00
Marc Alexander
a235f770f6 [ticket/9810] Hide "Select All" of code bbcode on print page
PHPBB3-9810
2010-09-10 05:34:57 -07: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
rxu
c71236ff4d [ticket/9117] Wrong redirection after login.
Go easy way for now - just place S_LOGIN_REDIRECT before S_HIDDEN_FIELDS so
the last value override the previous one.

PHPBB3-9117
2010-08-28 23:16:00 +02:00
Andreas Fischer
4222510e9c Merge branch 'ticket/cs278/7332' into develop-olympus
* ticket/cs278/7332:
  [ticket/7332] Redirect users back to post details when performing actions.
  [ticket/7332] Collapse post details content down to a maximum of 300px heigh
2010-08-21 20:30:33 +02:00
Andreas Fischer
19599b4c69 Merge branch 'ticket/nickvergessen/9743' into develop-olympus
* ticket/nickvergessen/9743:
  [ticket/9743] Fix background of top2-class in prosilver for RTL-languages.
2010-08-10 16:03:56 +02:00
Chris Smith
42e7c8a440 [ticket/7332] Collapse post details content down to a maximum of 300px heigh
The MCP post details can be difficult to use if the post is particularly long
this change shrinks the post area to a maximum of 300 pixels, like the topic
review, making it easier to access the functions beneath the post content.

PHPBB3-7332
2010-08-08 22:49:48 +01:00
Joas Schilling
8045f63b41 [ticket/9743] Fix background of top2-class in prosilver for RTL-languages.
PHPBB3-9743
2010-08-02 11:35:38 +02:00
Andreas Fischer
e1328e87ce Merge branch 'ticket/jellydoughnut/9757' into develop-olympus
* ticket/jellydoughnut/9757:
  [ticket/9757] Fix empty template variable {HISTORY_TITLE}
2010-07-31 02:11:33 +02:00
Andreas Fischer
f179987f64 Merge branch 'ticket/jellydoughnut/9499' into develop-olympus
* ticket/jellydoughnut/9499:
  [ticket/9499] Unify definition of dE() and other javascript functions
2010-07-31 02:10:00 +02:00
Andreas Fischer
d0d9122165 Merge branch 'ticket/jellydoughnut/9722' into develop-olympus
* ticket/jellydoughnut/9722:
  [ticket/9722] Adjust "New Topic" title attribute for consistency in prosilver
2010-07-31 02:06:44 +02:00
Josh Woody
15d7010d46 [ticket/9757] Fix empty template variable {HISTORY_TITLE}
The template variable {HISTORY_TITLE} was always being set to the empty string.
It is now filled with the title of the currently displayed message.  It is not
showed in prosilver or subsilver2 for aesthetic reasons (title is already
prominent)

PHPBB3-9757
2010-07-29 13:19:19 -05:00