1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-14 19:45:21 +02:00

1525 Commits

Author SHA1 Message Date
Oleg Pudeyev
fb51bc487a Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/css-reset-v2' into develop
* cyberalien/feature/prosilver-cleanup/css-reset-v2:
  [feature/prosilver-cleanup/css-reset-v2] CSS reset
2012-03-24 06:54:26 -04:00
Vjacheslav Trushkin
583da4274f Merge branch 'develop' into feature/prosilver-cleanup/duplicate-colors
* develop: (117 commits)
  [task/travis] Refactor php version check for dbunit install
  [task/travis] Exclude functional and slow tests
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [ticket/10684] Adjust function and parameter name, minor changes.
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  [task/travis] Adding Travis Continuous Intergration Support
  [ticket/10704] minor typo in a comment
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
  [ticket/10691] Fixed the speed of creating search index
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
  [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
  [ticket/10689] Fix "First character"-option in "Find a member"-search
  ...

Conflicts:
	phpBB/styles/prosilver/theme/cp.css
2012-03-24 11:45:53 +02:00
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
3a044b4b3e [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
As cyberalien requested. This was changed to match better the idea behind
what was made in prosilver to subsilver2.

PHPBB3-10600
2012-03-19 08:27:32 -04: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
c241a4a2b4 [feature/save-post-on-report] Saves the post reported when a report is creat
A problem when creating a report is that the report may be made and then
the post changed. After the changes, if the report is seen the message
it shows may not be correct to be reported. With these changes, when
a report is created the system copies the post that was reported and
shows it in the report details in the MCP

PHPBB3-10600
2012-03-19 08:27:31 -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
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
Vjacheslav Trushkin
95a69639fd [feature/merging-style-components] Adding template information to style.cfg
Adding template data to style.cfg and removing obsolete comments

PHPBB3-10632
2012-03-14 23:26:23 +02: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
f70786ab2e [feature/prosilver-cleanup/remove-tweaks2] Updating tweaks
Removing unnecessary tweaks, changing IE7 tweaks to modern code

PHPBB3-10622
2012-03-08 01:43:11 +02:00
Vjacheslav Trushkin
dfce7c7e96 [feature/prosilver-cleanup/remove-tweaks2] Copying common tweaks
Copying commonly used code from tweaks.css to common.css

PHPBB3-10622
2012-03-08 01:42:27 +02:00
Vjacheslav Trushkin
179fa3ef40 [feature/prosilver-cleanup/remove-tweaks2] Removing tweaks from forms
Removing IE6 tweaks from forms.css

PHPBB3-10622
2012-03-08 01:40:09 +02: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
Callum Macrae
2b0282cba7 [ticket/10510] Updated quick-mod conditional in subsilver2.
It was still trying to use the old conditional, which was referring to a
variable which had been removed.

PHPBB3-10510
2012-03-04 10:51:57 +00: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
Andreas Fischer
ad3bbcf466 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10456] Add tabindex to subsilver2 captcha
2012-02-25 20:26:29 +01:00
Andreas Fischer
20d3d279ce Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympus
* nickvergessen/ticket/10456:
  [ticket/10456] Add tabindex to subsilver2 captcha
2012-02-25 20:26:19 +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
340a8f19d6 [ticket/10456] Add tabindex to subsilver2 captcha
Did not set tabindex on registration page, as the hole page does not have any.

PHPBB3-10456
2012-02-21 11:25:22 +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
Igor Wiedler
625a1f2b20 Merge remote-tracking branch 'cyberalien/ticket/10378' into develop
* cyberalien/ticket/10378:
  [ticket/10378] Missing entries from imageset to css conversion
  [ticket/10378] Imageset to css convertor typo
2012-02-17 14:08:03 +01:00
Igor Wiedler
d70c3f1eb8 Merge branch 'develop' into ticket/10380
* develop: (325 commits)
  [ticket/10641] Update MCP template with new plurality forms
  [ticket/10637] Leftovers from implementation of extensions in convertor
  [ticket/10637] Leftovers from implementation of extensions in develop tools
  [ticket/10637] Leftovers from implementation of extensions in mcp_post
  [ticket/10637] Leftovers from implementation of extensions in mcp_main
  [ticket/10637] Leftovers from implementation of extensions
  [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
  [ticket/10606] Fix incorrect hidden fields array name in page_header().
  [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
  [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
  [ticket/10634] Specify module type when viewing profile
  [ticket/10634] Changing p_master::is_full_class
  [ticket/10569] Invalid string comparison in prosilver
  [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
  [ticket/10512] Call startup.php from tests/bootstrap.php
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/9914] Add backup warning to updater.
  [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-17 13:48:48 +01:00
Vjacheslav Trushkin
f17449e5ff [feature/prosilver-cleanup/duplicate-colors] Removing duplicate colors
Removing color values from files other than colours.css

PHPBB3-10619
2012-02-16 10:53:36 +02: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
Vjacheslav Trushkin
246be1cb08 [feature/prosilver-cleanup/css-reset-v2] CSS reset
Adding proper CSS reset to prosilver

PHPBB3-10617
2012-02-05 14:09:28 +02: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
Vjacheslav Trushkin
879c92e8a2 [ticket/10569] Invalid string comparison in subsilver2
Fixing invalid string comparison in ucp_main_front.html in subsilver2

PHPBB3-10569
2012-02-03 15:38:52 +02:00
Vjacheslav Trushkin
c54c06e98c [ticket/10378] Missing entries from imageset to css conversion
Adding missing entries from imageset to css conversion to prosilver/theme/en/stylesheet.css

PHPBB3-10378
2012-01-20 12:41:36 +02:00