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

1256 Commits

Author SHA1 Message Date
Nils Adermann
3fb9b62c69 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
2011-07-06 21:52:05 -04:00
Yuriy Rusko
a275d17625 [ticket/9859] Changing all phpBB footers to match the new credit line
PHPBB3-9859
2011-07-06 21:46:33 -04:00
Yuriy Rusko
f22081d21e [ticket/9859] New footer copyright line with registered symbol
PHPBB3-9859
2011-07-06 19:36:25 -04:00
Sam Thompson
77c9422630 [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
PHPBB3-10250
2011-07-05 17:08:11 -04:00
Andreas Fischer
aba4007ae6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10233] IE Emulation fix breaks PM posting layout
2011-06-26 20:42:06 +02:00
Andreas Fischer
1ae42ae6ba Merge remote-tracking branch 'naderman/ticket/10233' into prep-release-3.0.9
* naderman/ticket/10233:
  [ticket/10233] IE Emulation fix breaks PM posting layout
2011-06-26 20:40:59 +02:00
Raimon
d59482366a [ticket/10233] IE Emulation fix breaks PM posting layout
The minimum and maximum width of 100% make the textarea dynamically
adjust. However the smilies next to the textarea will float out of
their containing div when the default width pre-min/max is specified
as a too high value.

PHPBB3-10233
2011-06-26 11:10:05 +02:00
Andreas Fischer
b2f5d5c876 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
2011-06-19 17:58:16 +02:00
Nils Adermann
6458a1a16a [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
Avoids the global hidden fields from functions.php overwriting local
searches.

PHPBB3-10232
2011-06-18 23:22:25 +02:00
Andreas Fischer
b774520621 [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases. 2011-06-12 19:45:01 +02:00
Nils Adermann
da41c754be Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9878] Remove IE7 emulation from prosilver/subSilver2
2011-06-09 23:24:05 +02:00
Nils Adermann
4f4c3220ad Merge branch 'ticket/adamreyher/9878' into develop-olympus
* ticket/adamreyher/9878:
  [ticket/9878] Remove IE7 emulation from prosilver/subSilver2
2011-06-09 23:23:45 +02:00
Andreas Fischer
0942fca299 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10068] Style links posted in posts the same way as in signatures.
2011-06-09 22:33:49 +02:00
Andreas Fischer
d783211f82 Merge remote-tracking branch 'nickvergessen/ticket/10068' into develop-olympus
* nickvergessen/ticket/10068:
  [ticket/10068] Style links posted in posts the same way as in signatures.
2011-06-09 22:33:12 +02:00
Andreas Fischer
73e5c7ece5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10171] Fix displaying the "PM marking colours" in Firefox4.
2011-06-09 22:10:09 +02:00
Andreas Fischer
e03e213d0b Merge remote-tracking branch 'nickvergessen/ticket/10171' into develop-olympus
* nickvergessen/ticket/10171:
  [ticket/10171] Fix displaying the "PM marking colours" in Firefox4.
2011-06-09 22:08:49 +02:00
Andreas Fischer
d2f7782b75 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7888] Swap in-forum/topic search to GET forms.
2011-06-09 21:59:52 +02:00
Andreas Fischer
905d93ccee Merge remote-tracking branch 'naderman/ticket/7888' into develop-olympus
* naderman/ticket/7888:
  [ticket/7888] Swap in-forum/topic search to GET forms.
2011-06-09 21:57:05 +02:00
Nils Adermann
5b5ed96bc5 [ticket/7888] Swap in-forum/topic search to GET forms.
This will allow sending URLs to search results to other users. The advanced
search page has always worked like this, but these special pages used to
cause problems.

PHPBB3-7888
2011-06-09 21:53:12 +02:00
Andreas Fischer
b64159c001 Merge remote-tracking branch 'naderman/ticket/7057' into develop-olympus
* naderman/ticket/7057:
  [ticket/7057] Use GET for quicksearch and add session id to hidden fields
  [ticket/7057] Remove trailing whitespace in functions.php
2011-06-09 13:10:48 +02:00
Andreas Fischer
19439b86b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7057] Use GET for quicksearch and add session id to hidden fields
  [ticket/7057] Remove trailing whitespace in functions.php
2011-06-09 13:10:48 +02:00
Adam Reyher
fe425dedff [ticket/9878] Remove IE7 emulation from prosilver/subSilver2
With these changes, prosilver and subSilver2 no longer need to force IE7
emulation when browsing with IE8 due to the well-known textarea scrolling
bug.

PHPBB3-9878
2011-06-09 06:52:11 -04:00
Joas Schilling
c07540163c [ticket/10068] Style links posted in posts the same way as in signatures.
Firefox4 is going to have some restrictions to :visited for security purpose
(see http://hacks.mozilla.org/2010/03/privacy-related-changes-coming-to-css-vistited/ for more information)
In phpBB links inside posts therefor can not be displayed with the dotted line
anymore. So when we change this anyway we can just make links in signature and
posts look the same.

PHPBB3-10068
2011-06-06 16:54:40 +02:00
Nils Adermann
0a1e7ca02b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9922] Link post subject to the post's anchor in subsilver2.
2011-06-05 03:06:31 +02:00
Nils Adermann
ffc137986f Merge branch 'ticket/bantu/9922' into develop-olympus
* ticket/bantu/9922:
  [ticket/9922] Link post subject to the post's anchor in subsilver2.
2011-06-05 03:00:56 +02:00
Nils Adermann
6e8b59dce3 [ticket/7057] Use GET for quicksearch and add session id to hidden fields
Without sid a GET form logs a user out if they have cookies disabled.

PHPBB3-7057
2011-06-02 10:10:42 +02:00
Andreas Fischer
09776d2302 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:55 +02:00
Oleg Pudeyev
f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php
2011-05-20 19:50:29 -04: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
Andreas Fischer
2f458352b8 [ticket/10173] Use a loop var for the birthdays list to allow proper templating
Introduce a loop variable for the list of birthdays to allow templates to
handle how the list is displayed.

We keep the old BIRTHDAY_LIST variable that contains the precompiled list
around for backward compatibility.

PHPBB3-10173
2011-05-08 15:36:27 +02:00
Andreas Fischer
963a67332a [ticket/9922] Link post subject to the post's anchor in subsilver2.
Link post subject to the post's anchor in subsilver2 to expose full URL to post
which is otherwise only hidden behind the small post icon.

PHPBB3-9922
2011-05-05 19:53:10 +02:00
Joas Schilling
0d234cabf4 [ticket/10171] Fix displaying the "PM marking colours" in Firefox4.
PHPBB3-10171
2011-05-05 15:57:59 +02:00
Oleg Pudeyev
c651948cb3 [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
PHPBB3-9630
2011-05-02 23:54:35 -04:00
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
Igor Wiedler
30daee12f9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
2011-03-20 22:42:51 +01: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
089e3a9ff4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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:33:55 -05: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
8053be52e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9948] Inline quicktime files won't show
2011-03-12 19:14:04 -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
Oleg Pudeyev
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
Oleg Pudeyev
79caaa455e Merge branch 'ticket/nickvergessen/7938' into develop
* ticket/nickvergessen/7938:
  [ticket/7938] Display information about unread and new PMs in the header.
2011-02-28 19:55:58 -05:00
Joas Schilling
8fee84a68a [ticket/7938] Display information about unread and new PMs in the header.
PHPBB3-7938
2011-03-01 01:11:53 +01:00
Igor Wiedler
ab3f45c0e9 Merge branch 'ticket/hanakin/10001' into develop
* ticket/hanakin/10001:
  [ticket/10001]  Created the new styles within colours.css to handle the displaying of the forum & topic images
  [ticket/10001]  Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
2011-02-28 00:07:59 +01:00
Igor Wiedler
f49b8a0e3e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
2011-02-27 23:18:33 +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
cee6014ccf Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10036] Use image from configuration file for displaying online-status.
2011-02-26 18:17:50 +01:00