Commit graph

2369 commits

Author SHA1 Message Date
Andreas Fischer
67ae7f6b60 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
2012-03-22 11:11:31 +01:00
Andreas Fischer
99a271f34b Merge remote-tracking branch 'nickvergessen/ticket/10717' into develop-olympus
* nickvergessen/ticket/10717:
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
2012-03-22 11:11:21 +01:00
Joas Schilling
2005c339ff [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
PHPBB3-10717
2012-03-20 17:45:08 +01:00
Bruno Ais
28c6b95100 [feature/save-post-on-report] bbcode_nl2br missing.
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
95b5109c62 [feature/save-post-on-report] The complete changes for this feature
This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
2012-03-19 08:27:31 -04:00
Cullen Walsh
8416bf3dc9 [feature/avatars] Made ACP avatar gallery in Manage Users prettier
Added row/column information so avatars can be displayed nicely in
the ACP

PHPBB3-10018
2012-03-18 22:21:36 +00:00
Cullen Walsh
6deadc3acf [feature/avatars] Rework UCP to be simpler/more consistent
Redesigning the UCP avatar page to use javascript to make use less
confusing. This design is also more easily transfered to the ACP for
group avatars, which will give better consistency in the long run.

PHPBB3-10018
2012-03-18 22:21:36 +00:00
Cullen Walsh
84099e5bc1 [feature/avatars] Support proper avatar deletion, stub ACP
Fixing avatar deletion in the UCP and ACP, and stubbing the ACP
configuration page. I'll admit I kind of got caught carried away, so
this really should be a couple separate commits.

PHPBB3-10018
2012-03-18 22:20:45 +00:00
Cullen Walsh
f02f621686 [feature/avatars] Fixing remote avatars size checks
Remote avatars size checks were broken. It assumed getimagesize() was
available and used the wrong template values.

PHPBB3-10018
2012-03-18 22:20:45 +00:00
Cullen Walsh
00d4b9d431 [feature/avatars] Implement UCP remote/local avatars
Implementing selection logic for gallery and remote avatars. Modified
some of the driver interfaces to make things work nicer also. Upload
functionality will be in the next commit.

PHPBB3-10018
2012-03-18 22:20:45 +00:00
Cullen Walsh
7abded081d [feature/avatars] UCP Avatar Interface
This stubs out the avatar form fields and how form processing will
occur. Form processing is not yet implemented, but shouldn't be too
hard. After this I will refactor/duplicate some of the logic for the
ACP.

PHPBB3-10018
2012-03-18 22:19:16 +00:00
Callum Macrae
c52e99fdbb [ticket/10510] Fixed a bug where quickmod tools weren't being displayed.
It was referring to some template variables that were removed in a
previous commit. Changed!

PHPBB3-10510
2012-03-17 18:06:45 +00:00
Callum Macrae
9a07f5287c [ticket/10510] Moved quick-mod tools into a loop.
PHPBB3-10510
2012-03-17 18:06:37 +00:00
Oleg Pudeyev
1fa39ea722 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
Oleg Pudeyev
81eeafbb8d Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus
* nickvergessen/ticket/8636:
  [ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:29 -04:00
Oleg Pudeyev
56a7038aa5 [feature/new-tz-handling] Removed DST options from templates.
PHPBB3-9558
2012-03-14 22:57:31 -04:00
Oleg Pudeyev
da8009603d [feature/new-tz-handling] Preselect a timezone in registration.
Use Javascript to obtain client's timezone offset and select the
first timezone in our list with that offset.

Changes for prosilver only. The javascript file should be shared
between styles.

PHPBB3-9558
2012-03-14 22:57:31 -04:00
Vjacheslav Trushkin
1cc9f60f95 [feature/merging-style-components] Removing theme.cfg and template.cfg
Removing theme.cfg and template.cfg

PHPBB3-10632
2012-03-14 23:26:01 +02:00
Joas Schilling
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
PHPBB3-10690
2012-03-14 22:22:22 +01:00
Vjacheslav Trushkin
68fb7356b8 [feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IE
Removing tweaks.css from stylesheet.css, including it for IE8 or older via conditional statements

PHPBB3-10622
2012-03-08 01:38:16 +02:00
callumacrae
c5de658c7f [ticket/10510] Moved quick-mod tools markup to template.
PHPBB3-10510
2012-03-04 10:51:46 +00:00
Andreas Fischer
50d234b9af Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.

Conflicts:
	phpBB/styles/prosilver/template/memberlist_leaders.html
2012-02-28 22:25:09 +01:00
Andreas Fischer
f6cf8782c8 Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympus
* nickvergessen/ticket/9220:
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
2012-02-28 22:23:38 +01:00
Joas Schilling
17dc8c6c5c [ticket/9089] Add tabindex to pm/topic/post icon-options aswell
PHPBB3-9089
2012-02-27 17:18:08 +01:00
Joas Schilling
d3091da5ea [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.

PHPBB3-9220
2012-02-27 16:32:29 +01:00
Andreas Fischer
23e845d066 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10453] Fixing spacing
2012-02-26 16:01:42 +01:00
Vjacheslav Trushkin
d3d8793c1f [ticket/10453] Fixing spacing
Fixing spacing

PHPBB3-10453
2012-02-26 16:54:31 +02:00
Andreas Fischer
2f91623392 Merge remote-tracking branch 'nickvergessen/ticket/10458' into develop
* nickvergessen/ticket/10458:
  [ticket/10458] Fix xHTML errors when print-viewing PMs
2012-02-25 20:34:23 +01:00
Vjacheslav Trushkin
b9da8f3a33 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
2012-02-24 20:05:41 +02:00
Vjacheslav Trushkin
8cb95b3b84 Merge branch 'ticket/raimon/10453' into develop-olympus
* ticket/raimon/10453:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
2012-02-24 20:05:26 +02:00
Joas Schilling
30c08bfe5b [ticket/10458] Fix xHTML errors when print-viewing PMs
PHPBB3-10458
2012-02-23 16:25:47 +01:00
Joas Schilling
8e1e48a7b6 [ticket/8636] Add resync option to topic_view moderation page
PHPBB3-8636
2012-02-23 10:55:57 +01:00
Joas Schilling
cd5c01ac2d [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
I also added tabindex 1 to the buttons for adding the recipients.
Also note, that duplicated tabindex are fine:
http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex

PHPBB3-9089
2012-02-21 11:10:10 +01:00
Patrick Webster
2a5e30db9e [ticket/10641] Update MCP template with new plurality forms
Updates the MCP template according to PHPBB3-10345

PHPBB3-10641
2012-02-11 01:40:01 -06:00
Oleg Pudeyev
598e022d4c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10569] Invalid string comparison in subsilver2
2012-02-10 21:00:51 -05:00
Oleg Pudeyev
ed6bd50ab8 Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympus
* cyberalien/ticket/10569:
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10569] Invalid string comparison in subsilver2
2012-02-10 21:00:36 -05:00
Vjacheslav Trushkin
62288b3c05 [ticket/10569] Invalid string comparison in prosilver
Fixing invalid string comparison in ucp_main_front.html in prosilver

PHPBB3-10569
2012-02-07 22:03:24 +02:00
Igor Wiedler
d4e00b6c0d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10616] Add template inheritance to exported template
  [ticket/10616] Ignore template inheritance that points to self
  [ticket/10616] Add template inheritance to default styles
2012-02-07 16:57:09 +01:00
Oleg Pudeyev
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05:00
Vjacheslav Trushkin
d2a3496149 [ticket/10616] Add template inheritance to default styles
Adding template inheritance field to prosilver and subsilver2

PHPBB3-10616
2012-02-03 16:00:14 +02:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2012-01-02 19:10:27 +01:00
Andreas Fischer
d42d097244 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485

Conflicts:
	phpBB/styles/prosilver/template/forumlist_body.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2011-12-16 17:51:48 +01:00
Andreas Fischer
6bfca76f1c Merge remote-tracking branch 'nickvergessen/ticket/10504' into prep-release-3.0.10
* nickvergessen/ticket/10504:
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
  [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
2011-12-16 17:44:57 +01:00
Andreas Fischer
93701adf02 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
  [ticket/8996] Revert initial fix to keep old behaviour on empty selection
2011-12-16 15:50:11 +01:00
David King
d73c3a297e [ticket/10535] Removed email confirm from UCP, removed unused language entries
PHPBB3-10535
2011-12-15 23:15:24 +00:00
Joas Schilling
2bf4e8d3d0 [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
Revert
"[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey"

This reverts commit 219bdbaf70.

PHPBB3-8996
2011-12-15 22:17:39 +01:00
Joas Schilling
730d2d5d19 [ticket/8996] Revert initial fix to keep old behaviour on empty selection
Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"

This reverts commit eb1f15bc8b.

PHPBB3-8996
2011-12-15 22:14:59 +01:00
David King
18aa4e4ecd [ticket/10535] Remove email confirm check on registration form
PHPBB3-10535
2011-12-15 15:13:11 +00:00
Joas Schilling
8af9a0054c [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
Revert "[ticket/6632] Better viewing of topics for wide screen displays"

This reverts commit bb733b0204.

PHPBB3-6632
PHPBB3-10504
2011-12-08 23:14:02 +01:00
Joas Schilling
e3d81812fa [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and
MCP"

This reverts commit 88aacd0f2c.

PHPBB3-6632
PHPBB3-10408
PHPBB3-10504
2011-12-08 23:07:44 +01:00