| Commit message (Collapse) | Author | Age | Files | Lines |
| ... | |
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* callumacrae/ticket/10783:
[ticket/10783] Fixed an HTML error with assets_version.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-10783
|
| |\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* github-callumacrae/ticket/10783:
[ticket/10783] Added assets_version to ACP and simple_*.html.
[ticket/10783] Added assets_version to subsilver2.
[ticket/10783] Added ?assets_version to assets.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-10783
|
| | | |_|/ / /
| |/| | | |
| | | | | |
| | | | | | |
PHPBB3-10783
|
| |\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
* develop-olympus:
[ticket/10455] Removed NOTE from prosilver overall_header.html.
|
| | | |\ \ \ \
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | | |
* callumacrae/ticket/10455:
[ticket/10455] Removed NOTE from prosilver overall_header.html.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
PHPBB3-10455
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The pull request (#654) was merged a little too quickly.
In particular, display_last_subject per-forum option needs consensus.
This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing
changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59.
PHPBB3-10650
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The subject being displayed in the forum list have been
shortened to 30 characters. Also it is now being shown
in a separate line.
PHPBB3-10650
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The entry in languages have been changed from
title to subject. Also the IF condition in forumlist_body.html
has been properly intented.
PHPBB3-10650
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The most recent topic title of the forum can now
be displayed on the board index. An option is provided
in the ACP under the 'General Forum Setting' which
allows the admin to enable or disable this feature.
PHPBB3-10650
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| / / / /
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* develop-olympus:
[ticket/10607] Added 'Powered by' translation string.
Conflicts:
phpBB/adm/index.php
phpBB/language/en/common.php
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Added POWERED_BY line to common.php and modified the templates
to use it.
PHPBB3-10607
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* develop-olympus:
[ticket/10699] Long h2 title breaks div.minitabs in MCP
[ticket/10699] Long h2 title breaks div.minitabs in MCP
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* sadu/ticket/10699:
[ticket/10699] Long h2 title breaks div.minitabs in MCP
[ticket/10699] Long h2 title breaks div.minitabs in MCP
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixed minor issues in formatting.
PHPBB3-10699
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fixed overlapping of Subject title over the minitabs.
Added css property to cp.css under MCP Specific tweaks.
Wrapped h2 and #minitabs under .tabs-container with
clear: both
PHPBB3-10699
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.
PHPBB3-10731
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | | |
[feature/qrpreview] Preview from Quick Reply
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-10726
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PHPBB3-10726
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* upstream/develop:
[ticket/10733] Fixing test
[ticket/10733] Removing static from data providers
[ticket/10731] Fixed addquote() to work on opera browser.
[ticket/10731] Fixed addquote() to work on opera browser.
[Ticket/10675] Correct language string ATTACH_DISK_FULL
[feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
[ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
[ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
[ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
[ticket/10675] Add disk full language string when posting attachments
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In opera, window.getSelection() returned incorrect values, should be using
document.getSelection() instead. Fixed in prosilver and subsilver2 templates.
PHPBB3-10731
|
| | | |\ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Located the L_WARNINGS_ZERO_TOTAL in prosilver and replaced it with
L_NO_WARNINGS
PHPBB3-10705
|
| | |/ / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Implementing INLCUDEJS template tag in styles
PHPBB3-10665
|
| | |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* develop: (175 commits)
[feature/ajax] Remove strange non-breaking spaces from approve button
[feature/ajax] Add entirely unrelated but nice newlines
[feature/ajax] Unify phpbb_json_response instantiation
[feature/ajax] Fix acp_styles activate_deactivate ajax callback name
[feature/ajax] Send correct activate/deactivate JSON response in acp_profile
[ticket/10270] Alter background colors for posts
[feature/ajax] Remove not working module enable/disable ajax code
[feature/ajax] Replace static call to phpbb_request with OO
[feature/ajax] Remove quick-reply AJAX handling until we have something good
[ticket/10270] Changing close button for ajax popups
[ticket/10270] Disabling links in disappearing content
[ticket/10291] Fixed an AJAX bug on quick reply form submit.
[ticket/10273] Fixed accepting / denying posts AJAX.
[ticket/10272] Removed code that was prevent event propogation in AJAX.
[ticket/10291] Fixed a bug in the quick reply AJAX.
[feature/ajax] Handle acp_modules error cases with JSON response
[feature/ajax] Fix filter check, quick mod tools data-attribute
[feature/ajax] Use the error handler
[feature/ajax] Generic error handling with a phpbb.alert box
[feature/ajax] Change filter semantics, some minor adjustments
...
Conflicts:
phpBB/adm/style/acp_styles.html
phpBB/includes/acp/acp_styles.php
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Removing theme.cfg and template.cfg
PHPBB3-10632
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Moved color related style elements to colours.css and other elements to
common.css
Also added an empty display for corners span.
Removed unwanted space in mcp_topic
Removed DS_Store
PHPBB-10734
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Removed the corner span classes from all the template and theme files.
PHPBB-10734
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Removed the corner and clear span classes
PHPBB-10734
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Removed unnecessary span from several other template files
PHPBB3-10734
|
| | |_|/ / / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Removed unnecessary span from overall_header, overall_footer,
forumlist_body, viewforum_body.
PHPBB3-10734
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The viewtopic inline approve/disapprove buttons for posts had spaces.
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change background colors for posts after deleted post
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The current implementation is not very user friendly, lots of things flashing
in the user's face. We can re-consider AJAX when we have a decent solution.
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Disabling click events for blocks that are being removed via ajax
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
It wasn't fading out.
PHPBB3-10291
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
PHPBB3-10273
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
PHPBB3-10270
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Better handling for zebra: message is displayed instead of first .zebra. Other .zebra entries are emptied, but not completely removed to avoid changing layout.
PHPBB3-10272
|