Commit graph

1037 commits

Author SHA1 Message Date
Vjacheslav Trushkin
6145e0ba65 [ticket/10270] Changing close button for ajax popups
Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css

PHPBB3-10270
2012-03-31 02:10:16 +02:00
Igor Wiedler
8a0d8c0a84 [feature/ajax] Do not hard-code sorting images of acp_forums ordering
PHPBB3-10270
2012-03-31 02:09:25 +02:00
Callum Macrae
ba817086f8 [ticket/10270] Renamed the CSS class "jalert" to "phpbb_alert".
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
db7c4f938e [ticket/10270] Added close buttons to phpbb.alert and phpbb.confirm.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
7ccc18297a [ticket/10270] Makes page fade to dark on popup, and added $.querystring.
PHPBB3-10270
2012-03-31 02:09:12 +02:00
Callum Macrae
8a28456f75 [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).
This commit AJAXifies the moderator approval functionality, and adds it to
viewtopic instead of the MCP. This commit has involved some language changes,
which may affect fallbacks.

PHPBB3-10273
2012-03-31 02:00:22 +02:00
Callum Macrae
d420ceb9c7 [ticket/10270] Added JavaScript popups and basic AJAX functionality to PHP.
This commit adds the phpbb object (JavaScript), and alert and confirm box
methods. It also adds the first basic AJAX functionality, to deleting posts
in viewtopic.

PHPBB3-10270
2012-03-31 02:00:22 +02:00
David King
0f93e0c719 Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/duplicate-colors' into develop 2012-03-30 18:57:14 -04:00
David King
3d610e3872 Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/remove-tweaks2' into develop 2012-03-30 17:08:40 -04:00
Vjacheslav Trushkin
ba431def5d Merge remote-tracking branch 'upstream/develop' into feature/merging-style-components
* upstream/develop: (65 commits)
  [ticket/10730] Added label tag around "select" text in post splitting UI
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [task/php5.3] Updated range of tested PHP versions
  [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
  [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
  [ticket/10723] Stop Travis running all tests on sqlite
  [ticket/10703] Added a condition to check if ext directory exists
  [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
  ...

Conflicts:
	phpBB/install/database_update.php
2012-03-29 22:38:07 +03:00
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
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
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
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
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
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
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
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
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
Vjacheslav Trushkin
7295e5824a [ticket/10380] BIDI support for imageset
BIDI support for imageset conversion script, added RTL imageset entries to prosilver and subsilver2, fixed small bug in imageset.css, changed spacing in code to match phpbb coding guidelines

PHPBB3-10380
2012-01-16 14:35:29 +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
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
Joas Schilling
1a09f9005c [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
Revert "[ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632"

This reverts commit c67633577f.

PHPBB3-6632
PHPBB3-10485
PHPBB3-10504
2011-12-08 23:05:13 +01:00
Joas Schilling
c67633577f [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1

PHPBB3-6632
PHPBB3-10485
2011-11-21 23:23:02 +01:00
Andreas Fischer
06ae98b1e5 [develop-olympus] Bumping version numbers to final for 3.0.10 releases. 2011-11-20 21:41:24 +01:00
Raimon
c0ffc8386c [ticket/10453] PM viewmessage page is misplacing the online icon
Removed the position: absolute value, and made it so that if the
buttons are bigger the text move with it, also added support for
bidi.css (text right to left).

PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
2011-11-14 21:38:10 +01:00
Andreas Fischer
b21e343b5e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
2011-11-14 13:45:01 +01:00
Andreas Fischer
9d7b144c54 Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympus
* bantu/ticket/10254:
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
2011-11-14 13:44:38 +01:00
Andreas Fischer
e543effc64 [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
PHPBB3-10254
2011-11-14 13:32:54 +01:00
maelsoucaze
4d760630c3 [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
PHPBB3-10254
2011-11-14 13:29:28 +01:00
maelsoucaze
dee836315c [ticket/10254] Remove style names from themes and fix some informations on it.
PHPBB3-10254
2011-11-14 13:28:42 +01:00
Raimon
65921ae67a [ticket/10453] PM viewmessage page is misplacing the online icon
PHPBB3-10453

http://tracker.phpbb.com/browse/PHPBB3-10453
2011-11-13 20:10:51 +01:00
Andreas Fischer
5546e8cf57 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7932] Fix font size in select boxes
2011-11-01 20:24:00 +01:00
Andreas Fischer
945a63d204 Merge remote-tracking branch 'nickvergessen/ticket/7932' into develop-olympus
* nickvergessen/ticket/7932:
  [ticket/7932] Fix font size in select boxes
2011-11-01 20:23:20 +01:00
Joas Schilling
cf49b5f46f [ticket/7932] Fix font size in select boxes
PHPBB3-7932
2011-10-29 23:32:47 +02:00
Andreas Fischer
baf09125ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
2011-10-13 17:10:38 +02:00
Joas Schilling
88aacd0f2c [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
PHPBB3-10408
2011-10-13 15:52:12 +02:00
Chris Smith
b1df91db80 [feature/remove-db-styles] Remove parse_css_file option from themes.
PHPBB3-9741
2011-09-20 21:06:52 +01:00